OpenBSD CVS

CVS log for src/sys/netinet/ip_ether.h


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

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.30 / (download) - annotate - [select for diffs], Fri Oct 4 05:00:49 2019 UTC (4 years, 8 months ago) by dlg
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1, OPENBSD_7_0_BASE, OPENBSD_7_0, OPENBSD_6_9_BASE, OPENBSD_6_9, OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7, OPENBSD_6_6_BASE, OPENBSD_6_6, HEAD
Changes since 1.29: +1 -3 lines
Diff to previous 1.29 (colored)

gif shouldn't include netinet/ip_ether.h, cos gif doesnt do etherip.

ip_ether.h is where netinet/ip_ipip.h got the forward declaration
for struct tdb from though, so fix that before cutting ip_ether.h
out of gif.

Revision 1.29 / (download) - annotate - [select for diffs], Fri Oct 4 04:52:40 2019 UTC (4 years, 8 months ago) by dlg
Branch: MAIN
Changes since 1.28: +1 -6 lines
Diff to previous 1.28 (colored)

get rid of prototypes for mplsip_input and mplsip_output. they don't exist.

Revision 1.28 / (download) - annotate - [select for diffs], Fri Nov 17 18:21:33 2017 UTC (6 years, 6 months ago) by jca
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4, OPENBSD_6_3_BASE, OPENBSD_6_3
Changes since 1.27: +4 -2 lines
Diff to previous 1.27 (colored)

Add ifdef MPLS around all the MPLS-in-IP code

ok visa@ mpi@

Revision 1.27 / (download) - annotate - [select for diffs], Fri Nov 17 18:20:49 2017 UTC (6 years, 6 months ago) by jca
Branch: MAIN
Changes since 1.26: +3 -3 lines
Diff to previous 1.26 (colored)

Rename functions that now handle only MPLS-in-IP

ok visa@ mpi@

Revision 1.26 / (download) - annotate - [select for diffs], Fri Nov 17 14:52:51 2017 UTC (6 years, 6 months ago) by jca
Branch: MAIN
Changes since 1.25: +1 -3 lines
Diff to previous 1.25 (colored)

Move etherip_allow where it is used

While here, drop the declaration in headers, since the variable is used
in a single file.  ok visa@ mpi@

Revision 1.25 / (download) - annotate - [select for diffs], Fri Nov 17 13:36:04 2017 UTC (6 years, 6 months ago) by jca
Branch: MAIN
Changes since 1.24: +1 -2 lines
Diff to previous 1.24 (colored)

Move etherip counters and their allocation to etherip(4)

gif(4) now depends on etherip(4) but this is a temporary drawback: we
can get rid of etherip_init(), called from the protocol switch, and
ip_ether.c should stop using etherip counters once it is clear that this
file doesn't handle ethernet-in-IP any more.

ok visa@ as part of a larger diff, ok mpi@

Revision 1.24 / (download) - annotate - [select for diffs], Wed Nov 15 17:30:20 2017 UTC (6 years, 6 months ago) by jca
Branch: MAIN
Changes since 1.23: +1 -3 lines
Diff to previous 1.23 (colored)

etherip(4) now handles etherip sysctls, move/remove code accordingly.

ok visa@ as part of a larger diff, ok mpi@

Revision 1.23 / (download) - annotate - [select for diffs], Fri Nov 10 02:37:14 2017 UTC (6 years, 7 months ago) by visa
Branch: MAIN
Changes since 1.22: +42 -2 lines
Diff to previous 1.22 (colored)

Use percpu counters with etheripstat.

Input and OK jca@, OK florian@

Revision 1.22 / (download) - annotate - [select for diffs], Fri Apr 14 20:46:31 2017 UTC (7 years, 1 month ago) by bluhm
Branch: MAIN
CVS Tags: OPENBSD_6_2_BASE, OPENBSD_6_2
Changes since 1.21: +2 -2 lines
Diff to previous 1.21 (colored)

Pass down the address family through the pr_input calls.  This
allows to simplify code used for both IPv4 and IPv6.
OK mikeb@ deraadt@

Revision 1.21 / (download) - annotate - [select for diffs], Tue Mar 7 23:35:06 2017 UTC (7 years, 3 months ago) by jca
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE, OPENBSD_6_1
Changes since 1.20: +10 -10 lines
Diff to previous 1.20 (colored)

Rename struct etheripstat members for consistency, move them all to 64bits

Will make transition to percpu counters easier.  ok bluhm@

Revision 1.20 / (download) - annotate - [select for diffs], Sun Jan 29 19:58:47 2017 UTC (7 years, 4 months ago) by bluhm
Branch: MAIN
Changes since 1.19: +2 -5 lines
Diff to previous 1.19 (colored)

Change the IPv4 pr_input function to the way IPv6 is implemented,
to get rid of struct ip6protosw and some wrapper functions.  It is
more consistent to have less different structures.  The divert_input
functions cannot be called anyway, so remove them.
OK visa@ mpi@

