PERFORCE change 118398 for review
Marko Zec
zec at FreeBSD.org
Thu Apr 19 07:28:01 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=118398
Change 118398 by zec at zec_tca51 on 2007/04/19 07:27:11
More cleanups after failing to properly check in offline
changes all at once...
Affected files ...
.. //depot/projects/vimage/src/sys/netinet/in_pcb.h#5 edit
.. //depot/projects/vimage/src/sys/netinet/ip_input.c#11 edit
.. //depot/projects/vimage/src/sys/netinet/ip_var.h#3 edit
.. //depot/projects/vimage/src/sys/netinet/tcp_var.h#6 edit
Differences ...
==== //depot/projects/vimage/src/sys/netinet/in_pcb.h#5 (text+ko) ====
@@ -326,6 +326,7 @@
#define INP_CHECK_SOCKAF(so, af) (INP_SOCKAF(so) == af)
#ifdef _KERNEL
+#ifndef VIMAGE
extern int ipport_reservedhigh;
extern int ipport_reservedlow;
extern int ipport_lowfirstauto;
@@ -334,6 +335,11 @@
extern int ipport_lastauto;
extern int ipport_hifirstauto;
extern int ipport_hilastauto;
+extern int ipport_randomized;
+extern int ipport_randomcps;
+extern int ipport_randomtime;
+extern int ipport_stoprandom;
+#endif
extern struct callout ipport_tick_callout;
void in_pcbpurgeif0(struct inpcbinfo *, struct ifnet *);
==== //depot/projects/vimage/src/sys/netinet/ip_input.c#11 (text+ko) ====
==== //depot/projects/vimage/src/sys/netinet/ip_var.h#3 (text+ko) ====
@@ -150,21 +150,18 @@
#ifndef VIMAGE
extern struct ipstat ipstat;
-#endif
extern u_short ip_id; /* ip packet ctr, for ids */
extern int ip_defttl; /* default IP ttl */
-#ifndef VIMAGE
extern int ipforwarding; /* ip forwarding */
-#endif
+extern int ip_do_randomid;
#ifdef IPSTEALTH
extern int ipstealth; /* stealth forwarding */
#endif
-extern u_char ip_protox[];
-#ifndef VIMAGE
extern int rsvp_on;
extern struct socket *ip_rsvpd; /* reservation protocol daemon */
extern struct socket *ip_mrouter; /* multicast routing daemon */
#endif
+extern u_char ip_protox[];
extern int (*legal_vif_num)(int);
extern u_long (*ip_mcast_src)(int);
extern struct pr_usrreqs rip_usrreqs;
@@ -209,9 +206,7 @@
void in_delayed_cksum(struct mbuf *m);
-static __inline uint16_t ip_newid(void);
-extern int ip_do_randomid;
-
+#if 0
static __inline uint16_t
ip_newid(void)
{
@@ -220,6 +215,9 @@
return htons(ip_id++);
}
+#else
+#define ip_newid() (V_ip_do_randomid ? ip_randomid() : V_ip_id++)
+#endif
#endif /* _KERNEL */
==== //depot/projects/vimage/src/sys/netinet/tcp_var.h#6 (text+ko) ====
@@ -491,7 +491,6 @@
extern struct inpcbhead tcb; /* head of queue of active tcpcb's */
extern struct inpcbinfo tcbinfo;
extern struct tcpstat tcpstat; /* tcp statistics */
-#endif
extern int tcp_mssdflt; /* XXX */
extern int tcp_minmss;
extern int tcp_delack_enabled;
@@ -499,8 +498,24 @@
extern int path_mtu_discovery;
extern int ss_fltsz;
extern int ss_fltsz_local;
-
extern int tcp_do_sack; /* SACK enabled/disabled */
+extern int tcp_sack_maxholes;
+extern int tcp_sack_globalmaxholes;
+extern int tcp_sack_globalholes;
+extern int tcp_do_tso;
+extern int tcp_do_autosndbuf;
+extern int tcp_autosndbuf_max;
+extern int tcp_autosndbuf_inc;
+extern int tcp_autorcvbuf;
+extern int tcp_do_autorcvbuf;
+extern int tcp_autorcvbuf_inc;
+extern int tcp_autorcvbuf_max;
+extern int blackhole;
+extern int drop_synfin;
+extern int tcp_do_rfc3042;
+extern int tcp_do_rfc3390;
+extern int tcp_insecure_rst;
+#endif
int tcp_addoptions(struct tcpopt *, u_char *);
struct tcpcb *
More information about the p4-projects
mailing list