PERFORCE change 149158 for review
Julian Elischer
julian at FreeBSD.org
Wed Sep 3 21:19:19 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=149158
Change 149158 by julian at julian_trafmon1 on 2008/09/03 21:18:22
Merging between branches
Affected files ...
.. //depot/projects/vimage-devel/src/sys/conf/options#6 integrate
.. //depot/projects/vimage-devel/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#7 integrate
.. //depot/projects/vimage-devel/src/sys/contrib/pf/net/pf_subr.c#3 integrate
.. //depot/projects/vimage-devel/src/sys/ddb/db_textdump.c#5 integrate
.. //depot/projects/vimage-devel/src/sys/dev/firewire/firewire.c#6 integrate
.. //depot/projects/vimage-devel/src/sys/kern/kern_xxx.c#11 integrate
.. //depot/projects/vimage-devel/src/sys/kern/tty.c#7 integrate
.. //depot/projects/vimage-devel/src/sys/net/if.c#8 integrate
.. //depot/projects/vimage-devel/src/sys/net/if_bridge.c#6 integrate
.. //depot/projects/vimage-devel/src/sys/net/if_ef.c#5 integrate
.. //depot/projects/vimage-devel/src/sys/net/if_gif.c#5 edit
.. //depot/projects/vimage-devel/src/sys/net/if_loop.c#8 integrate
.. //depot/projects/vimage-devel/src/sys/net/route.c#8 integrate
.. //depot/projects/vimage-devel/src/sys/net/rtsock.c#7 integrate
.. //depot/projects/vimage-devel/src/sys/net80211/ieee80211.c#9 integrate
.. //depot/projects/vimage-devel/src/sys/net80211/ieee80211_ddb.c#6 integrate
.. //depot/projects/vimage-devel/src/sys/netgraph/atm/ng_atm.c#6 integrate
.. //depot/projects/vimage-devel/src/sys/netgraph/ng_base.c#11 integrate
.. //depot/projects/vimage-devel/src/sys/netgraph/ng_eiface.c#6 integrate
.. //depot/projects/vimage-devel/src/sys/netgraph/ng_ether.c#8 integrate
.. //depot/projects/vimage-devel/src/sys/netgraph/ng_iface.c#6 integrate
.. //depot/projects/vimage-devel/src/sys/netgraph/ng_source.c#4 integrate
.. //depot/projects/vimage-devel/src/sys/netinet/in_rmx.c#6 integrate
.. //depot/projects/vimage-devel/src/sys/netinet/in_var.h#4 integrate
.. //depot/projects/vimage-devel/src/sys/netinet/ip_divert.c#6 integrate
.. //depot/projects/vimage-devel/src/sys/netinet/ip_fw2.c#9 integrate
.. //depot/projects/vimage-devel/src/sys/netinet/ip_input.c#7 integrate
.. //depot/projects/vimage-devel/src/sys/netinet/ip_mroute.c#5 integrate
.. //depot/projects/vimage-devel/src/sys/netinet/raw_ip.c#9 integrate
.. //depot/projects/vimage-devel/src/sys/netinet/tcp_input.c#6 integrate
.. //depot/projects/vimage-devel/src/sys/netinet/tcp_subr.c#7 integrate
.. //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.c#11 integrate
.. //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.h#9 integrate
.. //depot/projects/vimage-devel/src/sys/netinet/tcp_timewait.c#5 integrate
.. //depot/projects/vimage-devel/src/sys/netinet/udp_usrreq.c#11 integrate
.. //depot/projects/vimage-devel/src/sys/netinet/vinet.h#5 integrate
.. //depot/projects/vimage-devel/src/sys/netinet6/frag6.c#7 integrate
.. //depot/projects/vimage-devel/src/sys/netinet6/icmp6.c#8 integrate
.. //depot/projects/vimage-devel/src/sys/netinet6/in6.c#7 integrate
.. //depot/projects/vimage-devel/src/sys/netinet6/in6_ifattach.c#8 integrate
.. //depot/projects/vimage-devel/src/sys/netinet6/in6_rmx.c#8 integrate
.. //depot/projects/vimage-devel/src/sys/netinet6/ip6_input.c#8 integrate
.. //depot/projects/vimage-devel/src/sys/netinet6/nd6_rtr.c#5 integrate
.. //depot/projects/vimage-devel/src/sys/netinet6/scope6.c#6 integrate
.. //depot/projects/vimage-devel/src/sys/netinet6/vinet6.h#4 integrate
.. //depot/projects/vimage-devel/src/sys/netipsec/xform_esp.c#6 integrate
.. //depot/projects/vimage-devel/src/sys/nfsclient/nfs_diskless.c#5 integrate
.. //depot/projects/vimage-devel/src/sys/sys/sysctl.h#9 integrate
.. //depot/projects/vimage-devel/src/sys/sys/vimage.h#12 integrate
Differences ...
==== //depot/projects/vimage-devel/src/sys/conf/options#6 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#7 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/contrib/pf/net/pf_subr.c#3 (text+ko) ====
@@ -65,6 +65,8 @@
#include <netinet/tcp_timer.h>
#include <netinet/tcp_var.h>
#include <netinet/if_ether.h>
+#include <netinet/vinet.h>
+
#include <net/pfvar.h>
/*
@@ -115,10 +117,12 @@
#define ISN_STATIC_INCREMENT 4096
#define ISN_RANDOM_INCREMENT (4096 - 1)
+#ifndef VIMAGE
static u_char isn_secret[32];
static int isn_last_reseed;
static u_int32_t isn_offset;
static MD5_CTX isn_ctx;
+#endif
u_int32_t
pf_new_isn(struct pf_state *s)
==== //depot/projects/vimage-devel/src/sys/ddb/db_textdump.c#5 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/dev/firewire/firewire.c#6 (text+ko) ====
@@ -678,7 +678,6 @@
static void
fw_reset_crom(struct firewire_comm *fc)
{
- INIT_VPROCG(TD_TO_VPROCG(curthread)); /* XXX */
struct crom_src_buf *buf;
struct crom_src *src;
struct crom_chunk *root;
@@ -704,7 +703,7 @@
crom_add_simple_text(src, root, &buf->vendor, "FreeBSD Project");
crom_add_entry(root, CSRKEY_HW, __FreeBSD_version);
#endif
- crom_add_simple_text(src, root, &buf->hw, V_hostname);
+ crom_add_simple_text(src, root, &buf->hw, G_hostname);
}
/*
==== //depot/projects/vimage-devel/src/sys/kern/kern_xxx.c#11 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/kern/tty.c#7 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/net/if.c#8 (text+ko) ====
@@ -374,6 +374,7 @@
static void
if_init(void *dummy __unused)
{
+ INIT_VNET_NET(curvnet);
#ifdef VIMAGE
vnet_mod_register(&vnet_net_modinfo);
==== //depot/projects/vimage-devel/src/sys/net/if_bridge.c#6 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/net/if_ef.c#5 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/net/if_gif.c#5 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/net/if_loop.c#8 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/net/route.c#8 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/net/rtsock.c#7 (text+ko) ====
@@ -416,7 +416,8 @@
case RTM_GET:
case RTM_CHANGE:
case RTM_LOCK:
- rnh = V_rt_tables[so->so_fibnum][info.rti_info[RTAX_DST]->sa_family];
+ rnh =
+ V_rt_tables[so->so_fibnum][info.rti_info[RTAX_DST]->sa_family];
if (rnh == NULL)
senderr(EAFNOSUPPORT);
RADIX_NODE_HEAD_LOCK(rnh);
==== //depot/projects/vimage-devel/src/sys/net80211/ieee80211.c#9 (text+ko) ====
@@ -35,7 +35,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-
#include <sys/socket.h>
#include <sys/vimage.h>
==== //depot/projects/vimage-devel/src/sys/net80211/ieee80211_ddb.c#6 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netgraph/atm/ng_atm.c#6 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netgraph/ng_base.c#11 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netgraph/ng_eiface.c#6 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netgraph/ng_ether.c#8 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netgraph/ng_iface.c#6 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netgraph/ng_source.c#4 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netinet/in_rmx.c#6 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netinet/in_var.h#4 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netinet/ip_divert.c#6 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netinet/ip_fw2.c#9 (text+ko) ====
@@ -4522,7 +4522,7 @@
}
done:
callout_reset(&V_ipfw_timeout, V_dyn_keepalive_period * hz,
- ipfw_tick, arg);
+ ipfw_tick, arg);
}
static int vnet_ipfw_iattach(const void *unused)
==== //depot/projects/vimage-devel/src/sys/netinet/ip_input.c#7 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netinet/ip_mroute.c#5 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netinet/raw_ip.c#9 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netinet/tcp_input.c#6 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netinet/tcp_subr.c#7 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.c#11 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.h#9 (text+ko) ====
@@ -126,4 +126,4 @@
};
#endif /* _KERNEL */
-#endif /* !_NETINET_TCP_SYNCACHE_H_ */
+#endif /* _NETINET_TCP_SYNCACHE_H_ */
==== //depot/projects/vimage-devel/src/sys/netinet/tcp_timewait.c#5 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netinet/udp_usrreq.c#11 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netinet/vinet.h#5 (text+ko) ====
@@ -142,6 +142,7 @@
struct inpcbhead _udb;
struct inpcbinfo _udbinfo;
struct udpstat _udpstat;
+ int _udp_blackhole;
struct inpcbhead _ripcb;
struct inpcbinfo _ripcbinfo;
@@ -269,6 +270,7 @@
#define V_tcp_reass_maxqlen VNET_INET(tcp_reass_maxqlen)
#define V_tcp_reass_overflows VNET_INET(tcp_reass_overflows)
+/* pf needs to get to these (!?) */
#define V_isn_secret VNET_INET(isn_secret)
#define V_isn_last_reseed VNET_INET(isn_last_reseed)
#define V_isn_offset VNET_INET(isn_offset)
@@ -278,6 +280,7 @@
#define V_udb VNET_INET(udb)
#define V_udbinfo VNET_INET(udbinfo)
#define V_udpstat VNET_INET(udpstat)
+#define V_udp_blackhole VNET_INET(udp_blackhole)
#define V_ripcb VNET_INET(ripcb)
#define V_ripcbinfo VNET_INET(ripcbinfo)
==== //depot/projects/vimage-devel/src/sys/netinet6/frag6.c#7 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netinet6/icmp6.c#8 (text+ko) ====
@@ -2810,7 +2810,7 @@
ret = 0; /* okay to send */
/* PPS limit */
- if (!ppsratecheck(&V_icmp6errppslim_last, &V_icmp6errpps_count,
+ if (!ppsratecheck(&icmp6errppslim_last, &V_icmp6errpps_count,
V_icmp6errppslim)) {
/* The packet is subject to rate limit */
ret++;
==== //depot/projects/vimage-devel/src/sys/netinet6/in6.c#7 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netinet6/in6_ifattach.c#8 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netinet6/in6_rmx.c#8 (text+ko) ====
@@ -225,20 +225,20 @@
SYSCTL_DECL(_net_inet6_ip6);
-static int rtq_reallyold6 = 60*60;
- /* one hour is ``really old'' */
-SYSCTL_INT(_net_inet6_ip6, IPV6CTL_RTEXPIRE, rtexpire,
- CTLFLAG_RW, &rtq_reallyold6 , 0, "");
+#ifndef VIMAGE
+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'' */
+#endif /* VIMAGE */
+
+SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_RTEXPIRE,
+ rtexpire, CTLFLAG_RW, rtq_reallyold6 , 0, "");
-static int rtq_minreallyold6 = 10;
- /* never automatically crank down to less */
-SYSCTL_INT(_net_inet6_ip6, IPV6CTL_RTMINEXPIRE, rtminexpire,
- CTLFLAG_RW, &rtq_minreallyold6 , 0, "");
+SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_RTMINEXPIRE,
+ rtminexpire, CTLFLAG_RW, rtq_minreallyold6 , 0, "");
-static int rtq_toomany6 = 128;
- /* 128 cached routes is ``too many'' */
-SYSCTL_INT(_net_inet6_ip6, IPV6CTL_RTMAXCACHE, rtmaxcache,
- CTLFLAG_RW, &rtq_toomany6 , 0, "");
+SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_RTMAXCACHE,
+ rtmaxcache, CTLFLAG_RW, rtq_toomany6 , 0, "");
/*
@@ -248,6 +248,7 @@
static void
in6_clsroute(struct radix_node *rn, struct radix_node_head *head)
{
+ INIT_VNET_INET6(curvnet);
struct rtentry *rt = (struct rtentry *)rn;
RT_LOCK_ASSERT(rt);
@@ -292,6 +293,7 @@
static int
in6_rtqkill(struct radix_node *rn, void *rock)
{
+ INIT_VNET_INET6(curvnet);
struct rtqk_arg *ap = rock;
struct rtentry *rt = (struct rtentry *)rn;
int err;
==== //depot/projects/vimage-devel/src/sys/netinet6/ip6_input.c#8 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netinet6/nd6_rtr.c#5 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netinet6/scope6.c#6 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/netinet6/vinet6.h#4 (text+ko) ====
@@ -62,6 +62,9 @@
TAILQ_HEAD(, addrsel_policyent) _addrsel_policytab;
u_int _in6_maxmtu;
int _ip6_auto_linklocal;
+ int _rtq_minreallyold6;
+ int _rtq_reallyold6;
+ int _rtq_toomany6;
struct ip6stat _ip6stat;
struct rip6stat _rip6stat;
@@ -173,6 +176,10 @@
#define V_in6_maxmtu VNET_INET6(in6_maxmtu)
#define V_ip6_auto_linklocal VNET_INET6(ip6_auto_linklocal)
+#define V_rtq_minreallyold6 VNET_INET6(rtq_minreallyold6)
+#define V_rtq_reallyold6 VNET_INET6(rtq_reallyold6)
+#define V_rtq_toomany6 VNET_INET6(rtq_toomany6)
+
#define V_ip6stat VNET_INET6(ip6stat)
#define V_rip6stat VNET_INET6(rip6stat)
#define V_icmp6stat VNET_INET6(icmp6stat)
==== //depot/projects/vimage-devel/src/sys/netipsec/xform_esp.c#6 (text+ko) ====
@@ -1005,6 +1005,7 @@
#define MAXIV(xform) \
if (xform.blocksize > V_esp_max_ivlen) \
V_esp_max_ivlen = xform.blocksize \
+
MAXIV(enc_xform_des); /* SADB_EALG_DESCBC */
MAXIV(enc_xform_3des); /* SADB_EALG_3DESCBC */
MAXIV(enc_xform_rijndael128); /* SADB_X_EALG_AES */
==== //depot/projects/vimage-devel/src/sys/nfsclient/nfs_diskless.c#5 (text+ko) ====
@@ -45,6 +45,7 @@
#include <sys/socket.h>
#include <sys/vimage.h>
+#include <net/vnet.h>
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_types.h>
==== //depot/projects/vimage-devel/src/sys/sys/sysctl.h#9 (text+ko) ====
==== //depot/projects/vimage-devel/src/sys/sys/vimage.h#12 (text+ko) ====
@@ -26,7 +26,6 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
* $FreeBSD$
*/
More information about the p4-projects
mailing list