OpenBSD CVS

CVS log for src/sys/netinet/Attic/in_gif.c


[BACK] Up to [local] / src / sys / netinet

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.47, Mon Sep 28 08:32:05 2015 UTC (8 years, 8 months ago) by mpi
Branch: MAIN
CVS Tags: HEAD
Changes since 1.46: +1 -1 lines
FILE REMOVED

Merge gif(4)'s tentacles in a single file.

Tested by <mxb AT alumni DOT chalmers DOT se>.

ok dlg@

Revision 1.46 / (download) - annotate - [select for diffs], Fri Aug 14 18:07:28 2015 UTC (8 years, 9 months ago) by bluhm
Branch: MAIN
Changes since 1.45: +3 -3 lines
Diff to previous 1.45 (colored)

Replace sockaddr casts with the proper satosin() or satosin6() calls.
From David Hill;  OK mpi@

Revision 1.45 / (download) - annotate - [select for diffs], Tue Jun 16 11:09:40 2015 UTC (8 years, 11 months ago) by mpi
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8
Changes since 1.44: +2 -2 lines
Diff to previous 1.44 (colored)

Store a unique ID, an interface index, rather than a pointer to the
receiving interface in the packet header of every mbuf.

The interface pointer should now be retrieved when necessary with
if_get().  If a NULL pointer is returned by if_get(), the interface
has probably been destroy/removed and the mbuf should be freed.

Such mechanism will simplify garbage collection of mbufs and limit
problems with dangling ifp pointers.

Tested by jmatthew@ and krw@, discussed with many.

ok mikeb@, bluhm@, dlg@

Revision 1.44 / (download) - annotate - [select for diffs], Tue May 12 12:27:17 2015 UTC (9 years, 1 month ago) by mpi
Branch: MAIN
Changes since 1.43: +2 -2 lines
Diff to previous 1.43 (colored)

MPLS also needs a definition for etherip_output(), fix build without
bridge.

Revision 1.43 / (download) - annotate - [select for diffs], Sat Mar 14 03:38:51 2015 UTC (9 years, 3 months ago) by jsg
Branch: MAIN
Changes since 1.42: +1 -5 lines
Diff to previous 1.42 (colored)

Remove some includes include-what-you-use claims don't
have any direct symbols used.  Tested for indirect use by compiling
amd64/i386/sparc64 kernels.

ok tedu@ deraadt@

Revision 1.42 / (download) - annotate - [select for diffs], Fri Dec 5 15:50:04 2014 UTC (9 years, 6 months ago) by mpi
Branch: MAIN
CVS Tags: OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.41: +2 -1 lines
Diff to previous 1.41 (colored)

Explicitly include <net/if_var.h> instead of pulling it in <net/if.h>.

ok mikeb@, krw@, bluhm@, tedu@

Revision 1.41 / (download) - annotate - [select for diffs], Tue Jul 22 11:06:10 2014 UTC (9 years, 10 months ago) by mpi
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6
Changes since 1.40: +1 -2 lines
Diff to previous 1.40 (colored)

Fewer <netinet/in_systm.h> !

Revision 1.40 / (download) - annotate - [select for diffs], Mon Apr 14 09:06:42 2014 UTC (10 years, 2 months ago) by mpi
Branch: MAIN
Changes since 1.39: +6 -6 lines
Diff to previous 1.39 (colored)

"struct pkthdr" holds a routing table ID, not a routing domain one.
Avoid the confusion by using an appropriate name for the variable.

Note that since routing domain IDs are a subset of the set of routing
table IDs, the following idiom is correct:

	rtableid = rdomain

But to get the routing domain ID corresponding to a given routing table
ID, you must call rtable_l2(9).

claudio@ likes it, ok mikeb@

