Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 32bit builds #50

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix 32bit builds #50

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
255bb3c
net-test: packetdrill: run_system_call: splice expects a pointer to t…
roxell Apr 22, 2021
0ff87dd
net-test: packetdrill: run_system_call: fix 32 bit builds
roxell Apr 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions gtests/net/packetdrill/run_system_call.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <arpa/inet.h>
#include <errno.h>
#include <fcntl.h>
#include <inttypes.h>
#include <limits.h>
#include <linux/netlink.h>
#include <netinet/in.h>
Expand Down Expand Up @@ -857,7 +858,7 @@ static bool cmsg_expect_eq(struct state *state, struct msghdr *expect,
}
if (acm->cmsg_len != ecm->cmsg_len) {
asprintf(error,
"Bad len in cmsg %d: expected=%lu actual=%lu",
"Bad len in cmsg %d: expected=%zu actual=%zu",
i, ecm->cmsg_len, acm->cmsg_len);
return false;
}
Expand Down Expand Up @@ -2921,7 +2922,7 @@ static int get_epoll_event_from_expr(struct state *state,
if (epollev_expr->ptr) {
if (check_type(epollev_expr->ptr, EXPR_INTEGER, error))
return STATUS_ERR;
event->data.ptr = (void *)epollev_expr->ptr->value.num;
event->data.ptr = (void *)((intptr_t)epollev_expr->ptr->value.num);
*epoll_data = EPOLL_DATA_PTR;
} else if (epollev_expr->fd) {
if (check_type(epollev_expr->fd, EXPR_INTEGER, error))
Expand Down Expand Up @@ -3127,8 +3128,8 @@ static int syscall_epoll_wait(struct state *state, struct syscall_spec *syscall,
if (event_script.data.u64 != event_live->data.u64) {
asprintf(error,
"epoll_event->data does not match script: "
"expected: %lu "
"actual: %lu\n",
"expected: %"PRIu64" "
"actual: %"PRIu64"\n",
event_script.data.u64,
event_live->data.u64);
goto error_out;
Expand Down Expand Up @@ -3246,8 +3247,8 @@ static int syscall_splice(struct state *state, struct syscall_spec *syscall,
fd_out_live, (loff_t *) &off_out,
len, flags);
} else {
result = splice(fd_in_live, (loff_t *) off_in, fd_out_live,
(loff_t *) off_out, len, flags);
result = splice(fd_in_live, (loff_t *) &off_in, fd_out_live,
(loff_t *) &off_out, len, flags);
}
if (end_syscall(state, syscall, CHECK_EXACT, result, error))
return STATUS_ERR;
Expand Down