forked from the-tcpdump-group/tcpdump
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Pull the "linux-include" versions of "slip.h" and "slcompress.h" up to
the top-level directory, remove from them all stuff not needed by tcpdump, include them rather than the system's header files, and get rid of assorted unnecessary include files. This means you don't need to check for "slip.h" when building "print-sl.c", stubbing it out on systems that don't have "slip.h". We also don't need to build the stuff in "print-vjc.c" only on BSD/OS. Use "u_int32_t" and "u_int16_t" rather than "u_int" and "u_short" for structure members in "print-chdlc.c". Move PPP_HDRLEN from "print-ppp.c" to "ppp.h", as per the XXX comment in "print-ppp.c".
- Loading branch information
Showing
8 changed files
with
143 additions
and
101 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -160,6 +160,8 @@ savestr.h | |
| send-ack.awk | ||
| setsignal.c | ||
| setsignal.h | ||
| slip.h | ||
| slcompress.h | ||
| smb.h | ||
| smbutil.c | ||
| stime.awk | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| /* | ||
| * Definitions for tcp compression routines. | ||
| * | ||
| * @(#) $Header: /tcpdump/master/tcpdump/slcompress.h,v 1.1 2000-10-09 01:53:21 guy Exp $ (LBL) | ||
| * | ||
| * Copyright (c) 1989, 1990, 1992, 1993 Regents of the University of | ||
| * California. All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms are permitted | ||
| * provided that the above copyright notice and this paragraph are | ||
| * duplicated in all such forms and that any documentation, | ||
| * advertising materials, and other materials related to such | ||
| * distribution and use acknowledge that the software was developed | ||
| * by the University of California, Berkeley. The name of the | ||
| * University may not be used to endorse or promote products derived | ||
| * from this software without specific prior written permission. | ||
| * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR | ||
| * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED | ||
| * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. | ||
| * | ||
| * Van Jacobson (van@ee.lbl.gov), Dec 31, 1989: | ||
| * - Initial distribution. | ||
| */ | ||
|
|
||
| #define MAX_STATES 16 /* must be > 2 and < 256 */ | ||
| #define MAX_HDR MLEN /* XXX 4bsd-ism: should really be 128 */ | ||
|
|
||
| /* | ||
| * Compressed packet format: | ||
| * | ||
| * The first octet contains the packet type (top 3 bits), TCP | ||
| * 'push' bit, and flags that indicate which of the 4 TCP sequence | ||
| * numbers have changed (bottom 5 bits). The next octet is a | ||
| * conversation number that associates a saved IP/TCP header with | ||
| * the compressed packet. The next two octets are the TCP checksum | ||
| * from the original datagram. The next 0 to 15 octets are | ||
| * sequence number changes, one change per bit set in the header | ||
| * (there may be no changes and there are two special cases where | ||
| * the receiver implicitly knows what changed -- see below). | ||
| * | ||
| * There are 5 numbers which can change (they are always inserted | ||
| * in the following order): TCP urgent pointer, window, | ||
| * acknowlegement, sequence number and IP ID. (The urgent pointer | ||
| * is different from the others in that its value is sent, not the | ||
| * change in value.) Since typical use of SLIP links is biased | ||
| * toward small packets (see comments on MTU/MSS below), changes | ||
| * use a variable length coding with one octet for numbers in the | ||
| * range 1 - 255 and 3 octets (0, MSB, LSB) for numbers in the | ||
| * range 256 - 65535 or 0. (If the change in sequence number or | ||
| * ack is more than 65535, an uncompressed packet is sent.) | ||
| */ | ||
|
|
||
| /* | ||
| * Packet types (must not conflict with IP protocol version) | ||
| * | ||
| * The top nibble of the first octet is the packet type. There are | ||
| * three possible types: IP (not proto TCP or tcp with one of the | ||
| * control flags set); uncompressed TCP (a normal IP/TCP packet but | ||
| * with the 8-bit protocol field replaced by an 8-bit connection id -- | ||
| * this type of packet syncs the sender & receiver); and compressed | ||
| * TCP (described above). | ||
| * | ||
| * LSB of 4-bit field is TCP "PUSH" bit (a worthless anachronism) and | ||
| * is logically part of the 4-bit "changes" field that follows. Top | ||
| * three bits are actual packet type. For backward compatibility | ||
| * and in the interest of conserving bits, numbers are chosen so the | ||
| * IP protocol version number (4) which normally appears in this nibble | ||
| * means "IP packet". | ||
| */ | ||
|
|
||
| /* packet types */ | ||
| #define TYPE_IP 0x40 | ||
| #define TYPE_UNCOMPRESSED_TCP 0x70 | ||
| #define TYPE_COMPRESSED_TCP 0x80 | ||
| #define TYPE_ERROR 0x00 | ||
|
|
||
| /* Bits in first octet of compressed packet */ | ||
| #define NEW_C 0x40 /* flag bits for what changed in a packet */ | ||
| #define NEW_I 0x20 | ||
| #define NEW_S 0x08 | ||
| #define NEW_A 0x04 | ||
| #define NEW_W 0x02 | ||
| #define NEW_U 0x01 | ||
|
|
||
| /* reserved, special-case values of above */ | ||
| #define SPECIAL_I (NEW_S|NEW_W|NEW_U) /* echoed interactive traffic */ | ||
| #define SPECIAL_D (NEW_S|NEW_A|NEW_W|NEW_U) /* unidirectional data */ | ||
| #define SPECIALS_MASK (NEW_S|NEW_A|NEW_W|NEW_U) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* | ||
| * Definitions that user level programs might need to know to interact | ||
| * with serial line IP (slip) lines. | ||
| * | ||
| * @(#) $Header: /tcpdump/master/tcpdump/slip.h,v 1.1 2000-10-09 01:53:21 guy Exp $ | ||
| * | ||
| * Copyright (c) 1990 Regents of the University of California. | ||
| * All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms are permitted | ||
| * provided that the above copyright notice and this paragraph are | ||
| * duplicated in all such forms and that any documentation, | ||
| * advertising materials, and other materials related to such | ||
| * distribution and use acknowledge that the software was developed | ||
| * by the University of California, Berkeley. The name of the | ||
| * University may not be used to endorse or promote products derived | ||
| * from this software without specific prior written permission. | ||
| * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR | ||
| * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED | ||
| * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. | ||
| */ | ||
|
|
||
| /* | ||
| * definitions of the pseudo- link-level header attached to slip | ||
| * packets grabbed by the packet filter (bpf) traffic monitor. | ||
| */ | ||
| #define SLIP_HDRLEN 16 | ||
|
|
||
| #define SLX_DIR 0 | ||
| #define SLX_CHDR 1 | ||
| #define CHDR_LEN 15 | ||
|
|
||
| #define SLIPDIR_IN 0 | ||
| #define SLIPDIR_OUT 1 |