Revision 1.39 / (download) - annotate - [select for diffs], Sun Jun 19 17:55:37 2011 UTC (12 years, 11 months ago) by jsg
Branch: MAIN
CVS Tags: OPENBSD_5_5_BASE, OPENBSD_5_5, OPENBSD_5_4_BASE, OPENBSD_5_4, OPENBSD_5_3_BASE, OPENBSD_5_3, OPENBSD_5_2_BASE, OPENBSD_5_2, OPENBSD_5_1_BASE, OPENBSD_5_1, OPENBSD_5_0_BASE, OPENBSD_5_0
Changes since 1.38: +3 -2 lines
Diff to previous 1.38 (colored)

fix up unbalanced format strings
ok deraadt@

Revision 1.38 / (download) - annotate - [select for diffs], Tue May 11 09:36:07 2010 UTC (14 years, 1 month ago) by claudio
Branch: MAIN
CVS Tags: OPENBSD_4_9_BASE, OPENBSD_4_9, OPENBSD_4_8_BASE, OPENBSD_4_8
Changes since 1.37: +25 -13 lines
Diff to previous 1.37 (colored)

Massiv cleanup of the gif(4) mess. Move encapsulation into gif_output()
where it is not necessary to guess protocols by looking at the first nibble.
in_gif_output() will encapsulate the packet but not send it. Because of
etherip support and the way the bridge works a minimal hack is needed in
gif_start() to ensure that the bridged packets are encapsulated as well.
This actually started with the idea to add MPLS support but that turned out
to be not as simple as in the gre(4) case.
Tested by myself (IP, IPv6, etherip, MPLS), sthen@ (IP, IPv6), naddy (IPv6)
OK sthen@

Revision 1.37 / (download) - annotate - [select for diffs], Sat Nov 21 14:08:14 2009 UTC (14 years, 6 months ago) by claudio
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE, OPENBSD_4_7
Changes since 1.36: +15 -4 lines
Diff to previous 1.36 (colored)

Add a way to bind the tunnel endpoint of a gif/gre interface into a
different rdomain than the default one. This allows to do MPLS VPNs
without the MPLS madness.  OK deraadt@, henning@

Revision 1.36 / (download) - annotate - [select for diffs], Tue Jun 2 17:01:20 2009 UTC (15 years ago) by blambert
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE, OPENBSD_4_6
Changes since 1.35: +1 -2 lines
Diff to previous 1.35 (colored)

satosin was already defined in in.h, no need to redefine it here

ok claudio@

Revision 1.35 / (download) - annotate - [select for diffs], Sun Sep 28 16:14:40 2008 UTC (15 years, 8 months ago) by jsing
Branch: MAIN
CVS Tags: OPENBSD_4_5_BASE, OPENBSD_4_5
Changes since 1.34: +2 -5 lines
Diff to previous 1.34 (colored)

Ansify function declarations for gif(4).

ok claudio@

Revision 1.34 / (download) - annotate - [select for diffs], Sun Sep 28 15:25:32 2008 UTC (15 years, 8 months ago) by jsing
Branch: MAIN
Changes since 1.33: +9 -0 lines
Diff to previous 1.33 (colored)

Clear the PF state key before an IP packet exits a gif(4) tunnel, in order
to prevent state key mismatches.

ok henning@

Revision 1.33 / (download) - annotate - [select for diffs], Thu Feb 15 22:40:02 2007 UTC (17 years, 3 months ago) by claudio
Branch: MAIN
CVS Tags: OPENBSD_4_4_BASE, OPENBSD_4_4, OPENBSD_4_3_BASE, OPENBSD_4_3, OPENBSD_4_2_BASE, OPENBSD_4_2, OPENBSD_4_1_BASE, OPENBSD_4_1
Changes since 1.32: +5 -15 lines
Diff to previous 1.32 (colored)

Simplify even more by reducing shared code in #if NBRIDGE and default case.
OK mglocker@

Revision 1.32 / (download) - annotate - [select for diffs], Sat Feb 10 15:34:22 2007 UTC (17 years, 4 months ago) by claudio
Branch: MAIN
Changes since 1.31: +7 -20 lines
Diff to previous 1.31 (colored)

Cleanup, kill dead code and unused arguments. Mostly stuff that is computed
and passed around but never used. OK mglocker@

