summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/netinet/ip_output.c16
-rw-r--r--sys/netinet/tcp_input.c33
-rw-r--r--sys/netinet/tcp_output.c10
3 files changed, 29 insertions, 30 deletions
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index d4a4b5667ff..6dedd8789e6 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_output.c,v 1.314 2015/12/03 21:29:58 sashan Exp $ */
+/* $OpenBSD: ip_output.c,v 1.315 2015/12/05 10:52:26 tedu Exp $ */
/* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */
/*
@@ -761,7 +761,7 @@ ip_insertoptions(struct mbuf *m, struct mbuf *opt, int *phlen)
m = n;
m->m_len = optlen + sizeof(struct ip);
m->m_data += max_linkhdr;
- bcopy((caddr_t)ip, mtod(m, caddr_t), sizeof(struct ip));
+ memcpy(mtod(m, caddr_t), ip, sizeof(struct ip));
} else {
m->m_data -= optlen;
m->m_len += optlen;
@@ -769,7 +769,7 @@ ip_insertoptions(struct mbuf *m, struct mbuf *opt, int *phlen)
memmove(mtod(m, caddr_t), (caddr_t)ip, sizeof(struct ip));
}
ip = mtod(m, struct ip *);
- bcopy((caddr_t)p->ipopt_list, (caddr_t)(ip + 1), optlen);
+ memcpy(ip + 1, p->ipopt_list, optlen);
*phlen = sizeof(struct ip) + optlen;
ip->ip_len = htons(ntohs(ip->ip_len) + optlen);
return (m);
@@ -811,7 +811,7 @@ ip_optcopy(struct ip *ip, struct ip *jp)
if (optlen > cnt)
optlen = cnt;
if (IPOPT_COPIED(opt)) {
- bcopy((caddr_t)cp, (caddr_t)dp, optlen);
+ memcpy(dp, cp, optlen);
dp += optlen;
}
}
@@ -1058,8 +1058,8 @@ ip_ctloutput(int op, struct socket *so, int level, int optname,
*mp = m = m_get(M_WAIT, MT_SOOPTS);
if (inp->inp_options) {
m->m_len = inp->inp_options->m_len;
- bcopy(mtod(inp->inp_options, caddr_t),
- mtod(m, caddr_t), m->m_len);
+ memcpy(mtod(m, caddr_t),
+ mtod(inp->inp_options, caddr_t), m->m_len);
} else
m->m_len = 0;
break;
@@ -1280,7 +1280,7 @@ ip_pcbopts(struct mbuf **pcbopt, struct mbuf *m)
/*
* Move first hop before start of options.
*/
- bcopy((caddr_t)&cp[IPOPT_OFFSET+1], mtod(m, caddr_t),
+ memcpy(mtod(m, caddr_t), &cp[IPOPT_OFFSET+1],
sizeof(struct in_addr));
/*
* Then copy rest of options back
@@ -1486,7 +1486,7 @@ ip_setmoptions(int optname, struct ip_moptions **imop, struct mbuf *m,
sizeof(*nmships) * newmax, M_IPMOPTS,
M_NOWAIT|M_ZERO);
if (nmships != NULL) {
- bcopy(omships, nmships,
+ memcpy(nmships, omships,
sizeof(*omships) *
imo->imo_max_memberships);
free(omships, M_IPMOPTS,
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index e82ccaf1bd0..a495f54fe31 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_input.c,v 1.311 2015/12/03 14:05:28 bluhm Exp $ */
+/* $OpenBSD: tcp_input.c,v 1.312 2015/12/05 10:52:26 tedu Exp $ */
/* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */
/*
@@ -689,13 +689,13 @@ findpcb:
switch (af) {
#ifdef INET6
case AF_INET6:
- bcopy(ip6, &tcp_saveti6.ti6_i, sizeof(*ip6));
- bcopy(th, &tcp_saveti6.ti6_t, sizeof(*th));
+ memcpy(&tcp_saveti6.ti6_i, ip6, sizeof(*ip6));
+ memcpy(&tcp_saveti6.ti6_t, th, sizeof(*th));
break;
#endif
case AF_INET:
- bcopy(ip, &tcp_saveti.ti_i, sizeof(*ip));
- bcopy(th, &tcp_saveti.ti_t, sizeof(*th));
+ memcpy(&tcp_saveti.ti_i, ip, sizeof(*ip));
+ memcpy(&tcp_saveti.ti_t, th, sizeof(*th));
break;
}
}
@@ -2272,7 +2272,7 @@ tcp_dooptions(struct tcpcb *tp, u_char *cp, int cnt, struct tcphdr *th,
continue;
if (TCPS_HAVERCVDSYN(tp->t_state))
continue;
- bcopy((char *) cp + 2, (char *) &mss, sizeof(mss));
+ memcpy(&mss, cp + 2, sizeof(mss));
mss = ntohs(mss);
oi->maxseg = mss;
break;
@@ -2292,9 +2292,9 @@ tcp_dooptions(struct tcpcb *tp, u_char *cp, int cnt, struct tcphdr *th,
if (optlen != TCPOLEN_TIMESTAMP)
continue;
oi->ts_present = 1;
- bcopy(cp + 2, &oi->ts_val, sizeof(oi->ts_val));
+ memcpy(&oi->ts_val, cp + 2, sizeof(oi->ts_val));
oi->ts_val = ntohl(oi->ts_val);
- bcopy(cp + 6, &oi->ts_ecr, sizeof(oi->ts_ecr));
+ memcpy(&oi->ts_ecr, cp + 6, sizeof(oi->ts_ecr));
oi->ts_ecr = ntohl(oi->ts_ecr);
if (!(th->th_flags & TH_SYN))
@@ -2547,10 +2547,9 @@ tcp_sack_option(struct tcpcb *tp, struct tcphdr *th, u_char *cp, int optlen)
while (tmp_olen > 0) {
struct sackblk sack;
- bcopy(tmp_cp, (char *) &(sack.start), sizeof(tcp_seq));
+ memcpy(&sack.start, tmp_cp, sizeof(tcp_seq));
sack.start = ntohl(sack.start);
- bcopy(tmp_cp + sizeof(tcp_seq),
- (char *) &(sack.end), sizeof(tcp_seq));
+ memcpy(&sack.end, tmp_cp + sizeof(tcp_seq), sizeof(tcp_seq));
sack.end = ntohl(sack.end);
tmp_olen -= TCPOLEN_SACK;
tmp_cp += TCPOLEN_SACK;
@@ -2833,7 +2832,7 @@ tcp_pulloutofband(struct socket *so, u_int urgent, struct mbuf *m, int off)
tp->t_iobc = *cp;
tp->t_oobflags |= TCPOOB_HAVEDATA;
- bcopy(cp+1, cp, (unsigned)(m->m_len - cnt - 1));
+ memmove(cp, cp + 1, m->m_len - cnt - 1);
m->m_len--;
return;
}
@@ -3652,8 +3651,8 @@ syn_cache_get(struct sockaddr *src, struct sockaddr *dst, struct tcphdr *th,
*/
{
struct inpcb *newinp = sotoinpcb(so);
- bcopy(inp->inp_seclevel, newinp->inp_seclevel,
- sizeof(inp->inp_seclevel));
+ memcpy(newinp->inp_seclevel, inp->inp_seclevel,
+ sizeof(inp->inp_seclevel));
}
#endif /* IPSEC */
#ifdef INET6
@@ -3718,7 +3717,7 @@ syn_cache_get(struct sockaddr *src, struct sockaddr *dst, struct tcphdr *th,
if (am == NULL)
goto resetandabort;
am->m_len = src->sa_len;
- bcopy(src, mtod(am, caddr_t), src->sa_len);
+ memcpy(mtod(am, caddr_t), src, src->sa_len);
switch (src->sa_family) {
case AF_INET:
@@ -4009,8 +4008,8 @@ syn_cache_add(struct sockaddr *src, struct sockaddr *dst, struct tcphdr *th,
* Fill in the cache, and put the necessary IP and TCP
* options into the reply.
*/
- bcopy(src, &sc->sc_src, src->sa_len);
- bcopy(dst, &sc->sc_dst, dst->sa_len);
+ memcpy(&sc->sc_src, src, src->sa_len);
+ memcpy(&sc->sc_dst, dst, dst->sa_len);
sc->sc_rtableid = sotoinpcb(so)->inp_rtableid;
sc->sc_flags = 0;
sc->sc_ipopts = ipopts;
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 7aa2690e21e..ebffeb41691 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_output.c,v 1.115 2015/10/24 16:08:48 mpi Exp $ */
+/* $OpenBSD: tcp_output.c,v 1.116 2015/12/05 10:52:26 tedu Exp $ */
/* $NetBSD: tcp_output.c,v 1.16 1997/06/03 16:17:09 kml Exp $ */
/*
@@ -544,7 +544,7 @@ send:
opt[0] = TCPOPT_MAXSEG;
opt[1] = 4;
mss = htons((u_int16_t) tcp_mss(tp, 0));
- bcopy((caddr_t)&mss, (caddr_t)(opt + 2), sizeof(mss));
+ memcpy(opt + 2, &mss, sizeof(mss));
optlen = 4;
if (flags & TH_ACK)
@@ -775,8 +775,8 @@ send:
if (tp->t_template->m_len != hdrlen - optlen)
panic("tcp_output: template len != hdrlen - optlen");
#endif /* DIAGNOSTIC */
- bcopy(mtod(tp->t_template, caddr_t), mtod(m, caddr_t),
- tp->t_template->m_len);
+ memcpy(mtod(m, caddr_t), mtod(tp->t_template, caddr_t),
+ tp->t_template->m_len);
th = (struct tcphdr *)(mtod(m, caddr_t) + tp->t_template->m_len -
sizeof(struct tcphdr));
@@ -827,7 +827,7 @@ send:
th->th_ack = htonl(tp->rcv_nxt);
if (optlen) {
- bcopy((caddr_t)opt, (caddr_t)(th + 1), optlen);
+ memcpy(th + 1, opt, optlen);
th->th_off = (sizeof (struct tcphdr) + optlen) >> 2;
}
#ifdef TCP_ECN
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.