Revision 1.19 / (download) - annotate - [select for diffs], Wed Jan 25 17:34:31 2017 UTC (7 years, 4 months ago) by bluhm
Branch: MAIN
Changes since 1.18: +2 -2 lines
Diff to previous 1.18 (colored)

Since raw_input() and route_input() are gone from pr_input, we can
make the variable parameters of the protocol input functions fixed.
Also add the proto to make it similar to IPv6.
OK mpi@ guenther@ millert@

Revision 1.18 / (download) - annotate - [select for diffs], Mon Jul 14 12:18:30 2014 UTC (9 years, 11 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE, OPENBSD_6_0, OPENBSD_5_9_BASE, OPENBSD_5_9, OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7, OPENBSD_5_6_BASE, OPENBSD_5_6
Changes since 1.17: +3 -3 lines
Diff to previous 1.17 (colored)

In the next step, stop accepting the nibble-swapped protocol for 5.6.
This completes the transition.  A cvs log and diff will tell the story
of why we went through this.
with david.dahlberg@fkie.fraunhofer.de and claudio

Revision 1.17 / (download) - annotate - [select for diffs], Mon Jan 14 23:06:10 2013 UTC (11 years, 4 months ago) by deraadt
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
Changes since 1.16: +11 -6 lines
Diff to previous 1.16 (colored)

after OpenBSD requested a etherip rev 3 to solve a byte order weakness, and
worked with them to define a specific format, ietf quietly changed their
mind and did something different.
First step of transitioning over two release -- accept both types, but
continue sending old format.
pointed out by david.dahlberg@fkie.fraunhofer.de
ok claudio

Revision 1.16 / (download) - annotate - [select for diffs], Sat May 12 12:58:16 2012 UTC (12 years, 1 month ago) by mpf
Branch: MAIN
CVS Tags: OPENBSD_5_2_BASE, OPENBSD_5_2
Changes since 1.15: +3 -1 lines
Diff to previous 1.15 (colored)

Fix tcpdump for etherip packets.
bpf_mtap() needs to be called without the etherip_header.
Idea to use a forward declaration for struct tdb by claudio.
OK claudio@

Revision 1.15 / (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_5_1_BASE, OPENBSD_5_1, OPENBSD_5_0_BASE, OPENBSD_5_0, OPENBSD_4_9_BASE, OPENBSD_4_9, OPENBSD_4_8_BASE, OPENBSD_4_8
Changes since 1.14: +6 -1 lines
Diff to previous 1.14 (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.14 / (download) - annotate - [select for diffs], Fri Dec 14 18:33:41 2007 UTC (16 years, 6 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE, OPENBSD_4_7, OPENBSD_4_6_BASE, OPENBSD_4_6, OPENBSD_4_5_BASE, OPENBSD_4_5, OPENBSD_4_4_BASE, OPENBSD_4_4, OPENBSD_4_3_BASE, OPENBSD_4_3
Changes since 1.13: +4 -2 lines
Diff to previous 1.13 (colored)

add sysctl entry points into various network layers, in particular to
provide netstat(1) with data it needs;  ok claudio reyk

Revision 1.3.2.4 / (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.3.2.3: +3 -3 lines
Diff to previous 1.3.2.3 (colored) to branchpoint 1.3 (colored) next main 1.4 (colored)

Sync the SMP branch with 3.3

Revision 1.11.4.2 / (download) - annotate - [select for diffs], Tue Oct 29 00:36:47 2002 UTC (21 years, 7 months ago) by art
Branch: UBC
Changes since 1.11.4.1: +4 -4 lines
Diff to previous 1.11.4.1 (colored) to branchpoint 1.11 (colored) next main 1.12 (colored)

sync to -current

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

Sync UBC branch to -current

Revision 1.13 / (download) - annotate - [select for diffs], Sun Jun 9 16:26:10 2002 UTC (22 years ago) by itojun
Branch: MAIN
CVS Tags: UBC_SYNC_B, UBC_SYNC_A, SMP_SYNC_B, SMP_SYNC_A, OPENBSD_4_2_BASE, OPENBSD_4_2, OPENBSD_4_1_BASE, OPENBSD_4_1, OPENBSD_4_0_BASE, OPENBSD_4_0, OPENBSD_3_9_BASE, OPENBSD_3_9, 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, OPENBSD_3_4_BASE, OPENBSD_3_4, OPENBSD_3_3_BASE, OPENBSD_3_3, OPENBSD_3_2_BASE, OPENBSD_3_2
Changes since 1.12: +4 -4 lines
Diff to previous 1.12 (colored)

whitespace

Revision 1.3.2.3 / (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.3.2.2: +1 -1 lines
Diff to previous 1.3.2.2 (colored) to branchpoint 1.3 (colored)

Merge in -current from roughly a week ago

Revision 1.12 / (download) - annotate - [select for diffs], Thu Mar 14 01:27:11 2002 UTC (22 years, 3 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_1_BASE, OPENBSD_3_1
Changes since 1.11: +2 -2 lines
Diff to previous 1.11 (colored)

First round of __P removal in sys

Revision 1.3.2.2 / (download) - annotate - [select for diffs], Wed Jul 4 10:54:43 2001 UTC (22 years, 11 months ago) by niklas
Branch: SMP
Changes since 1.3.2.1: +8 -5 lines
Diff to previous 1.3.2.1 (colored) to branchpoint 1.3 (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.11 / (download) - annotate - [select for diffs], Mon Jun 25 05:11:58 2001 UTC (22 years, 11 months ago) by angelos
Branch: MAIN
CVS Tags: UBC_BASE, OPENBSD_3_0_BASE, OPENBSD_3_0
Branch point for: UBC
Changes since 1.10: +3 -4 lines
Diff to previous 1.10 (colored)

Copyright.

Revision 1.10 / (download) - annotate - [select for diffs], Sat Jun 9 07:03:42 2001 UTC (23 years ago) by angelos
Branch: MAIN
Changes since 1.9: +6 -2 lines
Diff to previous 1.9 (colored)

Inclusion protection.

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

merge in approximately 2.9 into SMP branch

Revision 1.9 / (download) - annotate - [select for diffs], Sat Feb 3 21:38:39 2001 UTC (23 years, 4 months ago) by jason
Branch: MAIN
CVS Tags: OPENBSD_2_9_BASE, OPENBSD_2_9
Changes since 1.8: +4 -3 lines
Diff to previous 1.8 (colored)

- define and use EtherIP version 3 (2 byte padded header instead of the
single byte header used in V2), and drop support for V2.
- that done, remove some of the buffer copies that were used as alignment shims

Revision 1.8 / (download) - annotate - [select for diffs], Sat Feb 3 19:45:04 2001 UTC (23 years, 4 months ago) by jason
Branch: MAIN
Changes since 1.7: +11 -12 lines
Diff to previous 1.7 (colored)

KNF

Revision 1.7 / (download) - annotate - [select for diffs], Fri Feb 2 08:28:21 2001 UTC (23 years, 4 months ago) by jason
Branch: MAIN
Changes since 1.6: +7 -3 lines
Diff to previous 1.6 (colored)

a quick checkpoint:
- add a struct etherip_header (will make switching protocol versions a bit easier and give a base for aligning things correctly)
- fix the version/reserved field checking for good this time
- don't need to m_copydata to grab the first byte of an mbuf that you know has t
hat byte
- m_adj() instead of homebrew
- fix M_MCAST/M_BCAST setting (cut/pasto)
- if_imcasts was being updated on the wrong interface

Revision 1.6 / (download) - annotate - [select for diffs], Thu Feb 1 20:19:24 2001 UTC (23 years, 4 months ago) by jason
Branch: MAIN
Changes since 1.5: +2 -1 lines
Diff to previous 1.5 (colored)

grr, don't forget to change the reserved field to the upper 4 bits of the header.

Revision 1.5 / (download) - annotate - [select for diffs], Thu Feb 1 20:14:27 2001 UTC (23 years, 4 months ago) by jason
Branch: MAIN
Changes since 1.4: +3 -2 lines
Diff to previous 1.4 (colored)

according to the draft-housley-etherip-01, the version is in the low order
4 bits of the header

Revision 1.4 / (download) - annotate - [select for diffs], Tue Jan 9 02:47:19 2001 UTC (23 years, 5 months ago) by angelos
Branch: MAIN
Changes since 1.3: +3 -1 lines
Diff to previous 1.3 (colored)

Define version number for EtherIP protocol (soon to become RFC).

Revision 1.3 / (download) - annotate - [select for diffs], Fri Jan 21 03:40:31 2000 UTC (24 years, 4 months ago) by angelos
Branch: MAIN
CVS Tags: SMP_BASE, OPENBSD_2_8_BASE, OPENBSD_2_8, OPENBSD_2_7_BASE, OPENBSD_2_7
Branch point for: SMP
Changes since 1.2: +2 -2 lines
Diff to previous 1.2 (colored)

Fix comment.

Revision 1.2 / (download) - annotate - [select for diffs], Fri Oct 29 02:00:23 1999 UTC (24 years, 7 months ago) by angelos
Branch: MAIN
CVS Tags: kame_19991208
Changes since 1.1: +8 -7 lines
Diff to previous 1.1 (colored)

Queue on the bridge interface.

Revision 1.1 / (download) - annotate - [select for diffs], Thu Oct 28 03:08:34 1999 UTC (24 years, 7 months ago) by angelos
Branch: MAIN

Add Ethernet-IP encapsulation handling.

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.