Page MenuHomeFreeBSD
Files F162630065

D58177.id.diff
No OneTemporary
Actions

D58177.id.diff
View Options

diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -2195,7 +2195,7 @@
}
}
ip6 = mtod(m, struct ip6_hdr *);
- nd_rd = (struct nd_redirect *)((caddr_t)ip6 + off);
+ nd_rd = (struct nd_redirect *)((char *)ip6 + off);
ifp = m->m_pkthdr.rcvif;
redtgt6 = nd_rd->nd_rd_target;
@@ -2276,7 +2276,7 @@
is_router = is_onlink = 0;
if (IN6_IS_ADDR_LINKLOCAL(&redtgt6))
is_router = 1; /* router case */
- if (bcmp(&redtgt6, &reddst6, sizeof(redtgt6)) == 0)
+ if (memcmp(&redtgt6, &reddst6, sizeof(redtgt6)) == 0)
is_onlink = 1; /* on-link destination case */
if (!is_router && !is_onlink) {
nd6log((LOG_ERR,
@@ -2330,18 +2330,18 @@
int rt_flags;
u_int fibnum;
- bzero(&sdst, sizeof(sdst));
- bzero(&ssrc, sizeof(ssrc));
+ memset(&sdst, 0, sizeof(sdst));
+ memset(&ssrc, 0, sizeof(ssrc));
sdst.sin6_family = ssrc.sin6_family = AF_INET6;
sdst.sin6_len = ssrc.sin6_len = sizeof(struct sockaddr_in6);
- bcopy(&reddst6, &sdst.sin6_addr, sizeof(struct in6_addr));
- bcopy(&src6, &ssrc.sin6_addr, sizeof(struct in6_addr));
+ memcpy(&sdst.sin6_addr, &reddst6, sizeof(struct in6_addr));
+ memcpy(&ssrc.sin6_addr, &src6, sizeof(struct in6_addr));
rt_flags = 0;
if (is_router) {
- bzero(&sgw, sizeof(sgw));
+ memset(&sgw, 0, sizeof(sgw));
sgw.sin6_family = AF_INET6;
sgw.sin6_len = sizeof(struct sockaddr_in6);
- bcopy(&redtgt6, &sgw.sin6_addr,
+ memcpy(&sgw.sin6_addr, &redtgt6,
sizeof(struct in6_addr));
gw = (struct sockaddr *)&sgw;
rt_flags |= RTF_GATEWAY;
@@ -2396,7 +2396,7 @@
* [RFC 2461, sec 8.2]
*/
sip6 = mtod(m0, struct ip6_hdr *);
- bzero(&src_sa, sizeof(src_sa));
+ memset(&src_sa, 0, sizeof(src_sa));
src_sa.sin6_family = AF_INET6;
src_sa.sin6_len = sizeof(src_sa);
src_sa.sin6_addr = sip6->ip6_src;
@@ -2436,7 +2436,7 @@
IN6_IFF_NOTREADY|
IN6_IFF_ANYCAST)) == NULL)
goto fail;
- bcopy(&ia->ia_addr.sin6_addr, &ifp_ll6, sizeof(ifp_ll6));
+ memcpy(&ifp_ll6, &ia->ia_addr.sin6_addr, sizeof(ifp_ll6));
ifa_free(&ia->ia_ifa);
}
@@ -2459,8 +2459,8 @@
ip6->ip6_nxt = IPPROTO_ICMPV6;
ip6->ip6_hlim = 255;
/* ip6->ip6_src must be linklocal addr for my outgoing if. */
- bcopy(&ifp_ll6, &ip6->ip6_src, sizeof(struct in6_addr));
- bcopy(&sip6->ip6_src, &ip6->ip6_dst, sizeof(struct in6_addr));
+ memcpy(&ip6->ip6_src, &ifp_ll6, sizeof(struct in6_addr));
+ memcpy(&ip6->ip6_dst, &sip6->ip6_src, sizeof(struct in6_addr));
/* ND Redirect */
nd_rd = (struct nd_redirect *)(ip6 + 1);
@@ -2474,15 +2474,15 @@
*/
if (!router_ll6)
goto fail;
- bcopy(router_ll6, &nd_rd->nd_rd_target,
+ memcpy(&nd_rd->nd_rd_target, router_ll6,
sizeof(nd_rd->nd_rd_target));
- bcopy(&sip6->ip6_dst, &nd_rd->nd_rd_dst,
+ memcpy(&nd_rd->nd_rd_dst, &sip6->ip6_dst,
sizeof(nd_rd->nd_rd_dst));
} else {
/* make sure redtgt == reddst */
- bcopy(&sip6->ip6_dst, &nd_rd->nd_rd_target,
+ memcpy(&nd_rd->nd_rd_target, &sip6->ip6_dst,
sizeof(nd_rd->nd_rd_target));
- bcopy(&sip6->ip6_dst, &nd_rd->nd_rd_dst,
+ memcpy(&nd_rd->nd_rd_dst, &sip6->ip6_dst,
sizeof(nd_rd->nd_rd_dst));
}
@@ -2515,7 +2515,7 @@
nd_opt->nd_opt_type = ND_OPT_TARGET_LINKADDR;
nd_opt->nd_opt_len = len >> 3;
lladdr = (char *)(nd_opt + 1) + pad;
- bcopy(ln->ll_addr, lladdr, ifp->if_addrlen);
+ memcpy(lladdr, ln->ll_addr, ifp->if_addrlen);
p += len;
}
}
@@ -2582,7 +2582,8 @@
/* pad if easy enough, truncate if not */
if (8 - extra <= M_TRAILINGSPACE(m0)) {
/* pad */
- bzero(m0->m_data + m0->m_len, 8 - extra);
+ memset(m0->m_data + m0->m_len, 0,
+ 8 - extra);
m0->m_len += (8 - extra);
m0->m_pkthdr.len += (8 - extra);
} else {
@@ -2597,7 +2598,7 @@
}
nd_opt_rh = (struct nd_opt_rd_hdr *)p;
- bzero(nd_opt_rh, sizeof(*nd_opt_rh));
+ memset(nd_opt_rh, 0, sizeof(*nd_opt_rh));
nd_opt_rh->nd_opt_rh_type = ND_OPT_REDIRECTED_HEADER;
nd_opt_rh->nd_opt_rh_len = len >> 3;
p += sizeof(*nd_opt_rh);
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -180,7 +180,7 @@
}
}
ip6 = mtod(m, struct ip6_hdr *);
- nd_ns = (struct nd_neighbor_solicit *)((caddr_t)ip6 + off);
+ nd_ns = (struct nd_neighbor_solicit *)((char *)ip6 + off);
saddr6 = ip6->ip6_src;
daddr6 = ip6->ip6_dst;
@@ -214,7 +214,7 @@
* to be a neighbor otherwise. This point is expected to be
* clarified in future revisions of the specification.
*/
- bzero(&src_sa6, sizeof(src_sa6));
+ memset(&src_sa6, 0, sizeof(src_sa6));
src_sa6.sin6_family = AF_INET6;
src_sa6.sin6_len = sizeof(src_sa6);
src_sa6.sin6_addr = saddr6;
@@ -408,7 +408,7 @@
if ((ln->la_flags & (LLE_PUB | LLE_VALID)) == (LLE_PUB | LLE_VALID)) {
link_init_sdl(ifp, (struct sockaddr *)sdl, ifp->if_type);
sdl->sdl_alen = ifp->if_addrlen;
- bcopy(ln->ll_addr, &sdl->sdl_data, ifp->if_addrlen);
+ memcpy(&sdl->sdl_data, ln->ll_addr, ifp->if_addrlen);
LLE_RUNLOCK(ln);
ifa = (struct ifaddr *)in6ifa_ifpforlinklocal(ifp,
IN6_IFF_NOTREADY|IN6_IFF_ANYCAST);
@@ -559,7 +559,7 @@
* above), but we do so here explicitly to make the intention
* clearer.
*/
- bzero(&ip6->ip6_src, sizeof(ip6->ip6_src));
+ memset(&ip6->ip6_src, 0, sizeof(ip6->ip6_src));
}
nd_ns = (struct nd_neighbor_solicit *)(ip6 + 1);
nd_ns->nd_ns_type = ND_NEIGHBOR_SOLICIT;
@@ -601,7 +601,7 @@
m->m_pkthdr.len += optlen;
m->m_len += optlen;
icmp6len += optlen;
- bzero(nd_opt, optlen);
+ memset(nd_opt, 0, optlen);
nd_opt->nd_opt_type = ND_OPT_SOURCE_LINKADDR;
nd_opt->nd_opt_len = optlen >> 3;
memcpy((char *)(nd_opt + 1) + pad, mac,
@@ -623,10 +623,10 @@
m->m_pkthdr.len += optlen;
m->m_len += optlen;
icmp6len += optlen;
- bzero((caddr_t)nd_opt, optlen);
+ memset(nd_opt, 0, optlen);
nd_opt->nd_opt_type = ND_OPT_NONCE;
nd_opt->nd_opt_len = optlen >> 3;
- bcopy(nonce, (caddr_t)(nd_opt + 1), ND_OPT_NONCE_LEN);
+ memcpy(nd_opt + 1, nonce, ND_OPT_NONCE_LEN);
}
ip6->ip6_plen = htons((u_short)icmp6len);
nd_ns->nd_ns_cksum = 0;
@@ -718,7 +718,7 @@
}
}
ip6 = mtod(m, struct ip6_hdr *);
- nd_na = (struct nd_neighbor_advert *)((caddr_t)ip6 + off);
+ nd_na = (struct nd_neighbor_advert *)((char *)ip6 + off);
flags = nd_na->nd_na_flags_reserved;
is_router = ((flags & ND_NA_FLAG_ROUTER) != 0);
@@ -861,7 +861,8 @@
llchange = 0;
else {
if (ln->la_flags & LLE_VALID) {
- if (bcmp(lladdr, ln->ll_addr, ifp->if_addrlen))
+ if (memcmp(lladdr, ln->ll_addr,
+ ifp->if_addrlen))
llchange = 1;
else
llchange = 0;
@@ -1004,7 +1005,7 @@
NET_EPOCH_ASSERT();
int icmp6len, maxlen, error;
- caddr_t mac = NULL;
+ char *mac = NULL;
daddr6 = *daddr6_0; /* make a local copy for modification */
@@ -1104,7 +1105,7 @@
m->m_pkthdr.len += optlen;
m->m_len += optlen;
icmp6len += optlen;
- bzero((caddr_t)nd_opt, optlen);
+ memset(nd_opt, 0, optlen);
nd_opt->nd_opt_type = ND_OPT_TARGET_LINKADDR;
nd_opt->nd_opt_len = optlen >> 3;
memcpy((char *)(nd_opt + 1) + pad, mac, ifp->if_addrlen);
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c
--- a/sys/netinet6/nd6_rtr.c
+++ b/sys/netinet6/nd6_rtr.c
@@ -213,7 +213,7 @@
}
}
ip6 = mtod(m, struct ip6_hdr *);
- nd_rs = (struct nd_router_solicit *)((caddr_t)ip6 + off);
+ nd_rs = (struct nd_router_solicit *)((char *)ip6 + off);
icmp6len -= sizeof(*nd_rs);
nd6_option_init(nd_rs + 1, icmp6len, &ndopts);
@@ -301,7 +301,7 @@
return;
}
- bzero(&pr, sizeof(pr));
+ memset(&pr, 0, sizeof(pr));
pr.ndpr_prefix.sin6_family = AF_INET6;
pr.ndpr_prefix.sin6_len = sizeof(pr.ndpr_prefix);
pr.ndpr_prefix.sin6_addr = pi->nd_opt_pi_prefix;
@@ -557,7 +557,7 @@
return;
}
}
- nd_ra = (struct nd_router_advert *)((caddr_t)ip6 + off);
+ nd_ra = (struct nd_router_advert *)((char *)ip6 + off);
icmp6len -= sizeof(*nd_ra);
nd6_option_init(nd_ra + 1, icmp6len, &ndopts);
@@ -574,7 +574,7 @@
if (IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst))
mcast = true;
- bzero(&dr0, sizeof(dr0));
+ memset(&dr0, 0, sizeof(dr0));
dr0.rtaddr = saddr6;
dr0.raflags = nd_ra->nd_ra_flags_reserved;
/*
@@ -636,7 +636,7 @@
auth = ((m->m_flags & M_AUTHIPHDR) && (m->m_flags & M_AUTHIPDGM));
for (pt = (struct nd_opt_hdr *)ndopts.nd_opts_pi;
pt <= (struct nd_opt_hdr *)ndopts.nd_opts_pi_end;
- pt = (struct nd_opt_hdr *)((caddr_t)pt +
+ pt = (struct nd_opt_hdr *)((char *)pt +
(pt->nd_opt_len << 3))) {
nd6_ra_opt_pi(pt, ifp, nd_ra, dr, auth, mcast);
}
@@ -2807,7 +2807,7 @@
if (error != 0)
return (error);
- bzero(&d, sizeof(d));
+ memset(&d, 0, sizeof(d));
d.rtaddr.sin6_family = AF_INET6;
d.rtaddr.sin6_len = sizeof(d.rtaddr);

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 16, 6:39 AM (5 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35085412
Default Alt Text
D58177.id.diff (8 KB)

Event Timeline