summaryrefslogtreecommitdiff
path: root/print-ip.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-01-17 17:24:23 -0800
committerGuy Harris <guy@alum.mit.edu>2014-01-17 17:24:23 -0800
commitc947c9dd69434c708f629700a46dcbd9ca5b3987 (patch)
tree0b4a245575663abcdc52a821a24fcd7e73eaedb0 /print-ip.c
parent5f357be7ac5641f60dbe9413f81d184e2984f695 (diff)
downloadtcpdump-c947c9dd69434c708f629700a46dcbd9ca5b3987.tar.gz
More possibly-unaligned memcpy()s and assignments - use unaligned_memcpy().
Diffstat (limited to 'print-ip.c')
-rw-r--r--print-ip.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/print-ip.c b/print-ip.c
index 128834c4..2a3f1e67 100644
--- a/print-ip.c
+++ b/print-ip.c
@@ -117,12 +117,12 @@ ip_finddst(const struct ip *ip)
case IPOPT_LSRR:
if (len < 7)
break;
- memcpy(&retval, cp + len - 4, 4);
+ unaligned_memcpy(&retval, cp + len - 4, 4);
return retval;
}
}
trunc:
- memcpy(&retval, &ip->ip_dst.s_addr, sizeof(u_int32_t));
+ unaligned_memcpy(&retval, &ip->ip_dst.s_addr, sizeof(u_int32_t));
return retval;
}
@@ -146,9 +146,9 @@ nextproto4_cksum(const struct ip *ip, const u_int8_t *data,
ph.len = htons((u_int16_t)len);
ph.mbz = 0;
ph.proto = next_proto;
- memcpy(&ph.src, &ip->ip_src.s_addr, sizeof(u_int32_t));
+ unaligned_memcpy(&ph.src, &ip->ip_src.s_addr, sizeof(u_int32_t));
if (IP_HL(ip) == 5)
- memcpy(&ph.dst, &ip->ip_dst.s_addr, sizeof(u_int32_t));
+ unaligned_memcpy(&ph.dst, &ip->ip_dst.s_addr, sizeof(u_int32_t));
else
ph.dst = ip_finddst(ip);