PERFORCE change 143784 for review
Julian Elischer
julian at FreeBSD.org
Thu Jun 19 20:12:43 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=143784
Change 143784 by julian at julian_trafmon1 on 2008/06/19 20:12:11
Remove all sctp changes
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_asconf.c#4 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_bsd_addr.c#5 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_input.c#4 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os.h#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#4 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.c#6 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#6 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_timer.c#4 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_usrreq.c#6 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/sctp6_usrreq.c#5 edit
Differences ...
==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_asconf.c#4 (text+ko) ====
@@ -877,7 +877,7 @@
*/
/* we probably don't need these operations */
(void)sa6_recoverscope(from6);
- sa6_embedscope(from6, V_ip6_use_defzone);
+ sa6_embedscope(from6, ip6_use_defzone);
break;
}
#endif
==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_bsd_addr.c#5 (text+ko) ====
@@ -47,7 +47,6 @@
#include <netinet/sctp_sysctl.h>
#include <netinet/sctp_indata.h>
#include <sys/unistd.h>
-#include <sys/vimage.h>
/* Declare all of our malloc named types */
@@ -124,7 +123,7 @@
ifa6 = (struct in6_ifaddr *)ifa->ifa;
ifa->flags = ifa6->ia6_flags;
- if (!V_ip6_use_deprecated) {
+ if (!ip6_use_deprecated) {
if (ifa->flags &
IN6_IFF_DEPRECATED) {
ifa->localifa_flags |= SCTP_ADDR_IFA_UNUSEABLE;
@@ -201,7 +200,7 @@
struct sctp_ifa *sctp_ifa;
uint32_t ifa_flags;
- TAILQ_FOREACH(ifn, &V_ifnet, if_list) {
+ TAILQ_FOREACH(ifn, &ifnet, if_list) {
TAILQ_FOREACH(ifa, &ifn->if_addrlist, ifa_list) {
if (ifa->ifa_addr == NULL) {
continue;
==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_input.c#4 (text+ko) ====
@@ -5434,7 +5434,7 @@
* idea, so I will leave it in place.
*/
if (inp && ipsec4_in_reject(m, &inp->ip_inp.inp)) {
- V_ipsec4stat.in_polvio++;
+ ipsec4stat.in_polvio++;
SCTP_STAT_INCR(sctps_hdrops);
goto bad;
}
==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_os.h#2 (text+ko) ====
==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#4 (text+ko) ====
@@ -60,7 +60,6 @@
#include <sys/random.h>
#include <sys/limits.h>
#include <sys/queue.h>
-#include <sys/vimage.h>
#include <machine/cpu.h>
#include <net/if.h>
==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.c#6 (text+ko) ====
@@ -3826,7 +3826,7 @@
sin6 = &tmp;
/* KAME hack: embed scopeid */
- if (sa6_embedscope(sin6, V_ip6_use_defzone) != 0) {
+ if (sa6_embedscope(sin6, ip6_use_defzone) != 0) {
SCTP_LTRACE_ERR_RET_PKT(m, inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EINVAL);
return (EINVAL);
}
@@ -3880,7 +3880,7 @@
if (net->src_addr_selected == 0) {
sin6 = (struct sockaddr_in6 *)&net->ro._l_addr;
/* KAME hack: embed scopeid */
- if (sa6_embedscope(sin6, V_ip6_use_defzone) != 0) {
+ if (sa6_embedscope(sin6, ip6_use_defzone) != 0) {
SCTP_LTRACE_ERR_RET_PKT(m, inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EINVAL);
return (EINVAL);
}
@@ -3903,7 +3903,7 @@
} else {
sin6 = (struct sockaddr_in6 *)&ro->ro_dst;
/* KAME hack: embed scopeid */
- if (sa6_embedscope(sin6, V_ip6_use_defzone) != 0) {
+ if (sa6_embedscope(sin6, ip6_use_defzone) != 0) {
SCTP_LTRACE_ERR_RET_PKT(m, inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EINVAL);
return (EINVAL);
}
@@ -5096,7 +5096,7 @@
*/
(void)sa6_recoverscope(sin6);
stc.scope_id = sin6->sin6_scope_id;
- sa6_embedscope(sin6, V_ip6_use_defzone);
+ sa6_embedscope(sin6, ip6_use_defzone);
stc.loopback_scope = 1;
stc.local_scope = 0;
stc.site_scope = 1;
@@ -5132,7 +5132,7 @@
*/
(void)sa6_recoverscope(sin6);
stc.scope_id = sin6->sin6_scope_id;
- sa6_embedscope(sin6, V_ip6_use_defzone);
+ sa6_embedscope(sin6, ip6_use_defzone);
} else if (IN6_IS_ADDR_SITELOCAL(&sin6->sin6_addr)) {
/*
* If the new destination is
@@ -10260,7 +10260,7 @@
/* Fill in the IPv6 header for the ABORT */
ip6_out->ip6_flow = ip6->ip6_flow;
- ip6_out->ip6_hlim = V_ip6_defhlim;
+ ip6_out->ip6_hlim = ip6_defhlim;
if (port) {
ip6_out->ip6_nxt = IPPROTO_UDP;
} else {
@@ -11225,7 +11225,7 @@
/* Fill in the IP6 header for the ABORT */
ip6_out->ip6_flow = ip6->ip6_flow;
- ip6_out->ip6_hlim = V_ip6_defhlim;
+ ip6_out->ip6_hlim = ip6_defhlim;
if (port) {
ip6_out->ip6_nxt = IPPROTO_UDP;
} else {
@@ -11517,7 +11517,7 @@
in6 = mtod(m, struct ip6_hdr *);
out6 = mtod(mout, struct ip6_hdr *);
out6->ip6_flow = in6->ip6_flow;
- out6->ip6_hlim = V_ip6_defhlim;
+ out6->ip6_hlim = ip6_defhlim;
if (port) {
out6->ip6_nxt = IPPROTO_UDP;
} else {
@@ -13162,7 +13162,7 @@
return (0);
/* get prefix entry of address */
- LIST_FOREACH(pfx, &V_nd_prefix, ndpr_entry) {
+ LIST_FOREACH(pfx, &nd_prefix, ndpr_entry) {
if (pfx->ndpr_stateflags & NDPRF_DETACHED)
continue;
if (IN6_ARE_MASKED_ADDR_EQUAL(&pfx->ndpr_prefix.sin6_addr,
==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#6 (text+ko) ====
@@ -59,11 +59,11 @@
struct sockaddr_in6 tmp_a, tmp_b;
memcpy(&tmp_a, a, sizeof(struct sockaddr_in6));
- if (sa6_embedscope(&tmp_a, V_ip6_use_defzone) != 0) {
+ if (sa6_embedscope(&tmp_a, ip6_use_defzone) != 0) {
return 0;
}
memcpy(&tmp_b, b, sizeof(struct sockaddr_in6));
- if (sa6_embedscope(&tmp_b, V_ip6_use_defzone) != 0) {
+ if (sa6_embedscope(&tmp_b, ip6_use_defzone) != 0) {
return 0;
}
return (IN6_ARE_ADDR_EQUAL(&tmp_a.sin6_addr, &tmp_b.sin6_addr));
@@ -1894,7 +1894,7 @@
/* Get the scopes in properly to the sin6 addr's */
/* we probably don't need these operations */
(void)sa6_recoverscope(from6);
- sa6_embedscope(from6, V_ip6_use_defzone);
+ sa6_embedscope(from6, ip6_use_defzone);
break;
}
#endif
@@ -1941,7 +1941,7 @@
/* Get the scopes in properly to the sin6 addr's */
/* we probably don't need these operations */
(void)sa6_recoverscope(to6);
- sa6_embedscope(to6, V_ip6_use_defzone);
+ sa6_embedscope(to6, ip6_use_defzone);
break;
}
#endif
@@ -2193,7 +2193,7 @@
}
#endif /* IPSEC */
SCTP_INCR_EP_COUNT();
- inp->ip_inp.inp.inp_ip_ttl = V_ip_defttl;
+ inp->ip_inp.inp.inp_ip_ttl = ip_defttl;
SCTP_INP_INFO_WUNLOCK();
so->so_pcb = (caddr_t)inp;
@@ -2606,7 +2606,7 @@
if (!IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
bindall = 0;
/* KAME hack: embed scopeid */
- if (sa6_embedscope(sin6, V_ip6_use_defzone) != 0) {
+ if (sa6_embedscope(sin6, ip6_use_defzone) != 0) {
SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_PCB, EINVAL);
return (EINVAL);
}
@@ -2706,8 +2706,8 @@
int done;
if (ip_inp->inp_flags & INP_HIGHPORT) {
- first = V_ipport_hifirstauto;
- last = V_ipport_hilastauto;
+ first = ipport_hifirstauto;
+ last = ipport_hilastauto;
} else if (ip_inp->inp_flags & INP_LOWPORT) {
if (p && (error =
priv_check(p, PRIV_NETINET_RESERVEDPORT)
@@ -2718,11 +2718,11 @@
SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_PCB, error);
return (error);
}
- first = V_ipport_lowfirstauto;
- last = V_ipport_lowlastauto;
+ first = ipport_lowfirstauto;
+ last = ipport_lowlastauto;
} else {
- first = V_ipport_firstauto;
- last = V_ipport_lastauto;
+ first = ipport_firstauto;
+ last = ipport_lastauto;
}
if (first > last) {
uint16_t temp;
@@ -3635,7 +3635,7 @@
struct sockaddr_in6 *sin6;
sin6 = (struct sockaddr_in6 *)&net->ro._l_addr;
- (void)sa6_embedscope(sin6, V_ip6_use_defzone);
+ (void)sa6_embedscope(sin6, ip6_use_defzone);
sin6->sin6_scope_id = 0;
}
#endif
==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_timer.c#4 (text+ko) ====
@@ -1711,7 +1711,7 @@
struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&net->ro._l_addr;
/* KAME hack: embed scopeid */
- (void)sa6_embedscope(sin6, V_ip6_use_defzone);
+ (void)sa6_embedscope(sin6, ip6_use_defzone);
}
#endif
==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_usrreq.c#6 (text+ko) ====
@@ -532,7 +532,7 @@
inp->sctp_flags &= ~SCTP_PCB_FLAGS_BOUND_V6; /* I'm not v6! */
ip_inp = &inp->ip_inp.inp;
ip_inp->inp_vflag |= INP_IPV4;
- ip_inp->inp_ip_ttl = V_ip_defttl;
+ ip_inp->inp_ip_ttl = ip_defttl;
#ifdef IPSEC
error = ipsec_init_policy(so, &ip_inp->inp_sp);
#ifdef SCTP_LOG_CLOSING
==== //depot/projects/vimage-commit2/src/sys/netinet6/sctp6_usrreq.c#5 (text+ko) ====
@@ -210,7 +210,7 @@
*/
if (in6p_ip && (ipsec6_in_reject(m, in6p_ip))) {
/* XXX */
- V_ipsec6stat.in_polvio++;
+ ipsec6stat.in_polvio++;
goto bad;
}
#endif /* IPSEC */
@@ -679,7 +679,7 @@
* socket as well, because the socket may be bound to an IPv6
* wildcard address, which may match an IPv4-mapped IPv6 address.
*/
- inp6->inp_ip_ttl = V_ip_defttl;
+ inp6->inp_ip_ttl = ip_defttl;
#endif
/*
* Hmm what about the IPSEC stuff that is missing here but in
@@ -843,7 +843,7 @@
}
}
if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
- if (!V_ip6_v6only) {
+ if (!ip6_v6only) {
struct sockaddr_in sin;
/* convert v4-mapped into v4 addr and send */
@@ -974,7 +974,7 @@
}
}
if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
- if (!V_ip6_v6only) {
+ if (!ip6_v6only) {
/* convert v4-mapped into v4 addr */
in6_sin6_2_sin((struct sockaddr_in *)&ss, sin6);
addr = (struct sockaddr *)&ss;
More information about the p4-projects
mailing list