PERFORCE change 152447 for review
Bjoern A. Zeeb
bz at FreeBSD.org
Tue Nov 4 02:53:33 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=152447
Change 152447 by bz at bz_dumpster on 2008/11/04 10:52:51
Whitespace, admittedly not always better.
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#15 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#12 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#17 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#17 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#24 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#8 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#14 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#12 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#16 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#8 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#14 edit
Differences ...
==== //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#15 (text+ko) ====
@@ -384,7 +384,7 @@
V_rtq_reallyold = 60*60; /* one hour is "really old" */
V_rtq_minreallyold = 10; /* never automatically crank down to less */
- V_rtq_toomany = 128; /* 128 cached routes is "too many" */
+ V_rtq_toomany = 128; /* 128 cached routes is "too many" */
V_rtq_timeout = RTQ_TIMEOUT;
rnh = *head;
==== //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#12 (text+ko) ====
@@ -78,12 +78,12 @@
*/
#ifdef VIMAGE_GLOBALS
-struct icmpstat icmpstat;
+struct icmpstat icmpstat;
static int icmpmaskrepl;
static u_int icmpmaskfake;
static int drop_redirect;
static int log_redirect;
-static int icmplim;
+static int icmplim;
static int icmplim_output;
static char reply_src[IFNAMSIZ];
static int icmp_rfi;
==== //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#17 (text+ko) ====
@@ -231,12 +231,12 @@
V_ipstealth = 0;
V_nipq = 0; /* Total # of reass queues */
- V_ipport_lowfirstauto = IPPORT_RESERVED - 1; /* 1023 */
+ V_ipport_lowfirstauto = IPPORT_RESERVED - 1; /* 1023 */
V_ipport_lowlastauto = IPPORT_RESERVEDSTART; /* 600 */
V_ipport_firstauto = IPPORT_EPHEMERALFIRST; /* 10000 */
- V_ipport_lastauto = IPPORT_EPHEMERALLAST; /* 65535 */
+ V_ipport_lastauto = IPPORT_EPHEMERALLAST; /* 65535 */
V_ipport_hifirstauto = IPPORT_HIFIRSTAUTO; /* 49152 */
- V_ipport_hilastauto = IPPORT_HILASTAUTO; /* 65535 */
+ V_ipport_hilastauto = IPPORT_HILASTAUTO; /* 65535 */
V_ipport_reservedhigh = IPPORT_RESERVED - 1; /* 1023 */
V_ipport_reservedlow = 0;
V_ipport_randomized = 1; /* user controlled via sysctl */
==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#17 (text+ko) ====
@@ -91,11 +91,11 @@
int path_mtu_discovery;
int ss_fltsz;
int ss_fltsz_local;
-int tcp_do_newreno;
-int tcp_do_tso;
-int tcp_do_autosndbuf;
-int tcp_autosndbuf_inc;
-int tcp_autosndbuf_max;
+int tcp_do_newreno;
+int tcp_do_tso;
+int tcp_do_autosndbuf;
+int tcp_autosndbuf_inc;
+int tcp_autosndbuf_max;
#endif
SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, path_mtu_discovery,
==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#24 (text+ko) ====
@@ -102,7 +102,7 @@
static struct tcp_syncache tcp_syncache;
static int tcp_syncookies;
static int tcp_syncookiesonly;
-int tcp_sc_rst_sock_fail;
+int tcp_sc_rst_sock_fail;
#endif
SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, syncookies,
==== //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#8 (text+ko) ====
@@ -326,8 +326,8 @@
#define V_tcp_sack_maxholes VNET_INET(tcp_sack_maxholes)
#define V_tcp_sc_rst_sock_fail VNET_INET(tcp_sc_rst_sock_fail)
#define V_tcp_syncache VNET_INET(tcp_syncache)
-#define V_tcp_syncookies VNET_INET(tcp_syncookies)
-#define V_tcp_syncookiesonly VNET_INET(tcp_syncookiesonly)
+#define V_tcp_syncookies VNET_INET(tcp_syncookies)
+#define V_tcp_syncookiesonly VNET_INET(tcp_syncookiesonly)
#define V_tcp_v6mssdflt VNET_INET(tcp_v6mssdflt)
#define V_tcpstat VNET_INET(tcpstat)
#define V_twq_2msl VNET_INET(twq_2msl)
==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#14 (text+ko) ====
@@ -226,13 +226,13 @@
#endif
SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_RTEXPIRE, rtexpire,
- CTLFLAG_RW, rtq_reallyold6 , 0, "");
+ CTLFLAG_RW, rtq_reallyold6 , 0, "");
SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_RTMINEXPIRE,
- rtminexpire, CTLFLAG_RW, rtq_minreallyold6 , 0, "");
+ rtminexpire, CTLFLAG_RW, rtq_minreallyold6 , 0, "");
SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_RTMAXCACHE, rtmaxcache,
- CTLFLAG_RW, rtq_toomany6 , 0, "");
+ CTLFLAG_RW, rtq_toomany6 , 0, "");
/*
==== //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#12 (text+ko) ====
@@ -167,7 +167,7 @@
#ifdef IP6_AUTO_LINKLOCAL
V_ip6_auto_linklocal = IP6_AUTO_LINKLOCAL;
#else
- V_ip6_auto_linklocal = 1; /* enable by default */
+ V_ip6_auto_linklocal = 1; /* enable by default */
#endif
#ifndef IPV6FORWARDING
@@ -186,15 +186,15 @@
V_ip6_sendredirects = IPV6_SENDREDIRECTS;
V_ip6_defhlim = IPV6_DEFHLIM;
V_ip6_defmcasthlim = IPV6_DEFAULT_MULTICAST_HOPS;
- V_ip6_accept_rtadv = 0; /* "IPV6FORWARDING ? 0 : 1" is dangerous */
+ V_ip6_accept_rtadv = 0; /* "IPV6FORWARDING ? 0 : 1" is dangerous */
V_ip6_log_interval = 5;
V_ip6_hdrnestlimit = 15; /* How many header options will we process? */
- V_ip6_dad_count = 1; /* DupAddrDetectionTransmits */
+ V_ip6_dad_count = 1; /* DupAddrDetectionTransmits */
V_ip6_auto_flowlabel = 1;
- V_ip6_use_deprecated = 1; /* allow deprecated addr (RFC2462 5.5.4) */
- V_ip6_rr_prune = 5; /* router renumbering prefix
- * walk list every 5 sec. */
- V_ip6_mcast_pmtu = 0; /* enable pMTU discovery for multicast? */
+ V_ip6_use_deprecated = 1;/* allow deprecated addr (RFC2462 5.5.4) */
+ V_ip6_rr_prune = 5; /* router renumbering prefix
+ * walk list every 5 sec. */
+ V_ip6_mcast_pmtu = 0; /* enable pMTU discovery for multicast? */
V_ip6_v6only = 1;
V_ip6_keepfaith = 0;
V_ip6_log_time = (time_t)0L;
@@ -208,8 +208,8 @@
/* raw IP6 parameters */
/*
- * Nominal space allocated to a raw ip socket.
- */
+ * Nominal space allocated to a raw ip socket.
+ */
#define RIPV6SNDQ 8192
#define RIPV6RCVQ 8192
V_rip6_sendspace = RIPV6SNDQ;
==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#16 (text+ko) ====
@@ -80,12 +80,12 @@
#define SDL(s) ((struct sockaddr_dl *)s)
#ifdef VIMAGE_GLOBALS
-int nd6_prune;
-int nd6_delay;
-int nd6_umaxtries;
-int nd6_mmaxtries;
-int nd6_useloopback;
-int nd6_gctimer;
+int nd6_prune;
+int nd6_delay;
+int nd6_umaxtries;
+int nd6_mmaxtries;
+int nd6_useloopback;
+int nd6_gctimer;
/* preventing too many loops in ND option parsing */
int nd6_maxndopt;
==== //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#8 (text+ko) ====
@@ -233,7 +233,7 @@
#define V_nd6_maxnudhint VNET_INET6(nd6_maxnudhint)
#define V_nd6_maxqueuelen VNET_INET6(nd6_maxqueuelen)
#define V_nd6_mmaxtries VNET_INET6(nd6_mmaxtries)
-#define V_nd6_onlink_ns_rfc4861 VNET_INET6(nd6_onlink_ns_rfc4861)
+#define V_nd6_onlink_ns_rfc4861 VNET_INET6(nd6_onlink_ns_rfc4861)
#define V_nd6_prune VNET_INET6(nd6_prune)
#define V_nd6_recalc_reachtm_interval VNET_INET6(nd6_recalc_reachtm_interval)
#define V_nd6_slowtimo_ch VNET_INET6(nd6_slowtimo_ch)
==== //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#14 (text+ko) ====
@@ -262,6 +262,7 @@
V_ip4_ah_net_deflev = IPSEC_LEVEL_USE;
V_ip4_ipsec_ecn = 0; /* ECN ignore(-1)/forbidden(0)/allowed(1) */
V_ip4_esp_randpad = -1;
+
V_crypto_support = CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE;
#ifdef REGRESSION
More information about the p4-projects
mailing list