Revision 1.31 / (download) - annotate - [select for diffs], Fri Dec 23 13:01:23 2005 UTC (18 years, 5 months ago) by claudio
Branch: MAIN
CVS Tags: OPENBSD_4_0_BASE, OPENBSD_4_0, OPENBSD_3_9_BASE, OPENBSD_3_9
Changes since 1.30: +1 -5 lines
Diff to previous 1.30 (colored)

Remove unnecessary #ifdef MROUTING blocks. OK brad@ markus@

Revision 1.8.2.7 / (download) - annotate - [select for diffs], Thu Feb 19 10:57:23 2004 UTC (20 years, 3 months ago) by niklas
Branch: SMP
Changes since 1.8.2.6: +6 -12 lines
Diff to previous 1.8.2.6 (colored) to branchpoint 1.8 (colored) next main 1.9 (colored)

Merge of current from two weeks agointo the SMP branch

Revision 1.30 / (download) - annotate - [select for diffs], Wed Dec 10 07:22:43 2003 UTC (20 years, 6 months ago) by itojun
Branch: MAIN
CVS Tags: SMP_SYNC_B, SMP_SYNC_A, OPENBSD_3_8_BASE, OPENBSD_3_8, OPENBSD_3_7_BASE, OPENBSD_3_7, OPENBSD_3_6_BASE, OPENBSD_3_6, OPENBSD_3_5_BASE, OPENBSD_3_5
Changes since 1.29: +2 -2 lines
Diff to previous 1.29 (colored)

de-register.  deraadt ok

Revision 1.29 / (download) - annotate - [select for diffs], Wed Dec 3 14:51:05 2003 UTC (20 years, 6 months ago) by markus
Branch: MAIN
Changes since 1.28: +2 -3 lines
Diff to previous 1.28 (colored)

add support for ifconfig clone/destroy; ok henning deraadt

