X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/dc02d078e77c6072d849d4b8ba3fb5d977324f2a..2fd7b16acb63b86d7291abb4c68c27e24bc50a85:/print-tcp.c

diff --git a/print-tcp.c b/print-tcp.c
index d9ca4a34..4f91b762 100644
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -128,7 +128,7 @@ static const struct tok tcp_option_values[] = {
         { TCPOPT_TIMESTAMP, "TS" },
         { TCPOPT_CC, "cc" },
         { TCPOPT_CCNEW, "ccnew" },
-        { TCPOPT_CCECHO, "" },
+        { TCPOPT_CCECHO, "ccecho" },
         { TCPOPT_SIGNATURE, "md5" },
         { TCPOPT_SCPS, "scps" },
         { TCPOPT_UTO, "uto" },
@@ -746,7 +746,12 @@ tcp_print(netdissect_options *ndo,
                 return;
         }
 
-        if (IS_SRC_OR_DST_PORT(TELNET_PORT)) {
+        if (IS_SRC_OR_DST_PORT(FTP_PORT)) {
+                ND_PRINT(": ");
+                ftp_print(ndo, bp, length);
+        } else if (IS_SRC_OR_DST_PORT(SSH_PORT)) {
+                ssh_print(ndo, bp, length);
+        } else if (IS_SRC_OR_DST_PORT(TELNET_PORT)) {
                 telnet_print(ndo, bp, length);
         } else if (IS_SRC_OR_DST_PORT(SMTP_PORT)) {
                 ND_PRINT(": ");
@@ -754,42 +759,45 @@ tcp_print(netdissect_options *ndo,
         } else if (IS_SRC_OR_DST_PORT(WHOIS_PORT)) {
                 ND_PRINT(": ");
                 whois_print(ndo, bp, length);
-        } else if (IS_SRC_OR_DST_PORT(BGP_PORT))
-                bgp_print(ndo, bp, length);
-        else if (IS_SRC_OR_DST_PORT(PPTP_PORT))
-                pptp_print(ndo, bp);
-        else if (IS_SRC_OR_DST_PORT(REDIS_PORT))
-                resp_print(ndo, bp, length);
-        else if (IS_SRC_OR_DST_PORT(SSH_PORT))
-                ssh_print(ndo, bp, length);
+        } else if (IS_SRC_OR_DST_PORT(NAMESERVER_PORT)) {
+                /* over_tcp: TRUE, is_mdns: FALSE */
+                domain_print(ndo, bp, length, TRUE, FALSE);
+        } else if (IS_SRC_OR_DST_PORT(HTTP_PORT)) {
+                ND_PRINT(": ");
+                http_print(ndo, bp, length);
 #ifdef ENABLE_SMB
-        else if (IS_SRC_OR_DST_PORT(NETBIOS_SSN_PORT))
+        } else if (IS_SRC_OR_DST_PORT(NETBIOS_SSN_PORT)) {
                 nbt_tcp_print(ndo, bp, length);
-        else if (IS_SRC_OR_DST_PORT(SMB_PORT))
+#endif
+        } else if (IS_SRC_OR_DST_PORT(BGP_PORT)) {
+                bgp_print(ndo, bp, length);
+        } else if (IS_SRC_OR_DST_PORT(RPKI_RTR_PORT)) {
+                rpki_rtr_print(ndo, bp, length);
+#ifdef ENABLE_SMB
+        } else if (IS_SRC_OR_DST_PORT(SMB_PORT)) {
                 smb_tcp_print(ndo, bp, length);
 #endif
+        } else if (IS_SRC_OR_DST_PORT(RTSP_PORT)) {
+                ND_PRINT(": ");
+                rtsp_print(ndo, bp, length);
+        } else if (IS_SRC_OR_DST_PORT(MSDP_PORT)) {
+                msdp_print(ndo, bp, length);
+        } else if (IS_SRC_OR_DST_PORT(LDP_PORT)) {
+                ldp_print(ndo, bp, length);
+        } else if (IS_SRC_OR_DST_PORT(PPTP_PORT))
+                pptp_print(ndo, bp);
+        else if (IS_SRC_OR_DST_PORT(REDIS_PORT))
+                resp_print(ndo, bp, length);
         else if (IS_SRC_OR_DST_PORT(BEEP_PORT))
                 beep_print(ndo, bp, length);
-        else if (IS_SRC_OR_DST_PORT(OPENFLOW_PORT_OLD) || IS_SRC_OR_DST_PORT(OPENFLOW_PORT_IANA))
+        else if (IS_SRC_OR_DST_PORT(OPENFLOW_PORT_OLD) || IS_SRC_OR_DST_PORT(OPENFLOW_PORT_IANA)) {
                 openflow_print(ndo, bp, length);
-        else if (IS_SRC_OR_DST_PORT(FTP_PORT)) {
-                ND_PRINT(": ");
-                ftp_print(ndo, bp, length);
-        } else if (IS_SRC_OR_DST_PORT(HTTP_PORT) || IS_SRC_OR_DST_PORT(HTTP_PORT_ALT)) {
+        } else if (IS_SRC_OR_DST_PORT(HTTP_PORT_ALT)) {
                 ND_PRINT(": ");
                 http_print(ndo, bp, length);
-        } else if (IS_SRC_OR_DST_PORT(RTSP_PORT) || IS_SRC_OR_DST_PORT(RTSP_PORT_ALT)) {
+        } else if (IS_SRC_OR_DST_PORT(RTSP_PORT_ALT)) {
                 ND_PRINT(": ");
                 rtsp_print(ndo, bp, length);
-        } else if (IS_SRC_OR_DST_PORT(NAMESERVER_PORT)) {
-                /* over_tcp: TRUE, is_mdns: FALSE */
-                domain_print(ndo, bp, length, TRUE, FALSE);
-        } else if (IS_SRC_OR_DST_PORT(MSDP_PORT)) {
-                msdp_print(ndo, bp, length);
-        } else if (IS_SRC_OR_DST_PORT(RPKI_RTR_PORT)) {
-                rpki_rtr_print(ndo, bp, length);
-        } else if (IS_SRC_OR_DST_PORT(LDP_PORT)) {
-                ldp_print(ndo, bp, length);
         } else if ((IS_SRC_OR_DST_PORT(NFS_PORT)) &&
                  length >= 4) {
                 /*