OpenBSD CVS

CVS log for src/usr.sbin/tcpdump/print-l2tp.c


[BACK] Up to [local] / src / usr.sbin / tcpdump

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.11 / (download) - annotate - [select for diffs], Wed Jan 5 05:46:18 2022 UTC (2 years, 5 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, HEAD
Changes since 1.10: +1 -5 lines
Diff to previous 1.10 (colored)

fix some more -Wunused-but-set-variable

Revision 1.10 / (download) - annotate - [select for diffs], Fri Jul 6 05:47:22 2018 UTC (5 years, 11 months ago) by dlg
Branch: MAIN
CVS Tags: 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, OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4
Changes since 1.9: +4 -4 lines
Diff to previous 1.9 (colored)

Rework UDP parsing, particularly around IP addresses.

This originally started as trying to put a consistent space between
the UDP header information and the payload parsing, but while doing
that I noticed inconsistent IPv4 vs IPv6 handling.

Apart from the default "srcip.srcport > dstip.dstpor" output, all
the other places that IP addresses were printed assumed IPv4. It
looks like it is possible that udp_print() can be called without
an IP header, which made these blind IPv4 prints turn into NULL
derefs.

This fixes the problem above by only having a single place that
prints the addresses out, and makes sure to get the difference
between IPv4, IPv6 and no IP correct.

This changes how the checksum is calculated. It incrementally builds
the UDP checksum by feeding the IPv4 and v6 addresses in separately,
then using common code for the rest of the pseudo header and actual
payload.

Lastly, this does make printing the space between the UDP header
and its payload consistent. The UDP code is now responsible for
adding a space after itself so the payload parsers don't have to.
They got it wrong in some cases anyway, so this should be a lot
more uniform.

help and ok sthen@

Revision 1.9 / (download) - annotate - [select for diffs], Sat Dec 5 05:56:26 2015 UTC (8 years, 6 months ago) by mmcc
Branch: MAIN
CVS Tags: OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2, OPENBSD_6_1_BASE, OPENBSD_6_1, OPENBSD_6_0_BASE, OPENBSD_6_0, OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.8: +2 -2 lines
Diff to previous 1.8 (colored)

strings.h -> string.h so that memcpy is declared.   ok deraadt

Revision 1.8 / (download) - annotate - [select for diffs], Fri Jan 16 06:40:21 2015 UTC (9 years, 4 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.7: +1 -2 lines
Diff to previous 1.7 (colored)

Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible.  Annotate <sys/param.h> lines with their current reasons.  Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc.  Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution.  These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)

Revision 1.7 / (download) - annotate - [select for diffs], Sun Sep 18 14:04:36 2011 UTC (12 years, 8 months ago) by naddy
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6, 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
Changes since 1.6: +2 -2 lines
Diff to previous 1.6 (colored)

extract 8 octets (as per RFC 2661) rather than a long; with jsing@

Revision 1.6 / (download) - annotate - [select for diffs], Mon Jul 25 18:39:35 2011 UTC (12 years, 10 months ago) by claudio
Branch: MAIN
CVS Tags: OPENBSD_5_0_BASE, OPENBSD_5_0
Changes since 1.5: +51 -25 lines
Diff to previous 1.5 (colored)

Be more careful when looking at l2tp traffic. Do more length checks and
make sure that no unaligned access to uint16_t values happen.
Tested and feedback by yasuoka@

Revision 1.5 / (download) - annotate - [select for diffs], Tue Oct 27 23:59:55 2009 UTC (14 years, 7 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_9_BASE, OPENBSD_4_9, OPENBSD_4_8_BASE, OPENBSD_4_8, OPENBSD_4_7_BASE, OPENBSD_4_7
Changes since 1.4: +1 -6 lines
Diff to previous 1.4 (colored)

rcsid[] and sccsid[] and copyright[] are essentially unmaintained (and
unmaintainable).  these days, people use source.  these id's do not provide
any benefit, and do hurt the small install media
(the 33,000 line diff is essentially mechanical)
ok with the idea millert, ok dms

Revision 1.4 / (download) - annotate - [select for diffs], Sun Jul 12 18:11:03 2009 UTC (14 years, 11 months ago) by jsg
Branch: MAIN
Changes since 1.3: +3 -3 lines
Diff to previous 1.3 (colored)

don't cast lvalue, no binary change.

Revision 1.3 / (download) - annotate - [select for diffs], Sun Oct 7 16:41:05 2007 UTC (16 years, 8 months ago) by deraadt
Branch: MAIN
CVS Tags: 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.2: +2 -2 lines
Diff to previous 1.2 (colored)

trash $Header goo which is just annoying; 5595

Revision 1.1.16.1 / (download) - annotate - [select for diffs], Wed Dec 24 00:30:08 2003 UTC (20 years, 5 months ago) by brad
Branch: OPENBSD_3_4
Changes since 1.1: +8 -6 lines
Diff to previous 1.1 (colored) next main 1.2 (colored)

MFC:
Fix by otto@

Fix unbounded recursion and an unsigned/signed mixup. Resolves PR 3610.

ok deraadt@

Revision 1.2 / (download) - annotate - [select for diffs], Mon Dec 22 22:22:24 2003 UTC (20 years, 5 months ago) by otto
Branch: MAIN
CVS Tags: 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
Changes since 1.1: +8 -6 lines
Diff to previous 1.1 (colored)

Fix unbounded recursion and an unsigned/signed mixup. Resolves PR 3610.

ok deraadt@ millert@

Revision 1.1 / (download) - annotate - [select for diffs], Sun Jan 16 10:54:58 2000 UTC (24 years, 4 months ago) by jakob
Branch: MAIN
CVS Tags: OPENBSD_3_4_BASE, OPENBSD_3_3_BASE, OPENBSD_3_3, OPENBSD_3_2_BASE, OPENBSD_3_2, OPENBSD_3_1_BASE, OPENBSD_3_1, OPENBSD_3_0_BASE, OPENBSD_3_0, OPENBSD_2_9_BASE, OPENBSD_2_9, OPENBSD_2_8_BASE, OPENBSD_2_8, OPENBSD_2_7_BASE, OPENBSD_2_7
Branch point for: OPENBSD_3_4

L2TP support (from KAME)

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.