[Midnightbsd-cvs] src [9138] trunk/sys: hard revert on network stack code
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Oct 1 20:59:55 EDT 2016
Revision: 9138
http://svnweb.midnightbsd.org/src/?rev=9138
Author: laffer1
Date: 2016-10-01 20:59:55 -0400 (Sat, 01 Oct 2016)
Log Message:
-----------
hard revert on network stack code
Modified Paths:
--------------
trunk/sys/net/bpf.c
trunk/sys/net/bpf.h
trunk/sys/net/bpf_buffer.c
trunk/sys/net/bpf_buffer.h
trunk/sys/net/bpf_filter.c
trunk/sys/net/bpf_jitter.c
trunk/sys/net/bpf_jitter.h
trunk/sys/net/bpf_zerocopy.c
trunk/sys/net/bpf_zerocopy.h
trunk/sys/net/bpfdesc.h
trunk/sys/net/bridgestp.c
trunk/sys/net/bridgestp.h
trunk/sys/net/ethernet.h
trunk/sys/net/fddi.h
trunk/sys/net/firewire.h
trunk/sys/net/flowtable.c
trunk/sys/net/flowtable.h
trunk/sys/net/ieee8023ad_lacp.c
trunk/sys/net/ieee8023ad_lacp.h
trunk/sys/net/if.c
trunk/sys/net/if.h
trunk/sys/net/if_arc.h
trunk/sys/net/if_arcsubr.c
trunk/sys/net/if_arp.h
trunk/sys/net/if_atm.h
trunk/sys/net/if_atmsubr.c
trunk/sys/net/if_bridge.c
trunk/sys/net/if_bridgevar.h
trunk/sys/net/if_clone.c
trunk/sys/net/if_clone.h
trunk/sys/net/if_dead.c
trunk/sys/net/if_debug.c
trunk/sys/net/if_disc.c
trunk/sys/net/if_dl.h
trunk/sys/net/if_edsc.c
trunk/sys/net/if_ef.c
trunk/sys/net/if_enc.c
trunk/sys/net/if_enc.h
trunk/sys/net/if_epair.c
trunk/sys/net/if_ethersubr.c
trunk/sys/net/if_faith.c
trunk/sys/net/if_fddisubr.c
trunk/sys/net/if_fwsubr.c
trunk/sys/net/if_gif.c
trunk/sys/net/if_gif.h
trunk/sys/net/if_gre.c
trunk/sys/net/if_gre.h
trunk/sys/net/if_iso88025subr.c
trunk/sys/net/if_lagg.c
trunk/sys/net/if_lagg.h
trunk/sys/net/if_llatbl.c
trunk/sys/net/if_llatbl.h
trunk/sys/net/if_llc.h
trunk/sys/net/if_loop.c
trunk/sys/net/if_media.c
trunk/sys/net/if_media.h
trunk/sys/net/if_mib.c
trunk/sys/net/if_mib.h
trunk/sys/net/if_sppp.h
trunk/sys/net/if_spppfr.c
trunk/sys/net/if_spppsubr.c
trunk/sys/net/if_stf.c
trunk/sys/net/if_stf.h
trunk/sys/net/if_tap.c
trunk/sys/net/if_tap.h
trunk/sys/net/if_tapvar.h
trunk/sys/net/if_tun.c
trunk/sys/net/if_tun.h
trunk/sys/net/if_types.h
trunk/sys/net/if_var.h
trunk/sys/net/if_vlan.c
trunk/sys/net/if_vlan_var.h
trunk/sys/net/iso88025.h
trunk/sys/net/netisr.c
trunk/sys/net/netisr.h
trunk/sys/net/netisr_internal.h
trunk/sys/net/netmap.h
trunk/sys/net/netmap_user.h
trunk/sys/net/pfil.c
trunk/sys/net/pfil.h
trunk/sys/net/pfkeyv2.h
trunk/sys/net/ppp_defs.h
trunk/sys/net/radix.c
trunk/sys/net/radix.h
trunk/sys/net/radix_mpath.c
trunk/sys/net/radix_mpath.h
trunk/sys/net/raw_cb.c
trunk/sys/net/raw_cb.h
trunk/sys/net/raw_usrreq.c
trunk/sys/net/route.c
trunk/sys/net/route.h
trunk/sys/net/rtsock.c
trunk/sys/net/slcompress.c
trunk/sys/net/slcompress.h
trunk/sys/net/vnet.c
trunk/sys/net/vnet.h
trunk/sys/net/zlib.c
trunk/sys/net/zlib.h
trunk/sys/net/zutil.h
trunk/sys/netinet/accf_data.c
trunk/sys/netinet/accf_dns.c
trunk/sys/netinet/accf_http.c
trunk/sys/netinet/cc/cc.c
trunk/sys/netinet/cc/cc_chd.c
trunk/sys/netinet/cc/cc_cubic.c
trunk/sys/netinet/cc/cc_cubic.h
trunk/sys/netinet/cc/cc_hd.c
trunk/sys/netinet/cc/cc_htcp.c
trunk/sys/netinet/cc/cc_module.h
trunk/sys/netinet/cc/cc_newreno.c
trunk/sys/netinet/cc/cc_vegas.c
trunk/sys/netinet/cc.h
trunk/sys/netinet/icmp6.h
trunk/sys/netinet/icmp_var.h
trunk/sys/netinet/if_atm.c
trunk/sys/netinet/if_atm.h
trunk/sys/netinet/if_ether.c
trunk/sys/netinet/if_ether.h
trunk/sys/netinet/igmp.c
trunk/sys/netinet/igmp.h
trunk/sys/netinet/igmp_var.h
trunk/sys/netinet/in.c
trunk/sys/netinet/in.h
trunk/sys/netinet/in_cksum.c
trunk/sys/netinet/in_debug.c
trunk/sys/netinet/in_gif.c
trunk/sys/netinet/in_gif.h
trunk/sys/netinet/in_mcast.c
trunk/sys/netinet/in_pcb.c
trunk/sys/netinet/in_pcb.h
trunk/sys/netinet/in_pcbgroup.c
trunk/sys/netinet/in_proto.c
trunk/sys/netinet/in_rmx.c
trunk/sys/netinet/in_systm.h
trunk/sys/netinet/in_var.h
trunk/sys/netinet/ip.h
trunk/sys/netinet/ip6.h
trunk/sys/netinet/ip_carp.c
trunk/sys/netinet/ip_carp.h
trunk/sys/netinet/ip_divert.c
trunk/sys/netinet/ip_divert.h
trunk/sys/netinet/ip_dummynet.h
trunk/sys/netinet/ip_ecn.c
trunk/sys/netinet/ip_ecn.h
trunk/sys/netinet/ip_encap.c
trunk/sys/netinet/ip_encap.h
trunk/sys/netinet/ip_fastfwd.c
trunk/sys/netinet/ip_fw.h
trunk/sys/netinet/ip_gre.c
trunk/sys/netinet/ip_gre.h
trunk/sys/netinet/ip_icmp.c
trunk/sys/netinet/ip_icmp.h
trunk/sys/netinet/ip_id.c
trunk/sys/netinet/ip_input.c
trunk/sys/netinet/ip_ipsec.c
trunk/sys/netinet/ip_ipsec.h
trunk/sys/netinet/ip_mroute.c
trunk/sys/netinet/ip_mroute.h
trunk/sys/netinet/ip_options.c
trunk/sys/netinet/ip_options.h
trunk/sys/netinet/ip_output.c
trunk/sys/netinet/ip_var.h
trunk/sys/netinet/khelp/h_ertt.c
trunk/sys/netinet/khelp/h_ertt.h
trunk/sys/netinet/libalias/HISTORY
trunk/sys/netinet/libalias/alias.c
trunk/sys/netinet/libalias/alias.h
trunk/sys/netinet/libalias/alias_cuseeme.c
trunk/sys/netinet/libalias/alias_db.c
trunk/sys/netinet/libalias/alias_dummy.c
trunk/sys/netinet/libalias/alias_ftp.c
trunk/sys/netinet/libalias/alias_irc.c
trunk/sys/netinet/libalias/alias_local.h
trunk/sys/netinet/libalias/alias_mod.c
trunk/sys/netinet/libalias/alias_mod.h
trunk/sys/netinet/libalias/alias_nbt.c
trunk/sys/netinet/libalias/alias_pptp.c
trunk/sys/netinet/libalias/alias_proxy.c
trunk/sys/netinet/libalias/alias_sctp.c
trunk/sys/netinet/libalias/alias_sctp.h
trunk/sys/netinet/libalias/alias_skinny.c
trunk/sys/netinet/libalias/alias_smedia.c
trunk/sys/netinet/libalias/alias_util.c
trunk/sys/netinet/libalias/libalias.3
trunk/sys/netinet/pim.h
trunk/sys/netinet/pim_var.h
trunk/sys/netinet/raw_ip.c
trunk/sys/netinet/sctp.h
trunk/sys/netinet/sctp_asconf.c
trunk/sys/netinet/sctp_asconf.h
trunk/sys/netinet/sctp_auth.c
trunk/sys/netinet/sctp_auth.h
trunk/sys/netinet/sctp_bsd_addr.c
trunk/sys/netinet/sctp_bsd_addr.h
trunk/sys/netinet/sctp_cc_functions.c
trunk/sys/netinet/sctp_constants.h
trunk/sys/netinet/sctp_crc32.c
trunk/sys/netinet/sctp_crc32.h
trunk/sys/netinet/sctp_dtrace_declare.h
trunk/sys/netinet/sctp_dtrace_define.h
trunk/sys/netinet/sctp_header.h
trunk/sys/netinet/sctp_indata.c
trunk/sys/netinet/sctp_indata.h
trunk/sys/netinet/sctp_input.c
trunk/sys/netinet/sctp_input.h
trunk/sys/netinet/sctp_lock_bsd.h
trunk/sys/netinet/sctp_os.h
trunk/sys/netinet/sctp_os_bsd.h
trunk/sys/netinet/sctp_output.c
trunk/sys/netinet/sctp_output.h
trunk/sys/netinet/sctp_pcb.c
trunk/sys/netinet/sctp_pcb.h
trunk/sys/netinet/sctp_peeloff.c
trunk/sys/netinet/sctp_peeloff.h
trunk/sys/netinet/sctp_ss_functions.c
trunk/sys/netinet/sctp_structs.h
trunk/sys/netinet/sctp_sysctl.c
trunk/sys/netinet/sctp_sysctl.h
trunk/sys/netinet/sctp_timer.c
trunk/sys/netinet/sctp_timer.h
trunk/sys/netinet/sctp_uio.h
trunk/sys/netinet/sctp_usrreq.c
trunk/sys/netinet/sctp_var.h
trunk/sys/netinet/sctputil.c
trunk/sys/netinet/sctputil.h
trunk/sys/netinet/siftr.c
trunk/sys/netinet/tcp.h
trunk/sys/netinet/tcp_debug.c
trunk/sys/netinet/tcp_debug.h
trunk/sys/netinet/tcp_fsm.h
trunk/sys/netinet/tcp_hostcache.c
trunk/sys/netinet/tcp_hostcache.h
trunk/sys/netinet/tcp_input.c
trunk/sys/netinet/tcp_lro.c
trunk/sys/netinet/tcp_lro.h
trunk/sys/netinet/tcp_output.c
trunk/sys/netinet/tcp_reass.c
trunk/sys/netinet/tcp_sack.c
trunk/sys/netinet/tcp_seq.h
trunk/sys/netinet/tcp_subr.c
trunk/sys/netinet/tcp_timer.c
trunk/sys/netinet/tcp_timer.h
trunk/sys/netinet/tcp_timewait.c
trunk/sys/netinet/tcp_usrreq.c
trunk/sys/netinet/tcp_var.h
trunk/sys/netinet/tcpip.h
trunk/sys/netinet/toedev.h
trunk/sys/netinet/udp.h
trunk/sys/netinet/udp_usrreq.c
trunk/sys/netinet/udp_var.h
trunk/sys/netinet6/dest6.c
trunk/sys/netinet6/frag6.c
trunk/sys/netinet6/icmp6.c
trunk/sys/netinet6/icmp6.h
trunk/sys/netinet6/in6.c
trunk/sys/netinet6/in6.h
trunk/sys/netinet6/in6_cksum.c
trunk/sys/netinet6/in6_gif.c
trunk/sys/netinet6/in6_gif.h
trunk/sys/netinet6/in6_ifattach.c
trunk/sys/netinet6/in6_ifattach.h
trunk/sys/netinet6/in6_mcast.c
trunk/sys/netinet6/in6_pcb.c
trunk/sys/netinet6/in6_pcb.h
trunk/sys/netinet6/in6_pcbgroup.c
trunk/sys/netinet6/in6_proto.c
trunk/sys/netinet6/in6_rmx.c
trunk/sys/netinet6/in6_src.c
trunk/sys/netinet6/in6_var.h
trunk/sys/netinet6/ip6.h
trunk/sys/netinet6/ip6_ecn.h
trunk/sys/netinet6/ip6_forward.c
trunk/sys/netinet6/ip6_id.c
trunk/sys/netinet6/ip6_input.c
trunk/sys/netinet6/ip6_ipsec.c
trunk/sys/netinet6/ip6_ipsec.h
trunk/sys/netinet6/ip6_mroute.c
trunk/sys/netinet6/ip6_mroute.h
trunk/sys/netinet6/ip6_output.c
trunk/sys/netinet6/ip6_var.h
trunk/sys/netinet6/ip6protosw.h
trunk/sys/netinet6/mld6.c
trunk/sys/netinet6/mld6.h
trunk/sys/netinet6/mld6_var.h
trunk/sys/netinet6/nd6.c
trunk/sys/netinet6/nd6.h
trunk/sys/netinet6/nd6_nbr.c
trunk/sys/netinet6/nd6_rtr.c
trunk/sys/netinet6/pim6.h
trunk/sys/netinet6/pim6_var.h
trunk/sys/netinet6/raw_ip6.c
trunk/sys/netinet6/raw_ip6.h
trunk/sys/netinet6/route6.c
trunk/sys/netinet6/scope6.c
trunk/sys/netinet6/scope6_var.h
trunk/sys/netinet6/sctp6_usrreq.c
trunk/sys/netinet6/sctp6_var.h
trunk/sys/netinet6/send.c
trunk/sys/netinet6/send.h
trunk/sys/netinet6/tcp6_var.h
trunk/sys/netinet6/udp6_usrreq.c
trunk/sys/netinet6/udp6_var.h
Removed Paths:
-------------
trunk/sys/netinet/udplite.h
Modified: trunk/sys/net/bpf.c
===================================================================
--- trunk/sys/net/bpf.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/bpf.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990, 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -35,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/net/bpf.c 248085 2013-03-09 02:36:32Z marius $");
#include "opt_bpf.h"
#include "opt_compat.h"
Modified: trunk/sys/net/bpf.h
===================================================================
--- trunk/sys/net/bpf.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/bpf.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990, 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -34,7 +35,7 @@
* @(#)bpf.h 8.1 (Berkeley) 6/10/93
* @(#)bpf.h 1.34 (LBL) 6/16/96
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/bpf.h 247629 2013-03-02 15:11:20Z melifaro $
*/
#ifndef _NET_BPF_H_
Modified: trunk/sys/net/bpf_buffer.c
===================================================================
--- trunk/sys/net/bpf_buffer.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/bpf_buffer.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2007 Seccuris Inc.
* All rights reserved.
@@ -62,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/net/bpf_buffer.c 247629 2013-03-02 15:11:20Z melifaro $");
#include "opt_bpf.h"
Modified: trunk/sys/net/bpf_buffer.h
===================================================================
--- trunk/sys/net/bpf_buffer.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/bpf_buffer.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2007 Seccuris Inc.
* All rights reserved.
@@ -26,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/bpf_buffer.h 247629 2013-03-02 15:11:20Z melifaro $
*/
#ifndef _NET_BPF_BUFFER_H_
Modified: trunk/sys/net/bpf_filter.c
===================================================================
--- trunk/sys/net/bpf_filter.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/bpf_filter.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990, 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -35,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/net/bpf_filter.c 224044 2011-07-14 21:06:22Z mp $");
#include <sys/param.h>
Modified: trunk/sys/net/bpf_jitter.c
===================================================================
--- trunk/sys/net/bpf_jitter.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/bpf_jitter.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy)
* Copyright (C) 2005-2009 Jung-uk Kim <jkim at FreeBSD.org>
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/net/bpf_jitter.c 199615 2009-11-20 21:12:40Z jkim $");
#ifdef _KERNEL
#include "opt_bpf.h"
Modified: trunk/sys/net/bpf_jitter.h
===================================================================
--- trunk/sys/net/bpf_jitter.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/bpf_jitter.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy)
* Copyright (C) 2005-2009 Jung-uk Kim <jkim at FreeBSD.org>
@@ -28,7 +29,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/bpf_jitter.h 199603 2009-11-20 18:49:20Z jkim $
*/
#ifndef _NET_BPF_JITTER_H_
Modified: trunk/sys/net/bpf_zerocopy.c
===================================================================
--- trunk/sys/net/bpf_zerocopy.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/bpf_zerocopy.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2007 Seccuris Inc.
* All rights reserved.
@@ -28,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/net/bpf_zerocopy.c 240238 2012-09-08 16:40:18Z kib $");
#include "opt_bpf.h"
Modified: trunk/sys/net/bpf_zerocopy.h
===================================================================
--- trunk/sys/net/bpf_zerocopy.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/bpf_zerocopy.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2007 Seccuris Inc.
* All rights reserved.
@@ -26,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/bpf_zerocopy.h 234969 2012-05-03 16:48:48Z eadler $
*/
#ifndef _NET_BPF_ZEROCOPY_H_
Modified: trunk/sys/net/bpfdesc.h
===================================================================
--- trunk/sys/net/bpfdesc.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/bpfdesc.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990, 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -33,7 +34,7 @@
*
* @(#)bpfdesc.h 8.1 (Berkeley) 6/10/93
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/bpfdesc.h 247629 2013-03-02 15:11:20Z melifaro $
*/
#ifndef _NET_BPFDESC_H_
Modified: trunk/sys/net/bridgestp.c
===================================================================
--- trunk/sys/net/bridgestp.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/bridgestp.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $NetBSD: bridgestp.c,v 1.5 2003/11/28 08:56:48 keihan Exp $ */
/*
@@ -35,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/net/bridgestp.c 236052 2012-05-26 07:43:17Z thompsa $");
#include <sys/param.h>
#include <sys/systm.h>
Modified: trunk/sys/net/bridgestp.h
===================================================================
--- trunk/sys/net/bridgestp.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/bridgestp.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $NetBSD: if_bridgevar.h,v 1.4 2003/07/08 07:13:50 itojun Exp $ */
/*
@@ -67,7 +68,7 @@
*
* OpenBSD: if_bridge.h,v 1.14 2001/03/22 03:48:29 jason Exp
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/bridgestp.h 236052 2012-05-26 07:43:17Z thompsa $
*/
/*
Modified: trunk/sys/net/ethernet.h
===================================================================
--- trunk/sys/net/ethernet.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/ethernet.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,7 +1,8 @@
+/* $MidnightBSD$ */
/*
* Fundamental constants relating to ethernet.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/ethernet.h 191148 2009-04-16 20:30:28Z kmacy $
*
*/
Modified: trunk/sys/net/fddi.h
===================================================================
--- trunk/sys/net/fddi.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/fddi.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
@@ -33,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)if_fddi.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/fddi.h 194581 2009-06-21 10:29:31Z rdivacky $
*/
#ifndef _NETINET_IF_FDDI_H_
Modified: trunk/sys/net/firewire.h
===================================================================
--- trunk/sys/net/firewire.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/firewire.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2004 Doug Rabson
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/firewire.h 194581 2009-06-21 10:29:31Z rdivacky $
*/
#ifndef _NET_FIREWIRE_H_
Modified: trunk/sys/net/flowtable.c
===================================================================
--- trunk/sys/net/flowtable.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/flowtable.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/**************************************************************************
Copyright (c) 2008-2010, BitGravity Inc.
@@ -34,7 +35,7 @@
#include "opt_inet6.h"
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/net/flowtable.c 248085 2013-03-09 02:36:32Z marius $");
#include <sys/param.h>
#include <sys/types.h>
Modified: trunk/sys/net/flowtable.h
===================================================================
--- trunk/sys/net/flowtable.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/flowtable.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/**************************************************************************
Copyright (c) 2008-2010, BitGravity Inc.
@@ -25,7 +26,7 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-$MidnightBSD$
+$FreeBSD: stable/9/sys/net/flowtable.h 208171 2010-05-16 21:48:39Z kmacy $
***************************************************************************/
Modified: trunk/sys/net/ieee8023ad_lacp.c
===================================================================
--- trunk/sys/net/ieee8023ad_lacp.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/ieee8023ad_lacp.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $NetBSD: ieee8023ad_lacp.c,v 1.3 2005/12/11 12:24:54 christos Exp $ */
/*-
@@ -28,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/net/ieee8023ad_lacp.c 237669 2012-06-27 22:06:42Z thompsa $");
#include <sys/param.h>
#include <sys/callout.h>
Modified: trunk/sys/net/ieee8023ad_lacp.h
===================================================================
--- trunk/sys/net/ieee8023ad_lacp.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/ieee8023ad_lacp.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $NetBSD: ieee8023ad_impl.h,v 1.2 2005/12/10 23:21:39 elad Exp $ */
/*-
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/ieee8023ad_lacp.h 177289 2008-03-17 01:26:44Z thompsa $
*/
/*
Modified: trunk/sys/net/if.c
===================================================================
--- trunk/sys/net/if.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)if.c 8.5 (Berkeley) 1/9/95
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if.c 249132 2013-04-05 08:22:11Z mav $
*/
#include "opt_compat.h"
@@ -2543,23 +2544,11 @@
CURVNET_RESTORE();
return (EOPNOTSUPP);
}
-
- /*
- * Pass the request on to the socket control method, and if the
- * latter returns EOPNOTSUPP, directly to the interface.
- *
- * Make an exception for the legacy SIOCSIF* requests. Drivers
- * trust SIOCSIFADDR et al to come from an already privileged
- * layer, and do not perform any credentials checks or input
- * validation.
- */
#ifndef COMPAT_43
error = ((*so->so_proto->pr_usrreqs->pru_control)(so, cmd,
data,
ifp, td));
- if (error == EOPNOTSUPP && ifp != NULL && ifp->if_ioctl != NULL &&
- cmd != SIOCSIFADDR && cmd != SIOCSIFBRDADDR &&
- cmd != SIOCSIFDSTADDR && cmd != SIOCSIFNETMASK)
+ if (error == EOPNOTSUPP && ifp != NULL && ifp->if_ioctl != NULL)
error = (*ifp->if_ioctl)(ifp, cmd, data);
#else
{
@@ -2603,9 +2592,7 @@
data,
ifp, td));
if (error == EOPNOTSUPP && ifp != NULL &&
- ifp->if_ioctl != NULL &&
- cmd != SIOCSIFADDR && cmd != SIOCSIFBRDADDR &&
- cmd != SIOCSIFDSTADDR && cmd != SIOCSIFNETMASK)
+ ifp->if_ioctl != NULL)
error = (*ifp->if_ioctl)(ifp, cmd, data);
switch (ocmd) {
Modified: trunk/sys/net/if.h
===================================================================
--- trunk/sys/net/if.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)if.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if.h 238247 2012-07-08 14:21:36Z bz $
*/
#ifndef _NET_IF_H_
Modified: trunk/sys/net/if_arc.h
===================================================================
--- trunk/sys/net/if_arc.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_arc.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* $NetBSD: if_arc.h,v 1.13 1999/11/19 20:41:19 thorpej Exp $ */
-/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/net/if_arc.h 194581 2009-06-21 10:29:31Z rdivacky $ */
/*-
* Copyright (c) 1982, 1986, 1993
Modified: trunk/sys/net/if_arcsubr.c
===================================================================
--- trunk/sys/net/if_arcsubr.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_arcsubr.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* $NetBSD: if_arcsubr.c,v 1.36 2001/06/14 05:44:23 itojun Exp $ */
-/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/net/if_arcsubr.c 249132 2013-04-05 08:22:11Z mav $ */
/*-
* Copyright (c) 1994, 1995 Ignatios Souvatzis
Modified: trunk/sys/net/if_arp.h
===================================================================
--- trunk/sys/net/if_arp.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_arp.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1986, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)if_arp.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_arp.h 219819 2011-03-21 09:40:01Z jeff $
*/
#ifndef _NET_IF_ARP_H_
Modified: trunk/sys/net/if_atm.h
===================================================================
--- trunk/sys/net/if_atm.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_atm.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* $NetBSD: if_atm.h,v 1.7 1996/11/09 23:02:27 chuck Exp $ */
-/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/net/if_atm.h 191148 2009-04-16 20:30:28Z kmacy $ */
/*-
*
Modified: trunk/sys/net/if_atmsubr.c
===================================================================
--- trunk/sys/net/if_atmsubr.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_atmsubr.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $NetBSD: if_atmsubr.c,v 1.10 1997/03/11 23:19:51 chuck Exp $ */
/*-
@@ -35,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/net/if_atmsubr.c 249132 2013-04-05 08:22:11Z mav $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/net/if_bridge.c
===================================================================
--- trunk/sys/net/if_bridge.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_bridge.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $NetBSD: if_bridge.c,v 1.31 2005/06/01 19:45:34 jdc Exp $ */
/*
@@ -75,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/net/if_bridge.c 248085 2013-03-09 02:36:32Z marius $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/net/if_bridgevar.h
===================================================================
--- trunk/sys/net/if_bridgevar.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_bridgevar.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $NetBSD: if_bridgevar.h,v 1.4 2003/07/08 07:13:50 itojun Exp $ */
/*
@@ -67,7 +68,7 @@
*
* OpenBSD: if_bridge.h,v 1.14 2001/03/22 03:48:29 jason Exp
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_bridgevar.h 173320 2007-11-04 08:32:27Z thompsa $
*/
/*
Modified: trunk/sys/net/if_clone.c
===================================================================
--- trunk/sys/net/if_clone.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_clone.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)if.c 8.5 (Berkeley) 1/9/95
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_clone.c 215701 2010-11-22 19:32:54Z dim $
*/
#include <sys/param.h>
Modified: trunk/sys/net/if_clone.h
===================================================================
--- trunk/sys/net/if_clone.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_clone.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* From: @(#)if.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_clone.h 195837 2009-07-23 20:46:49Z rwatson $
*/
#ifndef _NET_IF_CLONE_H_
Modified: trunk/sys/net/if_dead.c
===================================================================
--- trunk/sys/net/if_dead.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_dead.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2009 Robert N. M. Watson
* All rights reserved.
@@ -32,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/net/if_dead.c 199975 2009-11-30 21:25:57Z jhb $");
#include <sys/param.h>
#include <sys/mbuf.h>
Modified: trunk/sys/net/if_debug.c
===================================================================
--- trunk/sys/net/if_debug.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_debug.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2010 Bjoern A. Zeeb <bz at FreeBSD.org>
* All rights reserved.
@@ -25,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/net/if_debug.c 223735 2011-07-03 12:22:02Z bz $");
#include "opt_ddb.h"
Modified: trunk/sys/net/if_disc.c
===================================================================
--- trunk/sys/net/if_disc.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_disc.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* From: @(#)if_loop.c 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_disc.c 191148 2009-04-16 20:30:28Z kmacy $
*/
/*
Modified: trunk/sys/net/if_dl.h
===================================================================
--- trunk/sys/net/if_dl.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_dl.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)if_dl.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_dl.h 139823 2005-01-07 01:45:51Z imp $
*/
#ifndef _NET_IF_DL_H_
Modified: trunk/sys/net/if_edsc.c
===================================================================
--- trunk/sys/net/if_edsc.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_edsc.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* From: @(#)if_loop.c 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_edsc.c 167896 2007-03-26 09:05:10Z yar $
*/
/*
Modified: trunk/sys/net/if_ef.c
===================================================================
--- trunk/sys/net/if_ef.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_ef.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1999, 2000 Boris Popov
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_ef.c 207554 2010-05-03 07:32:50Z sobomax $
*/
#include "opt_inet.h"
Modified: trunk/sys/net/if_enc.c
===================================================================
--- trunk/sys/net/if_enc.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_enc.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2006 The FreeBSD Project.
* All rights reserved.
@@ -24,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_enc.c 248085 2013-03-09 02:36:32Z marius $
*/
#include "opt_inet.h"
Modified: trunk/sys/net/if_enc.h
===================================================================
--- trunk/sys/net/if_enc.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_enc.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 The FreeBSD Project.
* All rights reserved.
@@ -24,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_enc.h 181627 2008-08-12 09:05:01Z vanhu $
*/
#ifndef _NET_IF_ENC_H
Modified: trunk/sys/net/if_epair.c
===================================================================
--- trunk/sys/net/if_epair.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_epair.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 The FreeBSD Foundation
* Copyright (c) 2009-2010 Bjoern A. Zeeb <bz at FreeBSD.org>
@@ -48,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/net/if_epair.c 248085 2013-03-09 02:36:32Z marius $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/net/if_ethersubr.c
===================================================================
--- trunk/sys/net/if_ethersubr.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_ethersubr.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_ethersubr.c 249132 2013-04-05 08:22:11Z mav $
*/
#include "opt_atalk.h"
Modified: trunk/sys/net/if_faith.c
===================================================================
--- trunk/sys/net/if_faith.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_faith.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $KAME: if_faith.c,v 1.23 2001/12/17 13:55:29 sumikawa Exp $ */
/*-
@@ -28,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_faith.c 232292 2012-02-29 09:47:26Z bz $
*/
/*
* derived from
Modified: trunk/sys/net/if_fddisubr.c
===================================================================
--- trunk/sys/net/if_fddisubr.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_fddisubr.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1995, 1996
* Matt Thomas <matt at 3am-software.com>. All rights reserved.
@@ -33,7 +34,7 @@
* SUCH DAMAGE.
*
* from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_fddisubr.c 223741 2011-07-03 16:08:38Z bz $
*/
#include "opt_atalk.h"
Modified: trunk/sys/net/if_fwsubr.c
===================================================================
--- trunk/sys/net/if_fwsubr.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_fwsubr.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2004 Doug Rabson
* Copyright (c) 1982, 1989, 1993
@@ -27,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_fwsubr.c 249132 2013-04-05 08:22:11Z mav $
*/
#include "opt_inet.h"
Modified: trunk/sys/net/if_gif.c
===================================================================
--- trunk/sys/net/if_gif.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_gif.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,4 +1,5 @@
-/* $MidnightBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/net/if_gif.c 248085 2013-03-09 02:36:32Z marius $ */
/* $KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $ */
/*-
Modified: trunk/sys/net/if_gif.h
===================================================================
--- trunk/sys/net/if_gif.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_gif.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,4 +1,5 @@
-/* $MidnightBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/net/if_gif.h 207369 2010-04-29 11:52:42Z bz $ */
/* $KAME: if_gif.h,v 1.17 2000/09/11 11:36:41 sumikawa Exp $ */
/*-
Modified: trunk/sys/net/if_gre.c
===================================================================
--- trunk/sys/net/if_gre.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_gre.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* $NetBSD: if_gre.c,v 1.49 2003/12/11 00:22:29 itojun Exp $ */
-/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/net/if_gre.c 248085 2013-03-09 02:36:32Z marius $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
Modified: trunk/sys/net/if_gre.h
===================================================================
--- trunk/sys/net/if_gre.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_gre.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* $NetBSD: if_gre.h,v 1.13 2003/11/10 08:51:52 wiz Exp $ */
-/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/net/if_gre.h 223223 2011-06-18 09:34:03Z bz $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
Modified: trunk/sys/net/if_iso88025subr.c
===================================================================
--- trunk/sys/net/if_iso88025subr.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_iso88025subr.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1998, Larry Lile
* All rights reserved.
@@ -30,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_iso88025subr.c 249132 2013-04-05 08:22:11Z mav $
*
*/
Modified: trunk/sys/net/if_lagg.c
===================================================================
--- trunk/sys/net/if_lagg.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_lagg.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $OpenBSD: if_trunk.c,v 1.30 2007/01/31 06:20:19 reyk Exp $ */
/*
@@ -18,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/net/if_lagg.c 248085 2013-03-09 02:36:32Z marius $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/net/if_lagg.h
===================================================================
--- trunk/sys/net/if_lagg.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_lagg.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $OpenBSD: if_trunk.h,v 1.11 2007/01/31 06:20:19 reyk Exp $ */
/*
@@ -15,7 +16,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_lagg.h 236049 2012-05-26 07:39:52Z thompsa $
*/
#ifndef _NET_LAGG_H
Modified: trunk/sys/net/if_llatbl.c
===================================================================
--- trunk/sys/net/if_llatbl.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_llatbl.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2004 Luigi Rizzo, Alessandro Cerri. All rights reserved.
* Copyright (c) 2004-2008 Qing Li. All rights reserved.
@@ -25,7 +26,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/net/if_llatbl.c 248852 2013-03-28 20:48:40Z emaste $");
#include "opt_ddb.h"
#include "opt_inet.h"
Modified: trunk/sys/net/if_llatbl.h
===================================================================
--- trunk/sys/net/if_llatbl.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_llatbl.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2004 Luigi Rizzo, Alessandro Cerri. All rights reserved.
* Copyright (c) 2004-2008 Qing Li. All rights reserved.
@@ -25,7 +26,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/net/if_llatbl.h 240313 2012-09-10 12:25:57Z glebius $");
#ifndef _NET_IF_LLATBL_H_
#define _NET_IF_LLATBL_H_
@@ -205,14 +206,4 @@
}
int lla_rt_output(struct rt_msghdr *, struct rt_addrinfo *);
-
-#include <sys/eventhandler.h>
-enum {
- LLENTRY_RESOLVED,
- LLENTRY_TIMEDOUT,
- LLENTRY_DELETED,
- LLENTRY_EXPIRED,
-};
-typedef void (*lle_event_fn)(void *, struct llentry *, int);
-EVENTHANDLER_DECLARE(lle_event, lle_event_fn);
#endif /* _NET_IF_LLATBL_H_ */
Modified: trunk/sys/net/if_llc.h
===================================================================
--- trunk/sys/net/if_llc.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_llc.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $NetBSD: if_llc.h,v 1.12 1999/11/19 20:41:19 thorpej Exp $ */
/*-
@@ -29,7 +30,7 @@
* SUCH DAMAGE.
*
* @(#)if_llc.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_llc.h 164804 2006-12-01 17:50:11Z imp $
*/
#ifndef _NET_IF_LLC_H_
Modified: trunk/sys/net/if_loop.c
===================================================================
--- trunk/sys/net/if_loop.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_loop.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)if_loop.c 8.2 (Berkeley) 1/9/95
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_loop.c 238876 2012-07-28 23:11:09Z bz $
*/
/*
@@ -88,7 +89,7 @@
#elif defined(LARGE_LOMTU)
#define LOMTU 131072
#else
-#define LOMTU 32768
+#define LOMTU 16384
#endif
#define LO_CSUM_FEATURES (CSUM_IP | CSUM_TCP | CSUM_UDP | CSUM_SCTP)
Modified: trunk/sys/net/if_media.c
===================================================================
--- trunk/sys/net/if_media.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_media.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* $NetBSD: if_media.c,v 1.1 1997/03/17 02:55:15 thorpej Exp $ */
-/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/net/if_media.c 218909 2011-02-21 09:01:34Z brucec $ */
/*-
* Copyright (c) 1997
Modified: trunk/sys/net/if_media.h
===================================================================
--- trunk/sys/net/if_media.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_media.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* $NetBSD: if_media.h,v 1.3 1997/03/26 01:19:27 thorpej Exp $ */
-/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/net/if_media.h 235764 2012-05-22 00:00:17Z jhb $ */
/*-
* Copyright (c) 1997
Modified: trunk/sys/net/if_mib.c
===================================================================
--- trunk/sys/net/if_mib.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_mib.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1996 Massachusetts Institute of Technology
*
@@ -26,7 +27,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_mib.c 248085 2013-03-09 02:36:32Z marius $
*/
#include <sys/param.h>
Modified: trunk/sys/net/if_mib.h
===================================================================
--- trunk/sys/net/if_mib.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_mib.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1996 Massachusetts Institute of Technology
*
@@ -26,7 +27,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_mib.h 154023 2006-01-04 12:57:09Z harti $
*/
#ifndef _NET_IF_MIB_H
Modified: trunk/sys/net/if_sppp.h
===================================================================
--- trunk/sys/net/if_sppp.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_sppp.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Defines for synchronous PPP/Cisco/Frame Relay link level subroutines.
*/
@@ -17,7 +18,7 @@
*
* From: Version 2.0, Fri Oct 6 20:39:21 MSK 1995
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_sppp.h 147256 2005-06-10 16:49:24Z brooks $
*/
#ifndef _NET_IF_SPPP_H_
Modified: trunk/sys/net/if_spppfr.c
===================================================================
--- trunk/sys/net/if_spppfr.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_spppfr.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Synchronous Frame Relay link level subroutines.
* ANSI T1.617-compaible link management signaling
@@ -20,7 +21,7 @@
* works or modified versions.
*
* $Cronyx Id: if_spppfr.c,v 1.1.2.10 2004/06/29 09:02:30 rik Exp $
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_spppfr.c 223741 2011-07-03 16:08:38Z bz $
*/
#include <sys/param.h>
Modified: trunk/sys/net/if_spppsubr.c
===================================================================
--- trunk/sys/net/if_spppsubr.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_spppsubr.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Synchronous PPP/Cisco/Frame Relay link level subroutines.
* Keepalive protocol implemented in both Cisco and PPP modes.
@@ -18,7 +19,7 @@
*
* From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_spppsubr.c 249132 2013-04-05 08:22:11Z mav $
*/
#include <sys/param.h>
Modified: trunk/sys/net/if_stf.c
===================================================================
--- trunk/sys/net/if_stf.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_stf.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,4 +1,5 @@
-/* $MidnightBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/net/if_stf.c 248743 2013-03-26 18:57:25Z melifaro $ */
/* $KAME: if_stf.c,v 1.73 2001/12/03 11:08:30 keiichi Exp $ */
/*-
Modified: trunk/sys/net/if_stf.h
===================================================================
--- trunk/sys/net/if_stf.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_stf.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,4 +1,5 @@
-/* $MidnightBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/net/if_stf.h 139823 2005-01-07 01:45:51Z imp $ */
/* $KAME: if_stf.h,v 1.5 2001/10/12 10:09:17 keiichi Exp $ */
/*-
Modified: trunk/sys/net/if_tap.c
===================================================================
--- trunk/sys/net/if_tap.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_tap.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1999-2000 by Maksim Yevmenkin <m_evmenkin at yahoo.com>
* All rights reserved.
@@ -31,8 +32,8 @@
*/
/*
- * $MidnightBSD$
- * $Id: if_tap.c,v 1.6 2013-01-17 23:29:37 laffer1 Exp $
+ * $FreeBSD: stable/9/sys/net/if_tap.c 248085 2013-03-09 02:36:32Z marius $
+ * $Id: if_tap.c,v 0.21 2000/07/23 21:46:02 max Exp $
*/
#include "opt_compat.h"
Modified: trunk/sys/net/if_tap.h
===================================================================
--- trunk/sys/net/if_tap.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_tap.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1999-2000 by Maksim Yevmenkin <m_evmenkin at yahoo.com>
* All rights reserved.
@@ -31,8 +32,8 @@
*/
/*
- * $MidnightBSD$
- * $Id: if_tap.h,v 1.6 2013-01-17 23:29:37 laffer1 Exp $
+ * $FreeBSD: stable/9/sys/net/if_tap.h 182880 2008-09-08 22:43:55Z emax $
+ * $Id: if_tap.h,v 0.7 2000/07/12 04:12:51 max Exp $
*/
#ifndef _NET_IF_TAP_H_
Modified: trunk/sys/net/if_tapvar.h
===================================================================
--- trunk/sys/net/if_tapvar.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_tapvar.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1999-2000 by Maksim Yevmenkin <m_evmenkin at yahoo.com>
* All rights reserved.
@@ -34,8 +35,8 @@
*/
/*
- * $MidnightBSD$
- * $Id: if_tapvar.h,v 1.5 2013-01-17 23:29:37 laffer1 Exp $
+ * $FreeBSD: stable/9/sys/net/if_tapvar.h 147256 2005-06-10 16:49:24Z brooks $
+ * $Id: if_tapvar.h,v 0.6 2000/07/11 02:16:08 max Exp $
*/
#ifndef _NET_IF_TAPVAR_H_
Modified: trunk/sys/net/if_tun.c
===================================================================
--- trunk/sys/net/if_tun.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_tun.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $NetBSD: if_tun.c,v 1.14 1994/06/29 06:36:25 cgd Exp $ */
/*-
@@ -13,7 +14,7 @@
* UCL. This driver is based much more on read/write/poll mode of
* operation though.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_tun.c 248085 2013-03-09 02:36:32Z marius $
*/
#include "opt_atalk.h"
Modified: trunk/sys/net/if_tun.h
===================================================================
--- trunk/sys/net/if_tun.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_tun.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $NetBSD: if_tun.h,v 1.5 1994/06/29 06:36:27 cgd Exp $ */
/*-
@@ -13,7 +14,7 @@
* UCL. This driver is based much more on read/write/select mode of
* operation though.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_tun.h 139823 2005-01-07 01:45:51Z imp $
*/
#ifndef _NET_IF_TUN_H_
Modified: trunk/sys/net/if_types.h
===================================================================
--- trunk/sys/net/if_types.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_types.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)if_types.h 8.3 (Berkeley) 4/28/95
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_types.h 219819 2011-03-21 09:40:01Z jeff $
* $NetBSD: if_types.h,v 1.16 2000/04/19 06:30:53 itojun Exp $
*/
Modified: trunk/sys/net/if_var.h
===================================================================
--- trunk/sys/net/if_var.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_var.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* From: @(#)if.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_var.h 248287 2013-03-14 21:39:39Z jfv $
*/
#ifndef _NET_IF_VAR_H_
@@ -205,11 +206,7 @@
* be used with care where binary compatibility is required.
*/
char if_cspare[3];
- u_int if_hw_tsomax; /* tso burst length limit, the minmum
- * is (IP_MAXPACKET / 8).
- * XXXAO: Have to find a better place
- * for it eventually. */
- int if_ispare[3];
+ int if_ispare[4];
void *if_pspare[8]; /* 1 netmap, 7 TDB */
};
@@ -759,8 +756,6 @@
#define IF_MINMTU 72
#define IF_MAXMTU 65535
-#define TOEDEV(ifp) ((ifp)->if_llsoftc)
-
#endif /* _KERNEL */
/*
Modified: trunk/sys/net/if_vlan.c
===================================================================
--- trunk/sys/net/if_vlan.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_vlan.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1998 Massachusetts Institute of Technology
*
@@ -39,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/net/if_vlan.c 248085 2013-03-09 02:36:32Z marius $");
#include "opt_vlan.h"
@@ -742,8 +743,8 @@
vlan_trunk_cap_p = NULL;
vlan_trunkdev_p = NULL;
vlan_tag_p = NULL;
- vlan_cookie_p = NULL;
- vlan_setcookie_p = NULL;
+ vlan_cookie_p = vlan_cookie;
+ vlan_setcookie_p = vlan_setcookie;
vlan_devat_p = NULL;
VLAN_LOCK_DESTROY();
if (bootverbose)
@@ -1504,22 +1505,6 @@
ifp->if_capenable &= ~(p->if_capenable & IFCAP_TSO);
ifp->if_hwassist &= ~(p->if_hwassist & CSUM_TSO);
}
-
- /*
- * If the parent interface can offload TCP connections over VLANs then
- * propagate its TOE capability to the VLAN interface.
- *
- * All TOE drivers in the tree today can deal with VLANs. If this
- * changes then IFCAP_VLAN_TOE should be promoted to a full capability
- * with its own bit.
- */
-#define IFCAP_VLAN_TOE IFCAP_TOE
- if (p->if_capabilities & IFCAP_VLAN_TOE)
- ifp->if_capabilities |= p->if_capabilities & IFCAP_TOE;
- if (p->if_capenable & IFCAP_VLAN_TOE) {
- TOEDEV(ifp) = TOEDEV(p);
- ifp->if_capenable |= p->if_capenable & IFCAP_TOE;
- }
}
static void
Modified: trunk/sys/net/if_vlan_var.h
===================================================================
--- trunk/sys/net/if_vlan_var.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/if_vlan_var.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1998 Massachusetts Institute of Technology
*
@@ -26,7 +27,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/if_vlan_var.h 219819 2011-03-21 09:40:01Z jeff $
*/
#ifndef _NET_IF_VLAN_VAR_H_
Modified: trunk/sys/net/iso88025.h
===================================================================
--- trunk/sys/net/iso88025.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/iso88025.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1998, Larry Lile
* All rights reserved.
@@ -30,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/iso88025.h 194581 2009-06-21 10:29:31Z rdivacky $
*
* Information gathered from tokenring at freebsd, /sys/net/ethernet.h and
* the Mach token ring driver.
Modified: trunk/sys/net/netisr.c
===================================================================
--- trunk/sys/net/netisr.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/netisr.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2007-2009 Robert N. M. Watson
* Copyright (c) 2010-2011 Juniper Networks, Inc.
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/net/netisr.c 248085 2013-03-09 02:36:32Z marius $");
/*
* netisr is a packet dispatch service, allowing synchronous (directly
Modified: trunk/sys/net/netisr.h
===================================================================
--- trunk/sys/net/netisr.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/netisr.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2007-2009 Robert N. M. Watson
* Copyright (c) 2010-2011 Juniper Networks, Inc.
@@ -27,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/netisr.h 222249 2011-05-24 12:34:19Z rwatson $
*/
#ifndef _NET_NETISR_H_
Modified: trunk/sys/net/netisr_internal.h
===================================================================
--- trunk/sys/net/netisr_internal.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/netisr_internal.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2007-2009 Robert N. M. Watson
* Copyright (c) 2010-2011 Juniper Networks, Inc.
@@ -27,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/netisr_internal.h 222249 2011-05-24 12:34:19Z rwatson $
*/
#ifndef _NET_NETISR_INTERNAL_H_
Modified: trunk/sys/net/netmap.h
===================================================================
--- trunk/sys/net/netmap.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/netmap.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (C) 2011 Matteo Landi, Luigi Rizzo. All rights reserved.
*
@@ -31,8 +32,8 @@
*/
/*
- * $MidnightBSD$
- * $Id: netmap.h,v 1.2 2013-01-17 23:29:37 laffer1 Exp $
+ * $FreeBSD: stable/9/sys/net/netmap.h 247230 2013-02-24 18:26:17Z luigi $
+ * $Id: netmap.h 11997 2013-01-17 21:59:12Z luigi $
*
* Definitions of constants and the structures used by the netmap
* framework, for the part visible to both kernel and userspace.
Modified: trunk/sys/net/netmap_user.h
===================================================================
--- trunk/sys/net/netmap_user.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/netmap_user.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (C) 2011 Matteo Landi, Luigi Rizzo. All rights reserved.
*
@@ -31,8 +32,8 @@
*/
/*
- * $MidnightBSD$
- * $Id: netmap_user.h,v 1.2 2013-01-17 23:29:37 laffer1 Exp $
+ * $FreeBSD: stable/9/sys/net/netmap_user.h 246355 2013-02-05 09:40:31Z luigi $
+ * $Id: netmap_user.h 10597 2012-02-21 05:08:32Z luigi $
*
* This header contains the macros used to manipulate netmap structures
* and packets in userspace. See netmap(4) for more information.
Modified: trunk/sys/net/pfil.c
===================================================================
--- trunk/sys/net/pfil.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/pfil.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,4 +1,5 @@
-/* $MidnightBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/net/pfil.c 198233 2009-10-19 15:19:14Z rwatson $ */
/* $NetBSD: pfil.c,v 1.20 2001/11/12 23:49:46 lukem Exp $ */
/*-
Modified: trunk/sys/net/pfil.h
===================================================================
--- trunk/sys/net/pfil.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/pfil.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,4 +1,5 @@
-/* $MidnightBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/net/pfil.h 210121 2010-07-15 14:41:06Z luigi $ */
/* $NetBSD: pfil.h,v 1.22 2003/06/23 12:57:08 martin Exp $ */
/*-
Modified: trunk/sys/net/pfkeyv2.h
===================================================================
--- trunk/sys/net/pfkeyv2.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/pfkeyv2.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,4 +1,5 @@
-/* $MidnightBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/net/pfkeyv2.h 194062 2009-06-12 15:44:35Z vanhu $ */
/* $KAME: pfkeyv2.h,v 1.37 2003/09/06 05:15:43 itojun Exp $ */
/*-
Modified: trunk/sys/net/ppp_defs.h
===================================================================
--- trunk/sys/net/ppp_defs.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/ppp_defs.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* ppp_defs.h - PPP definitions.
*/
@@ -25,7 +26,7 @@
* OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
* OR MODIFICATIONS.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/ppp_defs.h 139823 2005-01-07 01:45:51Z imp $
*/
#ifndef _PPP_DEFS_H_
Modified: trunk/sys/net/radix.c
===================================================================
--- trunk/sys/net/radix.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/radix.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1988, 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)radix.c 8.5 (Berkeley) 5/19/95
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/radix.c 210122 2010-07-15 14:41:59Z luigi $
*/
/*
Modified: trunk/sys/net/radix.h
===================================================================
--- trunk/sys/net/radix.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/radix.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1988, 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)radix.h 8.2 (Berkeley) 10/31/94
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/radix.h 225698 2011-09-20 20:27:26Z kmacy $
*/
#ifndef _RADIX_H_
Modified: trunk/sys/net/radix_mpath.c
===================================================================
--- trunk/sys/net/radix_mpath.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/radix_mpath.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $KAME: radix_mpath.c,v 1.17 2004/11/08 10:29:39 itojun Exp $ */
/*
@@ -34,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/net/radix_mpath.c 225163 2011-08-25 04:31:20Z qingli $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/net/radix_mpath.h
===================================================================
--- trunk/sys/net/radix_mpath.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/radix_mpath.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $KAME: radix_mpath.h,v 1.10 2004/11/06 15:44:28 itojun Exp $ */
/*
@@ -32,7 +33,7 @@
* BE LIABLE FOR ANY INFRINGEMENT OF ANY OTHERS' INTELLECTUAL
* PROPERTIES.
*/
-/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/net/radix_mpath.h 179426 2008-05-30 09:34:35Z qingli $ */
#ifndef _NET_RADIX_MPATH_H_
#define _NET_RADIX_MPATH_H_
Modified: trunk/sys/net/raw_cb.c
===================================================================
--- trunk/sys/net/raw_cb.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/raw_cb.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California.
@@ -28,7 +29,7 @@
* SUCH DAMAGE.
*
* @(#)raw_cb.c 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/raw_cb.c 248085 2013-03-09 02:36:32Z marius $
*/
#include <sys/param.h>
Modified: trunk/sys/net/raw_cb.h
===================================================================
--- trunk/sys/net/raw_cb.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/raw_cb.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California.
@@ -28,7 +29,7 @@
* SUCH DAMAGE.
*
* @(#)raw_cb.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/raw_cb.h 225970 2011-10-04 11:35:18Z bz $
*/
#ifndef _NET_RAW_CB_H_
Modified: trunk/sys/net/raw_usrreq.c
===================================================================
--- trunk/sys/net/raw_usrreq.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/raw_usrreq.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California.
@@ -28,7 +29,7 @@
* SUCH DAMAGE.
*
* @(#)raw_usrreq.c 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/raw_usrreq.c 225970 2011-10-04 11:35:18Z bz $
*/
#include <sys/param.h>
Modified: trunk/sys/net/route.c
===================================================================
--- trunk/sys/net/route.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/route.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1980, 1986, 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)route.c 8.3.1.1 (Berkeley) 2/23/95
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/route.c 248895 2013-03-29 16:24:20Z melifaro $
*/
/************************************************************************
* Note: In this file a 'fib' is a "forwarding information base" *
@@ -68,7 +69,8 @@
#include <vm/uma.h>
-#define RT_MAXFIBS UINT16_MAX
+/* We use 4 bits in the mbuf flags, thus we are limited to 16 FIBS. */
+#define RT_MAXFIBS 16
/* Kernel config default option. */
#ifdef ROUTETABLES
@@ -85,10 +87,17 @@
#define RT_NUMFIBS 1
#endif
-/* This is read-only.. */
u_int rt_numfibs = RT_NUMFIBS;
SYSCTL_UINT(_net, OID_AUTO, fibs, CTLFLAG_RD, &rt_numfibs, 0, "");
-/* and this can be set too big but will be fixed before it is used */
+/*
+ * Allow the boot code to allow LESS than RT_MAXFIBS to be used.
+ * We can't do more because storage is statically allocated for now.
+ * (for compatibility reasons.. this will change. When this changes, code should
+ * be refactored to protocol independent parts and protocol dependent parts,
+ * probably hanging of domain(9) specific storage to not need the full
+ * fib * af RNH allocation etc. but allow tuning the number of tables per
+ * address family).
+ */
TUNABLE_INT("net.fibs", &rt_numfibs);
/*
Modified: trunk/sys/net/route.h
===================================================================
--- trunk/sys/net/route.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/route.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)route.h 8.4 (Berkeley) 1/9/95
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/route.h 248895 2013-03-29 16:24:20Z melifaro $
*/
#ifndef _NET_ROUTE_H_
Modified: trunk/sys/net/rtsock.c
===================================================================
--- trunk/sys/net/rtsock.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/rtsock.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1988, 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)rtsock.c 8.7 (Berkeley) 10/12/95
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/rtsock.c 248085 2013-03-09 02:36:32Z marius $
*/
#include "opt_compat.h"
#include "opt_sctp.h"
@@ -171,14 +172,6 @@
#define RTSOCK_LOCK_ASSERT() mtx_assert(&rtsock_mtx, MA_OWNED)
static SYSCTL_NODE(_net, OID_AUTO, route, CTLFLAG_RD, 0, "");
-#ifdef INET6
-static VNET_DEFINE(int, deembed_scopeid) = 1;
-#define V_deembed_scopeid VNET(deembed_scopeid)
-SYSCTL_DECL(_net_inet6_ip6);
-SYSCTL_VNET_INT(_net_inet6_ip6, OID_AUTO, deembed_scopeid, CTLFLAG_RW,
- &VNET_NAME(deembed_scopeid), 0,
- "Extract embedded zone ID and set it to sin6_scope_id in sockaddr_in6.");
-#endif
struct walkarg {
int w_tmemsize;
@@ -577,11 +570,6 @@
struct rtentry *rt = NULL;
struct radix_node_head *rnh;
struct rt_addrinfo info;
-#ifdef INET6
- struct sockaddr_storage ss_dst;
- struct sockaddr_storage ss_gw;
- struct sockaddr_in6 *sin6;
-#endif
int len, error = 0;
struct ifnet *ifp = NULL;
union sockaddr_union saun;
@@ -809,31 +797,7 @@
senderr(ESRCH);
}
info.rti_info[RTAX_DST] = rt_key(rt);
-#ifdef INET6
- switch (rt_key(rt)->sa_family) {
- case AF_INET6:
- if (V_deembed_scopeid == 0)
- break;
- sin6 = (struct sockaddr_in6 *)&ss_dst;
- bcopy(rt_key(rt), sin6, sizeof(*sin6));
- if (sa6_recoverscope(sin6) == 0)
- info.rti_info[RTAX_DST] =
- (struct sockaddr *)sin6;
- break;
- }
-#endif
info.rti_info[RTAX_GATEWAY] = rt->rt_gateway;
-#ifdef INET6
- switch (rt->rt_gateway->sa_family) {
- case AF_INET6:
- sin6 = (struct sockaddr_in6 *)&ss_gw;
- bcopy(rt->rt_gateway, sin6, sizeof(*sin6));
- if (sa6_recoverscope(sin6) == 0)
- info.rti_info[RTAX_GATEWAY] =
- (struct sockaddr *)sin6;
- break;
- }
-#endif
info.rti_info[RTAX_NETMASK] = rt_mask(rt);
info.rti_info[RTAX_GENMASK] = 0;
if (rtm->rtm_addrs & (RTA_IFP | RTA_IFA)) {
@@ -1084,10 +1048,6 @@
struct mbuf *m;
int i;
struct sockaddr *sa;
-#ifdef INET6
- struct sockaddr_storage ss;
- struct sockaddr_in6 *sin6;
-#endif
int len, dlen;
switch (type) {
@@ -1135,18 +1095,6 @@
continue;
rtinfo->rti_addrs |= (1 << i);
dlen = SA_SIZE(sa);
-#ifdef INET6
- switch (sa->sa_family) {
- case AF_INET6:
- if (V_deembed_scopeid == 0)
- break;
- sin6 = (struct sockaddr_in6 *)&ss;
- bcopy(sa, sin6, sizeof(*sin6));
- if (sa6_recoverscope(sin6) == 0)
- sa = (struct sockaddr *)sin6;
- break;
- }
-#endif
m_copyback(m, len, dlen, (caddr_t)sa);
len += dlen;
}
@@ -1169,10 +1117,6 @@
int i;
int len, dlen, second_time = 0;
caddr_t cp0;
-#ifdef INET6
- struct sockaddr_storage ss;
- struct sockaddr_in6 *sin6;
-#endif
rtinfo->rti_addrs = 0;
again:
@@ -1224,18 +1168,6 @@
continue;
rtinfo->rti_addrs |= (1 << i);
dlen = SA_SIZE(sa);
-#ifdef INET6
- switch (sa->sa_family) {
- case AF_INET6:
- if (V_deembed_scopeid == 0)
- break;
- sin6 = (struct sockaddr_in6 *)&ss;
- bcopy(sa, sin6, sizeof(*sin6));
- if (sa6_recoverscope(sin6) == 0)
- sa = (struct sockaddr *)sin6;
- break;
- }
-#endif
if (cp) {
bcopy((caddr_t)sa, cp, (unsigned)dlen);
cp += dlen;
@@ -1576,11 +1508,6 @@
struct rtentry *rt = (struct rtentry *)rn;
int error = 0, size;
struct rt_addrinfo info;
-#ifdef INET6
- struct sockaddr_storage ss[RTAX_MAX];
- struct sockaddr_in6 *sin6;
-#endif
- int i;
if (w->w_op == NET_RT_FLAGS && !(rt->rt_flags & w->w_arg))
return 0;
@@ -1599,22 +1526,6 @@
if (rt->rt_ifp->if_flags & IFF_POINTOPOINT)
info.rti_info[RTAX_BRD] = rt->rt_ifa->ifa_dstaddr;
}
-#ifdef INET6
- for (i = 0; i < RTAX_MAX; i++) {
- if (info.rti_info[i] == NULL)
- continue;
- switch (info.rti_info[i]->sa_family) {
- case AF_INET6:
- if (V_deembed_scopeid == 0)
- break;
- sin6 = (struct sockaddr_in6 *)&ss[i];
- bcopy(info.rti_info[i], sin6, sizeof(*sin6));
- if (sa6_recoverscope(sin6) == 0)
- info.rti_info[i] = (struct sockaddr *)sin6;
- break;
- }
- }
-#endif
size = rt_msg2(RTM_GET, &info, NULL, w);
if (w->w_req && w->w_tmem) {
struct rt_msghdr *rtm = (struct rt_msghdr *)w->w_tmem;
Modified: trunk/sys/net/slcompress.c
===================================================================
--- trunk/sys/net/slcompress.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/slcompress.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)slcompress.c 8.2 (Berkeley) 4/16/94
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/slcompress.c 128019 2004-04-07 20:46:16Z imp $
*/
/*
Modified: trunk/sys/net/slcompress.h
===================================================================
--- trunk/sys/net/slcompress.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/slcompress.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Definitions for tcp compression routines.
*/
@@ -31,7 +32,7 @@
*
* Van Jacobson (van at helios.ee.lbl.gov), Dec 31, 1989:
* - Initial distribution.
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/slcompress.h 139823 2005-01-07 01:45:51Z imp $
*/
#ifndef _NET_SLCOMPRESS_H_
Modified: trunk/sys/net/vnet.c
===================================================================
--- trunk/sys/net/vnet.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/vnet.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2004-2009 University of Zagreb
* Copyright (c) 2006-2009 FreeBSD Foundation
@@ -34,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/net/vnet.c 249132 2013-04-05 08:22:11Z mav $");
#include "opt_ddb.h"
#include "opt_kdb.h"
Modified: trunk/sys/net/vnet.h
===================================================================
--- trunk/sys/net/vnet.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/vnet.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2006-2009 University of Zagreb
* Copyright (c) 2006-2009 FreeBSD Foundation
@@ -32,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/vnet.h 218567 2011-02-11 14:17:58Z bz $
*/
/*-
Modified: trunk/sys/net/zlib.c
===================================================================
--- trunk/sys/net/zlib.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/zlib.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* This file is derived from various .h and .c files from the zlib-1.0.4
* distribution by Jean-loup Gailly and Mark Adler, with some additions
@@ -10,7 +11,7 @@
* - added inflateIncomp and deflateOutputPending
* - allow strm->next_out to be NULL, meaning discard the output
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/net/zlib.c 149993 2005-09-11 16:13:02Z rodrigc $
*/
/*
Modified: trunk/sys/net/zlib.h
===================================================================
--- trunk/sys/net/zlib.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/zlib.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,4 +1,5 @@
-/* $MidnightBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/net/zlib.h 204552 2010-03-02 06:58:58Z alfred $ */
/*
* This file is derived from zlib.h and zconf.h from the zlib-1.0.4
Modified: trunk/sys/net/zutil.h
===================================================================
--- trunk/sys/net/zutil.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/net/zutil.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* zutil.h -- internal interface and configuration of the compression library
* Copyright (C) 1995-1996 Jean-loup Gailly.
* For conditions of distribution and use, see copyright notice in zlib.h
@@ -9,7 +10,7 @@
*/
/* From: zutil.h,v 1.16 1996/07/24 13:41:13 me Exp $ */
-/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/net/zutil.h 204552 2010-03-02 06:58:58Z alfred $ */
#ifndef _Z_UTIL_H
#define _Z_UTIL_H
Modified: trunk/sys/netinet/accf_data.c
===================================================================
--- trunk/sys/netinet/accf_data.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/accf_data.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2000 Alfred Perlstein <alfred at FreeBSD.org>
* All rights reserved.
@@ -25,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/accf_data.c 193272 2009-06-01 21:17:03Z jhb $");
#define ACCEPT_FILTER_MOD
Modified: trunk/sys/netinet/accf_dns.c
===================================================================
--- trunk/sys/netinet/accf_dns.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/accf_dns.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (C) 2007 David Malone <dwmalone at FreeBSD.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/accf_dns.c 193272 2009-06-01 21:17:03Z jhb $
*/
#define ACCEPT_FILTER_MOD
Modified: trunk/sys/netinet/accf_http.c
===================================================================
--- trunk/sys/netinet/accf_http.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/accf_http.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2000 Paycounter, Inc.
* Author: Alfred Perlstein <alfred at paycounter.com>, <alfred at FreeBSD.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/accf_http.c 248085 2013-03-09 02:36:32Z marius $");
#define ACCEPT_FILTER_MOD
Modified: trunk/sys/netinet/cc/cc.c
===================================================================
--- trunk/sys/netinet/cc/cc.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/cc/cc.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/cc/cc.c 220560 2011-04-12 08:13:18Z lstewart $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/netinet/cc/cc_chd.c
===================================================================
--- trunk/sys/netinet/cc/cc_chd.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/cc/cc_chd.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/cc/cc_chd.c 220592 2011-04-13 11:28:46Z pluknet $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/netinet/cc/cc_cubic.c
===================================================================
--- trunk/sys/netinet/cc/cc_cubic.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/cc/cc_cubic.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/cc/cc_cubic.c 220592 2011-04-13 11:28:46Z pluknet $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/netinet/cc/cc_cubic.h
===================================================================
--- trunk/sys/netinet/cc/cc_cubic.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/cc/cc_cubic.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/cc/cc_cubic.h 220560 2011-04-12 08:13:18Z lstewart $
*/
#ifndef _NETINET_CC_CUBIC_H_
Modified: trunk/sys/netinet/cc/cc_hd.c
===================================================================
--- trunk/sys/netinet/cc/cc_hd.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/cc/cc_hd.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/cc/cc_hd.c 220560 2011-04-12 08:13:18Z lstewart $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/netinet/cc/cc_htcp.c
===================================================================
--- trunk/sys/netinet/cc/cc_htcp.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/cc/cc_htcp.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/cc/cc_htcp.c 220592 2011-04-13 11:28:46Z pluknet $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/netinet/cc/cc_module.h
===================================================================
--- trunk/sys/netinet/cc/cc_module.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/cc/cc_module.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/cc/cc_module.h 220560 2011-04-12 08:13:18Z lstewart $
*/
/*
Modified: trunk/sys/netinet/cc/cc_newreno.c
===================================================================
--- trunk/sys/netinet/cc/cc_newreno.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/cc/cc_newreno.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/cc/cc_newreno.c 220560 2011-04-12 08:13:18Z lstewart $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/netinet/cc/cc_vegas.c
===================================================================
--- trunk/sys/netinet/cc/cc_vegas.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/cc/cc_vegas.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/cc/cc_vegas.c 220592 2011-04-13 11:28:46Z pluknet $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/netinet/cc.h
===================================================================
--- trunk/sys/netinet/cc.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/cc.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2007-2008
* Swinburne University of Technology, Melbourne, Australia.
@@ -35,7 +36,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/cc.h 220560 2011-04-12 08:13:18Z lstewart $
*/
/*
Modified: trunk/sys/netinet/icmp6.h
===================================================================
--- trunk/sys/netinet/icmp6.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/icmp6.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,4 +1,5 @@
-/* $MidnightBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/netinet/icmp6.h 235705 2012-05-20 23:33:10Z bz $ */
/* $KAME: icmp6.h,v 1.46 2001/04/27 15:09:48 itojun Exp $ */
/*-
Modified: trunk/sys/netinet/icmp_var.h
===================================================================
--- trunk/sys/netinet/icmp_var.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/icmp_var.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)icmp_var.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/icmp_var.h 237913 2012-07-01 09:00:29Z tuexen $
*/
#ifndef _NETINET_ICMP_VAR_H_
Modified: trunk/sys/netinet/if_atm.c
===================================================================
--- trunk/sys/netinet/if_atm.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/if_atm.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $NetBSD: if_atm.c,v 1.6 1996/10/13 02:03:01 christos Exp $ */
/*-
@@ -32,7 +33,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/if_atm.c 216466 2010-12-15 22:58:45Z bz $");
/*
* IP <=> ATM address resolution.
Modified: trunk/sys/netinet/if_atm.h
===================================================================
--- trunk/sys/netinet/if_atm.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/if_atm.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,4 +1,5 @@
/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/netinet/if_atm.h 139823 2005-01-07 01:45:51Z imp $ */
/* $NetBSD: if_atm.h,v 1.2 1996/07/03 17:17:17 chuck Exp $ */
/*-
Modified: trunk/sys/netinet/if_ether.c
===================================================================
--- trunk/sys/netinet/if_ether.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/if_ether.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -36,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/if_ether.c 248852 2013-03-28 20:48:40Z emaste $");
#include "opt_inet.h"
@@ -178,16 +179,6 @@
ifp = lle->lle_tbl->llt_ifp;
CURVNET_SET(ifp->if_vnet);
- if ((lle->la_flags & LLE_DELETED) == 0) {
- int evt;
-
- if (lle->la_flags & LLE_VALID)
- evt = LLENTRY_EXPIRED;
- else
- evt = LLENTRY_TIMEDOUT;
- EVENTHANDLER_INVOKE(lle_event, lle, evt);
- }
-
callout_stop(&lle->la_timer);
/* XXX: LOR avoidance. We still have ref on lle. */
@@ -740,7 +731,7 @@
(void)memcpy(&la->ll_addr, ar_sha(ah), ifp->if_addrlen);
la->la_flags |= LLE_VALID;
- EVENTHANDLER_INVOKE(lle_event, la, LLENTRY_RESOLVED);
+ EVENTHANDLER_INVOKE(arp_update_event, la);
if (!(la->la_flags & LLE_STATIC)) {
int canceled;
Modified: trunk/sys/netinet/if_ether.h
===================================================================
--- trunk/sys/netinet/if_ether.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/if_ether.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)if_ether.h 8.3 (Berkeley) 5/2/95
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/if_ether.h 196995 2009-09-08 21:17:17Z np $
*/
#ifndef _NETINET_IF_ETHER_H_
@@ -117,6 +118,11 @@
struct llentry **lle);
void arp_ifinit(struct ifnet *, struct ifaddr *);
void arp_ifinit2(struct ifnet *, struct ifaddr *, u_char *);
+
+#include <sys/eventhandler.h>
+typedef void (*llevent_arp_update_fn)(void *, struct llentry *);
+EVENTHANDLER_DECLARE(arp_update_event, llevent_arp_update_fn);
+
#endif
#endif
Modified: trunk/sys/netinet/igmp.c
===================================================================
--- trunk/sys/netinet/igmp.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/igmp.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2007-2009 Bruce Simpson.
* Copyright (c) 1988 Stephen Deering.
@@ -48,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/igmp.c 249132 2013-04-05 08:22:11Z mav $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1533,7 +1534,8 @@
case IGMP_VERSION_3: {
struct igmpv3 *igmpv3;
uint16_t igmpv3len;
- uint16_t nsrc;
+ uint16_t srclen;
+ int nsrc;
IGMPSTAT_INC(igps_rcv_v3_queries);
igmpv3 = (struct igmpv3 *)igmp;
@@ -1541,8 +1543,8 @@
* Validate length based on source count.
*/
nsrc = ntohs(igmpv3->igmp_numsrc);
- if (nsrc * sizeof(in_addr_t) >
- UINT16_MAX - iphlen - IGMP_V3_QUERY_MINLEN) {
+ srclen = sizeof(struct in_addr) * nsrc;
+ if (nsrc * sizeof(in_addr_t) > srclen) {
IGMPSTAT_INC(igps_rcv_tooshort);
return;
}
@@ -1551,7 +1553,7 @@
* this scope.
*/
igmpv3len = iphlen + IGMP_V3_QUERY_MINLEN +
- sizeof(struct in_addr) * nsrc;
+ srclen;
if ((m->m_flags & M_EXT ||
m->m_len < igmpv3len) &&
(m = m_pullup(m, igmpv3len)) == NULL) {
Modified: trunk/sys/netinet/igmp.h
===================================================================
--- trunk/sys/netinet/igmp.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/igmp.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1988 Stephen Deering.
* Copyright (c) 1992, 1993
@@ -31,7 +32,7 @@
* SUCH DAMAGE.
*
* @(#)igmp.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/igmp.h 193938 2009-06-10 18:12:15Z imp $
*/
#ifndef _NETINET_IGMP_H_
Modified: trunk/sys/netinet/igmp_var.h
===================================================================
--- trunk/sys/netinet/igmp_var.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/igmp_var.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-a
* Copyright (c) 1988 Stephen Deering.
* Copyright (c) 1992, 1993
@@ -31,7 +32,7 @@
* SUCH DAMAGE.
*
* from: @(#)igmp_var.h 8.1 (Berkeley) 7/19/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/igmp_var.h 190965 2009-04-12 13:41:13Z rwatson $
*/
#ifndef _NETINET_IGMP_VAR_H_
Modified: trunk/sys/netinet/in.c
===================================================================
--- trunk/sys/netinet/in.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/in.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/in.c 240313 2012-09-10 12:25:57Z glebius $");
#include "opt_mpath.h"
Modified: trunk/sys/netinet/in.h
===================================================================
--- trunk/sys/netinet/in.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/in.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)in.h 8.3 (Berkeley) 1/3/94
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/in.h 239430 2012-08-20 14:42:29Z emaste $
*/
#ifndef _NETINET_IN_H_
Modified: trunk/sys/netinet/in_cksum.c
===================================================================
--- trunk/sys/netinet/in_cksum.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/in_cksum.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1988, 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/in_cksum.c 172467 2007-10-07 20:44:24Z silby $");
#include <sys/param.h>
#include <sys/mbuf.h>
Modified: trunk/sys/netinet/in_debug.c
===================================================================
--- trunk/sys/netinet/in_debug.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/in_debug.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2010 Bjoern A. Zeeb <bz at FreeBSD.org>
* All rights reserved.
@@ -25,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/in_debug.c 226572 2011-10-20 15:58:05Z glebius $");
#include "opt_ddb.h"
Modified: trunk/sys/netinet/in_gif.c
===================================================================
--- trunk/sys/netinet/in_gif.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/in_gif.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $KAME: in_gif.c,v 1.54 2001/05/14 14:02:16 itojun Exp $ */
/*-
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/in_gif.c 223637 2011-06-28 11:57:25Z bz $");
#include "opt_mrouting.h"
#include "opt_inet.h"
Modified: trunk/sys/netinet/in_gif.h
===================================================================
--- trunk/sys/netinet/in_gif.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/in_gif.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,4 +1,5 @@
-/* $MidnightBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/netinet/in_gif.h 139823 2005-01-07 01:45:51Z imp $ */
/* $KAME: in_gif.h,v 1.5 2000/04/14 08:36:02 itojun Exp $ */
/*-
Modified: trunk/sys/netinet/in_mcast.c
===================================================================
--- trunk/sys/netinet/in_mcast.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/in_mcast.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2007-2009 Bruce Simpson.
* Copyright (c) 2005 Robert N. M. Watson.
@@ -33,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/in_mcast.c 248085 2013-03-09 02:36:32Z marius $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1614,8 +1615,6 @@
* has asked for, but we always tell userland how big the
* buffer really needs to be.
*/
- if (msfr.msfr_nsrcs > in_mcast_maxsocksrc)
- msfr.msfr_nsrcs = in_mcast_maxsocksrc;
tss = NULL;
if (msfr.msfr_srcs != NULL && msfr.msfr_nsrcs > 0) {
tss = malloc(sizeof(struct sockaddr_storage) * msfr.msfr_nsrcs,
Modified: trunk/sys/netinet/in_pcb.c
===================================================================
--- trunk/sys/netinet/in_pcb.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/in_pcb.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1991, 1993, 1995
* The Regents of the University of California.
@@ -36,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/in_pcb.c 248085 2013-03-09 02:36:32Z marius $");
#include "opt_ddb.h"
#include "opt_ipsec.h"
Modified: trunk/sys/netinet/in_pcb.h
===================================================================
--- trunk/sys/netinet/in_pcb.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/in_pcb.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1990, 1993
* The Regents of the University of California.
@@ -32,7 +33,7 @@
* SUCH DAMAGE.
*
* @(#)in_pcb.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/in_pcb.h 241435 2012-10-11 01:32:51Z glebius $
*/
#ifndef _NETINET_IN_PCB_H_
Modified: trunk/sys/netinet/in_pcbgroup.c
===================================================================
--- trunk/sys/netinet/in_pcbgroup.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/in_pcbgroup.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2010-2011 Juniper Networks, Inc.
* All rights reserved.
@@ -29,7 +30,7 @@
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/in_pcbgroup.c 222748 2011-06-06 12:55:02Z rwatson $");
#include "opt_inet6.h"
Modified: trunk/sys/netinet/in_proto.c
===================================================================
--- trunk/sys/netinet/in_proto.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/in_proto.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/in_proto.c 230868 2012-02-01 15:57:49Z glebius $");
#include "opt_ipx.h"
#include "opt_mrouting.h"
Modified: trunk/sys/netinet/in_rmx.c
===================================================================
--- trunk/sys/netinet/in_rmx.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/in_rmx.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1994, 1995 Massachusetts Institute of Technology
*
@@ -28,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/in_rmx.c 242646 2012-11-06 01:18:53Z melifaro $");
#include <sys/param.h>
#include <sys/systm.h>
Modified: trunk/sys/netinet/in_systm.h
===================================================================
--- trunk/sys/netinet/in_systm.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/in_systm.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)in_systm.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/in_systm.h 188578 2009-02-13 15:14:43Z luigi $
*/
#ifndef _NETINET_IN_SYSTM_H_
Modified: trunk/sys/netinet/in_var.h
===================================================================
--- trunk/sys/netinet/in_var.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/in_var.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1985, 1986, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)in_var.h 8.2 (Berkeley) 1/9/95
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/in_var.h 242640 2012-11-06 00:49:52Z melifaro $
*/
#ifndef _NETINET_IN_VAR_H_
Modified: trunk/sys/netinet/ip.h
===================================================================
--- trunk/sys/netinet/ip.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California.
@@ -28,7 +29,7 @@
* SUCH DAMAGE.
*
* @(#)ip.h 8.2 (Berkeley) 6/1/94
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/ip.h 235805 2012-05-22 19:53:25Z delphij $
*/
#ifndef _NETINET_IP_H_
Modified: trunk/sys/netinet/ip6.h
===================================================================
--- trunk/sys/netinet/ip6.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip6.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,4 +1,5 @@
-/* $MidnightBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/netinet/ip6.h 215956 2010-11-27 21:51:39Z brucec $ */
/* $KAME: ip6.h,v 1.18 2001/03/29 05:34:30 itojun Exp $ */
/*-
Modified: trunk/sys/netinet/ip_carp.c
===================================================================
--- trunk/sys/netinet/ip_carp.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_carp.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2002 Michael Shalayeff. All rights reserved.
* Copyright (c) 2003 Ryan McBride. All rights reserved.
@@ -25,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/ip_carp.c 233200 2012-03-19 20:49:16Z jhb $");
#include "opt_bpf.h"
#include "opt_inet.h"
Modified: trunk/sys/netinet/ip_carp.h
===================================================================
--- trunk/sys/netinet/ip_carp.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_carp.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,4 +1,5 @@
-/* $MidnightBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/netinet/ip_carp.h 211193 2010-08-11 20:18:19Z will $ */
/* $OpenBSD: ip_carp.h,v 1.8 2004/07/29 22:12:15 mcbride Exp $ */
/*
Modified: trunk/sys/netinet/ip_divert.c
===================================================================
--- trunk/sys/netinet/ip_divert.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_divert.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -28,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/ip_divert.c 248085 2013-03-09 02:36:32Z marius $");
#if !defined(KLD_MODULE)
#include "opt_inet.h"
Modified: trunk/sys/netinet/ip_divert.h
===================================================================
--- trunk/sys/netinet/ip_divert.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_divert.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2003 Sam Leffler, Errno Consulting
* All rights reserved.
@@ -29,7 +30,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGES.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/ip_divert.h 201527 2010-01-04 19:01:22Z luigi $
*/
#ifndef _NETINET_IP_DIVERT_H_
Modified: trunk/sys/netinet/ip_dummynet.h
===================================================================
--- trunk/sys/netinet/ip_dummynet.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_dummynet.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1998-2010 Luigi Rizzo, Universita` di Pisa
* Portions Copyright (c) 2000 Akamba Corp.
@@ -24,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/ip_dummynet.h 206845 2010-04-19 16:17:30Z luigi $
*/
#ifndef _IP_DUMMYNET_H
Modified: trunk/sys/netinet/ip_ecn.c
===================================================================
--- trunk/sys/netinet/ip_ecn.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_ecn.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $KAME: ip_ecn.c,v 1.12 2002/01/07 11:34:47 kjc Exp $ */
/*-
@@ -35,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/ip_ecn.c 172467 2007-10-07 20:44:24Z silby $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/netinet/ip_ecn.h
===================================================================
--- trunk/sys/netinet/ip_ecn.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_ecn.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,4 +1,5 @@
-/* $MidnightBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/netinet/ip_ecn.h 139823 2005-01-07 01:45:51Z imp $ */
/* $KAME: ip_ecn.h,v 1.8 2002/01/07 11:34:47 kjc Exp $ */
/*-
Modified: trunk/sys/netinet/ip_encap.c
===================================================================
--- trunk/sys/netinet/ip_encap.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_encap.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $KAME: ip_encap.c,v 1.41 2001/03/15 08:35:08 itojun Exp $ */
/*-
@@ -57,7 +58,7 @@
/* XXX is M_NETADDR correct? */
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/ip_encap.c 201145 2009-12-28 22:56:30Z antoine $");
#include "opt_mrouting.h"
#include "opt_inet.h"
Modified: trunk/sys/netinet/ip_encap.h
===================================================================
--- trunk/sys/netinet/ip_encap.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_encap.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,4 +1,5 @@
-/* $MidnightBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/netinet/ip_encap.h 139823 2005-01-07 01:45:51Z imp $ */
/* $KAME: ip_encap.h,v 1.7 2000/03/25 07:23:37 sumikawa Exp $ */
/*-
Modified: trunk/sys/netinet/ip_fastfwd.c
===================================================================
--- trunk/sys/netinet/ip_fastfwd.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_fastfwd.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2003 Andre Oppermann, Internet Business Solutions AG
* All rights reserved.
@@ -74,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/ip_fastfwd.c 243586 2012-11-27 01:59:51Z ae $");
#include "opt_ipfw.h"
#include "opt_ipstealth.h"
Modified: trunk/sys/netinet/ip_fw.h
===================================================================
--- trunk/sys/netinet/ip_fw.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_fw.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2002-2009 Luigi Rizzo, Universita` di Pisa
*
@@ -22,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/ip_fw.h 234597 2012-04-23 07:15:15Z melifaro $
*/
#ifndef _IPFW2_H
Modified: trunk/sys/netinet/ip_gre.c
===================================================================
--- trunk/sys/netinet/ip_gre.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_gre.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $NetBSD: ip_gre.c,v 1.29 2003/09/05 23:02:43 itojun Exp $ */
/*-
@@ -38,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/ip_gre.c 204522 2010-03-01 17:05:46Z joel $");
#include "opt_inet.h"
#include "opt_atalk.h"
Modified: trunk/sys/netinet/ip_gre.h
===================================================================
--- trunk/sys/netinet/ip_gre.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_gre.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* $NetBSD: ip_gre.h,v 1.5 2002/06/09 16:33:40 itojun Exp $ */
-/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/netinet/ip_gre.h 204522 2010-03-01 17:05:46Z joel $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
Modified: trunk/sys/netinet/ip_icmp.c
===================================================================
--- trunk/sys/netinet/ip_icmp.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_icmp.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/ip_icmp.c 242640 2012-11-06 00:49:52Z melifaro $");
#include "opt_inet.h"
#include "opt_ipsec.h"
Modified: trunk/sys/netinet/ip_icmp.h
===================================================================
--- trunk/sys/netinet/ip_icmp.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_icmp.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)ip_icmp.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/ip_icmp.h 207369 2010-04-29 11:52:42Z bz $
*/
#ifndef _NETINET_IP_ICMP_H_
Modified: trunk/sys/netinet/ip_id.c
===================================================================
--- trunk/sys/netinet/ip_id.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_id.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Michael J. Silbersack.
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/ip_id.c 185571 2008-12-02 21:37:28Z bz $");
/*
* IP ID generation is a fascinating topic.
Modified: trunk/sys/netinet/ip_input.c
===================================================================
--- trunk/sys/netinet/ip_input.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_input.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/ip_input.c 243586 2012-11-27 01:59:51Z ae $");
#include "opt_bootp.h"
#include "opt_ipfw.h"
Modified: trunk/sys/netinet/ip_ipsec.c
===================================================================
--- trunk/sys/netinet/ip_ipsec.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_ipsec.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -28,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/ip_ipsec.c 222845 2011-06-08 03:02:11Z bz $");
#include "opt_ipsec.h"
#include "opt_sctp.h"
Modified: trunk/sys/netinet/ip_ipsec.h
===================================================================
--- trunk/sys/netinet/ip_ipsec.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_ipsec.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -26,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/ip_ipsec.h 199102 2009-11-09 19:53:34Z trasz $
*/
#ifndef _NETINET_IP_IPSEC_H_
Modified: trunk/sys/netinet/ip_mroute.c
===================================================================
--- trunk/sys/netinet/ip_mroute.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_mroute.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1989 Stephen Deering
* Copyright (c) 1992, 1993
@@ -67,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/ip_mroute.c 248085 2013-03-09 02:36:32Z marius $");
#include "opt_inet.h"
#include "opt_mrouting.h"
Modified: trunk/sys/netinet/ip_mroute.h
===================================================================
--- trunk/sys/netinet/ip_mroute.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_mroute.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1989 Stephen Deering.
* Copyright (c) 1992, 1993
@@ -31,7 +32,7 @@
* SUCH DAMAGE.
*
* @(#)ip_mroute.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/ip_mroute.h 240305 2012-09-10 11:38:02Z glebius $
*/
#ifndef _NETINET_IP_MROUTE_H_
Modified: trunk/sys/netinet/ip_options.c
===================================================================
--- trunk/sys/netinet/ip_options.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_options.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/ip_options.c 213832 2010-10-14 12:32:49Z bz $");
#include "opt_ipstealth.h"
Modified: trunk/sys/netinet/ip_options.h
===================================================================
--- trunk/sys/netinet/ip_options.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_options.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California.
@@ -28,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/ip_options.h 189343 2009-03-04 02:51:22Z bms $
*/
#ifndef _NETINET_IP_OPTIONS_H_
Modified: trunk/sys/netinet/ip_output.c
===================================================================
--- trunk/sys/netinet/ip_output.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_output.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1988, 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/ip_output.c 243586 2012-11-27 01:59:51Z ae $");
#include "opt_ipfw.h"
#include "opt_ipsec.h"
Modified: trunk/sys/netinet/ip_var.h
===================================================================
--- trunk/sys/netinet/ip_var.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/ip_var.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)ip_var.h 8.2 (Berkeley) 1/9/95
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/ip_var.h 243586 2012-11-27 01:59:51Z ae $
*/
#ifndef _NETINET_IP_VAR_H_
Modified: trunk/sys/netinet/khelp/h_ertt.c
===================================================================
--- trunk/sys/netinet/khelp/h_ertt.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/khelp/h_ertt.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/khelp/h_ertt.c 239474 2012-08-21 02:17:06Z lstewart $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/netinet/khelp/h_ertt.h
===================================================================
--- trunk/sys/netinet/khelp/h_ertt.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/khelp/h_ertt.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/khelp/h_ertt.h 220560 2011-04-12 08:13:18Z lstewart $
*/
/*
Modified: trunk/sys/netinet/libalias/HISTORY
===================================================================
--- trunk/sys/netinet/libalias/HISTORY 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/libalias/HISTORY 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: stable/9/sys/netinet/libalias/HISTORY 63899 2000-07-26 23:15:46Z archie $
Version 1.0: August 11, 1996 (cjm)
Modified: trunk/sys/netinet/libalias/alias.c
===================================================================
--- trunk/sys/netinet/libalias/alias.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/libalias/alias.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/libalias/alias.c 214754 2010-11-03 21:10:12Z n_hibma $");
/*
Alias.c provides supervisory control for the functions of the
Modified: trunk/sys/netinet/libalias/alias.h
===================================================================
--- trunk/sys/netinet/libalias/alias.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/libalias/alias.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: stable/9/sys/netinet/libalias/alias.h 223080 2011-06-14 13:35:24Z ae $
*/
/*
Modified: trunk/sys/netinet/libalias/alias_cuseeme.c
===================================================================
--- trunk/sys/netinet/libalias/alias_cuseeme.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/libalias/alias_cuseeme.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/libalias/alias_cuseeme.c 190841 2009-04-08 11:56:49Z piso $");
#ifdef _KERNEL
#include <sys/param.h>
Modified: trunk/sys/netinet/libalias/alias_db.c
===================================================================
--- trunk/sys/netinet/libalias/alias_db.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/libalias/alias_db.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/libalias/alias_db.c 223437 2011-06-22 20:00:27Z ae $");
/*
Alias_db.c encapsulates all data structures used for storing
Modified: trunk/sys/netinet/libalias/alias_dummy.c
===================================================================
--- trunk/sys/netinet/libalias/alias_dummy.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/libalias/alias_dummy.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/libalias/alias_dummy.c 190841 2009-04-08 11:56:49Z piso $");
/*
* Alias_dummy is just an empty skeleton used to demostrate how to write
Modified: trunk/sys/netinet/libalias/alias_ftp.c
===================================================================
--- trunk/sys/netinet/libalias/alias_ftp.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/libalias/alias_ftp.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/libalias/alias_ftp.c 223437 2011-06-22 20:00:27Z ae $");
/*
Alias_ftp.c performs special processing for FTP sessions under
Modified: trunk/sys/netinet/libalias/alias_irc.c
===================================================================
--- trunk/sys/netinet/libalias/alias_irc.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/libalias/alias_irc.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/libalias/alias_irc.c 190841 2009-04-08 11:56:49Z piso $");
/* Alias_irc.c intercepts packages contain IRC CTCP commands, and
changes DCC commands to export a port on the aliasing host instead
Modified: trunk/sys/netinet/libalias/alias_local.h
===================================================================
--- trunk/sys/netinet/libalias/alias_local.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/libalias/alias_local.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: stable/9/sys/netinet/libalias/alias_local.h 223437 2011-06-22 20:00:27Z ae $
*/
/*
Modified: trunk/sys/netinet/libalias/alias_mod.c
===================================================================
--- trunk/sys/netinet/libalias/alias_mod.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/libalias/alias_mod.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -25,7 +25,7 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/libalias/alias_mod.c 201758 2010-01-07 21:01:37Z mbr $");
#ifdef _KERNEL
#include <sys/libkern.h>
Modified: trunk/sys/netinet/libalias/alias_mod.h
===================================================================
--- trunk/sys/netinet/libalias/alias_mod.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/libalias/alias_mod.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: stable/9/sys/netinet/libalias/alias_mod.h 190841 2009-04-08 11:56:49Z piso $
*/
/*
Modified: trunk/sys/netinet/libalias/alias_nbt.c
===================================================================
--- trunk/sys/netinet/libalias/alias_nbt.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/libalias/alias_nbt.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/libalias/alias_nbt.c 190938 2009-04-11 15:19:09Z piso $");
/*
alias_nbt.c performs special processing for NetBios over TCP/IP
Modified: trunk/sys/netinet/libalias/alias_pptp.c
===================================================================
--- trunk/sys/netinet/libalias/alias_pptp.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/libalias/alias_pptp.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/libalias/alias_pptp.c 190841 2009-04-08 11:56:49Z piso $");
/* Includes */
#ifdef _KERNEL
Modified: trunk/sys/netinet/libalias/alias_proxy.c
===================================================================
--- trunk/sys/netinet/libalias/alias_proxy.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/libalias/alias_proxy.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/libalias/alias_proxy.c 243282 2012-11-19 15:26:03Z emaste $");
/* file: alias_proxy.c
Modified: trunk/sys/netinet/libalias/alias_sctp.c
===================================================================
--- trunk/sys/netinet/libalias/alias_sctp.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/libalias/alias_sctp.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -68,7 +68,7 @@
* - Dynamic control of hash-table size
*/
-/* $FreeBSD$ */
+/* $FreeBSD: stable/9/sys/netinet/libalias/alias_sctp.c 249132 2013-04-05 08:22:11Z mav $ */
#ifdef _KERNEL
#include <machine/stdarg.h>
Modified: trunk/sys/netinet/libalias/alias_sctp.h
===================================================================
--- trunk/sys/netinet/libalias/alias_sctp.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/libalias/alias_sctp.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -45,7 +45,7 @@
*
*/
-/* $FreeBSD$ */
+/* $FreeBSD: stable/9/sys/netinet/libalias/alias_sctp.h 222809 2011-06-07 06:57:22Z ae $ */
#ifndef _ALIAS_SCTP_H_
#define _ALIAS_SCTP_H_
Modified: trunk/sys/netinet/libalias/alias_skinny.c
===================================================================
--- trunk/sys/netinet/libalias/alias_skinny.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/libalias/alias_skinny.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -27,7 +27,7 @@
*
* Author: Joe Marcus Clarke <marcus at FreeBSD.org>
*
- * $FreeBSD$
+ * $FreeBSD: stable/9/sys/netinet/libalias/alias_skinny.c 190841 2009-04-08 11:56:49Z piso $
*/
#ifdef _KERNEL
Modified: trunk/sys/netinet/libalias/alias_smedia.c
===================================================================
--- trunk/sys/netinet/libalias/alias_smedia.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/libalias/alias_smedia.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/libalias/alias_smedia.c 190841 2009-04-08 11:56:49Z piso $");
/*
Alias_smedia.c is meant to contain the aliasing code for streaming media
Modified: trunk/sys/netinet/libalias/alias_util.c
===================================================================
--- trunk/sys/netinet/libalias/alias_util.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/libalias/alias_util.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/libalias/alias_util.c 174348 2007-12-06 09:31:13Z des $");
/*
Modified: trunk/sys/netinet/libalias/libalias.3
===================================================================
--- trunk/sys/netinet/libalias/libalias.3 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/libalias/libalias.3 2016-10-02 00:59:55 UTC (rev 9138)
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/9/sys/netinet/libalias/libalias.3 240059 2012-09-02 18:54:51Z eadler $
.\"
.Dd July 4, 2011
.Dt LIBALIAS 3
Modified: trunk/sys/netinet/pim.h
===================================================================
--- trunk/sys/netinet/pim.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/pim.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996-2000
* University of Southern California/Information Sciences Institute.
@@ -27,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/pim.h 139823 2005-01-07 01:45:51Z imp $
*/
#ifndef _NETINET_PIM_H_
Modified: trunk/sys/netinet/pim_var.h
===================================================================
--- trunk/sys/netinet/pim_var.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/pim_var.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1998-2000
* University of Southern California/Information Sciences Institute.
@@ -27,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/pim_var.h 208744 2010-06-02 15:44:43Z zec $
*/
#ifndef _NETINET_PIM_VAR_H_
Modified: trunk/sys/netinet/raw_ip.c
===================================================================
--- trunk/sys/netinet/raw_ip.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/raw_ip.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/raw_ip.c 227423 2011-11-10 19:10:53Z andre $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/netinet/sctp.h
===================================================================
--- trunk/sys/netinet/sctp.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp.h 237898 2012-07-01 08:04:10Z tuexen $");
#ifndef _NETINET_SCTP_H_
#define _NETINET_SCTP_H_
Modified: trunk/sys/netinet/sctp_asconf.c
===================================================================
--- trunk/sys/netinet/sctp_asconf.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_asconf.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_asconf.c 238613 2012-07-19 09:32:59Z tuexen $");
#include <netinet/sctp_os.h>
#include <netinet/sctp_var.h>
Modified: trunk/sys/netinet/sctp_asconf.h
===================================================================
--- trunk/sys/netinet/sctp_asconf.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_asconf.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_asconf.h 237896 2012-07-01 07:59:00Z tuexen $");
#ifndef _NETINET_SCTP_ASCONF_H_
#define _NETINET_SCTP_ASCONF_H_
Modified: trunk/sys/netinet/sctp_auth.c
===================================================================
--- trunk/sys/netinet/sctp_auth.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_auth.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_auth.c 237896 2012-07-01 07:59:00Z tuexen $");
#include <netinet/sctp_os.h>
#include <netinet/sctp.h>
@@ -1876,7 +1877,6 @@
SCTP_BUF_LEN(m_notify) = 0;
auth = mtod(m_notify, struct sctp_authkey_event *);
- memset(auth, 0, sizeof(struct sctp_authkey_event));
auth->auth_type = SCTP_AUTHENTICATION_EVENT;
auth->auth_flags = 0;
auth->auth_length = sizeof(*auth);
Modified: trunk/sys/netinet/sctp_auth.h
===================================================================
--- trunk/sys/netinet/sctp_auth.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_auth.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_auth.h 237896 2012-07-01 07:59:00Z tuexen $");
#ifndef _NETINET_SCTP_AUTH_H_
#define _NETINET_SCTP_AUTH_H_
Modified: trunk/sys/netinet/sctp_bsd_addr.c
===================================================================
--- trunk/sys/netinet/sctp_bsd_addr.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_bsd_addr.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_bsd_addr.c 237896 2012-07-01 07:59:00Z tuexen $");
#include <netinet/sctp_os.h>
#include <netinet/sctp_var.h>
Modified: trunk/sys/netinet/sctp_bsd_addr.h
===================================================================
--- trunk/sys/netinet/sctp_bsd_addr.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_bsd_addr.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_bsd_addr.h 237896 2012-07-01 07:59:00Z tuexen $");
#ifndef _NETINET_SCTP_BSD_ADDR_H_
#define _NETINET_SCTP_BSD_ADDR_H_
Modified: trunk/sys/netinet/sctp_cc_functions.c
===================================================================
--- trunk/sys/netinet/sctp_cc_functions.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_cc_functions.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_cc_functions.c 237896 2012-07-01 07:59:00Z tuexen $");
#include <netinet/sctp_os.h>
#include <netinet/sctp_var.h>
Modified: trunk/sys/netinet/sctp_constants.h
===================================================================
--- trunk/sys/netinet/sctp_constants.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_constants.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_constants.h 237896 2012-07-01 07:59:00Z tuexen $");
#ifndef _NETINET_SCTP_CONSTANTS_H_
#define _NETINET_SCTP_CONSTANTS_H_
Modified: trunk/sys/netinet/sctp_crc32.c
===================================================================
--- trunk/sys/netinet/sctp_crc32.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_crc32.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_crc32.c 237896 2012-07-01 07:59:00Z tuexen $");
#include <netinet/sctp_os.h>
#include <netinet/sctp.h>
Modified: trunk/sys/netinet/sctp_crc32.h
===================================================================
--- trunk/sys/netinet/sctp_crc32.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_crc32.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_crc32.h 237896 2012-07-01 07:59:00Z tuexen $");
#ifndef _NETINET_SCTP_CRC32_H_
#define _NETINET_SCTP_CRC32_H_
Modified: trunk/sys/netinet/sctp_dtrace_declare.h
===================================================================
--- trunk/sys/netinet/sctp_dtrace_declare.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_dtrace_declare.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_dtrace_declare.h 237896 2012-07-01 07:59:00Z tuexen $");
#ifndef _NETINET_SCTP_DTRACE_DECLARE_H_
#define _NETINET_SCTP_DTRACE_DECLARE_H_
Modified: trunk/sys/netinet/sctp_dtrace_define.h
===================================================================
--- trunk/sys/netinet/sctp_dtrace_define.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_dtrace_define.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_dtrace_define.h 237896 2012-07-01 07:59:00Z tuexen $");
#ifndef _NETINET_SCTP_DTRACE_DEFINE_H_
#define _NETINET_SCTP_DTRACE_DEFINE_H_
Modified: trunk/sys/netinet/sctp_header.h
===================================================================
--- trunk/sys/netinet/sctp_header.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_header.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_header.h 237896 2012-07-01 07:59:00Z tuexen $");
#ifndef _NETINET_SCTP_HEADER_H_
#define _NETINET_SCTP_HEADER_H_
Modified: trunk/sys/netinet/sctp_indata.c
===================================================================
--- trunk/sys/netinet/sctp_indata.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_indata.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_indata.c 238253 2012-07-08 16:14:42Z tuexen $");
#include <netinet/sctp_os.h>
#include <netinet/sctp_var.h>
@@ -250,11 +251,6 @@
/* We need a CMSG header followed by the struct */
cmh = mtod(ret, struct cmsghdr *);
- /*
- * Make sure that there is no un-initialized padding between the
- * cmsg header and cmsg data and after the cmsg data.
- */
- memset(cmh, 0, len);
if (sctp_is_feature_on(inp, SCTP_PCB_FLAGS_RECVRCVINFO)) {
cmh->cmsg_level = IPPROTO_SCTP;
cmh->cmsg_len = CMSG_LEN(sizeof(struct sctp_rcvinfo));
Modified: trunk/sys/netinet/sctp_indata.h
===================================================================
--- trunk/sys/netinet/sctp_indata.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_indata.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_indata.h 238253 2012-07-08 16:14:42Z tuexen $");
#ifndef _NETINET_SCTP_INDATA_H_
#define _NETINET_SCTP_INDATA_H_
Modified: trunk/sys/netinet/sctp_input.c
===================================================================
--- trunk/sys/netinet/sctp_input.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_input.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_input.c 240580 2012-09-17 00:47:35Z eadler $");
#include <netinet/sctp_os.h>
#include <netinet/sctp_var.h>
Modified: trunk/sys/netinet/sctp_input.h
===================================================================
--- trunk/sys/netinet/sctp_input.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_input.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_input.h 238253 2012-07-08 16:14:42Z tuexen $");
#ifndef _NETINET_SCTP_INPUT_H_
#define _NETINET_SCTP_INPUT_H_
Modified: trunk/sys/netinet/sctp_lock_bsd.h
===================================================================
--- trunk/sys/netinet/sctp_lock_bsd.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_lock_bsd.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_lock_bsd.h 237896 2012-07-01 07:59:00Z tuexen $");
#ifndef _NETINET_SCTP_LOCK_BSD_H_
#define _NETINET_SCTP_LOCK_BSD_H_
Modified: trunk/sys/netinet/sctp_os.h
===================================================================
--- trunk/sys/netinet/sctp_os.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_os.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2006-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_os.h 237896 2012-07-01 07:59:00Z tuexen $");
#ifndef _NETINET_SCTP_OS_H_
#define _NETINET_SCTP_OS_H_
Modified: trunk/sys/netinet/sctp_os_bsd.h
===================================================================
--- trunk/sys/netinet/sctp_os_bsd.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_os_bsd.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2006-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_os_bsd.h 237896 2012-07-01 07:59:00Z tuexen $");
#ifndef _NETINET_SCTP_OS_BSD_H_
#define _NETINET_SCTP_OS_BSD_H_
Modified: trunk/sys/netinet/sctp_output.c
===================================================================
--- trunk/sys/netinet/sctp_output.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_output.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_output.c 240305 2012-09-10 11:38:02Z glebius $");
#include <netinet/sctp_os.h>
#include <sys/proc.h>
@@ -5454,14 +5455,6 @@
}
SCTP_BUF_LEN(m) = sizeof(struct sctp_init_chunk);
- /*
- * We might not overwrite the identification[] completely and on
- * some platforms time_entered will contain some padding. Therefore
- * zero out the cookie to avoid putting uninitialized memory on the
- * wire.
- */
- memset(&stc, 0, sizeof(struct sctp_state_cookie));
-
/* the time I built cookie */
(void)SCTP_GETTIME_TIMEVAL(&stc.time_entered);
Modified: trunk/sys/netinet/sctp_output.h
===================================================================
--- trunk/sys/netinet/sctp_output.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_output.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_output.h 238253 2012-07-08 16:14:42Z tuexen $");
#ifndef _NETINET_SCTP_OUTPUT_H_
#define _NETINET_SCTP_OUTPUT_H_
Modified: trunk/sys/netinet/sctp_pcb.c
===================================================================
--- trunk/sys/netinet/sctp_pcb.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_pcb.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_pcb.c 239448 2012-08-20 16:45:46Z tuexen $");
#include <netinet/sctp_os.h>
#include <sys/proc.h>
Modified: trunk/sys/netinet/sctp_pcb.h
===================================================================
--- trunk/sys/netinet/sctp_pcb.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_pcb.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_pcb.h 237896 2012-07-01 07:59:00Z tuexen $");
#ifndef _NETINET_SCTP_PCB_H_
#define _NETINET_SCTP_PCB_H_
Modified: trunk/sys/netinet/sctp_peeloff.c
===================================================================
--- trunk/sys/netinet/sctp_peeloff.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_peeloff.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_peeloff.c 237896 2012-07-01 07:59:00Z tuexen $");
#include <netinet/sctp_os.h>
#include <netinet/sctp_pcb.h>
Modified: trunk/sys/netinet/sctp_peeloff.h
===================================================================
--- trunk/sys/netinet/sctp_peeloff.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_peeloff.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_peeloff.h 237896 2012-07-01 07:59:00Z tuexen $");
#ifndef _NETINET_SCTP_PEELOFF_H_
#define _NETINET_SCTP_PEELOFF_H_
Modified: trunk/sys/netinet/sctp_ss_functions.c
===================================================================
--- trunk/sys/netinet/sctp_ss_functions.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_ss_functions.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2010-2012, by Michael Tuexen. All rights reserved.
* Copyright (c) 2010-2012, by Randall Stewart. All rights reserved.
@@ -27,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_ss_functions.c 237896 2012-07-01 07:59:00Z tuexen $");
#include <netinet/sctp_pcb.h>
Modified: trunk/sys/netinet/sctp_structs.h
===================================================================
--- trunk/sys/netinet/sctp_structs.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_structs.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_structs.h 237896 2012-07-01 07:59:00Z tuexen $");
#ifndef _NETINET_SCTP_STRUCTS_H_
#define _NETINET_SCTP_STRUCTS_H_
Modified: trunk/sys/netinet/sctp_sysctl.c
===================================================================
--- trunk/sys/netinet/sctp_sysctl.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_sysctl.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_sysctl.c 238249 2012-07-08 15:37:58Z tuexen $");
#include <netinet/sctp_os.h>
#include <netinet/sctp.h>
Modified: trunk/sys/netinet/sctp_sysctl.h
===================================================================
--- trunk/sys/netinet/sctp_sysctl.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_sysctl.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_sysctl.h 238249 2012-07-08 15:37:58Z tuexen $");
#ifndef _NETINET_SCTP_SYSCTL_H_
#define _NETINET_SCTP_SYSCTL_H_
Modified: trunk/sys/netinet/sctp_timer.c
===================================================================
--- trunk/sys/netinet/sctp_timer.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_timer.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_timer.c 237896 2012-07-01 07:59:00Z tuexen $");
#define _IP_VHL
#include <netinet/sctp_os.h>
Modified: trunk/sys/netinet/sctp_timer.h
===================================================================
--- trunk/sys/netinet/sctp_timer.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_timer.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_timer.h 237896 2012-07-01 07:59:00Z tuexen $");
#ifndef _NETINET_SCTP_TIMER_H_
#define _NETINET_SCTP_TIMER_H_
Modified: trunk/sys/netinet/sctp_uio.h
===================================================================
--- trunk/sys/netinet/sctp_uio.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_uio.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_uio.h 244524 2012-12-21 00:41:52Z delphij $");
#ifndef _NETINET_SCTP_UIO_H_
#define _NETINET_SCTP_UIO_H_
Modified: trunk/sys/netinet/sctp_usrreq.c
===================================================================
--- trunk/sys/netinet/sctp_usrreq.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_usrreq.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_usrreq.c 238613 2012-07-19 09:32:59Z tuexen $");
#include <netinet/sctp_os.h>
#include <sys/proc.h>
Modified: trunk/sys/netinet/sctp_var.h
===================================================================
--- trunk/sys/netinet/sctp_var.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctp_var.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctp_var.h 244524 2012-12-21 00:41:52Z delphij $");
#ifndef _NETINET_SCTP_VAR_H_
#define _NETINET_SCTP_VAR_H_
Modified: trunk/sys/netinet/sctputil.c
===================================================================
--- trunk/sys/netinet/sctputil.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctputil.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctputil.c 242836 2012-11-09 19:31:31Z mjg $");
#include <netinet/sctp_os.h>
#include <netinet/sctp_pcb.h>
@@ -2628,7 +2629,6 @@
}
SCTP_BUF_NEXT(m_notify) = NULL;
sac = mtod(m_notify, struct sctp_assoc_change *);
- memset(sac, 0, notif_len);
sac->sac_type = SCTP_ASSOC_CHANGE;
sac->sac_flags = 0;
sac->sac_length = sizeof(struct sctp_assoc_change);
@@ -2835,10 +2835,11 @@
if (m_notify == NULL)
/* no space left */
return;
+ length += chk->send_size;
+ length -= sizeof(struct sctp_data_chunk);
SCTP_BUF_LEN(m_notify) = 0;
if (sctp_stcb_is_feature_on(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVNSENDFAILEVNT)) {
ssfe = mtod(m_notify, struct sctp_send_failed_event *);
- memset(ssfe, 0, length);
ssfe->ssfe_type = SCTP_SEND_FAILED_EVENT;
if (sent) {
ssfe->ssfe_flags = SCTP_DATA_SENT;
@@ -2845,11 +2846,10 @@
} else {
ssfe->ssfe_flags = SCTP_DATA_UNSENT;
}
- length += chk->send_size;
- length -= sizeof(struct sctp_data_chunk);
ssfe->ssfe_length = length;
ssfe->ssfe_error = error;
/* not exactly what the user sent in, but should be close :) */
+ bzero(&ssfe->ssfe_info, sizeof(ssfe->ssfe_info));
ssfe->ssfe_info.snd_sid = chk->rec.data.stream_number;
ssfe->ssfe_info.snd_flags = chk->rec.data.rcv_flags;
ssfe->ssfe_info.snd_ppid = chk->rec.data.payloadtype;
@@ -2859,7 +2859,6 @@
SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_send_failed_event);
} else {
ssf = mtod(m_notify, struct sctp_send_failed *);
- memset(ssf, 0, length);
ssf->ssf_type = SCTP_SEND_FAILED;
if (sent) {
ssf->ssf_flags = SCTP_DATA_SENT;
@@ -2866,8 +2865,6 @@
} else {
ssf->ssf_flags = SCTP_DATA_UNSENT;
}
- length += chk->send_size;
- length -= sizeof(struct sctp_data_chunk);
ssf->ssf_length = length;
ssf->ssf_error = error;
/* not exactly what the user sent in, but should be close :) */
@@ -2951,16 +2948,16 @@
/* no space left */
return;
}
+ length += sp->length;
SCTP_BUF_LEN(m_notify) = 0;
if (sctp_stcb_is_feature_on(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVNSENDFAILEVNT)) {
ssfe = mtod(m_notify, struct sctp_send_failed_event *);
- memset(ssfe, 0, length);
ssfe->ssfe_type = SCTP_SEND_FAILED_EVENT;
ssfe->ssfe_flags = SCTP_DATA_UNSENT;
- length += sp->length;
ssfe->ssfe_length = length;
ssfe->ssfe_error = error;
/* not exactly what the user sent in, but should be close :) */
+ bzero(&ssfe->ssfe_info, sizeof(ssfe->ssfe_info));
ssfe->ssfe_info.snd_sid = sp->stream;
if (sp->some_taken) {
ssfe->ssfe_info.snd_flags = SCTP_DATA_LAST_FRAG;
@@ -2974,13 +2971,12 @@
SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_send_failed_event);
} else {
ssf = mtod(m_notify, struct sctp_send_failed *);
- memset(ssf, 0, length);
ssf->ssf_type = SCTP_SEND_FAILED;
ssf->ssf_flags = SCTP_DATA_UNSENT;
- length += sp->length;
ssf->ssf_length = length;
ssf->ssf_error = error;
/* not exactly what the user sent in, but should be close :) */
+ bzero(&ssf->ssf_info, sizeof(ssf->ssf_info));
ssf->ssf_info.sinfo_stream = sp->stream;
ssf->ssf_info.sinfo_ssn = sp->strseq;
if (sp->some_taken) {
@@ -3042,7 +3038,6 @@
return;
SCTP_BUF_LEN(m_notify) = 0;
sai = mtod(m_notify, struct sctp_adaptation_event *);
- memset(sai, 0, sizeof(struct sctp_adaptation_event));
sai->sai_type = SCTP_ADAPTATION_INDICATION;
sai->sai_flags = 0;
sai->sai_length = sizeof(struct sctp_adaptation_event);
@@ -3098,7 +3093,6 @@
return;
SCTP_BUF_LEN(m_notify) = 0;
pdapi = mtod(m_notify, struct sctp_pdapi_event *);
- memset(pdapi, 0, sizeof(struct sctp_pdapi_event));
pdapi->pdapi_type = SCTP_PARTIAL_DELIVERY_EVENT;
pdapi->pdapi_flags = 0;
pdapi->pdapi_length = sizeof(struct sctp_pdapi_event);
@@ -3208,7 +3202,6 @@
/* no space left */
return;
sse = mtod(m_notify, struct sctp_shutdown_event *);
- memset(sse, 0, sizeof(struct sctp_shutdown_event));
sse->sse_type = SCTP_SHUTDOWN_EVENT;
sse->sse_flags = 0;
sse->sse_length = sizeof(struct sctp_shutdown_event);
@@ -3259,7 +3252,6 @@
}
SCTP_BUF_LEN(m_notify) = 0;
event = mtod(m_notify, struct sctp_sender_dry_event *);
- memset(event, 0, sizeof(struct sctp_sender_dry_event));
event->sender_dry_type = SCTP_SENDER_DRY_EVENT;
event->sender_dry_flags = 0;
event->sender_dry_length = sizeof(struct sctp_sender_dry_event);
@@ -3292,6 +3284,7 @@
struct mbuf *m_notify;
struct sctp_queued_to_read *control;
struct sctp_stream_change_event *stradd;
+ int len;
if ((stcb == NULL) ||
(sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_STREAM_CHANGEEVNT))) {
@@ -3304,20 +3297,25 @@
return;
}
stcb->asoc.peer_req_out = 0;
- m_notify = sctp_get_mbuf_for_msg(sizeof(struct sctp_stream_change_event), 0, M_DONTWAIT, 1, MT_DATA);
+ m_notify = sctp_get_mbuf_for_msg(MCLBYTES, 0, M_DONTWAIT, 1, MT_DATA);
if (m_notify == NULL)
/* no space left */
return;
SCTP_BUF_LEN(m_notify) = 0;
+ len = sizeof(struct sctp_stream_change_event);
+ if (len > M_TRAILINGSPACE(m_notify)) {
+ /* never enough room */
+ sctp_m_freem(m_notify);
+ return;
+ }
stradd = mtod(m_notify, struct sctp_stream_change_event *);
- memset(stradd, 0, sizeof(struct sctp_stream_change_event));
stradd->strchange_type = SCTP_STREAM_CHANGE_EVENT;
stradd->strchange_flags = flag;
- stradd->strchange_length = sizeof(struct sctp_stream_change_event);
+ stradd->strchange_length = len;
stradd->strchange_assoc_id = sctp_get_associd(stcb);
stradd->strchange_instrms = numberin;
stradd->strchange_outstrms = numberout;
- SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_stream_change_event);
+ SCTP_BUF_LEN(m_notify) = len;
SCTP_BUF_NEXT(m_notify) = NULL;
if (sctp_sbspace(&stcb->asoc, &stcb->sctp_socket->so_rcv) < SCTP_BUF_LEN(m_notify)) {
/* no space */
@@ -3348,6 +3346,7 @@
struct mbuf *m_notify;
struct sctp_queued_to_read *control;
struct sctp_assoc_reset_event *strasoc;
+ int len;
if ((stcb == NULL) ||
(sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_ASSOC_RESETEVNT))) {
@@ -3354,20 +3353,25 @@
/* event not enabled */
return;
}
- m_notify = sctp_get_mbuf_for_msg(sizeof(struct sctp_assoc_reset_event), 0, M_DONTWAIT, 1, MT_DATA);
+ m_notify = sctp_get_mbuf_for_msg(MCLBYTES, 0, M_DONTWAIT, 1, MT_DATA);
if (m_notify == NULL)
/* no space left */
return;
SCTP_BUF_LEN(m_notify) = 0;
+ len = sizeof(struct sctp_assoc_reset_event);
+ if (len > M_TRAILINGSPACE(m_notify)) {
+ /* never enough room */
+ sctp_m_freem(m_notify);
+ return;
+ }
strasoc = mtod(m_notify, struct sctp_assoc_reset_event *);
- memset(strasoc, 0, sizeof(struct sctp_assoc_reset_event));
strasoc->assocreset_type = SCTP_ASSOC_RESET_EVENT;
strasoc->assocreset_flags = flag;
- strasoc->assocreset_length = sizeof(struct sctp_assoc_reset_event);
+ strasoc->assocreset_length = len;
strasoc->assocreset_assoc_id = sctp_get_associd(stcb);
strasoc->assocreset_local_tsn = sending_tsn;
strasoc->assocreset_remote_tsn = recv_tsn;
- SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_assoc_reset_event);
+ SCTP_BUF_LEN(m_notify) = len;
SCTP_BUF_NEXT(m_notify) = NULL;
if (sctp_sbspace(&stcb->asoc, &stcb->sctp_socket->so_rcv) < SCTP_BUF_LEN(m_notify)) {
/* no space */
@@ -3420,7 +3424,6 @@
return;
}
strreset = mtod(m_notify, struct sctp_stream_reset_event *);
- memset(strreset, 0, len);
strreset->strreset_type = SCTP_STREAM_RESET_EVENT;
strreset->strreset_flags = flag;
strreset->strreset_length = len;
@@ -6259,12 +6262,9 @@
fromlen = 0;
}
- if (filling_sinfo) {
- memset(&sinfo, 0, sizeof(struct sctp_extrcvinfo));
- }
error = sctp_sorecvmsg(so, uio, mp0, from, fromlen, flagsp,
(struct sctp_sndrcvinfo *)&sinfo, filling_sinfo);
- if (controlp != NULL) {
+ if ((controlp) && (filling_sinfo)) {
/* copy back the sinfo in a CMSG format */
if (filling_sinfo)
*controlp = sctp_build_ctl_nchunk(inp,
Modified: trunk/sys/netinet/sctputil.h
===================================================================
--- trunk/sys/netinet/sctputil.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/sctputil.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/sctputil.h 238253 2012-07-08 16:14:42Z tuexen $");
#ifndef _NETINET_SCTP_UTIL_H_
#define _NETINET_SCTP_UTIL_H_
Modified: trunk/sys/netinet/siftr.c
===================================================================
--- trunk/sys/netinet/siftr.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/siftr.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2007-2009
* Swinburne University of Technology, Melbourne, Australia.
@@ -59,7 +60,7 @@
******************************************************/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/siftr.c 248144 2013-03-11 06:09:08Z lstewart $");
#include <sys/param.h>
#include <sys/alq.h>
Modified: trunk/sys/netinet/tcp.h
===================================================================
--- trunk/sys/netinet/tcp.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/tcp.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)tcp.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/tcp.h 247525 2013-03-01 03:04:57Z jhb $
*/
#ifndef _NETINET_TCP_H_
Modified: trunk/sys/netinet/tcp_debug.c
===================================================================
--- trunk/sys/netinet/tcp_debug.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/tcp_debug.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/tcp_debug.c 193895 2009-06-10 10:39:41Z bz $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/netinet/tcp_debug.h
===================================================================
--- trunk/sys/netinet/tcp_debug.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/tcp_debug.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)tcp_debug.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/tcp_debug.h 188578 2009-02-13 15:14:43Z luigi $
*/
#ifndef _NETINET_TCP_DEBUG_H_
Modified: trunk/sys/netinet/tcp_fsm.h
===================================================================
--- trunk/sys/netinet/tcp_fsm.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/tcp_fsm.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California.
@@ -28,7 +29,7 @@
* SUCH DAMAGE.
*
* @(#)tcp_fsm.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/tcp_fsm.h 171656 2007-07-30 11:06:42Z des $
*/
#ifndef _NETINET_TCP_FSM_H_
Modified: trunk/sys/netinet/tcp_hostcache.c
===================================================================
--- trunk/sys/netinet/tcp_hostcache.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/tcp_hostcache.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2002 Andre Oppermann, Internet Business Solutions AG
* All rights reserved.
@@ -63,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/tcp_hostcache.c 248085 2013-03-09 02:36:32Z marius $");
#include "opt_inet6.h"
Modified: trunk/sys/netinet/tcp_hostcache.h
===================================================================
--- trunk/sys/netinet/tcp_hostcache.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/tcp_hostcache.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2002 Andre Oppermann, Internet Business Solutions AG
* All rights reserved.
@@ -26,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/tcp_hostcache.h 185420 2008-11-28 23:39:25Z zec $
*/
/*
Modified: trunk/sys/netinet/tcp_input.c
===================================================================
--- trunk/sys/netinet/tcp_input.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/tcp_input.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 1995
* The Regents of the University of California. All rights reserved.
@@ -48,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/tcp_input.c 248085 2013-03-09 02:36:32Z marius $");
#include "opt_ipfw.h" /* for ipfw_fwd */
#include "opt_inet.h"
@@ -105,9 +106,6 @@
#ifdef TCPDEBUG
#include <netinet/tcp_debug.h>
#endif /* TCPDEBUG */
-#ifdef TCP_OFFLOAD
-#include <netinet/tcp_offload.h>
-#endif
#ifdef IPSEC
#include <netipsec/ipsec.h>
@@ -158,14 +156,6 @@
&VNET_NAME(tcp_do_rfc3390), 0,
"Enable RFC 3390 (Increasing TCP's Initial Congestion Window)");
-SYSCTL_NODE(_net_inet_tcp, OID_AUTO, experimental, CTLFLAG_RW, 0,
- "Experimental TCP extensions");
-
-VNET_DEFINE(int, tcp_do_initcwnd10) = 1;
-SYSCTL_VNET_INT(_net_inet_tcp_experimental, OID_AUTO, initcwnd10, CTLFLAG_RW,
- &VNET_NAME(tcp_do_initcwnd10), 0,
- "Enable draft-ietf-tcpm-initcwnd-05 (Increasing initial CWND to 10)");
-
VNET_DEFINE(int, tcp_do_rfc3465) = 1;
SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, rfc3465, CTLFLAG_RW,
&VNET_NAME(tcp_do_rfc3465), 0,
@@ -367,12 +357,14 @@
* RFC3390 says only do this if SYN or SYN/ACK didn't got lost.
* We currently check only in syncache_socket for that.
*/
- if (tp->snd_cwnd == 1)
- tp->snd_cwnd = tp->t_maxseg; /* SYN(-ACK) lost */
- else if (V_tcp_do_initcwnd10)
- tp->snd_cwnd = min(10 * tp->t_maxseg,
- max(2 * tp->t_maxseg, 14600));
- else if (V_tcp_do_rfc3390)
+/* #define TCP_METRICS_CWND */
+#ifdef TCP_METRICS_CWND
+ if (metrics.rmx_cwnd)
+ tp->snd_cwnd = max(tp->t_maxseg, min(metrics.rmx_cwnd / 2,
+ min(tp->snd_wnd, so->so_snd.sb_hiwat)));
+ else
+#endif
+ if (V_tcp_do_rfc3390)
tp->snd_cwnd = min(4 * tp->t_maxseg,
max(2 * tp->t_maxseg, 4380));
#ifdef INET6
@@ -879,6 +871,7 @@
/* Remove the tag from the packet. We don't need it anymore. */
m_tag_delete(m, fwd_tag);
m->m_flags &= ~M_IP_NEXTHOP;
+ fwd_tag = NULL;
} else
inp = in_pcblookup_mbuf(&V_tcbinfo, ip->ip_src,
th->th_sport, ip->ip_dst, th->th_dport,
@@ -1003,14 +996,6 @@
goto dropwithreset;
}
-#ifdef TCP_OFFLOAD
- if (tp->t_flags & TF_TOE) {
- tcp_offload_input(tp, m);
- m = NULL; /* consumed by the TOE driver */
- goto dropunlock;
- }
-#endif
-
/*
* We've identified a valid inpcb, but it could be that we need an
* inpcbinfo write lock but don't hold it. In this case, attempt to
@@ -2183,7 +2168,11 @@
todrop = tp->rcv_nxt - th->th_seq;
if (todrop > 0) {
- if (thflags & TH_SYN) {
+ /*
+ * If this is a duplicate SYN for our current connection,
+ * advance over it and pretend and it's not a SYN.
+ */
+ if (thflags & TH_SYN && th->th_seq == tp->irs) {
thflags &= ~TH_SYN;
th->th_seq++;
if (th->th_urp > 1)
Modified: trunk/sys/netinet/tcp_lro.c
===================================================================
--- trunk/sys/netinet/tcp_lro.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/tcp_lro.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2007, Myricom Inc.
* Copyright (c) 2008, Intel Corporation.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/tcp_lro.c 247470 2013-02-28 16:32:36Z gallatin $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/netinet/tcp_lro.h
===================================================================
--- trunk/sys/netinet/tcp_lro.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/tcp_lro.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2006, Myricom Inc.
* Copyright (c) 2008, Intel Corporation.
@@ -24,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/tcp_lro.h 238230 2012-07-08 11:24:22Z bz $
*/
#ifndef _TCP_LRO_H_
Modified: trunk/sys/netinet/tcp_output.c
===================================================================
--- trunk/sys/netinet/tcp_output.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/tcp_output.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
* The Regents of the University of California. All rights reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/tcp_output.c 240307 2012-09-10 11:43:28Z glebius $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -75,9 +76,6 @@
#ifdef TCPDEBUG
#include <netinet/tcp_debug.h>
#endif
-#ifdef TCP_OFFLOAD
-#include <netinet/tcp_offload.h>
-#endif
#ifdef IPSEC
#include <netipsec/ipsec.h>
@@ -199,11 +197,6 @@
INP_WLOCK_ASSERT(tp->t_inpcb);
-#ifdef TCP_OFFLOAD
- if (tp->t_flags & TF_TOE)
- return (tcp_offload_output(tp));
-#endif
-
/*
* Determine length of data that should be transmitted,
* and flags that will be used.
@@ -402,7 +395,7 @@
flags &= ~TH_FIN;
}
- if (len <= 0) {
+ if (len < 0) {
/*
* If FIN has been sent but not acked,
* but we haven't been called to retransmit,
@@ -412,16 +405,9 @@
* to (closed) window, and set the persist timer
* if it isn't already going. If the window didn't
* close completely, just wait for an ACK.
- *
- * We also do a general check here to ensure that
- * we will set the persist timer when we have data
- * to send, but a 0-byte window. This makes sure
- * the persist timer is set even if the packet
- * hits one of the "goto send" lines below.
*/
len = 0;
- if ((sendwin == 0) && (TCPS_HAVEESTABLISHED(tp->t_state)) &&
- (off < (int) so->so_snd.sb_cc)) {
+ if (sendwin == 0) {
tcp_timer_activate(tp, TT_REXMT, 0);
tp->t_rxtshift = 0;
tp->snd_nxt = tp->snd_una;
@@ -685,8 +671,8 @@
* segments. Options for SYN-ACK segments are handled in TCP
* syncache.
*/
- to.to_flags = 0;
if ((tp->t_flags & TF_NOOPT) == 0) {
+ to.to_flags = 0;
/* Maximum segment size. */
if (flags & TH_SYN) {
tp->snd_nxt = tp->iss;
@@ -1056,7 +1042,7 @@
tp->snd_up = tp->snd_una; /* drag it along */
#ifdef TCP_SIGNATURE
- if (to.to_flags & TOF_SIGNATURE) {
+ if (tp->t_flags & TF_SIGNATURE) {
int sigoff = to.to_signature - opt;
tcp_signature_compute(m, 0, len, optlen,
(u_char *)(th + 1) + sigoff, IPSEC_DIR_OUTBOUND);
@@ -1475,7 +1461,6 @@
bcopy((u_char *)&to->to_tsecr, optp, sizeof(to->to_tsecr));
optp += sizeof(to->to_tsecr);
break;
-#ifdef TCP_SIGNATURE
case TOF_SIGNATURE:
{
int siglen = TCPOLEN_SIGNATURE - 2;
@@ -1494,7 +1479,6 @@
*optp++ = 0;
break;
}
-#endif
case TOF_SACK:
{
int sackblks = 0;
Modified: trunk/sys/netinet/tcp_reass.c
===================================================================
--- trunk/sys/netinet/tcp_reass.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/tcp_reass.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 1995
* The Regents of the University of California. All rights reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/tcp_reass.c 248085 2013-03-09 02:36:32Z marius $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -80,25 +81,29 @@
static SYSCTL_NODE(_net_inet_tcp, OID_AUTO, reass, CTLFLAG_RW, 0,
"TCP Segment Reassembly Queue");
-static int tcp_reass_maxseg = 0;
+static VNET_DEFINE(int, tcp_reass_maxseg) = 0;
+#define V_tcp_reass_maxseg VNET(tcp_reass_maxseg)
SYSCTL_VNET_PROC(_net_inet_tcp_reass, OID_AUTO, maxsegments,
CTLTYPE_INT | CTLFLAG_RDTUN,
- &tcp_reass_maxseg, 0, &tcp_reass_sysctl_maxseg, "I",
+ &VNET_NAME(tcp_reass_maxseg), 0, &tcp_reass_sysctl_maxseg, "I",
"Global maximum number of TCP Segments in Reassembly Queue");
-static int tcp_reass_qsize = 0;
-SYSCTL_PROC(_net_inet_tcp_reass, OID_AUTO, cursegments,
+static VNET_DEFINE(int, tcp_reass_qsize) = 0;
+#define V_tcp_reass_qsize VNET(tcp_reass_qsize)
+SYSCTL_VNET_PROC(_net_inet_tcp_reass, OID_AUTO, cursegments,
CTLTYPE_INT | CTLFLAG_RD,
- &tcp_reass_qsize, 0, &tcp_reass_sysctl_qsize, "I",
+ &VNET_NAME(tcp_reass_qsize), 0, &tcp_reass_sysctl_qsize, "I",
"Global number of TCP Segments currently in Reassembly Queue");
-static int tcp_reass_overflows = 0;
-SYSCTL_INT(_net_inet_tcp_reass, OID_AUTO, overflows,
+static VNET_DEFINE(int, tcp_reass_overflows) = 0;
+#define V_tcp_reass_overflows VNET(tcp_reass_overflows)
+SYSCTL_VNET_INT(_net_inet_tcp_reass, OID_AUTO, overflows,
CTLTYPE_INT | CTLFLAG_RD,
- &tcp_reass_overflows, 0,
+ &VNET_NAME(tcp_reass_overflows), 0,
"Global number of TCP Segment Reassembly Queue Overflows");
-static uma_zone_t tcp_reass_zone;
+static VNET_DEFINE(uma_zone_t, tcp_reass_zone);
+#define V_tcp_reass_zone VNET(tcp_reass_zone)
/* Initialize TCP reassembly queue */
static void
@@ -105,25 +110,34 @@
tcp_reass_zone_change(void *tag)
{
- tcp_reass_maxseg = nmbclusters / 16;
- uma_zone_set_max(tcp_reass_zone, tcp_reass_maxseg);
+ V_tcp_reass_maxseg = nmbclusters / 16;
+ uma_zone_set_max(V_tcp_reass_zone, V_tcp_reass_maxseg);
}
void
-tcp_reass_global_init(void)
+tcp_reass_init(void)
{
- tcp_reass_maxseg = nmbclusters / 16;
+ V_tcp_reass_maxseg = nmbclusters / 16;
TUNABLE_INT_FETCH("net.inet.tcp.reass.maxsegments",
- &tcp_reass_maxseg);
- tcp_reass_zone = uma_zcreate("tcpreass", sizeof (struct tseg_qent),
+ &V_tcp_reass_maxseg);
+ V_tcp_reass_zone = uma_zcreate("tcpreass", sizeof (struct tseg_qent),
NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
- uma_zone_set_max(tcp_reass_zone, tcp_reass_maxseg);
+ uma_zone_set_max(V_tcp_reass_zone, V_tcp_reass_maxseg);
EVENTHANDLER_REGISTER(nmbclusters_change,
tcp_reass_zone_change, NULL, EVENTHANDLER_PRI_ANY);
}
+#ifdef VIMAGE
void
+tcp_reass_destroy(void)
+{
+
+ uma_zdestroy(V_tcp_reass_zone);
+}
+#endif
+
+void
tcp_reass_flush(struct tcpcb *tp)
{
struct tseg_qent *qe;
@@ -133,7 +147,7 @@
while ((qe = LIST_FIRST(&tp->t_segq)) != NULL) {
LIST_REMOVE(qe, tqe_q);
m_freem(qe->tqe_m);
- uma_zfree(tcp_reass_zone, qe);
+ uma_zfree(V_tcp_reass_zone, qe);
tp->t_segqlen--;
}
@@ -145,7 +159,7 @@
static int
tcp_reass_sysctl_maxseg(SYSCTL_HANDLER_ARGS)
{
- tcp_reass_maxseg = uma_zone_get_max(tcp_reass_zone);
+ V_tcp_reass_maxseg = uma_zone_get_max(V_tcp_reass_zone);
return (sysctl_handle_int(oidp, arg1, arg2, req));
}
@@ -152,7 +166,7 @@
static int
tcp_reass_sysctl_qsize(SYSCTL_HANDLER_ARGS)
{
- tcp_reass_qsize = uma_zone_get_cur(tcp_reass_zone);
+ V_tcp_reass_qsize = uma_zone_get_cur(V_tcp_reass_zone);
return (sysctl_handle_int(oidp, arg1, arg2, req));
}
@@ -198,9 +212,9 @@
* Investigate why and re-evaluate the below limit after the behaviour
* is understood.
*/
- if ((th->th_seq != tp->rcv_nxt || !TCPS_HAVEESTABLISHED(tp->t_state)) &&
+ if (th->th_seq != tp->rcv_nxt &&
tp->t_segqlen >= (so->so_rcv.sb_hiwat / tp->t_maxseg) + 1) {
- tcp_reass_overflows++;
+ V_tcp_reass_overflows++;
TCPSTAT_INC(tcps_rcvmemdrop);
m_freem(m);
*tlenp = 0;
@@ -219,9 +233,9 @@
* Use a temporary structure on the stack for the missing segment
* when the zone is exhausted. Otherwise we may get stuck.
*/
- te = uma_zalloc(tcp_reass_zone, M_NOWAIT);
+ te = uma_zalloc(V_tcp_reass_zone, M_NOWAIT);
if (te == NULL) {
- if (th->th_seq != tp->rcv_nxt || !TCPS_HAVEESTABLISHED(tp->t_state)) {
+ if (th->th_seq != tp->rcv_nxt) {
TCPSTAT_INC(tcps_rcvmemdrop);
m_freem(m);
*tlenp = 0;
@@ -269,8 +283,7 @@
TCPSTAT_INC(tcps_rcvduppack);
TCPSTAT_ADD(tcps_rcvdupbyte, *tlenp);
m_freem(m);
- if (te != &tqs)
- uma_zfree(tcp_reass_zone, te);
+ uma_zfree(V_tcp_reass_zone, te);
tp->t_segqlen--;
/*
* Try to present any queued data
@@ -307,7 +320,7 @@
nq = LIST_NEXT(q, tqe_q);
LIST_REMOVE(q, tqe_q);
m_freem(q->tqe_m);
- uma_zfree(tcp_reass_zone, q);
+ uma_zfree(V_tcp_reass_zone, q);
tp->t_segqlen--;
q = nq;
}
@@ -346,7 +359,7 @@
else
sbappendstream_locked(&so->so_rcv, q->tqe_m);
if (q != &tqs)
- uma_zfree(tcp_reass_zone, q);
+ uma_zfree(V_tcp_reass_zone, q);
tp->t_segqlen--;
q = nq;
} while (q && q->tqe_th->th_seq == tp->rcv_nxt);
Modified: trunk/sys/netinet/tcp_sack.c
===================================================================
--- trunk/sys/netinet/tcp_sack.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/tcp_sack.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 1995
* The Regents of the University of California.
@@ -71,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/tcp_sack.c 220105 2011-03-28 19:03:56Z weongyo $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/netinet/tcp_seq.h
===================================================================
--- trunk/sys/netinet/tcp_seq.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/tcp_seq.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1993, 1995
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)tcp_seq.h 8.3 (Berkeley) 6/21/95
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/tcp_seq.h 235657 2012-05-19 18:32:31Z bz $
*/
#ifndef _NETINET_TCP_SEQ_H_
Modified: trunk/sys/netinet/tcp_subr.c
===================================================================
--- trunk/sys/netinet/tcp_subr.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/tcp_subr.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
* The Regents of the University of California. All rights reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/tcp_subr.c 238247 2012-07-08 14:21:36Z bz $");
#include "opt_compat.h"
#include "opt_inet.h"
@@ -85,6 +86,7 @@
#include <netinet/tcp_timer.h>
#include <netinet/tcp_var.h>
#include <netinet/tcp_syncache.h>
+#include <netinet/tcp_offload.h>
#ifdef INET6
#include <netinet6/tcp6_var.h>
#endif
@@ -95,9 +97,6 @@
#ifdef INET6
#include <netinet6/ip6protosw.h>
#endif
-#ifdef TCP_OFFLOAD
-#include <netinet/tcp_offload.h>
-#endif
#ifdef IPSEC
#include <netipsec/ipsec.h>
@@ -314,6 +313,7 @@
tcp_tw_init();
syncache_init();
tcp_hc_init();
+ tcp_reass_init();
TUNABLE_INT_FETCH("net.inet.tcp.sack.enable", &V_tcp_do_sack);
V_sack_hole_zone = uma_zcreate("sackhole", sizeof(struct sackhole),
@@ -323,8 +323,6 @@
if (!IS_DEFAULT_VNET(curvnet))
return;
- tcp_reass_global_init();
-
/* XXX virtualize those bellow? */
tcp_delacktime = TCPTV_DELACK;
tcp_keepinit = TCPTV_KEEP_INIT;
@@ -372,6 +370,7 @@
tcp_destroy(void)
{
+ tcp_reass_destroy();
tcp_hc_destroy();
syncache_destroy();
tcp_tw_destroy();
@@ -826,7 +825,7 @@
if (TCPS_HAVERCVDSYN(tp->t_state)) {
tp->t_state = TCPS_CLOSED;
- (void) tcp_output(tp);
+ (void) tcp_output_reset(tp);
TCPSTAT_INC(tcps_drops);
} else
TCPSTAT_INC(tcps_conndrops);
@@ -926,12 +925,8 @@
/* free the reassembly queue, if any */
tcp_reass_flush(tp);
-
-#ifdef TCP_OFFLOAD
/* Disconnect offload device, if any. */
- if (tp->t_flags & TF_TOE)
- tcp_offload_detach(tp);
-#endif
+ tcp_offload_detach(tp);
tcp_free_sackholes(tp);
@@ -960,10 +955,9 @@
INP_INFO_WLOCK_ASSERT(&V_tcbinfo);
INP_WLOCK_ASSERT(inp);
-#ifdef TCP_OFFLOAD
+ /* Notify any offload devices of listener close */
if (tp->t_state == TCPS_LISTEN)
- tcp_offload_listen_stop(tp);
-#endif
+ tcp_offload_listen_close(tp);
in_pcbdrop(inp);
TCPSTAT_INC(tcps_closed);
KASSERT(inp->inp_socket != NULL, ("tcp_close: inp_socket NULL"));
@@ -1702,7 +1696,7 @@
tp->snd_recover = tp->snd_max;
if (tp->t_flags & TF_SACK_PERMIT)
EXIT_FASTRECOVERY(tp->t_flags);
- tcp_output(tp);
+ tcp_output_send(tp);
return (inp);
}
Modified: trunk/sys/netinet/tcp_timer.c
===================================================================
--- trunk/sys/netinet/tcp_timer.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/tcp_timer.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
* The Regents of the University of California. All rights reserved.
@@ -30,9 +31,8 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/tcp_timer.c 247498 2013-02-28 21:24:10Z jhb $");
-#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_tcpdebug.h"
@@ -638,11 +638,6 @@
struct inpcb *inp = tp->t_inpcb;
int cpu = INP_CPU(inp);
-#ifdef TCP_OFFLOAD
- if (tp->t_flags & TF_TOE)
- return;
-#endif
-
switch (timer_type) {
case TT_DELACK:
t_callout = &tp->t_timers->tt_delack;
Modified: trunk/sys/netinet/tcp_timer.h
===================================================================
--- trunk/sys/netinet/tcp_timer.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/tcp_timer.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)tcp_timer.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/tcp_timer.h 232945 2012-03-13 20:37:57Z glebius $
*/
#ifndef _NETINET_TCP_TIMER_H_
Modified: trunk/sys/netinet/tcp_timewait.c
===================================================================
--- trunk/sys/netinet/tcp_timewait.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/tcp_timewait.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
* The Regents of the University of California. All rights reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/tcp_timewait.c 247658 2013-03-02 17:51:22Z flo $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/netinet/tcp_usrreq.c
===================================================================
--- trunk/sys/netinet/tcp_usrreq.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/tcp_usrreq.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California.
@@ -36,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/tcp_usrreq.c 241132 2012-10-02 12:57:47Z glebius $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -87,9 +88,7 @@
#ifdef TCPDEBUG
#include <netinet/tcp_debug.h>
#endif
-#ifdef TCP_OFFLOAD
#include <netinet/tcp_offload.h>
-#endif
/*
* TCP protocol interface to socket abstraction.
@@ -369,10 +368,7 @@
if (error == 0) {
tp->t_state = TCPS_LISTEN;
solisten_proto(so, backlog);
-#ifdef TCP_OFFLOAD
- if ((so->so_options & SO_NO_OFFLOAD) == 0)
- tcp_offload_listen_start(tp);
-#endif
+ tcp_offload_listen_open(tp);
}
SOCK_UNLOCK(so);
@@ -414,10 +410,6 @@
if (error == 0) {
tp->t_state = TCPS_LISTEN;
solisten_proto(so, backlog);
-#ifdef TCP_OFFLOAD
- if ((so->so_options & SO_NO_OFFLOAD) == 0)
- tcp_offload_listen_start(tp);
-#endif
}
SOCK_UNLOCK(so);
@@ -468,14 +460,7 @@
TCPDEBUG1();
if ((error = tcp_connect(tp, nam, td)) != 0)
goto out;
-#ifdef TCP_OFFLOAD
- if (registered_toedevs > 0 &&
- (so->so_options & SO_NO_OFFLOAD) == 0 &&
- (error = tcp_offload_connect(so, nam)) == 0)
- goto out;
-#endif
- tcp_timer_activate(tp, TT_KEEP, TP_KEEPINIT(tp));
- error = tcp_output(tp);
+ error = tcp_output_connect(so, nam);
out:
TCPDEBUG2(PRU_CONNECT);
INP_WUNLOCK(inp);
@@ -535,13 +520,7 @@
goto out;
if ((error = tcp_connect(tp, (struct sockaddr *)&sin, td)) != 0)
goto out;
-#ifdef TCP_OFFLOAD
- if (registered_toedevs > 0 &&
- (so->so_options & SO_NO_OFFLOAD) == 0 &&
- (error = tcp_offload_connect(so, nam)) == 0)
- goto out;
-#endif
- error = tcp_output(tp);
+ error = tcp_output_connect(so, nam);
goto out;
}
#endif
@@ -552,14 +531,7 @@
goto out;
if ((error = tcp6_connect(tp, nam, td)) != 0)
goto out;
-#ifdef TCP_OFFLOAD
- if (registered_toedevs > 0 &&
- (so->so_options & SO_NO_OFFLOAD) == 0 &&
- (error = tcp_offload_connect(so, nam)) == 0)
- goto out;
-#endif
- tcp_timer_activate(tp, TT_KEEP, TP_KEEPINIT(tp));
- error = tcp_output(tp);
+ error = tcp_output_connect(so, nam);
out:
TCPDEBUG2(PRU_CONNECT);
@@ -738,7 +710,7 @@
socantsendmore(so);
tcp_usrclosed(tp);
if (!(inp->inp_flags & INP_DROPPED))
- error = tcp_output(tp);
+ error = tcp_output_disconnect(tp);
out:
TCPDEBUG2(PRU_SHUTDOWN);
@@ -768,12 +740,7 @@
}
tp = intotcpcb(inp);
TCPDEBUG1();
-#ifdef TCP_OFFLOAD
- if (tp->t_flags & TF_TOE)
- tcp_offload_rcvd(tp);
- else
-#endif
- tcp_output(tp);
+ tcp_output_rcvd(tp);
out:
TCPDEBUG2(PRU_RCVD);
@@ -869,7 +836,7 @@
if (!(inp->inp_flags & INP_DROPPED)) {
if (flags & PRUS_MORETOCOME)
tp->t_flags |= TF_MORETOCOME;
- error = tcp_output(tp);
+ error = tcp_output_send(tp);
if (flags & PRUS_MORETOCOME)
tp->t_flags &= ~TF_MORETOCOME;
}
@@ -918,7 +885,7 @@
}
tp->snd_up = tp->snd_una + so->so_snd.sb_cc;
tp->t_flags |= TF_FORCEDATA;
- error = tcp_output(tp);
+ error = tcp_output_send(tp);
tp->t_flags &= ~TF_FORCEDATA;
}
out:
@@ -1153,6 +1120,7 @@
soisconnecting(so);
TCPSTAT_INC(tcps_connattempt);
tp->t_state = TCPS_SYN_SENT;
+ tcp_timer_activate(tp, TT_KEEP, TP_KEEPINIT(tp));
tp->iss = tcp_new_isn(tp);
tcp_sendseqinit(tp);
@@ -1225,6 +1193,7 @@
soisconnecting(so);
TCPSTAT_INC(tcps_connattempt);
tp->t_state = TCPS_SYN_SENT;
+ tcp_timer_activate(tp, TT_KEEP, TP_KEEPINIT(tp));
tp->iss = tcp_new_isn(tp);
tcp_sendseqinit(tp);
@@ -1355,9 +1324,9 @@
tp->t_flags |= TF_SIGNATURE;
else
tp->t_flags &= ~TF_SIGNATURE;
- goto unlock_and_done;
+ INP_WUNLOCK(inp);
+ break;
#endif /* TCP_SIGNATURE */
-
case TCP_NODELAY:
case TCP_NOOPT:
INP_WUNLOCK(inp);
@@ -1383,13 +1352,6 @@
tp->t_flags |= opt;
else
tp->t_flags &= ~opt;
-unlock_and_done:
-#ifdef TCP_OFFLOAD
- if (tp->t_flags & TF_TOE) {
- tcp_offload_ctloutput(tp, sopt->sopt_dir,
- sopt->sopt_name);
- }
-#endif
INP_WUNLOCK(inp);
break;
@@ -1408,7 +1370,8 @@
if (TCPS_HAVEESTABLISHED(tp->t_state))
error = tcp_output(tp);
}
- goto unlock_and_done;
+ INP_WUNLOCK(inp);
+ break;
case TCP_MAXSEG:
INP_WUNLOCK(inp);
@@ -1423,7 +1386,8 @@
tp->t_maxseg = optval;
else
error = EINVAL;
- goto unlock_and_done;
+ INP_WUNLOCK(inp);
+ break;
case TCP_INFO:
INP_WUNLOCK(inp);
@@ -1475,7 +1439,8 @@
}
}
CC_LIST_RUNLOCK();
- goto unlock_and_done;
+ INP_WUNLOCK(inp);
+ break;
case TCP_KEEPIDLE:
case TCP_KEEPINTVL:
@@ -1519,7 +1484,8 @@
TP_KEEPINIT(tp));
break;
}
- goto unlock_and_done;
+ INP_WUNLOCK(inp);
+ break;
case TCP_KEEPCNT:
INP_WUNLOCK(inp);
@@ -1689,7 +1655,7 @@
sbflush(&so->so_rcv);
tcp_usrclosed(tp);
if (!(inp->inp_flags & INP_DROPPED))
- tcp_output(tp);
+ tcp_output_disconnect(tp);
}
}
@@ -1712,9 +1678,7 @@
switch (tp->t_state) {
case TCPS_LISTEN:
-#ifdef TCP_OFFLOAD
- tcp_offload_listen_stop(tp);
-#endif
+ tcp_offload_listen_close(tp);
/* FALLTHROUGH */
case TCPS_CLOSED:
tp->t_state = TCPS_CLOSED;
Modified: trunk/sys/netinet/tcp_var.h
===================================================================
--- trunk/sys/netinet/tcp_var.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/tcp_var.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1993, 1994, 1995
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)tcp_var.h 8.4 (Berkeley) 5/24/95
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/tcp_var.h 235051 2012-05-05 07:55:50Z glebius $
*/
#ifndef _NETINET_TCP_VAR_H_
@@ -194,7 +195,7 @@
int t_rttlow; /* smallest observerved RTT */
u_int32_t rfbuf_ts; /* recv buffer autoscaling timestamp */
int rfbuf_cnt; /* recv buffer autoscaling byte count */
- struct toedev *tod; /* toedev handling this connection */
+ struct toe_usrreqs *t_tu; /* offload operations vector */
int t_sndrexmitpack; /* retransmit packets sent */
int t_rcvoopack; /* out-of-order packets received */
void *t_toe; /* TOE pcb pointer */
@@ -611,7 +612,6 @@
VNET_DECLARE(int, tcp_minmss);
VNET_DECLARE(int, tcp_delack_enabled);
VNET_DECLARE(int, tcp_do_rfc3390);
-VNET_DECLARE(int, tcp_do_initcwnd10);
VNET_DECLARE(int, path_mtu_discovery);
VNET_DECLARE(int, ss_fltsz);
VNET_DECLARE(int, ss_fltsz_local);
@@ -624,7 +624,6 @@
#define V_tcp_minmss VNET(tcp_minmss)
#define V_tcp_delack_enabled VNET(tcp_delack_enabled)
#define V_tcp_do_rfc3390 VNET(tcp_do_rfc3390)
-#define V_tcp_do_initcwnd10 VNET(tcp_do_initcwnd10)
#define V_path_mtu_discovery VNET(path_mtu_discovery)
#define V_ss_fltsz VNET(ss_fltsz)
#define V_ss_fltsz_local VNET(ss_fltsz_local)
@@ -669,8 +668,11 @@
char *tcp_log_vain(struct in_conninfo *, struct tcphdr *, void *,
const void *);
int tcp_reass(struct tcpcb *, struct tcphdr *, int *, struct mbuf *);
-void tcp_reass_global_init(void);
+void tcp_reass_init(void);
void tcp_reass_flush(struct tcpcb *);
+#ifdef VIMAGE
+void tcp_reass_destroy(void);
+#endif
void tcp_input(struct mbuf *, int);
u_long tcp_maxmtu(struct in_conninfo *, int *);
u_long tcp_maxmtu6(struct in_conninfo *, int *);
Modified: trunk/sys/netinet/tcpip.h
===================================================================
--- trunk/sys/netinet/tcpip.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/tcpip.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)tcpip.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/tcpip.h 139823 2005-01-07 01:45:51Z imp $
*/
#ifndef _NETINET_TCPIP_H_
Modified: trunk/sys/netinet/toedev.h
===================================================================
--- trunk/sys/netinet/toedev.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/toedev.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2007, Chelsio Inc.
* All rights reserved.
@@ -24,7 +25,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/toedev.h 182591 2008-09-01 05:30:22Z kmacy $
*/
#ifndef _NETINET_TOEDEV_H_
Modified: trunk/sys/netinet/udp.h
===================================================================
--- trunk/sys/netinet/udp.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/udp.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California.
@@ -28,7 +29,7 @@
* SUCH DAMAGE.
*
* @(#)udp.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/udp.h 247525 2013-03-01 03:04:57Z jhb $
*/
#ifndef _NETINET_UDP_H_
Modified: trunk/sys/netinet/udp_usrreq.c
===================================================================
--- trunk/sys/netinet/udp_usrreq.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/udp_usrreq.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
* The Regents of the University of California.
@@ -36,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet/udp_usrreq.c 243586 2012-11-27 01:59:51Z ae $");
#include "opt_ipfw.h"
#include "opt_inet.h"
Modified: trunk/sys/netinet/udp_var.h
===================================================================
--- trunk/sys/netinet/udp_var.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/udp_var.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California.
@@ -28,7 +29,7 @@
* SUCH DAMAGE.
*
* @(#)udp_var.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet/udp_var.h 234780 2012-04-29 08:50:50Z bz $
*/
#ifndef _NETINET_UDP_VAR_H_
Deleted: trunk/sys/netinet/udplite.h
===================================================================
--- trunk/sys/netinet/udplite.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet/udplite.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,76 +0,0 @@
-/*-
- * Copyright (c) 2014, Kevin Lo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * 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.
- *
- * $MidnightBSD$
- */
-
-#ifndef _NETINET_UDPLITE_H_
-#define _NETINET_UDPLITE_H_
-
-/*
- * User-settable options (used with setsockopt).
- */
-#define UDPLITE_SEND_CSCOV 2 /* Sender checksum coverage. */
-#define UDPLITE_RECV_CSCOV 4 /* Receiver checksum coverage. */
-
-#endif /* !_NETINET_UDPLITE_H_ */
-/*-
- * Copyright (c) 2014, Kevin Lo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * 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.
- *
- * $MidnightBSD$
- */
-
-#ifndef _NETINET_UDPLITE_H_
-#define _NETINET_UDPLITE_H_
-
-/*
- * User-settable options (used with setsockopt).
- */
-#define UDPLITE_SEND_CSCOV 2 /* Sender checksum coverage. */
-#define UDPLITE_RECV_CSCOV 4 /* Receiver checksum coverage. */
-
-#endif /* !_NETINET_UDPLITE_H_ */
Modified: trunk/sys/netinet6/dest6.c
===================================================================
--- trunk/sys/netinet6/dest6.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/dest6.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/dest6.c 196019 2009-08-01 19:26:27Z rwatson $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/netinet6/frag6.c
===================================================================
--- trunk/sys/netinet6/frag6.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/frag6.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/frag6.c 238479 2012-07-15 11:27:15Z bz $");
#include <sys/param.h>
#include <sys/systm.h>
Modified: trunk/sys/netinet6/icmp6.c
===================================================================
--- trunk/sys/netinet6/icmp6.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/icmp6.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -61,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/icmp6.c 244524 2012-12-21 00:41:52Z delphij $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/netinet6/icmp6.h
===================================================================
--- trunk/sys/netinet6/icmp6.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/icmp6.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,4 +1,5 @@
-/* $MidnightBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/netinet6/icmp6.h 62587 2000-07-04 16:35:15Z itojun $ */
/* $KAME: icmp6.h,v 1.17 2000/06/11 17:23:40 jinmei Exp $ */
#error "netinet6/icmp6.h is obsolete. use netinet/icmp6.h"
Modified: trunk/sys/netinet6/in6.c
===================================================================
--- trunk/sys/netinet6/in6.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/in6.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -61,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/in6.c 244524 2012-12-21 00:41:52Z delphij $");
#include "opt_compat.h"
#include "opt_inet.h"
@@ -421,18 +422,6 @@
case SIOCGIFSTAT_ICMP6:
sa6 = &ifr->ifr_addr;
break;
- case SIOCSIFADDR:
- case SIOCSIFBRDADDR:
- case SIOCSIFDSTADDR:
- case SIOCSIFNETMASK:
- /*
- * Although we should pass any non-INET6 ioctl requests
- * down to driver, we filter some legacy INET requests.
- * Drivers trust SIOCSIFADDR et al to come from an already
- * privileged layer, and do not perform any credentials
- * checks or input validation.
- */
- return (EINVAL);
default:
sa6 = NULL;
break;
Modified: trunk/sys/netinet6/in6.h
===================================================================
--- trunk/sys/netinet6/in6.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/in6.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -58,7 +59,7 @@
* SUCH DAMAGE.
*
* @(#)in.h 8.3 (Berkeley) 1/3/94
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet6/in6.h 244524 2012-12-21 00:41:52Z delphij $
*/
#ifndef __KAME_NETINET_IN_H_INCLUDED_
Modified: trunk/sys/netinet6/in6_cksum.c
===================================================================
--- trunk/sys/netinet6/in6_cksum.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/in6_cksum.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -61,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/in6_cksum.c 238227 2012-07-08 10:29:01Z bz $");
#include <sys/param.h>
#include <sys/mbuf.h>
Modified: trunk/sys/netinet6/in6_gif.c
===================================================================
--- trunk/sys/netinet6/in6_gif.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/in6_gif.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/in6_gif.c 232292 2012-02-29 09:47:26Z bz $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/netinet6/in6_gif.h
===================================================================
--- trunk/sys/netinet6/in6_gif.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/in6_gif.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* $KAME: in6_gif.h,v 1.5 2000/04/14 08:36:03 itojun Exp $
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet6/in6_gif.h 244524 2012-12-21 00:41:52Z delphij $
*/
#ifndef _NETINET6_IN6_GIF_H_
Modified: trunk/sys/netinet6/in6_ifattach.c
===================================================================
--- trunk/sys/netinet6/in6_ifattach.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/in6_ifattach.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/in6_ifattach.c 233200 2012-03-19 20:49:16Z jhb $");
#include <sys/param.h>
#include <sys/systm.h>
Modified: trunk/sys/netinet6/in6_ifattach.h
===================================================================
--- trunk/sys/netinet6/in6_ifattach.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/in6_ifattach.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* $KAME: in6_ifattach.h,v 1.14 2001/02/08 12:48:39 jinmei Exp $
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet6/in6_ifattach.h 244524 2012-12-21 00:41:52Z delphij $
*/
#ifndef _NETINET6_IN6_IFATTACH_H_
Modified: trunk/sys/netinet6/in6_mcast.c
===================================================================
--- trunk/sys/netinet6/in6_mcast.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/in6_mcast.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2009 Bruce Simpson.
* All rights reserved.
@@ -33,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/in6_mcast.c 248085 2013-03-09 02:36:32Z marius $");
#include "opt_inet6.h"
@@ -1625,8 +1626,6 @@
* has asked for, but we always tell userland how big the
* buffer really needs to be.
*/
- if (msfr.msfr_nsrcs > in6_mcast_maxsocksrc)
- msfr.msfr_nsrcs = in6_mcast_maxsocksrc;
tss = NULL;
if (msfr.msfr_srcs != NULL && msfr.msfr_nsrcs > 0) {
tss = malloc(sizeof(struct sockaddr_storage) * msfr.msfr_nsrcs,
Modified: trunk/sys/netinet6/in6_pcb.c
===================================================================
--- trunk/sys/netinet6/in6_pcb.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/in6_pcb.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* Copyright (c) 2010-2011 Juniper Networks, Inc.
@@ -65,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/in6_pcb.c 234279 2012-04-14 10:36:43Z glebius $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/netinet6/in6_pcb.h
===================================================================
--- trunk/sys/netinet6/in6_pcb.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/in6_pcb.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -58,7 +59,7 @@
* SUCH DAMAGE.
*
* @(#)in_pcb.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet6/in6_pcb.h 244524 2012-12-21 00:41:52Z delphij $
*/
#ifndef _NETINET6_IN6_PCB_H_
Modified: trunk/sys/netinet6/in6_pcbgroup.c
===================================================================
--- trunk/sys/netinet6/in6_pcbgroup.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/in6_pcbgroup.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2010-2011 Juniper Networks, Inc.
* All rights reserved.
@@ -29,7 +30,7 @@
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/in6_pcbgroup.c 222748 2011-06-06 12:55:02Z rwatson $");
#include "opt_inet6.h"
Modified: trunk/sys/netinet6/in6_proto.c
===================================================================
--- trunk/sys/netinet6/in6_proto.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/in6_proto.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -61,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/in6_proto.c 239936 2012-08-31 06:38:43Z maxim $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/netinet6/in6_rmx.c
===================================================================
--- trunk/sys/netinet6/in6_rmx.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/in6_rmx.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -60,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/in6_rmx.c 242646 2012-11-06 01:18:53Z melifaro $");
#include <sys/param.h>
#include <sys/systm.h>
Modified: trunk/sys/netinet6/in6_src.c
===================================================================
--- trunk/sys/netinet6/in6_src.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/in6_src.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -61,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/in6_src.c 248085 2013-03-09 02:36:32Z marius $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/netinet6/in6_var.h
===================================================================
--- trunk/sys/netinet6/in6_var.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/in6_var.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -58,7 +59,7 @@
* SUCH DAMAGE.
*
* @(#)in_var.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet6/in6_var.h 244524 2012-12-21 00:41:52Z delphij $
*/
#ifndef _NETINET6_IN6_VAR_H_
Modified: trunk/sys/netinet6/ip6.h
===================================================================
--- trunk/sys/netinet6/ip6.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/ip6.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,4 +1,5 @@
-/* $MidnightBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/sys/netinet6/ip6.h 62587 2000-07-04 16:35:15Z itojun $ */
/* $KAME: ip6.h,v 1.7 2000/03/25 07:23:36 sumikawa Exp $ */
#error "netinet6/ip6.h is obsolete. use netinet/ip6.h"
Modified: trunk/sys/netinet6/ip6_ecn.h
===================================================================
--- trunk/sys/netinet6/ip6_ecn.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/ip6_ecn.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1999 WIDE Project.
* All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* $KAME: ip_ecn.h,v 1.5 2000/03/27 04:58:38 sumikawa Exp $
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet6/ip6_ecn.h 174510 2007-12-10 16:03:40Z obrien $
*/
/*
Modified: trunk/sys/netinet6/ip6_forward.c
===================================================================
--- trunk/sys/netinet6/ip6_forward.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/ip6_forward.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/ip6_forward.c 243586 2012-11-27 01:59:51Z ae $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/netinet6/ip6_id.c
===================================================================
--- trunk/sys/netinet6/ip6_id.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/ip6_id.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 2003 WIDE Project.
* All rights reserved.
@@ -67,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/ip6_id.c 174510 2007-12-10 16:03:40Z obrien $");
/*
* seed = random (bits - 1) bit
Modified: trunk/sys/netinet6/ip6_input.c
===================================================================
--- trunk/sys/netinet6/ip6_input.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/ip6_input.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -61,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/ip6_input.c 243586 2012-11-27 01:59:51Z ae $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/netinet6/ip6_ipsec.c
===================================================================
--- trunk/sys/netinet6/ip6_ipsec.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/ip6_ipsec.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -28,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/ip6_ipsec.c 239831 2012-08-29 13:14:39Z bz $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/netinet6/ip6_ipsec.h
===================================================================
--- trunk/sys/netinet6/ip6_ipsec.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/ip6_ipsec.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -26,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet6/ip6_ipsec.h 177166 2008-03-14 11:44:30Z bz $
*/
#ifndef _NETINET_IP6_IPSEC_H_
Modified: trunk/sys/netinet6/ip6_mroute.c
===================================================================
--- trunk/sys/netinet6/ip6_mroute.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/ip6_mroute.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
@@ -79,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/ip6_mroute.c 248085 2013-03-09 02:36:32Z marius $");
#include "opt_inet6.h"
Modified: trunk/sys/netinet6/ip6_mroute.h
===================================================================
--- trunk/sys/netinet6/ip6_mroute.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/ip6_mroute.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* $KAME: ip6_mroute.h,v 1.19 2001/06/14 06:12:55 suz Exp $
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet6/ip6_mroute.h 240305 2012-09-10 11:38:02Z glebius $
*/
/* BSDI ip_mroute.h,v 2.5 1996/10/11 16:01:48 pjd Exp */
Modified: trunk/sys/netinet6/ip6_output.c
===================================================================
--- trunk/sys/netinet6/ip6_output.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/ip6_output.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -61,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/ip6_output.c 245067 2013-01-05 20:07:28Z ae $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -1129,7 +1130,7 @@
goto sendorfree;
}
m->m_pkthdr.rcvif = NULL;
- m->m_flags = m0->m_flags & M_COPYFLAGS;
+ m->m_flags = m0->m_flags & M_COPYFLAGS; /* incl. FIB */
*mnext = m;
mnext = &m->m_nextpkt;
m->m_data += max_linkhdr;
@@ -1155,7 +1156,6 @@
}
m_cat(m, m_frgpart);
m->m_pkthdr.len = len + hlen + sizeof(*ip6f);
- m->m_pkthdr.fibnum = m0->m_pkthdr.fibnum;
m->m_pkthdr.rcvif = NULL;
ip6f->ip6f_reserved = 0;
ip6f->ip6f_ident = id;
Modified: trunk/sys/netinet6/ip6_var.h
===================================================================
--- trunk/sys/netinet6/ip6_var.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/ip6_var.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -58,7 +59,7 @@
* SUCH DAMAGE.
*
* @(#)ip_var.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet6/ip6_var.h 244524 2012-12-21 00:41:52Z delphij $
*/
#ifndef _NETINET6_IP6_VAR_H_
Modified: trunk/sys/netinet6/ip6protosw.h
===================================================================
--- trunk/sys/netinet6/ip6protosw.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/ip6protosw.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -59,7 +60,7 @@
*
* @(#)protosw.h 8.1 (Berkeley) 6/2/93
* BSDI protosw.h,v 2.3 1996/10/11 16:02:40 pjd Exp
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet6/ip6protosw.h 244524 2012-12-21 00:41:52Z delphij $
*/
#ifndef _NETINET6_IP6PROTOSW_H_
Modified: trunk/sys/netinet6/mld6.c
===================================================================
--- trunk/sys/netinet6/mld6.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/mld6.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2009 Bruce Simpson.
*
@@ -64,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/mld6.c 249132 2013-04-05 08:22:11Z mav $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/netinet6/mld6.h
===================================================================
--- trunk/sys/netinet6/mld6.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/mld6.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2009 Bruce Simpson.
*
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet6/mld6.h 191666 2009-04-29 11:31:23Z bms $
*/
#ifndef _NETINET6_MLD6_H_
Modified: trunk/sys/netinet6/mld6_var.h
===================================================================
--- trunk/sys/netinet6/mld6_var.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/mld6_var.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2009 Bruce Simpson.
*
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet6/mld6_var.h 200871 2009-12-22 20:40:22Z bms $
*/
#ifndef _NETINET6_MLD6_VAR_H_
#define _NETINET6_MLD6_VAR_H_
Modified: trunk/sys/netinet6/nd6.c
===================================================================
--- trunk/sys/netinet6/nd6.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/nd6.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/nd6.c 248852 2013-03-28 20:48:40Z emaste $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/netinet6/nd6.h
===================================================================
--- trunk/sys/netinet6/nd6.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/nd6.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* $KAME: nd6.h,v 1.76 2001/12/18 02:10:31 itojun Exp $
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet6/nd6.h 245555 2013-01-17 16:39:21Z ume $
*/
#ifndef _NETINET6_ND6_H_
Modified: trunk/sys/netinet6/nd6_nbr.c
===================================================================
--- trunk/sys/netinet6/nd6_nbr.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/nd6_nbr.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/nd6_nbr.c 240305 2012-09-10 11:38:02Z glebius $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/netinet6/nd6_rtr.c
===================================================================
--- trunk/sys/netinet6/nd6_rtr.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/nd6_rtr.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/nd6_rtr.c 244524 2012-12-21 00:41:52Z delphij $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -296,16 +297,8 @@
}
if (nd_ra->nd_ra_retransmit)
ndi->retrans = ntohl(nd_ra->nd_ra_retransmit);
- if (nd_ra->nd_ra_curhoplimit) {
- if (ndi->chlim < nd_ra->nd_ra_curhoplimit)
- ndi->chlim = nd_ra->nd_ra_curhoplimit;
- else if (ndi->chlim != nd_ra->nd_ra_curhoplimit) {
- log(LOG_ERR, "RA with a lower CurHopLimit sent from "
- "%s on %s (current = %d, received = %d). "
- "Ignored.\n", ip6_sprintf(ip6bufs, &ip6->ip6_src),
- if_name(ifp), ndi->chlim, nd_ra->nd_ra_curhoplimit);
- }
- }
+ if (nd_ra->nd_ra_curhoplimit)
+ ndi->chlim = nd_ra->nd_ra_curhoplimit;
dr = defrtrlist_update(&dr0);
}
Modified: trunk/sys/netinet6/pim6.h
===================================================================
--- trunk/sys/netinet6/pim6.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/pim6.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* $KAME: pim6.h,v 1.3 2000/03/25 07:23:58 sumikawa Exp $
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet6/pim6.h 174510 2007-12-10 16:03:40Z obrien $
*/
/*
* Protocol Independent Multicast (PIM) definitions
Modified: trunk/sys/netinet6/pim6_var.h
===================================================================
--- trunk/sys/netinet6/pim6_var.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/pim6_var.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* $KAME: pim6_var.h,v 1.8 2000/06/06 08:07:43 jinmei Exp $
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet6/pim6_var.h 244524 2012-12-21 00:41:52Z delphij $
*/
/*
Modified: trunk/sys/netinet6/raw_ip6.c
===================================================================
--- trunk/sys/netinet6/raw_ip6.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/raw_ip6.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -60,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/raw_ip6.c 248549 2013-03-20 09:12:28Z ae $");
#include "opt_ipsec.h"
#include "opt_inet6.h"
Modified: trunk/sys/netinet6/raw_ip6.h
===================================================================
--- trunk/sys/netinet6/raw_ip6.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/raw_ip6.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 2001 WIDE Project.
* All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* $KAME: raw_ip6.h,v 1.2 2001/05/27 13:28:35 itojun Exp $
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet6/raw_ip6.h 195727 2009-07-16 21:13:04Z rwatson $
*/
#ifndef _NETINET6_RAW_IP6_H_
Modified: trunk/sys/netinet6/route6.c
===================================================================
--- trunk/sys/netinet6/route6.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/route6.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/route6.c 238231 2012-07-08 11:28:33Z bz $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/netinet6/scope6.c
===================================================================
--- trunk/sys/netinet6/scope6.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/scope6.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 2000 WIDE Project.
* All rights reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/scope6.c 243382 2012-11-22 00:22:54Z ae $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -369,6 +370,12 @@
char ip6buf[INET6_ADDRSTRLEN];
u_int32_t zoneid;
+ if (sin6->sin6_scope_id != 0) {
+ log(LOG_NOTICE,
+ "sa6_recoverscope: assumption failure (non 0 ID): %s%%%d\n",
+ ip6_sprintf(ip6buf, &sin6->sin6_addr), sin6->sin6_scope_id);
+ /* XXX: proceed anyway... */
+ }
if (IN6_IS_SCOPE_LINKLOCAL(&sin6->sin6_addr) ||
IN6_IS_ADDR_MC_INTFACELOCAL(&sin6->sin6_addr)) {
/*
@@ -381,14 +388,6 @@
return (ENXIO);
if (!ifnet_byindex(zoneid))
return (ENXIO);
- if (sin6->sin6_scope_id != 0 &&
- zoneid != sin6->sin6_scope_id) {
- log(LOG_NOTICE,
- "%s: embedded scope mismatch: %s%%%d. "
- "sin6_scope_id was overridden.", __func__,
- ip6_sprintf(ip6buf, &sin6->sin6_addr),
- sin6->sin6_scope_id);
- }
sin6->sin6_addr.s6_addr16[1] = 0;
sin6->sin6_scope_id = zoneid;
}
Modified: trunk/sys/netinet6/scope6_var.h
===================================================================
--- trunk/sys/netinet6/scope6_var.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/scope6_var.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 2000 WIDE Project.
* All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* $KAME: scope6_var.h,v 1.4 2000/05/18 15:03:27 jinmei Exp $
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet6/scope6_var.h 244524 2012-12-21 00:41:52Z delphij $
*/
#ifndef _NETINET6_SCOPE6_VAR_H_
Modified: trunk/sys/netinet6/sctp6_usrreq.c
===================================================================
--- trunk/sys/netinet6/sctp6_usrreq.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/sctp6_usrreq.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/sctp6_usrreq.c 238613 2012-07-19 09:32:59Z tuexen $");
#include <netinet/sctp_os.h>
#ifdef INET6
@@ -502,6 +503,7 @@
* XXX: We assume that when IPV6 is non NULL, M and OFF are
* valid.
*/
+ /* check if we can safely examine src and dst ports */
struct sctp_inpcb *inp = NULL;
struct sctp_tcb *stcb = NULL;
struct sctp_nets *net = NULL;
@@ -510,10 +512,6 @@
if (ip6cp->ip6c_m == NULL)
return;
- /* Check if we can safely examine the SCTP header. */
- if (ip6cp->ip6c_m->m_pkthdr.len < ip6cp->ip6c_off + sizeof(sh))
- return;
-
bzero(&sh, sizeof(sh));
bzero(&final, sizeof(final));
inp = NULL;
Modified: trunk/sys/netinet6/sctp6_var.h
===================================================================
--- trunk/sys/netinet6/sctp6_var.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/sctp6_var.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/sctp6_var.h 244524 2012-12-21 00:41:52Z delphij $");
#ifndef _NETINET6_SCTP6_VAR_H_
#define _NETINET6_SCTP6_VAR_H_
Modified: trunk/sys/netinet6/send.c
===================================================================
--- trunk/sys/netinet6/send.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/send.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2009-2010 Ana Kukec <anchie at FreeBSD.org>
* All rights reserved.
@@ -25,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/send.c 249132 2013-04-05 08:22:11Z mav $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/netinet6/send.h
===================================================================
--- trunk/sys/netinet6/send.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/send.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2009-2010 Ana Kukec <anchie at FreeBSD.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet6/send.h 222712 2011-06-05 11:40:30Z hrs $
*/
#ifndef _NETINET6_SEND_H_
Modified: trunk/sys/netinet6/tcp6_var.h
===================================================================
--- trunk/sys/netinet6/tcp6_var.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/tcp6_var.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -56,7 +57,7 @@
* SUCH DAMAGE.
*
* @(#)tcp_var.h 8.4 (Berkeley) 5/24/95
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet6/tcp6_var.h 244524 2012-12-21 00:41:52Z delphij $
*/
#ifndef _NETINET_TCP6_VAR_H_
Modified: trunk/sys/netinet6/udp6_usrreq.c
===================================================================
--- trunk/sys/netinet6/udp6_usrreq.c 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/udp6_usrreq.c 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* Copyright (c) 2010-2011 Juniper Networks, Inc.
@@ -67,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/9/sys/netinet6/udp6_usrreq.c 243586 2012-11-27 01:59:51Z ae $");
#include "opt_inet.h"
#include "opt_inet6.h"
Modified: trunk/sys/netinet6/udp6_var.h
===================================================================
--- trunk/sys/netinet6/udp6_var.h 2016-10-02 00:52:15 UTC (rev 9137)
+++ trunk/sys/netinet6/udp6_var.h 2016-10-02 00:59:55 UTC (rev 9138)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -57,7 +58,7 @@
* SUCH DAMAGE.
*
* @(#)udp_var.h 8.1 (Berkeley) 6/10/93
- * $MidnightBSD$
+ * $FreeBSD: stable/9/sys/netinet6/udp6_var.h 174510 2007-12-10 16:03:40Z obrien $
*/
#ifndef _NETINET6_UDP6_VAR_H_
More information about the Midnightbsd-cvs
mailing list