diff options
| author | delphij <delphij@FreeBSD.org> | 2015-01-07 19:55:18 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2015-01-07 19:55:18 +0000 |
| commit | f49c5d523af9076a4a59e8dd664f9a897108432e (patch) | |
| tree | e268839e08c106e178b33bd461d8d0a9c6fb5ad9 /contrib/tcpdump/tcp.h | |
| parent | c371846049d370ab78d943e60e789cdffe0aad3d (diff) | |
| parent | 08263d19579d35a7a65e0c8bcb768504ce76d04e (diff) | |
| download | FreeBSD-src-f49c5d523af9076a4a59e8dd664f9a897108432e.zip FreeBSD-src-f49c5d523af9076a4a59e8dd664f9a897108432e.tar.gz | |
MFV r276761: tcpdump 4.6.2.
MFC after: 1 month
Diffstat (limited to 'contrib/tcpdump/tcp.h')
| -rw-r--r-- | contrib/tcpdump/tcp.h | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/contrib/tcpdump/tcp.h b/contrib/tcpdump/tcp.h index 92d505a..3645486 100644 --- a/contrib/tcpdump/tcp.h +++ b/contrib/tcpdump/tcp.h @@ -1,4 +1,3 @@ -/* @(#) $Header: /tcpdump/master/tcpdump/tcp.h,v 1.14 2007-12-09 00:30:47 guy Exp $ (LBL) */ /* * Copyright (c) 1982, 1986, 1993 * The Regents of the University of California. All rights reserved. @@ -34,22 +33,22 @@ * @(#)tcp.h 8.1 (Berkeley) 6/10/93 */ -typedef u_int32_t tcp_seq; +typedef uint32_t tcp_seq; /* * TCP header. * Per RFC 793, September, 1981. */ struct tcphdr { - u_int16_t th_sport; /* source port */ - u_int16_t th_dport; /* destination port */ + uint16_t th_sport; /* source port */ + uint16_t th_dport; /* destination port */ tcp_seq th_seq; /* sequence number */ tcp_seq th_ack; /* acknowledgement number */ - u_int8_t th_offx2; /* data offset, rsvd */ - u_int8_t th_flags; - u_int16_t th_win; /* window */ - u_int16_t th_sum; /* checksum */ - u_int16_t th_urp; /* urgent pointer */ -}; + uint8_t th_offx2; /* data offset, rsvd */ + uint8_t th_flags; + uint16_t th_win; /* window */ + uint16_t th_sum; /* checksum */ + uint16_t th_urp; /* urgent pointer */ +} UNALIGNED; #define TH_OFF(th) (((th)->th_offx2 & 0xf0) >> 4) @@ -85,7 +84,8 @@ struct tcphdr { #define TCPOPT_AUTH 20 /* Enhanced AUTH option */ #define TCPOPT_UTO 28 /* tcp user timeout (rfc5482) */ #define TCPOLEN_UTO 4 - +#define TCPOPT_MPTCP 30 /* MPTCP options */ +#define TCPOPT_EXPERIMENT2 254 /* experimental headers (rfc4727) */ #define TCPOPT_TSTAMP_HDR \ (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP) @@ -97,6 +97,12 @@ struct tcphdr { #define BGP_PORT 179 #endif #define NETBIOS_SSN_PORT 139 +#ifndef OPENFLOW_PORT_OLD +#define OPENFLOW_PORT_OLD 6633 +#endif +#ifndef OPENFLOW_PORT_IANA +#define OPENFLOW_PORT_IANA 6653 +#endif #ifndef PPTP_PORT #define PPTP_PORT 1723 #endif |