Revision 1.28 / (download) - annotate - [select for diffs], Mon Jul 28 10:10:16 2003 UTC (20 years, 10 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_3_4_BASE, OPENBSD_3_4
Changes since 1.27: +5 -3 lines
Diff to previous 1.27 (colored)

allow gif(4) over ipsec: mark mbuf for transport mode SA,
so in_gif_input can detect whether a proto 4 header is due
to ipsec tunnel mode or gif(4) encapsulation; fixes pr 3023
ok itojun@. provos@ and angelos@ agree; tested by sturm@

Revision 1.27 / (download) - annotate - [select for diffs], Wed Jul 9 22:03:16 2003 UTC (20 years, 11 months ago) by itojun
Branch: MAIN
Changes since 1.26: +1 -8 lines
Diff to previous 1.26 (colored)

do not flip ip_len/ip_off in netinet stack.  deraadt ok.
(please test, especially PF portion)

Revision 1.8.2.6 / (download) - annotate - [select for diffs], Fri Mar 28 00:06:54 2003 UTC (21 years, 2 months ago) by niklas
Branch: SMP
Changes since 1.8.2.5: +7 -23 lines
Diff to previous 1.8.2.5 (colored) to branchpoint 1.8 (colored)

Sync the SMP branch with 3.3

Revision 1.22.2.2 / (download) - annotate - [select for diffs], Tue Oct 29 00:36:46 2002 UTC (21 years, 7 months ago) by art
Branch: UBC
Changes since 1.22.2.1: +3 -3 lines
Diff to previous 1.22.2.1 (colored) to branchpoint 1.22 (colored) next main 1.23 (colored)

sync to -current

Revision 1.26 / (download) - annotate - [select for diffs], Wed Aug 28 15:43:03 2002 UTC (21 years, 9 months ago) by pefo
Branch: MAIN
CVS Tags: UBC_SYNC_B, UBC_SYNC_A, OPENBSD_3_3_BASE, OPENBSD_3_3, OPENBSD_3_2_BASE, OPENBSD_3_2
Changes since 1.25: +2 -2 lines
Diff to previous 1.25 (colored)

Fix a problem where passing NULL as a pointer with varargs does not promote
NULL to full 64 bits on a 64 bit address system. Soultion is to add a
(void *) cast before NULL. This makes a 64 bit MIPS kernel work and will
probably help future 64 bit ports as well.

OK from art@

Revision 1.22.2.1 / (download) - annotate - [select for diffs], Tue Jun 11 03:31:36 2002 UTC (22 years ago) by art
Branch: UBC
Changes since 1.22: +6 -28 lines
Diff to previous 1.22 (colored)

Sync UBC branch to -current

Revision 1.25 / (download) - annotate - [select for diffs], Sun Jun 9 16:26:10 2002 UTC (22 years ago) by itojun
Branch: MAIN
Changes since 1.24: +2 -2 lines
Diff to previous 1.24 (colored)

whitespace

Revision 1.24 / (download) - annotate - [select for diffs], Thu May 30 04:19:44 2002 UTC (22 years ago) by itojun
Branch: MAIN
Changes since 1.23: +6 -22 lines
Diff to previous 1.23 (colored)

minor KNF.  nuke obsolete IFF_LINK0 support completely

Revision 1.8.2.5 / (download) - annotate - [select for diffs], Thu Mar 28 14:56:45 2002 UTC (22 years, 2 months ago) by niklas
Branch: SMP
Changes since 1.8.2.4: +0 -6 lines
Diff to previous 1.8.2.4 (colored) to branchpoint 1.8 (colored)

Merge in -current from roughly a week ago

Revision 1.23 / (download) - annotate - [select for diffs], Fri Mar 15 18:19:52 2002 UTC (22 years, 3 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_1_BASE, OPENBSD_3_1
Changes since 1.22: +1 -7 lines
Diff to previous 1.22 (colored)

Kill #if __STDC__ used to do K&R vs. ANSI varargs/stdarg; just do things
the ANSI way.

Revision 1.8.2.4 / (download) - annotate - [select for diffs], Wed Mar 6 02:15:07 2002 UTC (22 years, 3 months ago) by niklas
Branch: SMP
Changes since 1.8.2.3: +1 -5 lines
Diff to previous 1.8.2.3 (colored) to branchpoint 1.8 (colored)

Merge in trunk

Revision 1.22 / (download) - annotate - [select for diffs], Fri Dec 7 09:32:45 2001 UTC (22 years, 6 months ago) by itojun
Branch: MAIN
CVS Tags: UBC_BASE
Branch point for: UBC
Changes since 1.21: +1 -5 lines
Diff to previous 1.21 (colored)

sync comment with kame

Revision 1.8.2.3 / (download) - annotate - [select for diffs], Wed Oct 31 03:29:03 2001 UTC (22 years, 7 months ago) by nate
Branch: SMP
Changes since 1.8.2.2: +3 -3 lines
Diff to previous 1.8.2.2 (colored) to branchpoint 1.8 (colored)

Sync the SMP branch to something just after 3.0

Revision 1.21 / (download) - annotate - [select for diffs], Sun Aug 19 06:31:56 2001 UTC (22 years, 9 months ago) by angelos
Branch: MAIN
CVS Tags: OPENBSD_3_0_BASE, OPENBSD_3_0
Changes since 1.20: +2 -2 lines
Diff to previous 1.20 (colored)

Pass the interface (if any) to ipip_input(), so it can be used in
BPF. Closes PR 2000.

Revision 1.20 / (download) - annotate - [select for diffs], Fri Jul 27 15:48:38 2001 UTC (22 years, 10 months ago) by itojun
Branch: MAIN
Changes since 1.19: +2 -2 lines
Diff to previous 1.19 (colored)

variable name "gif" is way too generic - use "gif_softc".  sync with kame

Revision 1.8.2.2 / (download) - annotate - [select for diffs], Wed Jul 4 10:54:32 2001 UTC (22 years, 11 months ago) by niklas
Branch: SMP
Changes since 1.8.2.1: +4 -13 lines
Diff to previous 1.8.2.1 (colored) to branchpoint 1.8 (colored)

Merge in -current from two days ago in the SMP branch.
As usual with merges, they do not indicate progress, so do not hold
your breath for working SMP, and do not mail me and ask about the
state of it.  It has not changed.  There is work ongoing, but very, very
slowly.  The commit is done in parts as to not lock up the tree in too
big chunks at a time.

Revision 1.19 / (download) - annotate - [select for diffs], Fri Jun 8 10:37:46 2001 UTC (23 years ago) by art
Branch: MAIN
Changes since 1.18: +3 -1 lines
Diff to previous 1.18 (colored)

Update packet counters correctly.
From Robert J. Wozny <speedy@atman.pl>

Revision 1.18 / (download) - annotate - [select for diffs], Fri Jun 8 03:53:45 2001 UTC (23 years ago) by angelos
Branch: MAIN
Changes since 1.17: +1 -12 lines
Diff to previous 1.17 (colored)

Cut down on include files.

Revision 1.17 / (download) - annotate - [select for diffs], Wed May 30 12:30:02 2001 UTC (23 years ago) by angelos
Branch: MAIN
Changes since 1.16: +2 -2 lines
Diff to previous 1.16 (colored)

No need for last argument in ipip_output()

Revision 1.8.2.1 / (download) - annotate - [select for diffs], Mon May 14 22:40:08 2001 UTC (23 years, 1 month ago) by niklas
Branch: SMP
Changes since 1.8: +27 -14 lines
Diff to previous 1.8 (colored)

merge in approximately 2.9 into SMP branch

Revision 1.16 / (download) - annotate - [select for diffs], Sat Apr 14 00:30:58 2001 UTC (23 years, 2 months ago) by angelos
Branch: MAIN
CVS Tags: OPENBSD_2_9_BASE, OPENBSD_2_9
Changes since 1.15: +2 -2 lines
Diff to previous 1.15 (colored)

Minor changes, preparing for real socket-attached TDBs; also, more
information will be stored in the TDB. ok ho@ provos@

Revision 1.15 / (download) - annotate - [select for diffs], Fri Apr 6 04:42:08 2001 UTC (23 years, 2 months ago) by csapuntz
Branch: MAIN
Changes since 1.14: +1 -5 lines
Diff to previous 1.14 (colored)



Move offsetof define into sys/param.h

Revision 1.14 / (download) - annotate - [select for diffs], Fri Feb 16 08:48:04 2001 UTC (23 years, 3 months ago) by itojun
Branch: MAIN
Changes since 1.13: +4 -3 lines
Diff to previous 1.13 (colored)

sync whitespace/comment with kame.  to help merge tasks

Revision 1.13 / (download) - annotate - [select for diffs], Sun Dec 31 17:23:35 2000 UTC (23 years, 5 months ago) by angelos
Branch: MAIN
Changes since 1.12: +3 -1 lines
Diff to previous 1.12 (colored)

Fix non-NBRIDGE case

Revision 1.12 / (download) - annotate - [select for diffs], Sun Dec 31 17:20:14 2000 UTC (23 years, 5 months ago) by angelos
Branch: MAIN
Changes since 1.11: +1 -2 lines
Diff to previous 1.11 (colored)

Remove debugging printf.

Revision 1.11 / (download) - annotate - [select for diffs], Sat Dec 30 21:50:46 2000 UTC (23 years, 5 months ago) by angelos
Branch: MAIN
Changes since 1.10: +6 -1 lines
Diff to previous 1.10 (colored)

AF_LINK case.

Revision 1.10 / (download) - annotate - [select for diffs], Sat Dec 30 19:03:38 2000 UTC (23 years, 5 months ago) by angelos
Branch: MAIN
Changes since 1.9: +17 -1 lines
Diff to previous 1.9 (colored)

Send AF_LINK to etherip_output()

Revision 1.9 / (download) - annotate - [select for diffs], Thu May 25 01:22:00 2000 UTC (24 years ago) by itojun
Branch: MAIN
CVS Tags: OPENBSD_2_8_BASE, OPENBSD_2_8
Changes since 1.8: +1 -7 lines
Diff to previous 1.8 (colored)

net.inet.ip.gif_ttl (and IPv6 counterpart) is never used.
enforce type checking on IN6_ARE_ADDR_EQUAL.

Revision 1.8 / (download) - annotate - [select for diffs], Mon Feb 7 06:18:44 2000 UTC (24 years, 4 months ago) by itojun
Branch: MAIN
CVS Tags: SMP_BASE, OPENBSD_2_7_BASE, OPENBSD_2_7
Branch point for: SMP
Changes since 1.7: +2 -2 lines
Diff to previous 1.7 (colored)

s/DIAGNOSTIC/DEBUG/

Revision 1.7 / (download) - annotate - [select for diffs], Fri Jan 21 03:15:04 2000 UTC (24 years, 4 months ago) by angelos
Branch: MAIN
Changes since 1.6: +8 -5 lines
Diff to previous 1.6 (colored)

Rename the ip4_* routines to ipip_*, make it so GIF tunnels are not
affected by net.inet.ipip.allow (the sysctl formerly known as
net.inet.ip4.allow), rename the VIF ipip_input to ipip_mroute_input.

Revision 1.6 / (download) - annotate - [select for diffs], Tue Jan 11 07:47:09 2000 UTC (24 years, 5 months ago) by angelos
Branch: MAIN
Changes since 1.5: +16 -17 lines
Diff to previous 1.5 (colored)

Mostly cosmetic changes, and avoid an m_pullup()

Revision 1.5 / (download) - annotate - [select for diffs], Fri Jan 7 00:57:54 2000 UTC (24 years, 5 months ago) by itojun
Branch: MAIN
Changes since 1.4: +3 -3 lines
Diff to previous 1.4 (colored)

s/memset/bzero/
From: Michael Shalayeff <mickey@lucifier.dial-up.user.akula.net>

Revision 1.4 / (download) - annotate - [select for diffs], Tue Dec 28 07:17:38 1999 UTC (24 years, 5 months ago) by itojun
Branch: MAIN
Changes since 1.3: +3 -4 lines
Diff to previous 1.3 (colored)

remove non-effective kame patch.  openbsd ip_input() passes
different thing to the upper-layers than other KAME/*BSD does
(additional NULL pointer and "0"), so live with that.

(sync with kame)

Revision 1.3 / (download) - annotate - [select for diffs], Tue Dec 21 09:00:50 1999 UTC (24 years, 5 months ago) by itojun
Branch: MAIN
Changes since 1.2: +68 -167 lines
Diff to previous 1.2 (colored)

reuse encapsulate/decapsulate routine in ip_ip4.c from gif interface
(outer=IPv4 case).  tested with (inner=IPv6, outer=IPv4) case.

BUG ALERT: in_gif_output() assumes about ipe4_output()'s behavior too much.
I mean, "tdb" is configured with certain knowledge about ipe4_output()'s
behavior.

Revision 1.2 / (download) - annotate - [select for diffs], Thu Dec 9 03:45:21 1999 UTC (24 years, 6 months ago) by angelos
Branch: MAIN
Changes since 1.1: +4 -28 lines
Diff to previous 1.1 (colored)

Minor cleanup

Revision 1.1 / (download) - annotate - [select for diffs], Wed Dec 8 06:50:19 1999 UTC (24 years, 6 months ago) by itojun
Branch: MAIN
CVS Tags: kame_19991208

bring in KAME IPv6 code, dated 19991208.
replaces NRL IPv6 layer.  reuses NRL pcb layer.  no IPsec-on-v6 support.
see sys/netinet6/{TODO,IMPLEMENTATION} for more details.

GENERIC configuration should work fine as before.  GENERIC.v6 works fine
as well, but you'll need KAME userland tools to play with IPv6 (will be
bringed into soon).

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.