PERFORCE change 153129 for review
Marko Zec
zec at FreeBSD.org
Tue Nov 18 04:56:17 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=153129
Change 153129 by zec at zec_tca51 on 2008/11/18 12:55:22
Further diff reduction against head / back out a few changes
for some later time...
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#17 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#11 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#26 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#26 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#22 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#9 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#16 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#7 edit
Differences ...
==== //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#17 (text+ko) ====
@@ -89,8 +89,8 @@
static int arp_proxyall;
#endif
-SYSCTL_V_INT(V_NET, vnet_inet, _net_link_ether_inet, OID_AUTO, max_age,
- CTLFLAG_RW, arpt_keep, 0, "ARP entry lifetime in seconds");
+SYSCTL_INT(_net_link_ether_inet, OID_AUTO, max_age, CTLFLAG_RW,
+ &arpt_keep, 0, "ARP entry lifetime in seconds");
#define rt_expire rt_rmx.rmx_expire
==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#11 (text+ko) ====
@@ -115,6 +115,7 @@
void
tcp_reass_init(void)
{
+ INIT_VNET_INET(curvnet);
V_tcp_reass_maxseg = 0;
V_tcp_reass_qsize = 0;
==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#26 (text+ko) ====
@@ -145,7 +145,7 @@
}
SYSCTL_PROC(_net_inet_tcp, TCPCTL_MSSDFLT, mssdflt, CTLTYPE_INT|CTLFLAG_RW,
- &tcp_mssdflt, 0, &sysctl_net_inet_tcp_mss_check, "I",
+ &tcp_mssdflt, 0, &sysctl_net_inet_tcp_mss_check, "I",
"Default TCP Maximum Segment Size");
#ifdef INET6
@@ -167,7 +167,7 @@
}
SYSCTL_PROC(_net_inet_tcp, TCPCTL_V6MSSDFLT, v6mssdflt, CTLTYPE_INT|CTLFLAG_RW,
- &tcp_v6mssdflt, 0, &sysctl_net_inet_tcp_mss_v6_check, "I",
+ &tcp_v6mssdflt, 0, &sysctl_net_inet_tcp_mss_v6_check, "I",
"Default TCP Maximum Segment Size for IPv6");
#endif
==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#26 (text+ko) ====
@@ -1097,7 +1097,7 @@
syncache_drop(sc, sch);
sc = uma_zalloc(V_tcp_syncache.zone, M_NOWAIT | M_ZERO);
if (sc == NULL) {
- if (V_tcp_syncookies) {
+ if (tcp_syncookies) {
bzero(&scs, sizeof(scs));
sc = &scs;
} else {
@@ -1206,7 +1206,7 @@
if ((th->th_flags & (TH_ECE|TH_CWR)) && V_tcp_do_ecn)
sc->sc_flags |= SCF_ECN;
- if (V_tcp_syncookies) {
+ if (tcp_syncookies) {
syncookie_generate(sch, sc, &flowtmp);
#ifdef INET6
if (autoflowlabel)
@@ -1225,7 +1225,7 @@
* Do a standard 3-way handshake.
*/
if (TOEPCB_ISSET(sc) || syncache_respond(sc) == 0) {
- if (V_tcp_syncookies && V_tcp_syncookiesonly && sc != &scs)
+ if (tcp_syncookies && tcp_syncookiesonly && sc != &scs)
syncache_free(sc);
else if (sc != &scs)
syncache_insert(sc, sch); /* locks and unlocks sch */
==== //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#22 (text+ko) ====
@@ -135,7 +135,7 @@
#ifdef VIMAGE_GLOBALS
struct inpcbhead udb; /* from udp_var.h */
struct inpcbinfo udbinfo;
-struct udpstat udpstat; /* from udp_var.h */
+struct udpstat udpstat; /* from udp_var.h */
#endif
#ifndef UDBHASHSIZE
==== //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#9 (text+ko) ====
@@ -78,10 +78,7 @@
int _ip_checkinterface;
u_short _ip_id;
-#if 0 /* NOTYET */
uma_zone_t _ipq_zone;
-#endif
-
int _nipq; /* Total # of reass queues */
int _maxnipq; /* Admin. limit on # reass queues. */
int _maxfragsperpacket;
@@ -92,16 +89,12 @@
struct tcpstat _tcpstat; /* tcp statistics */
struct tcp_hostcache _tcp_hostcache;
struct callout _tcp_hc_callout;
-
struct tcp_syncache _tcp_syncache;
- int _tcp_syncookies;
- int _tcp_syncookiesonly;
- int _tcp_sc_rst_sock_fail;
-
struct inpcbhead _divcb;
struct inpcbinfo _divcbinfo;
TAILQ_HEAD(, tcptw) _twq_2msl;
+ int _tcp_sc_rst_sock_fail;
int _tcp_mssdflt;
int _tcp_v6mssdflt;
int _tcp_minmss;
==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#16 (text+ko) ====
@@ -220,19 +220,19 @@
SYSCTL_DECL(_net_inet6_ip6);
#ifdef VIMAGE_GLOBALS
-static int rtq_reallyold6 = 60*60; /* one hour is ``really old'' */
-static int rtq_minreallyold6 = 10; /* never automatically crank down to less */
-static int rtq_toomany6 = 128; /* 128 cached routes is ``too many'' */
+static int rtq_reallyold6;
+static int rtq_minreallyold6;
+static int rtq_toomany6;
#endif
SYSCTL_INT(_net_inet6_ip6, IPV6CTL_RTEXPIRE, rtexpire,
- CTLFLAG_RW, &rtq_reallyold6 , 0, "");
+ CTLFLAG_RW, &rtq_reallyold6 , 0, "");
SYSCTL_INT(_net_inet6_ip6, IPV6CTL_RTMINEXPIRE, rtminexpire,
- CTLFLAG_RW, &rtq_minreallyold6 , 0, "");
+ CTLFLAG_RW, &rtq_minreallyold6 , 0, "");
SYSCTL_INT(_net_inet6_ip6, IPV6CTL_RTMAXCACHE, rtmaxcache,
- CTLFLAG_RW, &rtq_toomany6 , 0, "");
+ CTLFLAG_RW, &rtq_toomany6 , 0, "");
/*
==== //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#7 (text+ko) ====
@@ -147,9 +147,9 @@
#define V_ip4_ipsec_dfbit VNET_IPSEC(ip4_ipsec_dfbit)
#define V_ip4_ipsec_ecn VNET_IPSEC(ip4_ipsec_ecn)
#define V_ip6_ah_net_deflev VNET_IPSEC(ip6_ah_net_deflev)
-#define V_ip6_esp_randpad VNET_IPSEC(ip6_esp_randpad)
#define V_ip6_ah_trans_deflev VNET_IPSEC(ip6_ah_trans_deflev)
#define V_ip6_esp_net_deflev VNET_IPSEC(ip6_esp_net_deflev)
+#define V_ip6_esp_randpad VNET_IPSEC(ip6_esp_randpad)
#define V_ip6_esp_trans_deflev VNET_IPSEC(ip6_esp_trans_deflev)
#define V_ip6_ipsec_ecn VNET_IPSEC(ip6_ipsec_ecn)
#define V_ipcomp_enable VNET_IPSEC(ipcomp_enable)
More information about the p4-projects
mailing list