Skip to content

Fix a couple of compile warnings. #2

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

Closed
wdoekes wants to merge 2 commits into from
Closed

Fix a couple of compile warnings. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b18a17
exec: Fix kill.c compile warnings by including <unistd.h>.
wdoekes Mar 5, 2014
f2e64f5
core: Fix pass_fd.c aliasing warnings by forcing proper packing.
wdoekes Mar 5, 2014
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
1 change: 1 addition & 0 deletions modules/exec/kill.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#include <errno.h>
#include <sys/types.h>
#include <signal.h>
#include <unistd.h>

#include "../../mem/shm_mem.h"
#include "../../dprint.h"
Expand Down
17 changes: 15 additions & 2 deletions pass_fd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,19 @@ int send_all(int socket, void* data, int data_len)
return n;
}

/* gcc does the right thing */
static inline int get_unaligned_int(const void *p)
{
const struct { int d; } __attribute__((packed)) *pp = p;
return pp->d;
}

/* gcc does the right thing */
static inline void put_unaligned_int(void *p, int value)
{
struct { int d; } __attribute__((packed, may_alias)) *pp = p;
pp->d = value;
}

/* at least 1 byte must be sent! */
int send_fd(int unix_socket, void* data, int data_len, int fd)
Expand All @@ -129,7 +142,7 @@ int send_fd(int unix_socket, void* data, int data_len, int fd)
cmsg->cmsg_level = SOL_SOCKET;
cmsg->cmsg_type = SCM_RIGHTS;
cmsg->cmsg_len = CMSG_LEN(sizeof(fd));
*(int*)CMSG_DATA(cmsg)=fd;
put_unaligned_int(CMSG_DATA(cmsg), fd);
msg.msg_flags=0;
#else
msg.msg_accrights=(caddr_t) &fd;
Expand Down Expand Up @@ -237,7 +250,7 @@ int receive_fd(int unix_socket, void* data, int data_len, int* fd, int flags)
ret=-1;
goto error;
}
*fd=*((int*) CMSG_DATA(cmsg));
*fd = get_unaligned_int(CMSG_DATA(cmsg));
}else{
/*
LM_ERR("no descriptor passed, cmsg=%p,len=%d\n",
Expand Down