- support for the route target information SAFI #132 defined in draft-marques-ppvpn...

[tcpdump] / print-udp.c

diff --git a/print-udp.c b/print-udp.c
index 4f230bce5b7e7d11bcedc75efd1c88b51671e536..e289be615e008ab40f0ce3f125e0db08dda3b5e5 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -21,17 +21,14 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.102 2001-11-26 06:48:12 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.121 2003-09-12 22:05:57 guy Exp $ (LBL)";

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

-#include <sys/param.h>
-#include <sys/time.h>
-
-#include <netinet/in.h>
+#include <tcpdump-stdinc.h>

 
 #ifdef SEGSIZE
 #undef SEGSIZE
 
 #ifdef SEGSIZE
 #undef SEGSIZE


@@ -45,6 +42,7 @@ static const char rcsid[] =
 
 #include "interface.h"
 #include "addrtoname.h"
 
 #include "interface.h"
 #include "addrtoname.h"

+#include "extract.h"

 #include "appletalk.h"
 
 #include "udp.h"
 #include "appletalk.h"
 
 #include "udp.h"


@@ -53,6 +51,7 @@ static const char rcsid[] =
 #ifdef INET6
 #include "ip6.h"
 #endif
 #ifdef INET6
 #include "ip6.h"
 #endif

+#include "ipproto.h"

 
 #include "nameser.h"
 #include "nfs.h"
 
 #include "nameser.h"
 #include "nfs.h"


