Add CAP_FCNTL and use cap_fcntls_limit().

[tcpdump] / tcp.h

diff --git a/tcp.h b/tcp.h
index ac83714fe29e08c050eef8d09906bc5fbd204dc6..c18d1382511c53d0d1a662673807c0b659999bb0 100644 (file)
--- a/tcp.h
+++ b/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.
 /*
  * 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
  */
 
  *     @(#)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 {
 /*
  * 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 */
        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)
 
 
 #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_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)
 
 #define TCPOPT_TSTAMP_HDR      \
     (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)


@@ -93,10 +93,19 @@ struct tcphdr {
 #ifndef TELNET_PORT
 #define TELNET_PORT             23
 #endif
 #ifndef TELNET_PORT
 #define TELNET_PORT             23
 #endif

+#ifndef SMTP_PORT
+#define SMTP_PORT              25
+#endif

 #ifndef BGP_PORT
 #define BGP_PORT                179
 #endif
 #define NETBIOS_SSN_PORT        139
 #ifndef BGP_PORT
 #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
 #ifndef PPTP_PORT
 #define PPTP_PORT              1723
 #endif


@@ -105,7 +114,23 @@ struct tcphdr {
 #define NFS_PORT               2049
 #endif
 #define MSDP_PORT              639
 #define NFS_PORT               2049
 #endif
 #define MSDP_PORT              639

+#define RPKI_RTR_PORT          323

 #define LDP_PORT                646
 #ifndef SMB_PORT
 #define SMB_PORT                445
 #endif
 #define LDP_PORT                646
 #ifndef SMB_PORT
 #define SMB_PORT                445
 #endif

+#ifndef HTTP_PORT
+#define HTTP_PORT              80
+#endif
+#ifndef HTTP_PORT_ALT
+#define HTTP_PORT_ALT          8080
+#endif
+#ifndef RTSP_PORT
+#define RTSP_PORT              554
+#endif
+#ifndef RTSP_PORT_ALT
+#define RTSP_PORT_ALT          8554
+#endif
+#ifndef FTP_PORT
+#define FTP_PORT               21
+#endif