]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-udp.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add support for optional AFI, SAFI and MAXPREFL values that
[tcpdump] / print-udp.c
diff --git a/print-udp.c b/print-udp.c
index b1f466095a80a10769219b42b1abb76b425693b4..166eca3a304b1b61ccd4b2eb19e76084e82bf570 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.109 2002-09-05 21:25:50 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.117 2003-05-11 06:01:17 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -42,6 +42,7 @@ static const char rcsid[] =
 
 #include "interface.h"
 #include "addrtoname.h"
+#include "extract.h"
 #include "appletalk.h"
 
 #include "udp.h"
@@ -112,14 +113,14 @@ vat_print(const void *hdr, register const struct udphdr *up)
        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 */
-               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",
-                       (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 */
@@ -136,9 +137,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;
-       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;
@@ -171,7 +172,7 @@ rtp_print(const void *hdr, u_int len, register const struct udphdr *up)
                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 {
@@ -215,8 +216,8 @@ rtcp_print(const u_char *hdr, const u_char *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:
@@ -225,16 +226,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)
-                       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);
                }
-               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);
-               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:
@@ -243,18 +244,18 @@ rtcp_print(const u_char *hdr, const u_char *ep)
                        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)
-                       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)
-                       printf(" %u", (u_int32_t)ntohl(rh->rh_ssrc));
+                       printf(" %u", EXTRACT_32BITS(&rh->rh_ssrc));
                cnt = 0;
                break;
        default:
@@ -270,13 +271,13 @@ rtcp_print(const u_char *hdr, const u_char *ep)
                        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",
-                   (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);
 }
@@ -330,7 +331,7 @@ static int udp6_cksum(const struct ip6_hdr *ip6, const struct udphdr *up,
                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 */
@@ -389,6 +390,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 MPLS_LSP_PING_PORT      3503 /* draft-ietf-mpls-lsp-ping-02.txt */
 
 #ifdef INET6
 #define RIPNG_PORT 521         /*XXX*/
@@ -471,9 +473,9 @@ udp_print(register const u_char *bp, u_int length,
        }
        length -= sizeof(struct udphdr);
 
-       sport = ntohs(up->uh_sport);
-       dport = ntohs(up->uh_dport);
-       ulen = ntohs(up->uh_ulen);
+       sport = EXTRACT_16BITS(&up->uh_sport);
+       dport = EXTRACT_16BITS(&up->uh_dport);
+       ulen = EXTRACT_16BITS(&up->uh_ulen);
        if (ulen < 8) {
                (void)printf("%s > %s: truncated-udplength %d",
                             ipaddr_string(&ip->ip_src),
@@ -499,7 +501,7 @@ udp_print(register const u_char *bp, u_int length,
 
                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);
@@ -528,6 +530,11 @@ udp_print(register const u_char *bp, u_int length,
                        udpipaddr_print(ip, sport, dport);
                        cnfp_print(cp, (const u_char *)ip);
                        break;
+
+               case PT_TFTP:
+                       udpipaddr_print(ip, sport, dport);
+                       tftp_print(cp, length);
+                       break;
                }
                return;
        }
@@ -538,7 +545,7 @@ udp_print(register const u_char *bp, u_int length,
 
                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);
@@ -602,7 +609,7 @@ udp_print(register const u_char *bp, u_int length,
                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), 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(ISAKMP_PORT))
@@ -662,7 +669,9 @@ udp_print(register const u_char *bp, u_int length,
                else if (ISPORT(LWRES_PORT))
                        lwres_print((const u_char *)(up + 1), length);
                 else if (ISPORT(LDP_PORT))
-                        printf("LDP, length: %u", length);
+                       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)));
@@ -670,9 +679,3 @@ udp_print(register const u_char *bp, u_int length,
        } else
                (void)printf("udp %u", (u_int32_t)(ulen - sizeof(*up)));
 }
-
-
-
-
-
-
[mirror] the TCPdump network dissector