@@ -108,21 +107,21 @@ struct rtcp_rr {
 #define RTCP_PT_APP    204
 
 static void
 #define RTCP_PT_APP    204
 
 static void

-vat_print(const void *hdr, u_int len, register const struct udphdr *up)
+vat_print(const void *hdr, register const struct udphdr *up)

 {
        /* vat/vt audio */
        u_int ts = *(u_int16_t *)hdr;
        if ((ts & 0xf060) != 0) {
                /* probably vt */
                (void)printf("udp/vt %u %d / %d",
 {
        /* vat/vt audio */
        u_int ts = *(u_int16_t *)hdr;
        if ((ts & 0xf060) != 0) {
                /* probably vt */
                (void)printf("udp/vt %u %d / %d",

-                            (u_int32_t)(ntohs(up->uh_ulen) - sizeof(*up)),
+                            (u_int32_t)(EXTRACT_16BITS(&up->uh_ulen) - sizeof(*up)),

                             ts & 0x3ff, ts >> 10);
        } else {
                /* probably vat */
                             ts & 0x3ff, ts >> 10);
        } else {
                /* probably vat */

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

                printf("udp/vat %u c%d %u%s",
                printf("udp/vat %u c%d %u%s",

-                       (u_int32_t)(ntohs(up->uh_ulen) - sizeof(*up) - 8),
+                       (u_int32_t)(EXTRACT_16BITS(&up->uh_ulen) - sizeof(*up) - 8),

                        i0 & 0xffff,
                        i1, i0 & 0x800000? "*" : "");
                /* audio format */
                        i0 & 0xffff,
                        i1, i0 & 0x800000? "*" : "");
                /* audio format */


@@ -139,9 +138,9 @@ rtp_print(const void *hdr, u_int len, register const struct udphdr *up)
        /* rtp v1 or v2 */
        u_int *ip = (u_int *)hdr;
        u_int hasopt, hasext, contype, hasmarker;
        /* rtp v1 or v2 */
        u_int *ip = (u_int *)hdr;
        u_int hasopt, hasext, contype, hasmarker;

-       u_int32_t i0 = (u_int32_t)ntohl(((u_int *)hdr)[0]);
-       u_int32_t i1 = (u_int32_t)ntohl(((u_int *)hdr)[1]);
-       u_int dlen = ntohs(up->uh_ulen) - sizeof(*up) - 8;
+       u_int32_t i0 = EXTRACT_32BITS(&((u_int *)hdr)[0]);
+       u_int32_t i1 = EXTRACT_32BITS(&((u_int *)hdr)[1]);
+       u_int dlen = EXTRACT_16BITS(&up->uh_ulen) - sizeof(*up) - 8;

        const char * ptype;
 
        ip += 2;
        const char * ptype;
 
        ip += 2;


@@ -174,7 +173,7 @@ rtp_print(const void *hdr, u_int len, register const struct udphdr *up)
                i0 & 0xffff,
                i1);
        if (vflag) {
                i0 & 0xffff,
                i1);
        if (vflag) {

-               printf(" %u", (u_int32_t)ntohl(((u_int *)hdr)[2]));
+               printf(" %u", EXTRACT_32BITS(&((u_int *)hdr)[2]));

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


@@ -218,8 +217,8 @@ rtcp_print(const u_char *hdr, const u_char *ep)
                printf(" [|rtcp]");
                return (ep);
        }
                printf(" [|rtcp]");
                return (ep);
        }

-       len = (ntohs(rh->rh_len) + 1) * 4;
-       flags = ntohs(rh->rh_flags);
+       len = (EXTRACT_16BITS(&rh->rh_len) + 1) * 4;
+       flags = EXTRACT_16BITS(&rh->rh_flags);

        cnt = (flags >> 8) & 0x1f;
        switch (flags & 0xff) {
        case RTCP_PT_SR:
        cnt = (flags >> 8) & 0x1f;
        switch (flags & 0xff) {
        case RTCP_PT_SR:


@@ -228,16 +227,16 @@ rtcp_print(const u_char *hdr, const u_char *ep)
                if (len != cnt * sizeof(*rr) + sizeof(*sr) + sizeof(*rh))
                        printf(" [%d]", len);
                if (vflag)
                if (len != cnt * sizeof(*rr) + sizeof(*sr) + sizeof(*rh))
                        printf(" [%d]", len);
                if (vflag)

-                       printf(" %u", (u_int32_t)ntohl(rh->rh_ssrc));
+                       printf(" %u", EXTRACT_32BITS(&rh->rh_ssrc));

                if ((u_char *)(sr + 1) > ep) {
                        printf(" [|rtcp]");
                        return (ep);
                }
                if ((u_char *)(sr + 1) > ep) {
                        printf(" [|rtcp]");
                        return (ep);
                }

-               ts = (double)((u_int32_t)ntohl(sr->sr_ntp.upper)) +
-                   ((double)((u_int32_t)ntohl(sr->sr_ntp.lower)) /
+               ts = (double)(EXTRACT_32BITS(&sr->sr_ntp.upper)) +
+                   ((double)(EXTRACT_32BITS(&sr->sr_ntp.lower)) /

                    4294967296.0);
                    4294967296.0);

-               printf(" @%.2f %u %up %ub", ts, (u_int32_t)ntohl(sr->sr_ts),
-                   (u_int32_t)ntohl(sr->sr_np), (u_int32_t)ntohl(sr->sr_nb));
+               printf(" @%.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);
                break;
        case RTCP_PT_RR:
                rr = (struct rtcp_rr *)(sr + 1);
                break;
        case RTCP_PT_RR:


@@ -246,18 +245,18 @@ rtcp_print(const u_char *hdr, const u_char *ep)
                        printf(" [%d]", len);
                rr = (struct rtcp_rr *)(rh + 1);
                if (vflag)
                        printf(" [%d]", len);
                rr = (struct rtcp_rr *)(rh + 1);
                if (vflag)

-                       printf(" %u", (u_int32_t)ntohl(rh->rh_ssrc));
+                       printf(" %u", EXTRACT_32BITS(&rh->rh_ssrc));

                break;
        case RTCP_PT_SDES:
                printf(" sdes %d", len);
                if (vflag)
                break;
        case RTCP_PT_SDES:
                printf(" sdes %d", len);
                if (vflag)

-                       printf(" %u", (u_int32_t)ntohl(rh->rh_ssrc));
+                       printf(" %u", EXTRACT_32BITS(&rh->rh_ssrc));

                cnt = 0;
                break;
        case RTCP_PT_BYE:
                printf(" bye %d", len);
                if (vflag)
                cnt = 0;
                break;
        case RTCP_PT_BYE:
                printf(" bye %d", len);
                if (vflag)

-                       printf(" %u", (u_int32_t)ntohl(rh->rh_ssrc));
+                       printf(" %u", EXTRACT_32BITS(&rh->rh_ssrc));

                cnt = 0;
                break;
        default:
                cnt = 0;
                break;
        default:


@@ -273,13 +272,13 @@ rtcp_print(const u_char *hdr, const u_char *ep)
                        return (ep);
                }
                if (vflag)
                        return (ep);
                }
                if (vflag)

-                       printf(" %u", (u_int32_t)ntohl(rr->rr_srcid));
-               ts = (double)((u_int32_t)ntohl(rr->rr_lsr)) / 65536.;
-               dts = (double)((u_int32_t)ntohl(rr->rr_dlsr)) / 65536.;
+                       printf(" %u", EXTRACT_32BITS(&rr->rr_srcid));
+               ts = (double)(EXTRACT_32BITS(&rr->rr_lsr)) / 65536.;
+               dts = (double)(EXTRACT_32BITS(&rr->rr_dlsr)) / 65536.;

                printf(" %ul %us %uj @%.2f+%.2f",
                printf(" %ul %us %uj @%.2f+%.2f",

-                   (u_int32_t)ntohl(rr->rr_nl) & 0x00ffffff,
-                   (u_int32_t)ntohl(rr->rr_ls),
-                   (u_int32_t)ntohl(rr->rr_dv), ts, dts);
+                   EXTRACT_32BITS(&rr->rr_nl) & 0x00ffffff,
+                   EXTRACT_32BITS(&rr->rr_ls),
+                   EXTRACT_32BITS(&rr->rr_dv), ts, dts);

        }
        return (hdr + len);
 }
        }
        return (hdr + len);
 }


