Avoiding conditional directives that break statements

[tcpdump] / tcp.h

diff --git a/tcp.h b/tcp.h
index 2e58801625960ebb8154d3b78a40d74001fd741b..24739622aa16c7298b9b5b530970b5a6a592af7c 100644 (file)
--- a/tcp.h
+++ b/tcp.h
@@ -91,50 +91,66 @@ struct tcphdr {
 #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)
 

+#ifndef FTP_PORT
+#define FTP_PORT               21
+#endif
+#ifndef SSH_PORT
+#define SSH_PORT               22
+#endif

 #ifndef TELNET_PORT
 #ifndef TELNET_PORT

-#define TELNET_PORT             23
+#define TELNET_PORT            23

 #endif
 #ifndef SMTP_PORT
 #define SMTP_PORT              25
 #endif
 #ifndef NAMESERVER_PORT
 #endif
 #ifndef SMTP_PORT
 #define SMTP_PORT              25
 #endif
 #ifndef NAMESERVER_PORT

-#define NAMESERVER_PORT         53
+#define NAMESERVER_PORT                53
+#endif
+#ifndef HTTP_PORT
+#define HTTP_PORT              80
+#endif
+#ifndef NETBIOS_NS_PORT
+#define NETBIOS_NS_PORT                137     /* RFC 1001, RFC 1002 */
+#endif
+#ifndef NETBIOS_SSN_PORT
+#define NETBIOS_SSN_PORT       139     /* RFC 1001, RFC 1002 */

 #endif
 #ifndef BGP_PORT
 #endif
 #ifndef BGP_PORT

-#define BGP_PORT                179
+#define BGP_PORT               179

 #endif
 #endif

-#define NETBIOS_SSN_PORT        139
-#ifndef OPENFLOW_PORT_OLD
-#define OPENFLOW_PORT_OLD       6633
+#ifndef RPKI_RTR_PORT
+#define RPKI_RTR_PORT          323

 #endif
 #endif

-#ifndef OPENFLOW_PORT_IANA
-#define OPENFLOW_PORT_IANA      6653
+#ifndef SMB_PORT
+#define SMB_PORT               445
+#endif
+#ifndef RTSP_PORT
+#define RTSP_PORT              554
+#endif
+#ifndef MSDP_PORT
+#define MSDP_PORT              639
+#endif
+#ifndef LDP_PORT
+#define LDP_PORT               646

 #endif
 #ifndef PPTP_PORT
 #endif
 #ifndef PPTP_PORT

-#define PPTP_PORT              1723
+#define PPTP_PORT              1723

 #endif
 #endif

-#define BEEP_PORT               10288

 #ifndef NFS_PORT
 #ifndef NFS_PORT

-#define NFS_PORT               2049
+#define NFS_PORT               2049

 #endif
 #endif

-#define MSDP_PORT              639
-#define RPKI_RTR_PORT          323
-#define LDP_PORT                646
-#ifndef SMB_PORT
-#define SMB_PORT                445
+#ifndef OPENFLOW_PORT_OLD
+#define OPENFLOW_PORT_OLD      6633

 #endif
 #endif

-#ifndef HTTP_PORT
-#define HTTP_PORT              80
+#ifndef OPENFLOW_PORT_IANA
+#define OPENFLOW_PORT_IANA     6653

 #endif
 #ifndef HTTP_PORT_ALT
 #define HTTP_PORT_ALT          8080
 #endif
 #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 RTSP_PORT_ALT
 #define RTSP_PORT_ALT          8554
 #endif

-#ifndef FTP_PORT
-#define FTP_PORT               21
+#ifndef BEEP_PORT
+#define BEEP_PORT              10288

 #endif
 #endif