IP packet information printing from NFLOG packet

[tcpdump] / print-tcp.c

diff --git a/print-tcp.c b/print-tcp.c
index 24025e5958c705c3503a80b3c391111da5a45738..032001d1564c88cac98746b47dd39228e882409f 100644 (file)
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -122,6 +122,7 @@ struct tok tcp_option_values[] = {
         { TCPOPT_SIGNATURE, "md5" },
         { TCPOPT_AUTH, "enhanced auth" },
         { TCPOPT_UTO, "uto" },
+        { TCPOPT_MPTCP, "mptcp" },
         { 0, NULL }
 };
 
@@ -129,30 +130,8 @@ static int tcp_cksum(register const struct ip *ip,
                     register const struct tcphdr *tp,
                     register u_int len)
 {
-        struct phdr {
-                u_int32_t src;
-                u_int32_t dst;
-                u_char mbz;
-                u_char proto;
-                u_int16_t len;
-        } ph;
-        struct cksum_vec vec[2];
-
-        /* pseudo-header.. */
-        ph.len = htons((u_int16_t)len);
-        ph.mbz = 0;
-        ph.proto = IPPROTO_TCP;
-        memcpy(&ph.src, &ip->ip_src.s_addr, sizeof(u_int32_t));
-        if (IP_HL(ip) == 5)
-                memcpy(&ph.dst, &ip->ip_dst.s_addr, sizeof(u_int32_t));
-        else
-                ph.dst = ip_finddst(ip);
-
-        vec[0].ptr = (const u_int8_t *)(void *)&ph;
-        vec[0].len = sizeof(ph);
-        vec[1].ptr = (const u_int8_t *)tp;
-        vec[1].len = len;
-        return in_cksum(vec, 2);
+       return (nextproto4_cksum(ip, (const u_int8_t *)tp, len,
+           IPPROTO_TCP));
 }
 
 void
@@ -432,7 +411,7 @@ tcp_print(register const u_char *bp, register u_int length,
 #ifdef INET6
                 else if (IP_V(ip) == 6 && ip6->ip6_plen) {
                         if (TTEST2(tp->th_sport, length)) {
-                                sum = nextproto6_cksum(ip6, (u_short *)tp, length, IPPROTO_TCP);
+                                sum = nextproto6_cksum(ip6, (const u_int8_t *)tp, length, IPPROTO_TCP);
                                 tcp_sum = EXTRACT_16BITS(&tp->th_sum);
 
                                 (void)printf(", cksum 0x%04x", tcp_sum);
@@ -618,6 +597,13 @@ tcp_print(register const u_char *bp, register u_int length,
                                 (void)printf(" %u", utoval);
                                 break;
 
+                        case TCPOPT_MPTCP:
+                                datalen = len - 2;
+                                LENCHECK(datalen);
+                                if (!mptcp_print(cp-2, len, flags))
+                                        goto bad;
+                                break;
+
                         default:
                                 datalen = len - 2;
                                 for (i = 0; i < datalen; ++i) {
@@ -661,6 +647,15 @@ tcp_print(register const u_char *bp, register u_int length,
                 return;
         } 
 
+        if (packettype) {
+                switch (packettype) {
+                case PT_ZMTP1:
+                        zmtp1_print(bp, length);
+                        break;
+                }
+                return;
+        }
+
         if (sport == TELNET_PORT || dport == TELNET_PORT) {
                 if (!qflag && vflag)
                         telnet_print(bp, length);
@@ -676,6 +671,8 @@ tcp_print(register const u_char *bp, register u_int length,
 #endif
         else if (sport == BEEP_PORT || dport == BEEP_PORT)
                 beep_print(bp, length);
+        else if (sport == OPENFLOW_PORT || dport == OPENFLOW_PORT)
+                openflow_print(bp, length);
         else if (length > 2 &&
                  (sport == NAMESERVER_PORT || dport == NAMESERVER_PORT ||
                   sport == MULTICASTDNS_PORT || dport == MULTICASTDNS_PORT)) {