d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix -Wcast-align warnings

Browse Source 
Use memcpy instead of using direct assignment of void* pointers with
CMSG_DATA(..), which changes alignment

MFC after: 3 weeks
Reported by: clang
Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
Enji Cooper 2016-05-15 03:36:19 +00:00
parent c81c183dae
commit 09ac27c318
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=299830
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/bsnmp/snmpd/main.c
View File

@ -1169,7 +1169,7 @@ recv_dgram(struct port_input *pi, struct in_addr *laddr)
memcpy(laddr, CMSG_DATA(cmsg), sizeof(struct in_addr));
if (cmsg->cmsg_level == SOL_SOCKET &&
cmsg->cmsg_type == SCM_CREDS)
cred = (struct sockcred *)CMSG_DATA(cmsg);
memcpy(cred, CMSG_DATA(cmsg), sizeof(struct sockcred));
}
if (pi->cred)
@ -1207,7 +1207,7 @@ snmpd_input(struct port_input *pi, struct tport *tport)
ret = recv_stream(pi);
} else {
struct in_addr *laddr;
struct in_addr laddr;
memset(cbuf, 0, CMSG_SPACE(sizeof(struct in_addr)));
msg.msg_control = cbuf;
@ -1216,11 +1216,11 @@ snmpd_input(struct port_input *pi, struct tport *tport)
cmsgp->cmsg_len = CMSG_LEN(sizeof(struct in_addr));
cmsgp->cmsg_level = IPPROTO_IP;
cmsgp->cmsg_type = IP_SENDSRCADDR;
laddr = (struct in_addr *)CMSG_DATA(cmsgp);
memcpy(&laddr, CMSG_DATA(cmsgp), sizeof(struct in_addr));
ret = recv_dgram(pi, laddr);
ret = recv_dgram(pi, &laddr);
if (laddr->s_addr == 0) {
if (laddr.s_addr == 0) {
msg.msg_control = NULL;
msg.msg_controllen = 0;
}