@@ -305,7 +304,10 @@ static int udp_cksum(register const struct ip *ip,
        phu.ph.mbz = 0;
        phu.ph.proto = IPPROTO_UDP;
        memcpy(&phu.ph.src, &ip->ip_src.s_addr, sizeof(u_int32_t));
        phu.ph.mbz = 0;
        phu.ph.proto = IPPROTO_UDP;
        memcpy(&phu.ph.src, &ip->ip_src.s_addr, sizeof(u_int32_t));

-       memcpy(&phu.ph.dst, &ip->ip_dst.s_addr, sizeof(u_int32_t));
+       if (IP_HL(ip) == 5)
+               memcpy(&phu.ph.dst, &ip->ip_dst.s_addr, sizeof(u_int32_t));
+       else
+               phu.ph.dst = ip_finddst(ip);

 
        sp = &phu.pa[0];
        return in_cksum((u_short *)up, len,
 
        sp = &phu.pa[0];
        return in_cksum((u_short *)up, len,


@@ -330,7 +332,7 @@ static int udp6_cksum(const struct ip6_hdr *ip6, const struct udphdr *up,
                u_int16_t pa[20];
        } phu;
 
                u_int16_t pa[20];
        } phu;
 

-       tlen = ntohs(ip6->ip6_plen) + sizeof(struct ip6_hdr) -
+       tlen = EXTRACT_16BITS(&ip6->ip6_plen) + sizeof(struct ip6_hdr) -

            ((const char *)up - (const char*)ip6);
 
        /* pseudo-header */
            ((const char *)up - (const char*)ip6);
 
        /* pseudo-header */


@@ -371,6 +373,8 @@ static int udp6_cksum(const struct ip6_hdr *ip6, const struct udphdr *up,
 #define ISAKMP_PORT 500                /*XXX*/
 #define TIMED_PORT 525         /*XXX*/
 #define RIP_PORT 520           /*XXX*/
 #define ISAKMP_PORT 500                /*XXX*/
 #define TIMED_PORT 525         /*XXX*/
 #define RIP_PORT 520           /*XXX*/

+#define LDP_PORT 646
+#define AODV_PORT 654          /*XXX*/

 #define KERBEROS_SEC_PORT 750  /*XXX*/
 #define L2TP_PORT 1701         /*XXX*/
 #define ISAKMP_PORT_USER1 7500 /*XXX - nonstandard*/
 #define KERBEROS_SEC_PORT 750  /*XXX*/
 #define L2TP_PORT 1701         /*XXX*/
 #define ISAKMP_PORT_USER1 7500 /*XXX - nonstandard*/


@@ -388,6 +392,7 @@ static int udp6_cksum(const struct ip6_hdr *ip6, const struct udphdr *up,
 #define LWRES_PORT             921
 #define ZEPHYR_SRV_PORT                2103
 #define ZEPHYR_CLT_PORT                2104
 #define LWRES_PORT             921
 #define ZEPHYR_SRV_PORT                2103
 #define ZEPHYR_CLT_PORT                2104

+#define MPLS_LSP_PING_PORT      3503 /* draft-ietf-mpls-lsp-ping-02.txt */

 
 #ifdef INET6
 #define RIPNG_PORT 521         /*XXX*/
 
 #ifdef INET6
 #define RIPNG_PORT 521         /*XXX*/


@@ -396,7 +401,7 @@ static int udp6_cksum(const struct ip6_hdr *ip6, const struct udphdr *up,
 #endif
 
 static void
 #endif
 
 static void

-udpipaddr_print(const struct ip *ip, u_int16_t sport, u_int16_t dport)
+udpipaddr_print(const struct ip *ip, int sport, int dport)

 {
 #ifdef INET6
        const struct ip6_hdr *ip6;
 {
 #ifdef INET6
        const struct ip6_hdr *ip6;


@@ -407,28 +412,46 @@ udpipaddr_print(const struct ip *ip, u_int16_t sport, u_int16_t dport)
                ip6 = NULL;
 
        if (ip6) {
                ip6 = NULL;
 
        if (ip6) {

-               if (dport && ip6->ip6_nxt == IPPROTO_UDP) {
-                       (void)printf("%s.%s > %s.%s: ",
-                               ip6addr_string(&ip6->ip6_src),
-                               udpport_string(sport),
-                               ip6addr_string(&ip6->ip6_dst),
-                               udpport_string(dport));
+               if (ip6->ip6_nxt == IPPROTO_UDP) {
+                       if (sport == -1) {
+                               (void)printf("%s > %s: ",
+                                       ip6addr_string(&ip6->ip6_src),
+                                       ip6addr_string(&ip6->ip6_dst));
+                       } else {
+                               (void)printf("%s.%s > %s.%s: ",
+                                       ip6addr_string(&ip6->ip6_src),
+                                       udpport_string(sport),
+                                       ip6addr_string(&ip6->ip6_dst),
+                                       udpport_string(dport));
+                       }

                } else {
                } else {

-                       (void)printf("%s > %s: ",
-                               udpport_string(sport), udpport_string(dport));
+                       if (sport != -1) {
+                               (void)printf("%s > %s: ",
+                                       udpport_string(sport),
+                                       udpport_string(dport));
+                       }

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

-               if (dport && ip->ip_p == IPPROTO_UDP) {
-                       (void)printf("%s.%s > %s.%s: ",
-                               ipaddr_string(&ip->ip_src),
-                               udpport_string(sport),
-                               ipaddr_string(&ip->ip_dst),
-                               udpport_string(dport));
+               if (ip->ip_p == IPPROTO_UDP) {
+                       if (sport == -1) {
+                               (void)printf("%s > %s: ",
+                                       ipaddr_string(&ip->ip_src),
+                                       ipaddr_string(&ip->ip_dst));
+                       } else {
+                               (void)printf("%s.%s > %s.%s: ",
+                                       ipaddr_string(&ip->ip_src),
+                                       udpport_string(sport),
+                                       ipaddr_string(&ip->ip_dst),
+                                       udpport_string(dport));
+                       }

                } else {
                } else {

-                       (void)printf("%s > %s: ",
-                               udpport_string(sport), udpport_string(dport));
+                       if (sport != -1) {
+                               (void)printf("%s > %s: ",
+                                       udpport_string(sport),
+                                       udpport_string(dport));
+                       }

                }
        }
 }
                }
        }
 }


@@ -457,24 +480,32 @@ udp_print(register const u_char *bp, u_int length,
                ip6 = NULL;
 #endif /*INET6*/
        cp = (u_char *)(up + 1);
                ip6 = NULL;
 #endif /*INET6*/
        cp = (u_char *)(up + 1);

-       if (cp > snapend) {
-               udpipaddr_print(ip, 0, 0);
+       if (!TTEST(up->uh_dport)) {
+               udpipaddr_print(ip, -1, -1);

                (void)printf("[|udp]");
                return;
        }
                (void)printf("[|udp]");
                return;
        }

+
+       sport = EXTRACT_16BITS(&up->uh_sport);
+       dport = EXTRACT_16BITS(&up->uh_dport);
+

        if (length < sizeof(struct udphdr)) {
        if (length < sizeof(struct udphdr)) {

-               udpipaddr_print(ip, 0, 0);
-               (void)printf("truncated-udp %u", length);
+               udpipaddr_print(ip, sport, dport);
+               (void)printf("truncated-udp %d", length);

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

-       sport = ntohs(up->uh_sport);
-       dport = ntohs(up->uh_dport);
-       ulen = ntohs(up->uh_ulen);
+       if (cp > snapend) {
+               udpipaddr_print(ip, sport, dport);
+               (void)printf("[|udp]");
+               return;
+       }
+
+       ulen = EXTRACT_16BITS(&up->uh_ulen);

        if (ulen < 8) {
                udpipaddr_print(ip, sport, dport);
        if (ulen < 8) {
                udpipaddr_print(ip, sport, dport);

-               (void)printf("truncated-udplength %u", ulen);
+               (void)printf("truncated-udplength %d", ulen);

                return;
        }
        if (packettype) {
                return;
        }
        if (packettype) {


@@ -485,7 +516,7 @@ udp_print(register const u_char *bp, u_int length,
 
                case PT_VAT:
                        udpipaddr_print(ip, sport, dport);
 
                case PT_VAT:
                        udpipaddr_print(ip, sport, dport);

-                       vat_print((void *)(up + 1), length, up);
+                       vat_print((void *)(up + 1), up);

                        break;
 
                case PT_WB:
                        break;
 
                case PT_WB:


@@ -495,7 +526,7 @@ udp_print(register const u_char *bp, u_int length,
 
                case PT_RPC:
                        rp = (struct rpc_msg *)(up + 1);
 
                case PT_RPC:
                        rp = (struct rpc_msg *)(up + 1);

-                       direction = (enum msg_type)ntohl(rp->rm_direction);
+                       direction = (enum msg_type)EXTRACT_32BITS(&rp->rm_direction);

                        if (direction == CALL)
                                sunrpcrequest_print((u_char *)rp, length,
                                    (u_char *)ip);
                        if (direction == CALL)
                                sunrpcrequest_print((u_char *)rp, length,
                                    (u_char *)ip);


@@ -522,7 +553,22 @@ udp_print(register const u_char *bp, u_int length,
 
                case PT_CNFP:
                        udpipaddr_print(ip, sport, dport);
 
                case PT_CNFP:
                        udpipaddr_print(ip, sport, dport);

-                       cnfp_print(cp, length, (const u_char *)ip);
+                       cnfp_print(cp, (const u_char *)ip);
+                       break;
+
+               case PT_TFTP:
+                       udpipaddr_print(ip, sport, dport);
+                       tftp_print(cp, length);
+                       break;
+
+               case PT_AODV:
+                       udpipaddr_print(ip, sport, dport);
+                       aodv_print((const u_char *)(up + 1), length,
+#ifdef INET6
+                           ip6 != NULL);
+#else
+                           FALSE);
+#endif

                        break;
                }
                return;
                        break;
                }
                return;


@@ -534,7 +580,7 @@ udp_print(register const u_char *bp, u_int length,
 
                rp = (struct rpc_msg *)(up + 1);
                if (TTEST(rp->rm_direction)) {
 
                rp = (struct rpc_msg *)(up + 1);
                if (TTEST(rp->rm_direction)) {

-                       direction = (enum msg_type)ntohl(rp->rm_direction);
+                       direction = (enum msg_type)EXTRACT_32BITS(&rp->rm_direction);

                        if (dport == NFS_PORT && direction == CALL) {
                                nfsreq_print((u_char *)rp, length,
                                    (u_char *)ip);
                        if (dport == NFS_PORT && direction == CALL) {
                                nfsreq_print((u_char *)rp, length,
                                    (u_char *)ip);


@@ -591,17 +637,23 @@ udp_print(register const u_char *bp, u_int length,
 
        if (!qflag) {
 #define ISPORT(p) (dport == (p) || sport == (p))
 
        if (!qflag) {
 #define ISPORT(p) (dport == (p) || sport == (p))

-               if (ISPORT(NAMESERVER_PORT))
+               if (ISPORT(NAMESERVER_PORT) || ISPORT(MULTICASTDNS_PORT))

                        ns_print((const u_char *)(up + 1), length);
                else if (ISPORT(TIMED_PORT))
                        ns_print((const u_char *)(up + 1), length);
                else if (ISPORT(TIMED_PORT))

-                       timed_print((const u_char *)(up + 1), length);
+                       timed_print((const u_char *)(up + 1));

                else if (ISPORT(TFTP_PORT))
                        tftp_print((const u_char *)(up + 1), length);
                else if (ISPORT(IPPORT_BOOTPC) || ISPORT(IPPORT_BOOTPS))
                else if (ISPORT(TFTP_PORT))
                        tftp_print((const u_char *)(up + 1), length);
                else if (ISPORT(IPPORT_BOOTPC) || ISPORT(IPPORT_BOOTPS))

-                       bootp_print((const u_char *)(up + 1), length,
-                           sport, dport);
+                       bootp_print((const u_char *)(up + 1), length);

                else if (ISPORT(RIP_PORT))
                        rip_print((const u_char *)(up + 1), length);
                else if (ISPORT(RIP_PORT))
                        rip_print((const u_char *)(up + 1), length);

+               else if (ISPORT(AODV_PORT))
+                       aodv_print((const u_char *)(up + 1), length,
+#ifdef INET6
+                           ip6 != NULL);
+#else
+                           FALSE);
+#endif

                else if (ISPORT(ISAKMP_PORT))
                        isakmp_print((const u_char *)(up + 1), length, bp2);
 #if 1 /*???*/
                else if (ISPORT(ISAKMP_PORT))
                        isakmp_print((const u_char *)(up + 1), length, bp2);
 #if 1 /*???*/


@@ -613,27 +665,27 @@ udp_print(register const u_char *bp, u_int length,
                else if (ISPORT(NTP_PORT))
                        ntp_print((const u_char *)(up + 1), length);
                else if (ISPORT(KERBEROS_PORT) || ISPORT(KERBEROS_SEC_PORT))
                else if (ISPORT(NTP_PORT))
                        ntp_print((const u_char *)(up + 1), length);
                else if (ISPORT(KERBEROS_PORT) || ISPORT(KERBEROS_SEC_PORT))

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

                else if (ISPORT(L2TP_PORT))
                        l2tp_print((const u_char *)(up + 1), length);
 #ifdef TCPDUMP_DO_SMB
                else if (ISPORT(L2TP_PORT))
                        l2tp_print((const u_char *)(up + 1), length);
 #ifdef TCPDUMP_DO_SMB

-               else if (ISPORT(NETBIOS_NS_PORT))
+               else if (ISPORT(NETBIOS_NS_PORT))

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

-               else if (ISPORT(NETBIOS_DGRAM_PORT))
-                       nbt_udp138_print((const u_char *)(up + 1), length);
+               else if (ISPORT(NETBIOS_DGRAM_PORT))
+                       nbt_udp138_print((const u_char *)(up + 1), length);

 #endif
                else if (dport == 3456)
 #endif
                else if (dport == 3456)

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

                else if (ISPORT(ZEPHYR_SRV_PORT) || ISPORT(ZEPHYR_CLT_PORT))
                        zephyr_print((const void *)(up + 1), length);
                else if (ISPORT(ZEPHYR_SRV_PORT) || ISPORT(ZEPHYR_CLT_PORT))
                        zephyr_print((const void *)(up + 1), length);

-               /*
-                * Since there are 10 possible ports to check, I think
-                * a <> test would be more efficient
-                */
-               else if ((sport >= RX_PORT_LOW && sport <= RX_PORT_HIGH) ||
-                        (dport >= RX_PORT_LOW && dport <= RX_PORT_HIGH))
-                       rx_print((const void *)(up + 1), length, sport, dport,
-                                (u_char *) ip);
+               /*
+                * Since there are 10 possible ports to check, I think
+                * a <> test would be more efficient
+                */
+               else if ((sport >= RX_PORT_LOW && sport <= RX_PORT_HIGH) ||
+                        (dport >= RX_PORT_LOW && dport <= RX_PORT_HIGH))
+                       rx_print((const void *)(up + 1), length, sport, dport,
+                                (u_char *) ip);

 #ifdef INET6
                else if (ISPORT(RIPNG_PORT))
                        ripng_print((const u_char *)(up + 1), length);
 #ifdef INET6
                else if (ISPORT(RIPNG_PORT))
                        ripng_print((const u_char *)(up + 1), length);


@@ -651,13 +703,17 @@ udp_print(register const u_char *bp, u_int length,
                        cisco_autorp_print((const void *)(up + 1), length);
                else if (ISPORT(RADIUS_PORT) ||
                         ISPORT(RADIUS_NEW_PORT) ||
                        cisco_autorp_print((const void *)(up + 1), length);
                else if (ISPORT(RADIUS_PORT) ||
                         ISPORT(RADIUS_NEW_PORT) ||

-                        ISPORT(RADIUS_ACCOUNTING_PORT) || 
+                        ISPORT(RADIUS_ACCOUNTING_PORT) ||

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

-                       hsrp_print((const u_char *)(up + 1), length);
+                       hsrp_print((const u_char *)(up + 1), length);

                else if (ISPORT(LWRES_PORT))
                        lwres_print((const u_char *)(up + 1), length);
                else if (ISPORT(LWRES_PORT))
                        lwres_print((const u_char *)(up + 1), length);

+                else if (ISPORT(LDP_PORT))
+                       ldp_print((const u_char *)(up + 1), length);
+                else if (ISPORT(MPLS_LSP_PING_PORT))
+                       mpls_lsp_ping_print((const u_char *)(up + 1), length);

                else
                        (void)printf("udp %u",
                            (u_int32_t)(ulen - sizeof(*up)));
                else
                        (void)printf("udp %u",
                            (u_int32_t)(ulen - sizeof(*up)));