Translate UDP/1700 as RADIUS

[tcpdump] / print-udp.c

diff --git a/print-udp.c b/print-udp.c
index 605cd3c7ca8e01f8005bb2cf8f5c5d93f89791c2..37679eb169454e7b814a19dd47e55e9ee55a874e 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -19,14 +19,13 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 

-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.h"
 #include "extract.h"
 #include "appletalk.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "appletalk.h"


@@ -34,14 +33,11 @@
 #include "udp.h"
 
 #include "ip.h"
 #include "udp.h"
 
 #include "ip.h"

-#ifdef INET6

 #include "ip6.h"
 #include "ip6.h"

-#endif

 #include "ipproto.h"
 #include "rpc_auth.h"
 #include "rpc_msg.h"
 
 #include "ipproto.h"
 #include "rpc_auth.h"
 #include "rpc_msg.h"
 

-#include "nameser.h"

 #include "nfs.h"
 
 struct rtcphdr {
 #include "nfs.h"
 
 struct rtcphdr {


@@ -97,7 +93,7 @@ static void
 vat_print(netdissect_options *ndo, const void *hdr, register const struct udphdr *up)
 {
        /* vat/vt audio */
 vat_print(netdissect_options *ndo, const void *hdr, register const struct udphdr *up)
 {
        /* vat/vt audio */

-       u_int ts = *(uint16_t *)hdr;
+       u_int ts = EXTRACT_16BITS(hdr);

        if ((ts & 0xf060) != 0) {
                /* probably vt */
                ND_PRINT((ndo, "udp/vt %u %d / %d",
        if ((ts & 0xf060) != 0) {
                /* probably vt */
                ND_PRINT((ndo, "udp/vt %u %d / %d",


@@ -105,8 +101,8 @@ vat_print(netdissect_options *ndo, const void *hdr, register const struct udphdr
                             ts & 0x3ff, ts >> 10));
        } else {
                /* probably vat */
                             ts & 0x3ff, ts >> 10));
        } else {
                /* probably vat */

-               uint32_t i0 = EXTRACT_32BITS(&((u_int *)hdr)[0]);
-               uint32_t i1 = EXTRACT_32BITS(&((u_int *)hdr)[1]);
+               uint32_t i0 = EXTRACT_32BITS(&((const u_int *)hdr)[0]);
+               uint32_t i1 = EXTRACT_32BITS(&((const u_int *)hdr)[1]);

                ND_PRINT((ndo, "udp/vat %u c%d %u%s",
                        (uint32_t)(EXTRACT_16BITS(&up->uh_ulen) - sizeof(*up) - 8),
                        i0 & 0xffff,
                ND_PRINT((ndo, "udp/vat %u c%d %u%s",
                        (uint32_t)(EXTRACT_16BITS(&up->uh_ulen) - sizeof(*up) - 8),
                        i0 & 0xffff,


@@ -124,10 +120,10 @@ rtp_print(netdissect_options *ndo, const void *hdr, u_int len,
           register const struct udphdr *up)
 {
        /* rtp v1 or v2 */
           register const struct udphdr *up)
 {
        /* rtp v1 or v2 */

-       u_int *ip = (u_int *)hdr;
+       const u_int *ip = (const u_int *)hdr;

        u_int hasopt, hasext, contype, hasmarker;
        u_int hasopt, hasext, contype, hasmarker;

-       uint32_t i0 = EXTRACT_32BITS(&((u_int *)hdr)[0]);
-       uint32_t i1 = EXTRACT_32BITS(&((u_int *)hdr)[1]);
+       uint32_t i0 = EXTRACT_32BITS(&((const u_int *)hdr)[0]);
+       uint32_t i1 = EXTRACT_32BITS(&((const u_int *)hdr)[1]);

        u_int dlen = EXTRACT_16BITS(&up->uh_ulen) - sizeof(*up) - 8;
        const char * ptype;
 
        u_int dlen = EXTRACT_16BITS(&up->uh_ulen) - sizeof(*up) - 8;
        const char * ptype;
 


@@ -161,7 +157,7 @@ rtp_print(netdissect_options *ndo, const void *hdr, u_int len,
                i0 & 0xffff,
                i1));
        if (ndo->ndo_vflag) {
                i0 & 0xffff,
                i1));
        if (ndo->ndo_vflag) {

-               ND_PRINT((ndo, " %u", EXTRACT_32BITS(&((u_int *)hdr)[2])));
+               ND_PRINT((ndo, " %u", EXTRACT_32BITS(&((const u_int *)hdr)[2])));

                if (hasopt) {
                        u_int i2, optlen;
                        do {
                if (hasopt) {
                        u_int i2, optlen;
                        do {


@@ -194,14 +190,14 @@ static const u_char *
 rtcp_print(netdissect_options *ndo, const u_char *hdr, const u_char *ep)
 {
        /* rtp v2 control (rtcp) */
 rtcp_print(netdissect_options *ndo, const u_char *hdr, const u_char *ep)
 {
        /* rtp v2 control (rtcp) */

-       struct rtcp_rr *rr = 0;
-       struct rtcp_sr *sr;
-       struct rtcphdr *rh = (struct rtcphdr *)hdr;
+       const struct rtcp_rr *rr = 0;
+       const struct rtcp_sr *sr;
+       const struct rtcphdr *rh = (const struct rtcphdr *)hdr;

        u_int len;
        uint16_t flags;
        int cnt;
        double ts, dts;
        u_int len;
        uint16_t flags;
        int cnt;
        double ts, dts;

-       if ((u_char *)(rh + 1) > ep) {
+       if ((const u_char *)(rh + 1) > ep) {

                ND_PRINT((ndo, " [|rtcp]"));
                return (ep);
        }
                ND_PRINT((ndo, " [|rtcp]"));
                return (ep);
        }


@@ -210,13 +206,13 @@ rtcp_print(netdissect_options *ndo, const u_char *hdr, const u_char *ep)
        cnt = (flags >> 8) & 0x1f;
        switch (flags & 0xff) {
        case RTCP_PT_SR:
        cnt = (flags >> 8) & 0x1f;
        switch (flags & 0xff) {
        case RTCP_PT_SR:

-               sr = (struct rtcp_sr *)(rh + 1);
+               sr = (const struct rtcp_sr *)(rh + 1);

                ND_PRINT((ndo, " sr"));
                if (len != cnt * sizeof(*rr) + sizeof(*sr) + sizeof(*rh))
                        ND_PRINT((ndo, " [%d]", len));
                if (ndo->ndo_vflag)
                        ND_PRINT((ndo, " %u", EXTRACT_32BITS(&rh->rh_ssrc)));
                ND_PRINT((ndo, " sr"));
                if (len != cnt * sizeof(*rr) + sizeof(*sr) + sizeof(*rh))
                        ND_PRINT((ndo, " [%d]", len));
                if (ndo->ndo_vflag)
                        ND_PRINT((ndo, " %u", EXTRACT_32BITS(&rh->rh_ssrc)));

-               if ((u_char *)(sr + 1) > ep) {
+               if ((const u_char *)(sr + 1) > ep) {

                        ND_PRINT((ndo, " [|rtcp]"));
                        return (ep);
                }
                        ND_PRINT((ndo, " [|rtcp]"));
                        return (ep);
                }


@@ -225,13 +221,13 @@ rtcp_print(netdissect_options *ndo, const u_char *hdr, const u_char *ep)
                    4294967296.0);
                ND_PRINT((ndo, " @%.2f %u %up %ub", ts, EXTRACT_32BITS(&sr->sr_ts),
                    EXTRACT_32BITS(&sr->sr_np), EXTRACT_32BITS(&sr->sr_nb)));
                    4294967296.0);
                ND_PRINT((ndo, " @%.2f %u %up %ub", ts, EXTRACT_32BITS(&sr->sr_ts),
                    EXTRACT_32BITS(&sr->sr_np), EXTRACT_32BITS(&sr->sr_nb)));

-               rr = (struct rtcp_rr *)(sr + 1);
+               rr = (const struct rtcp_rr *)(sr + 1);

                break;
        case RTCP_PT_RR:
                ND_PRINT((ndo, " rr"));
                if (len != cnt * sizeof(*rr) + sizeof(*rh))
                        ND_PRINT((ndo, " [%d]", len));
                break;
        case RTCP_PT_RR:
                ND_PRINT((ndo, " rr"));
                if (len != cnt * sizeof(*rr) + sizeof(*rh))
                        ND_PRINT((ndo, " [%d]", len));

-               rr = (struct rtcp_rr *)(rh + 1);
+               rr = (const struct rtcp_rr *)(rh + 1);

                if (ndo->ndo_vflag)
                        ND_PRINT((ndo, " %u", EXTRACT_32BITS(&rh->rh_ssrc)));
                break;
                if (ndo->ndo_vflag)
                        ND_PRINT((ndo, " %u", EXTRACT_32BITS(&rh->rh_ssrc)));
                break;


@@ -255,7 +251,7 @@ rtcp_print(netdissect_options *ndo, const u_char *hdr, const u_char *ep)
        if (cnt > 1)
                ND_PRINT((ndo, " c%d", cnt));
        while (--cnt >= 0) {
        if (cnt > 1)
                ND_PRINT((ndo, " c%d", cnt));
        while (--cnt >= 0) {

-               if ((u_char *)(rr + 1) > ep) {
+               if ((const u_char *)(rr + 1) > ep) {

                        ND_PRINT((ndo, " [|rtcp]"));
                        return (ep);
                }
                        ND_PRINT((ndo, " [|rtcp]"));
                        return (ep);
                }


@@ -275,23 +271,20 @@ static int udp_cksum(netdissect_options *ndo, register const struct ip *ip,
                     register const struct udphdr *up,
                     register u_int len)
 {
                     register const struct udphdr *up,
                     register u_int len)
 {

-       return nextproto4_cksum(ndo, ip, (const uint8_t *)(void *)up, len, len,
+       return nextproto4_cksum(ndo, ip, (const uint8_t *)(const void *)up, len, len,

                                IPPROTO_UDP);
 }
 
                                IPPROTO_UDP);
 }
 

-#ifdef INET6

 static int udp6_cksum(const struct ip6_hdr *ip6, const struct udphdr *up,
        u_int len)
 {
 static int udp6_cksum(const struct ip6_hdr *ip6, const struct udphdr *up,
        u_int len)
 {

-       return nextproto6_cksum(ip6, (const uint8_t *)(void *)up, len, len,
+       return nextproto6_cksum(ip6, (const uint8_t *)(const void *)up, len, len,

            IPPROTO_UDP);
 }
            IPPROTO_UDP);
 }

-#endif

 
 static void
 udpipaddr_print(netdissect_options *ndo, const struct ip *ip, int sport, int dport)
 {
 
 static void
 udpipaddr_print(netdissect_options *ndo, const struct ip *ip, int sport, int dport)
 {

-#ifdef INET6

        const struct ip6_hdr *ip6;
 
        if (IP_V(ip) == 6)
        const struct ip6_hdr *ip6;
 
        if (IP_V(ip) == 6)


@@ -308,20 +301,18 @@ udpipaddr_print(netdissect_options *ndo, const struct ip *ip, int sport, int dpo
                        } else {
                                ND_PRINT((ndo, "%s.%s > %s.%s: ",
                                        ip6addr_string(ndo, &ip6->ip6_src),
                        } else {
                                ND_PRINT((ndo, "%s.%s > %s.%s: ",
                                        ip6addr_string(ndo, &ip6->ip6_src),

-                                       udpport_string(sport),
+                                       udpport_string(ndo, sport),

                                        ip6addr_string(ndo, &ip6->ip6_dst),
                                        ip6addr_string(ndo, &ip6->ip6_dst),

-                                       udpport_string(dport)));
+                                       udpport_string(ndo, dport)));

                        }
                } else {
                        if (sport != -1) {
                                ND_PRINT((ndo, "%s > %s: ",
                        }
                } else {
                        if (sport != -1) {
                                ND_PRINT((ndo, "%s > %s: ",

-                                       udpport_string(sport),
-                                       udpport_string(dport)));
+                                       udpport_string(ndo, sport),
+                                       udpport_string(ndo, dport)));

                        }
                }
                        }
                }

-       } else
-#endif /*INET6*/
-       {
+       } else {

                if (ip->ip_p == IPPROTO_UDP) {
                        if (sport == -1) {
                                ND_PRINT((ndo, "%s > %s: ",
                if (ip->ip_p == IPPROTO_UDP) {
                        if (sport == -1) {
                                ND_PRINT((ndo, "%s > %s: ",


@@ -330,15 +321,15 @@ udpipaddr_print(netdissect_options *ndo, const struct ip *ip, int sport, int dpo
                        } else {
                                ND_PRINT((ndo, "%s.%s > %s.%s: ",
                                        ipaddr_string(ndo, &ip->ip_src),
                        } else {
                                ND_PRINT((ndo, "%s.%s > %s.%s: ",
                                        ipaddr_string(ndo, &ip->ip_src),

-                                       udpport_string(sport),
+                                       udpport_string(ndo, sport),

                                        ipaddr_string(ndo, &ip->ip_dst),
                                        ipaddr_string(ndo, &ip->ip_dst),

-                                       udpport_string(dport)));
+                                       udpport_string(ndo, dport)));

                        }
                } else {
                        if (sport != -1) {
                                ND_PRINT((ndo, "%s > %s: ",
                        }
                } else {
                        if (sport != -1) {
                                ND_PRINT((ndo, "%s > %s: ",

-                                       udpport_string(sport),
-                                       udpport_string(dport)));
+                                       udpport_string(ndo, sport),
+                                       udpport_string(ndo, dport)));

                        }
                }
        }
                        }
                }
        }


@@ -353,21 +344,16 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
        register const u_char *cp;
        register const u_char *ep = bp + length;
        uint16_t sport, dport, ulen;
        register const u_char *cp;
        register const u_char *ep = bp + length;
        uint16_t sport, dport, ulen;

-#ifdef INET6

        register const struct ip6_hdr *ip6;
        register const struct ip6_hdr *ip6;

-#endif

 
        if (ep > ndo->ndo_snapend)
                ep = ndo->ndo_snapend;
 
        if (ep > ndo->ndo_snapend)
                ep = ndo->ndo_snapend;

-       up = (struct udphdr *)bp;
-       ip = (struct ip *)bp2;
-#ifdef INET6
+       up = (const struct udphdr *)bp;
+       ip = (const struct ip *)bp2;

        if (IP_V(ip) == 6)
        if (IP_V(ip) == 6)

-               ip6 = (struct ip6_hdr *)bp2;
+               ip6 = (const struct ip6_hdr *)bp2;

        else
                ip6 = NULL;
        else
                ip6 = NULL;

-#endif /*INET6*/
-       cp = (u_char *)(up + 1);

        if (!ND_TTEST(up->uh_dport)) {
                udpipaddr_print(ndo, ip, -1, -1);
                ND_PRINT((ndo, "[|udp]"));
        if (!ND_TTEST(up->uh_dport)) {
                udpipaddr_print(ndo, ip, -1, -1);
                ND_PRINT((ndo, "[|udp]"));


@@ -382,50 +368,54 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
                ND_PRINT((ndo, "truncated-udp %d", length));
                return;
        }
                ND_PRINT((ndo, "truncated-udp %d", length));
                return;
        }

+       ulen = EXTRACT_16BITS(&up->uh_ulen);
+       if (ulen < sizeof(struct udphdr)) {
+               udpipaddr_print(ndo, ip, sport, dport);
+               ND_PRINT((ndo, "truncated-udplength %d", ulen));
+               return;
+       }
+       ulen -= sizeof(struct udphdr);

        length -= sizeof(struct udphdr);
        length -= sizeof(struct udphdr);

+       if (ulen < length)
+               length = ulen;

 
 

+       cp = (const u_char *)(up + 1);

        if (cp > ndo->ndo_snapend) {
                udpipaddr_print(ndo, ip, sport, dport);
                ND_PRINT((ndo, "[|udp]"));
                return;
        }
 
        if (cp > ndo->ndo_snapend) {
                udpipaddr_print(ndo, ip, sport, dport);
                ND_PRINT((ndo, "[|udp]"));
                return;
        }
 

-       ulen = EXTRACT_16BITS(&up->uh_ulen);
-       if (ulen < 8) {
-               udpipaddr_print(ndo, ip, sport, dport);
-               ND_PRINT((ndo, "truncated-udplength %d", ulen));
-               return;
-       }

        if (ndo->ndo_packettype) {
        if (ndo->ndo_packettype) {

-               register struct sunrpc_msg *rp;
+               register const struct sunrpc_msg *rp;

                enum sunrpc_msg_type direction;
 
                switch (ndo->ndo_packettype) {
 
                case PT_VAT:
                        udpipaddr_print(ndo, ip, sport, dport);
                enum sunrpc_msg_type direction;
 
                switch (ndo->ndo_packettype) {
 
                case PT_VAT:
                        udpipaddr_print(ndo, ip, sport, dport);

-                       vat_print(ndo, (void *)(up + 1), up);
+                       vat_print(ndo, (const void *)(up + 1), up);

                        break;
 
                case PT_WB:
                        udpipaddr_print(ndo, ip, sport, dport);
                        break;
 
                case PT_WB:
                        udpipaddr_print(ndo, ip, sport, dport);

-                       wb_print(ndo, (void *)(up + 1), length);
+                       wb_print(ndo, (const void *)(up + 1), length);

                        break;
 
                case PT_RPC:
                        break;
 
                case PT_RPC:

-                       rp = (struct sunrpc_msg *)(up + 1);
+                       rp = (const struct sunrpc_msg *)(up + 1);

                        direction = (enum sunrpc_msg_type)EXTRACT_32BITS(&rp->rm_direction);
                        if (direction == SUNRPC_CALL)
                        direction = (enum sunrpc_msg_type)EXTRACT_32BITS(&rp->rm_direction);
                        if (direction == SUNRPC_CALL)

-                               sunrpcrequest_print(ndo, (u_char *)rp, length,
-                                   (u_char *)ip);
+                               sunrpcrequest_print(ndo, (const u_char *)rp, length,
+                                   (const u_char *)ip);

                        else
                        else

-                               nfsreply_print(ndo, (u_char *)rp, length,
-                                   (u_char *)ip);                      /*XXX*/
+                               nfsreply_print(ndo, (const u_char *)rp, length,
+                                   (const u_char *)ip);                        /*XXX*/

                        break;
 
                case PT_RTP:
                        udpipaddr_print(ndo, ip, sport, dport);
                        break;
 
                case PT_RTP:
                        udpipaddr_print(ndo, ip, sport, dport);

-                       rtp_print(ndo, (void *)(up + 1), length, up);
+                       rtp_print(ndo, (const void *)(up + 1), length, up);

                        break;
 
                case PT_RTCP:
                        break;
 
                case PT_RTCP:


@@ -441,7 +431,7 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
 
                case PT_CNFP:
                        udpipaddr_print(ndo, ip, sport, dport);
 
                case PT_CNFP:
                        udpipaddr_print(ndo, ip, sport, dport);

-                       cnfp_print(ndo, cp, (const u_char *)ip);
+                       cnfp_print(ndo, cp);

                        break;
 
                case PT_TFTP:
                        break;
 
                case PT_TFTP:


@@ -452,11 +442,7 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
                case PT_AODV:
                        udpipaddr_print(ndo, ip, sport, dport);
                        aodv_print(ndo, (const u_char *)(up + 1), length,
                case PT_AODV:
                        udpipaddr_print(ndo, ip, sport, dport);
                        aodv_print(ndo, (const u_char *)(up + 1), length,

-#ifdef INET6

                            ip6 != NULL);
                            ip6 != NULL);

-#else
-                           0);
-#endif

                        break;
 
                case PT_RADIUS:
                        break;
 
                case PT_RADIUS:


@@ -484,33 +470,33 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
 
        udpipaddr_print(ndo, ip, sport, dport);
        if (!ndo->ndo_qflag) {
 
        udpipaddr_print(ndo, ip, sport, dport);
        if (!ndo->ndo_qflag) {

-               register struct sunrpc_msg *rp;
+               register const struct sunrpc_msg *rp;

                enum sunrpc_msg_type direction;
 
                enum sunrpc_msg_type direction;
 

-               rp = (struct sunrpc_msg *)(up + 1);
+               rp = (const struct sunrpc_msg *)(up + 1);

                if (ND_TTEST(rp->rm_direction)) {
                        direction = (enum sunrpc_msg_type)EXTRACT_32BITS(&rp->rm_direction);
                        if (dport == NFS_PORT && direction == SUNRPC_CALL) {
                                ND_PRINT((ndo, "NFS request xid %u ", EXTRACT_32BITS(&rp->rm_xid)));
                if (ND_TTEST(rp->rm_direction)) {
                        direction = (enum sunrpc_msg_type)EXTRACT_32BITS(&rp->rm_direction);
                        if (dport == NFS_PORT && direction == SUNRPC_CALL) {
                                ND_PRINT((ndo, "NFS request xid %u ", EXTRACT_32BITS(&rp->rm_xid)));

-                               nfsreq_print_noaddr(ndo, (u_char *)rp, length,
-                                   (u_char *)ip);
+                               nfsreq_print_noaddr(ndo, (const u_char *)rp, length,
+                                   (const u_char *)ip);

                                return;
                        }
                        if (sport == NFS_PORT && direction == SUNRPC_REPLY) {
                                ND_PRINT((ndo, "NFS reply xid %u ", EXTRACT_32BITS(&rp->rm_xid)));
                                return;
                        }
                        if (sport == NFS_PORT && direction == SUNRPC_REPLY) {
                                ND_PRINT((ndo, "NFS reply xid %u ", EXTRACT_32BITS(&rp->rm_xid)));

-                               nfsreply_print_noaddr(ndo, (u_char *)rp, length,
-                                   (u_char *)ip);
+                               nfsreply_print_noaddr(ndo, (const u_char *)rp, length,
+                                   (const u_char *)ip);

                                return;
                        }
 #ifdef notdef
                        if (dport == SUNRPC_PORT && direction == SUNRPC_CALL) {
                                return;
                        }
 #ifdef notdef
                        if (dport == SUNRPC_PORT && direction == SUNRPC_CALL) {

-                               sunrpcrequest_print((u_char *)rp, length, (u_char *)ip);
+                               sunrpcrequest_print((const u_char *)rp, length, (const u_char *)ip);

                                return;
                        }
 #endif
                }
                                return;
                        }
 #endif
                }

-               if (ND_TTEST(((struct LAP *)cp)->type) &&
-                   ((struct LAP *)cp)->type == lapDDP &&
+               if (ND_TTEST(((const struct LAP *)cp)->type) &&
+                   ((const struct LAP *)cp)->type == lapDDP &&

                    (atalk_port(sport) || atalk_port(dport))) {
                        if (ndo->ndo_vflag)
                                ND_PRINT((ndo, "kip "));
                    (atalk_port(sport) || atalk_port(dport))) {
                        if (ndo->ndo_vflag)
                                ND_PRINT((ndo, "kip "));


@@ -542,7 +528,6 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
                                        ND_PRINT((ndo, "[udp sum ok] "));
                        }
                }
                                        ND_PRINT((ndo, "[udp sum ok] "));
                        }
                }

-#ifdef INET6

                else if (IP_V(ip) == 6 && ip6->ip6_plen) {
                        /* for IPv6, UDP checksum is mandatory */
                        if (ND_TTEST2(cp[0], length)) {
                else if (IP_V(ip) == 6 && ip6->ip6_plen) {
                        /* for IPv6, UDP checksum is mandatory */
                        if (ND_TTEST2(cp[0], length)) {


@@ -557,55 +542,49 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
                                        ND_PRINT((ndo, "[udp sum ok] "));
                        }
                }
                                        ND_PRINT((ndo, "[udp sum ok] "));
                        }
                }

-#endif

        }
 
        if (!ndo->ndo_qflag) {
        }
 
        if (!ndo->ndo_qflag) {

-#define ISPORT(p) (dport == (p) || sport == (p))
-               if (ISPORT(NAMESERVER_PORT))
+               if (IS_SRC_OR_DST_PORT(NAMESERVER_PORT))

                        ns_print(ndo, (const u_char *)(up + 1), length, 0);
                        ns_print(ndo, (const u_char *)(up + 1), length, 0);

-               else if (ISPORT(MULTICASTDNS_PORT))
+               else if (IS_SRC_OR_DST_PORT(MULTICASTDNS_PORT))

                        ns_print(ndo, (const u_char *)(up + 1), length, 1);
                        ns_print(ndo, (const u_char *)(up + 1), length, 1);

-               else if (ISPORT(TIMED_PORT))
+               else if (IS_SRC_OR_DST_PORT(TIMED_PORT))

                        timed_print(ndo, (const u_char *)(up + 1));
                        timed_print(ndo, (const u_char *)(up + 1));

-               else if (ISPORT(TFTP_PORT))
+               else if (IS_SRC_OR_DST_PORT(TFTP_PORT))

                        tftp_print(ndo, (const u_char *)(up + 1), length);
                        tftp_print(ndo, (const u_char *)(up + 1), length);

-               else if (ISPORT(BOOTPC_PORT) || ISPORT(BOOTPS_PORT))
+               else if (IS_SRC_OR_DST_PORT(BOOTPC_PORT) || IS_SRC_OR_DST_PORT(BOOTPS_PORT))

                        bootp_print(ndo, (const u_char *)(up + 1), length);
                        bootp_print(ndo, (const u_char *)(up + 1), length);

-               else if (ISPORT(RIP_PORT))
+               else if (IS_SRC_OR_DST_PORT(RIP_PORT))

                        rip_print(ndo, (const u_char *)(up + 1), length);
                        rip_print(ndo, (const u_char *)(up + 1), length);

-               else if (ISPORT(AODV_PORT))
+               else if (IS_SRC_OR_DST_PORT(AODV_PORT))

                        aodv_print(ndo, (const u_char *)(up + 1), length,
                        aodv_print(ndo, (const u_char *)(up + 1), length,

-#ifdef INET6

                            ip6 != NULL);
                            ip6 != NULL);

-#else
-                           0);
-#endif
-               else if (ISPORT(ISAKMP_PORT))
+               else if (IS_SRC_OR_DST_PORT(ISAKMP_PORT))

                         isakmp_print(ndo, (const u_char *)(up + 1), length, bp2);
                         isakmp_print(ndo, (const u_char *)(up + 1), length, bp2);

-               else if (ISPORT(ISAKMP_PORT_NATT))
+               else if (IS_SRC_OR_DST_PORT(ISAKMP_PORT_NATT))

                         isakmp_rfc3948_print(ndo, (const u_char *)(up + 1), length, bp2);
 #if 1 /*???*/
                         isakmp_rfc3948_print(ndo, (const u_char *)(up + 1), length, bp2);
 #if 1 /*???*/

-               else if (ISPORT(ISAKMP_PORT_USER1) || ISPORT(ISAKMP_PORT_USER2))
+               else if (IS_SRC_OR_DST_PORT(ISAKMP_PORT_USER1) || IS_SRC_OR_DST_PORT(ISAKMP_PORT_USER2))

                        isakmp_print(ndo, (const u_char *)(up + 1), length, bp2);
 #endif
                        isakmp_print(ndo, (const u_char *)(up + 1), length, bp2);
 #endif

-               else if (ISPORT(SNMP_PORT) || ISPORT(SNMPTRAP_PORT))
+               else if (IS_SRC_OR_DST_PORT(SNMP_PORT) || IS_SRC_OR_DST_PORT(SNMPTRAP_PORT))

                        snmp_print(ndo, (const u_char *)(up + 1), length);
                        snmp_print(ndo, (const u_char *)(up + 1), length);

-               else if (ISPORT(NTP_PORT))
+               else if (IS_SRC_OR_DST_PORT(NTP_PORT))

                        ntp_print(ndo, (const u_char *)(up + 1), length);
                        ntp_print(ndo, (const u_char *)(up + 1), length);

-               else if (ISPORT(KERBEROS_PORT) || ISPORT(KERBEROS_SEC_PORT))
+               else if (IS_SRC_OR_DST_PORT(KERBEROS_PORT) || IS_SRC_OR_DST_PORT(KERBEROS_SEC_PORT))

                        krb_print(ndo, (const void *)(up + 1));
                        krb_print(ndo, (const void *)(up + 1));

-               else if (ISPORT(L2TP_PORT))
+               else if (IS_SRC_OR_DST_PORT(L2TP_PORT))

                        l2tp_print(ndo, (const u_char *)(up + 1), length);
                        l2tp_print(ndo, (const u_char *)(up + 1), length);

-#ifdef TCPDUMP_DO_SMB
-               else if (ISPORT(NETBIOS_NS_PORT))
+#ifdef ENABLE_SMB
+               else if (IS_SRC_OR_DST_PORT(NETBIOS_NS_PORT))

                        nbt_udp137_print(ndo, (const u_char *)(up + 1), length);
                        nbt_udp137_print(ndo, (const u_char *)(up + 1), length);

-               else if (ISPORT(NETBIOS_DGRAM_PORT))
+               else if (IS_SRC_OR_DST_PORT(NETBIOS_DGRAM_PORT))

                        nbt_udp138_print(ndo, (const u_char *)(up + 1), length);
 #endif
                else if (dport == VAT_PORT)
                        vat_print(ndo, (const void *)(up + 1), up);
                        nbt_udp138_print(ndo, (const u_char *)(up + 1), length);
 #endif
                else if (dport == VAT_PORT)
                        vat_print(ndo, (const void *)(up + 1), up);

-               else if (ISPORT(ZEPHYR_SRV_PORT) || ISPORT(ZEPHYR_CLT_PORT))
+               else if (IS_SRC_OR_DST_PORT(ZEPHYR_SRV_PORT) || IS_SRC_OR_DST_PORT(ZEPHYR_CLT_PORT))

                        zephyr_print(ndo, (const void *)(up + 1), length);
                /*
                 * Since there are 10 possible ports to check, I think
                        zephyr_print(ndo, (const void *)(up + 1), length);
                /*
                 * Since there are 10 possible ports to check, I think


@@ -614,74 +593,81 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
                else if ((sport >= RX_PORT_LOW && sport <= RX_PORT_HIGH) ||
                         (dport >= RX_PORT_LOW && dport <= RX_PORT_HIGH))
                        rx_print(ndo, (const void *)(up + 1), length, sport, dport,
                else if ((sport >= RX_PORT_LOW && sport <= RX_PORT_HIGH) ||
                         (dport >= RX_PORT_LOW && dport <= RX_PORT_HIGH))
                        rx_print(ndo, (const void *)(up + 1), length, sport, dport,

-                                (u_char *) ip);
-#ifdef INET6
-               else if (ISPORT(RIPNG_PORT))
+                                (const u_char *) ip);
+               else if (IS_SRC_OR_DST_PORT(RIPNG_PORT))

                        ripng_print(ndo, (const u_char *)(up + 1), length);
                        ripng_print(ndo, (const u_char *)(up + 1), length);

-               else if (ISPORT(DHCP6_SERV_PORT) || ISPORT(DHCP6_CLI_PORT))
+               else if (IS_SRC_OR_DST_PORT(DHCP6_SERV_PORT) || IS_SRC_OR_DST_PORT(DHCP6_CLI_PORT))

                        dhcp6_print(ndo, (const u_char *)(up + 1), length);
                        dhcp6_print(ndo, (const u_char *)(up + 1), length);

-               else if (ISPORT(AHCP_PORT))
+               else if (IS_SRC_OR_DST_PORT(AHCP_PORT))

                        ahcp_print(ndo, (const u_char *)(up + 1), length);
                        ahcp_print(ndo, (const u_char *)(up + 1), length);

-               else if (ISPORT(BABEL_PORT) || ISPORT(BABEL_PORT_OLD))
+               else if (IS_SRC_OR_DST_PORT(BABEL_PORT) || IS_SRC_OR_DST_PORT(BABEL_PORT_OLD))

                        babel_print(ndo, (const u_char *)(up + 1), length);
                        babel_print(ndo, (const u_char *)(up + 1), length);

-#endif /*INET6*/

                /*
                 * Kludge in test for whiteboard packets.
                 */
                else if (dport == WB_PORT)
                        wb_print(ndo, (const void *)(up + 1), length);
                /*
                 * Kludge in test for whiteboard packets.
                 */
                else if (dport == WB_PORT)
                        wb_print(ndo, (const void *)(up + 1), length);

-               else if (ISPORT(CISCO_AUTORP_PORT))
+               else if (IS_SRC_OR_DST_PORT(CISCO_AUTORP_PORT))

                        cisco_autorp_print(ndo, (const void *)(up + 1), length);
                        cisco_autorp_print(ndo, (const void *)(up + 1), length);

-               else if (ISPORT(RADIUS_PORT) ||
-                        ISPORT(RADIUS_NEW_PORT) ||
-                        ISPORT(RADIUS_ACCOUNTING_PORT) ||
-                        ISPORT(RADIUS_NEW_ACCOUNTING_PORT) ||
-                        ISPORT(RADIUS_COA_PORT) )
+               else if (IS_SRC_OR_DST_PORT(RADIUS_PORT) ||
+                        IS_SRC_OR_DST_PORT(RADIUS_NEW_PORT) ||
+                        IS_SRC_OR_DST_PORT(RADIUS_ACCOUNTING_PORT) ||
+                        IS_SRC_OR_DST_PORT(RADIUS_NEW_ACCOUNTING_PORT) ||
+                        IS_SRC_OR_DST_PORT(RADIUS_CISCO_COA_PORT) ||
+                        IS_SRC_OR_DST_PORT(RADIUS_COA_PORT) )

                        radius_print(ndo, (const u_char *)(up+1), length);
                else if (dport == HSRP_PORT)
                        hsrp_print(ndo, (const u_char *)(up + 1), length);
                        radius_print(ndo, (const u_char *)(up+1), length);
                else if (dport == HSRP_PORT)
                        hsrp_print(ndo, (const u_char *)(up + 1), length);

-               else if (ISPORT(LWRES_PORT))
+               else if (IS_SRC_OR_DST_PORT(LWRES_PORT))

                        lwres_print(ndo, (const u_char *)(up + 1), length);
                        lwres_print(ndo, (const u_char *)(up + 1), length);

-               else if (ISPORT(LDP_PORT))
+               else if (IS_SRC_OR_DST_PORT(LDP_PORT))

                        ldp_print(ndo, (const u_char *)(up + 1), length);
                        ldp_print(ndo, (const u_char *)(up + 1), length);

-               else if (ISPORT(OLSR_PORT))
+               else if (IS_SRC_OR_DST_PORT(OLSR_PORT))

                        olsr_print(ndo, (const u_char *)(up + 1), length,
                        olsr_print(ndo, (const u_char *)(up + 1), length,

-#if INET6

                                        (IP_V(ip) == 6) ? 1 : 0);
                                        (IP_V(ip) == 6) ? 1 : 0);

-#else
-                                       0);
-#endif
-               else if (ISPORT(MPLS_LSP_PING_PORT))
+               else if (IS_SRC_OR_DST_PORT(MPLS_LSP_PING_PORT))

                        lspping_print(ndo, (const u_char *)(up + 1), length);
                else if (dport == BFD_CONTROL_PORT ||
                         dport == BFD_ECHO_PORT )
                        bfd_print(ndo, (const u_char *)(up+1), length, dport);
                        lspping_print(ndo, (const u_char *)(up + 1), length);
                else if (dport == BFD_CONTROL_PORT ||
                         dport == BFD_ECHO_PORT )
                        bfd_print(ndo, (const u_char *)(up+1), length, dport);

-                else if (ISPORT(LMP_PORT))
+                else if (IS_SRC_OR_DST_PORT(LMP_PORT))

                        lmp_print(ndo, (const u_char *)(up + 1), length);
                        lmp_print(ndo, (const u_char *)(up + 1), length);

-               else if (ISPORT(VQP_PORT))
+               else if (IS_SRC_OR_DST_PORT(VQP_PORT))

                        vqp_print(ndo, (const u_char *)(up + 1), length);
                        vqp_print(ndo, (const u_char *)(up + 1), length);

-                else if (ISPORT(SFLOW_PORT))
+                else if (IS_SRC_OR_DST_PORT(SFLOW_PORT))

                         sflow_print(ndo, (const u_char *)(up + 1), length);
                else if (dport == LWAPP_CONTROL_PORT)
                        lwapp_control_print(ndo, (const u_char *)(up + 1), length, 1);
                 else if (sport == LWAPP_CONTROL_PORT)
                         lwapp_control_print(ndo, (const u_char *)(up + 1), length, 0);
                         sflow_print(ndo, (const u_char *)(up + 1), length);
                else if (dport == LWAPP_CONTROL_PORT)
                        lwapp_control_print(ndo, (const u_char *)(up + 1), length, 1);
                 else if (sport == LWAPP_CONTROL_PORT)
                         lwapp_control_print(ndo, (const u_char *)(up + 1), length, 0);

-                else if (ISPORT(LWAPP_DATA_PORT))
+                else if (IS_SRC_OR_DST_PORT(LWAPP_DATA_PORT))

                         lwapp_data_print(ndo, (const u_char *)(up + 1), length);
                         lwapp_data_print(ndo, (const u_char *)(up + 1), length);

-                else if (ISPORT(SIP_PORT))
+                else if (IS_SRC_OR_DST_PORT(SIP_PORT))

                        sip_print(ndo, (const u_char *)(up + 1), length);
                        sip_print(ndo, (const u_char *)(up + 1), length);

-                else if (ISPORT(SYSLOG_PORT))
+                else if (IS_SRC_OR_DST_PORT(SYSLOG_PORT))

                        syslog_print(ndo, (const u_char *)(up + 1), length);
                        syslog_print(ndo, (const u_char *)(up + 1), length);

-                else if (ISPORT(OTV_PORT))
+                else if (IS_SRC_OR_DST_PORT(OTV_PORT))

                        otv_print(ndo, (const u_char *)(up + 1), length);
                        otv_print(ndo, (const u_char *)(up + 1), length);

-                else if (ISPORT(VXLAN_PORT))
+                else if (IS_SRC_OR_DST_PORT(VXLAN_PORT))

                        vxlan_print(ndo, (const u_char *)(up + 1), length);
                        vxlan_print(ndo, (const u_char *)(up + 1), length);

+                else if (IS_SRC_OR_DST_PORT(GENEVE_PORT))
+                       geneve_print(ndo, (const u_char *)(up + 1), length);
+               else if (IS_SRC_OR_DST_PORT(LISP_CONTROL_PORT))
+                       lisp_print(ndo, (const u_char *)(up + 1), length);
+               else {
+                       if (ulen > length)
+                               ND_PRINT((ndo, "UDP, bad length %u > %u",
+                                   ulen, length));
+                       else
+                               ND_PRINT((ndo, "UDP, length %u", ulen));
+               }
+       } else {
+               if (ulen > length)
+                       ND_PRINT((ndo, "UDP, bad length %u > %u",
+                           ulen, length));

                else
                else

-                       ND_PRINT((ndo, "UDP, length %u",
-                           (uint32_t)(ulen - sizeof(*up))));
-#undef ISPORT
-       } else
-               ND_PRINT((ndo, "UDP, length %u", (uint32_t)(ulen - sizeof(*up))));
+                       ND_PRINT((ndo, "UDP, length %u", ulen));
+       }

 }
 
 
 }