diff options
author | ume <ume@FreeBSD.org> | 2003-11-02 19:09:29 +0000 |
---|---|---|
committer | ume <ume@FreeBSD.org> | 2003-11-02 19:09:29 +0000 |
commit | 87ef6506afe842c6eb1bde321050dd1b826a040f (patch) | |
tree | f8ec8302e59226b97334d68bb28d0d797c136af5 /sys/netinet6 | |
parent | 109d46c916fe905b2d0f4d03304a045dd86f88eb (diff) | |
download | FreeBSD-src-87ef6506afe842c6eb1bde321050dd1b826a040f.zip FreeBSD-src-87ef6506afe842c6eb1bde321050dd1b826a040f.tar.gz |
rename variables.
Obtained from: KAME
Diffstat (limited to 'sys/netinet6')
-rw-r--r-- | sys/netinet6/raw_ip6.c | 8 | ||||
-rw-r--r-- | sys/netinet6/udp6_usrreq.c | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 4f77fae..7525338 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -141,7 +141,7 @@ rip6_input(mp, offp, proto) register struct inpcb *in6p; struct inpcb *last = 0; struct mbuf *opts = NULL; - struct sockaddr_in6 rip6src; + struct sockaddr_in6 fromsa; rip6stat.rip6s_ipackets++; @@ -151,7 +151,7 @@ rip6_input(mp, offp, proto) return IPPROTO_DONE; } - init_sin6(&rip6src, m); /* general init */ + init_sin6(&fromsa, m); /* general init */ LIST_FOREACH(in6p, &ripcb, inp_list) { if ((in6p->in6p_vflag & INP_IPV6) == 0) @@ -202,7 +202,7 @@ rip6_input(mp, offp, proto) /* strip intermediate headers */ m_adj(n, *offp); if (sbappendaddr(&last->in6p_socket->so_rcv, - (struct sockaddr *)&rip6src, + (struct sockaddr *)&fromsa, n, opts) == 0) { m_freem(n); if (opts) @@ -243,7 +243,7 @@ rip6_input(mp, offp, proto) /* strip intermediate headers */ m_adj(m, *offp); if (sbappendaddr(&last->in6p_socket->so_rcv, - (struct sockaddr *)&rip6src, m, opts) == 0) { + (struct sockaddr *)&fromsa, m, opts) == 0) { m_freem(m); if (opts) m_freem(opts); diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 0e5fa97..93d7b1d 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -158,7 +158,7 @@ udp6_input(mp, offp, proto) struct mbuf *opts = NULL; int off = *offp; int plen, ulen; - struct sockaddr_in6 udp_in6; + struct sockaddr_in6 fromsa; IP6_EXTHDR_CHECK(m, off, sizeof(struct udphdr), IPPROTO_DONE); @@ -223,8 +223,8 @@ udp6_input(mp, offp, proto) /* * Construct sockaddr format source address. */ - init_sin6(&udp_in6, m); /* general init */ - udp_in6.sin6_port = uh->uh_sport; + init_sin6(&fromsa, m); /* general init */ + fromsa.sin6_port = uh->uh_sport; /* * KAME note: traditionally we dropped udpiphdr from mbuf here. * We need udphdr for IPsec processing so we do that later. @@ -288,7 +288,7 @@ udp6_input(mp, offp, proto) m_adj(n, off + sizeof(struct udphdr)); if (sbappendaddr(&last->in6p_socket->so_rcv, - (struct sockaddr *)&udp_in6, + (struct sockaddr *)&fromsa, n, opts) == 0) { m_freem(n); if (opts) @@ -346,7 +346,7 @@ udp6_input(mp, offp, proto) m_adj(m, off + sizeof(struct udphdr)); if (sbappendaddr(&last->in6p_socket->so_rcv, - (struct sockaddr *)&udp_in6, + (struct sockaddr *)&fromsa, m, opts) == 0) { udpstat.udps_fullsock++; goto bad; @@ -401,14 +401,14 @@ udp6_input(mp, offp, proto) * Construct sockaddr format source address. * Stuff source address and datagram in user buffer. */ - init_sin6(&udp_in6, m); /* general init */ - udp_in6.sin6_port = uh->uh_sport; + init_sin6(&fromsa, m); /* general init */ + fromsa.sin6_port = uh->uh_sport; if (in6p->in6p_flags & IN6P_CONTROLOPTS || in6p->in6p_socket->so_options & SO_TIMESTAMP) ip6_savecontrol(in6p, m, &opts); m_adj(m, off + sizeof(struct udphdr)); if (sbappendaddr(&in6p->in6p_socket->so_rcv, - (struct sockaddr *)&udp_in6, + (struct sockaddr *)&fromsa, m, opts) == 0) { udpstat.udps_fullsock++; goto bad; |