]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-bgp.c
cleaned up bgp_attr_print{}
[tcpdump] / print-bgp.c
index 73d989b655ad4a701e433ec23b79bd257af7872d..fe87a9f8d6cc84df785b98db51b10c44dfe6f70a 100644 (file)
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-bgp.c,v 1.36 2002-07-14 14:14:51 hannes Exp $";
+     "@(#) $Header: /tcpdump/master/tcpdump/print-bgp.c,v 1.39 2002-07-22 14:09:07 hannes Exp $";
 #endif
 
 #include <sys/param.h>
@@ -63,12 +63,14 @@ struct bgp {
 #define BGP_UPDATE             2
 #define BGP_NOTIFICATION       3
 #define BGP_KEEPALIVE          4
+#define BGP_ROUTE_REFRESH       5
 
 static struct tok bgp_msg_values[] = {
     { BGP_OPEN,                 "Open"},
     { BGP_UPDATE,               "Update"},
     { BGP_NOTIFICATION,         "Notification"},
     { BGP_KEEPALIVE,            "Keepalive"},
+    { BGP_ROUTE_REFRESH,        "Route Refresh"},
     { 0, NULL}
 };
 
@@ -300,6 +302,13 @@ static struct tok bgp_afi_values[] = {
     { 0, NULL},
 };
 
+static struct tok bgp_extd_comm_subtype_values[] = {
+    { 2,                      "target"},
+    { 3,                      "origin"},
+    { 4,                      "link-BW"},
+    { 0, NULL},
+};
+
 static int
 decode_prefix4(const u_char *pd, char *buf, u_int buflen)
 {
@@ -380,17 +389,17 @@ decode_prefix6(const u_char *pd, char *buf, u_int buflen)
 #endif
 
 static void
-bgp_attr_print(const struct bgp_attr *attr, const u_char *dat, int len)
+bgp_attr_print(const struct bgp_attr *attr, const u_char *pptr, int len)
 {
        int i;
        u_int16_t af;
        u_int8_t safi, snpa;
        int advance;
        int tlen;
-       const u_char *p;
+       const u_char *tptr;
        char buf[MAXHOSTNAMELEN + 100];
 
-       p = dat;
+        tptr = pptr;
         tlen=len;
 
        switch (attr->bgpa_type) {
@@ -398,7 +407,7 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *dat, int len)
                if (len != 1)
                        printf("invalid len");
                else
-                       printf("%s", tok2str(bgp_origin_values, "Unknown Origin Typecode", p[0]));
+                       printf("%s", tok2str(bgp_origin_values, "Unknown Origin Typecode", tptr[0]));
                break;
        case BGPTYPE_AS_PATH:
                if (len % 2) {
@@ -409,35 +418,35 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *dat, int len)
                        printf("empty");
                        break;
                 }
-               while (p < dat + len) {
+               while (tptr < pptr + len) {
                        /*
                         * under RFC1965, p[0] means:
                         * 1: AS_SET 2: AS_SEQUENCE
                         * 3: AS_CONFED_SET 4: AS_CONFED_SEQUENCE
                         */
-                       if (p[0] == 3 || p[0] == 4)
+                       if (tptr[0] == 3 || tptr[0] == 4)
                                printf("confed");
-                       printf("%s", (p[0] & 1) ? "{" : "");
-                       for (i = 0; i < p[1] * 2; i += 2) {
+                       printf("%s", (tptr[0] & 1) ? "{" : "");
+                       for (i = 0; i < tptr[1] * 2; i += 2) {
                                printf("%s%u", i == 0 ? "" : " ",
-                                       EXTRACT_16BITS(&p[2 + i]));
+                                       EXTRACT_16BITS(&tptr[2 + i]));
                        }
-                       printf("%s", (p[0] & 1) ? "}" : "");
-                       p += 2 + p[1] * 2;
+                       printf("%s", (tptr[0] & 1) ? "}" : "");
+                       tptr += 2 + tptr[1] * 2;
                }
                break;
        case BGPTYPE_NEXT_HOP:
                if (len != 4)
                        printf("invalid len");
                else
-                       printf("%s", getname(p));
+                       printf("%s", getname(tptr));
                break;
        case BGPTYPE_MULTI_EXIT_DISC:
        case BGPTYPE_LOCAL_PREF:
                if (len != 4)
                        printf("invalid len");
                else
-                       printf("%u", EXTRACT_32BITS(p));
+                       printf("%u", EXTRACT_32BITS(tptr));
                break;
        case BGPTYPE_ATOMIC_AGGREGATE:
                if (len != 0)
@@ -448,8 +457,8 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *dat, int len)
                        printf("invalid len");
                        break;
                }
-               printf(" AS #%u, origin %s", EXTRACT_16BITS(p),
-                       getname(p + 2));
+               printf(" AS #%u, origin %s", EXTRACT_16BITS(tptr),
+                       getname(tptr + 2));
                break;
        case BGPTYPE_COMMUNITIES:
                if (len % 4) {
@@ -458,7 +467,7 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *dat, int len)
                }
                while (tlen>0) {
                        u_int32_t comm;
-                       comm = EXTRACT_32BITS(p);
+                       comm = EXTRACT_32BITS(tptr);
                        switch (comm) {
                        case BGP_COMMUNITY_NO_EXPORT:
                                printf(" NO_EXPORT");
@@ -477,7 +486,7 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *dat, int len)
                                break;
                        }
                         tlen -=4;
-                        p +=4;
+                        tptr +=4;
                }
                break;
         case BGPTYPE_ORIGINATOR_ID:
@@ -485,29 +494,27 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *dat, int len)
                        printf("invalid len");
                        break;
                }
-                printf("%s",getname(p));
+                printf("%s",getname(tptr));
                 break;
         case BGPTYPE_CLUSTER_LIST:
                 while (tlen>0) {
                         printf("%s%s",
-                               getname(p),
+                               getname(tptr),
                                 (tlen>4) ? ", " : "");
                         tlen -=4;
-                        p +=4;
+                        tptr +=4;
                 }
                 break;
        case BGPTYPE_MP_REACH_NLRI:
-               af = EXTRACT_16BITS(p);
-               safi = p[2];
+               af = EXTRACT_16BITS(tptr);
+               safi = tptr[2];
        
-                printf("\n\t    AFI %s (%u), %sSAFI %s (%u)",
+                printf("\n\t    AFI: %s (%u), %sSAFI: %s (%u)",
                        tok2str(bgp_afi_values, "Unknown AFI", af),
                        af,
                        (safi>128) ? "vendor specific " : "", /* 128 is meanwhile wellknown */
                        tok2str(bgp_safi_values, "Unknown SAFI", safi),
                        safi);
-       
-               p += 3;
 
                if (af == AFNUM_INET)
                        ;
@@ -515,14 +522,21 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *dat, int len)
                else if (af == AFNUM_INET6)
                        ;
 #endif
-               else
-                       break;
+               else {
+                    printf("\n\t    no AFI %u decoder",af);
+                    if (!vflag)
+                        print_unknown_data(tptr,"\n\t    ",tlen);
+                    break;
+                }
+
+                tptr +=3;
+
+               tlen = tptr[0];
+                tptr++;
 
-               tlen = p[0];
                if (tlen) {
                        printf("\n\t    nexthop: ");
-                       i = 0;
-                       while (i < tlen) {
+                       while (tlen > 0) {
                                switch (af) {
                                case AFNUM_INET:
                                     switch(safi) {
@@ -530,12 +544,14 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *dat, int len)
                                     case SAFNUM_MULTICAST:
                                     case SAFNUM_UNIMULTICAST:
                                     case SAFNUM_LABUNICAST:
-                                       printf("%s", getname(p + 1 + i));
-                                       i += sizeof(struct in_addr);
+                                       printf("%s", getname(tptr));
+                                       tlen -= sizeof(struct in_addr);
+                                        tptr += sizeof(struct in_addr);
                                        break;
                                     default:
                                         printf("no SAFI %u decoder",safi);                                        
-                                        i = tlen;
+                                        if (!vflag)
+                                            print_unknown_data(tptr,"\n\t    ",tlen);
                                         break;
                                     }
                                     break;
@@ -546,54 +562,60 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *dat, int len)
                                     case SAFNUM_MULTICAST:
                                     case SAFNUM_UNIMULTICAST:
                                     case SAFNUM_LABUNICAST:
-                                        printf("%s", getname6(p + 1 + i));
-                                        i += sizeof(struct in6_addr);
+                                        printf("%s", getname6(tptr));
+                                        tlen -= sizeof(struct in6_addr);
+                                        tptr += sizeof(struct in6_addr);
                                         break;
                                     default:
-                                        printf("no SAFI %u decoder",safi);                                        
-                                        i = tlen;
+                                        printf("no SAFI %u decoder",safi);
+                                        if (!vflag)
+                                            print_unknown_data(tptr,"\n\t    ",tlen);                                        
                                         break;
                                     }
 #endif
                                default:
-                                    printf("no AF %u decoder",af);
-                                    i = tlen;  /*exit loop*/
+                                    printf("no AFI %u decoder",af);
+                                    if (!vflag)
+                                      print_unknown_data(tptr,"\n\t    ",tlen);
                                     break;
                                }
                        }
                }
-               p += 1 + tlen;
+               tptr += tlen;
+
+               snpa = tptr[0];
+               tptr++;
 
-               snpa = p[0];
-               p++;
                if (snpa) {
                        printf("\n\t    %u SNPA", snpa);
                        for (/*nothing*/; snpa > 0; snpa--) {
-                               printf("\n\t      %d bytes", p[0]);
-                               p += p[0] + 1;
+                               printf("\n\t      %d bytes", tptr[0]);
+                               tptr += tptr[0] + 1;
                        }
                } else {
                 printf(", no SNPA");
                 }
 
-               while (len - (p - dat) > 0) {
+               while (len - (tptr - pptr) > 0) {
                        switch (af) {
                        case AFNUM_INET:
                             switch (safi) {
                             case SAFNUM_UNICAST:
                             case SAFNUM_MULTICAST:
                             case SAFNUM_UNIMULTICAST:
-                                advance = decode_prefix4(p, buf, sizeof(buf));
+                                advance = decode_prefix4(tptr, buf, sizeof(buf));
                                 printf("\n\t      %s", buf);
                                 break;
                             case SAFNUM_LABUNICAST:
-                                advance = decode_labeled_prefix4(p, buf, sizeof(buf));
+                                advance = decode_labeled_prefix4(tptr, buf, sizeof(buf));
                                 printf("\n\t      %s", buf);
                                 break;
                             default:
                                 printf("\n\t      no SAFI %u decoder",safi);
+                                if (!vflag)
+                                    print_unknown_data(tptr-3,"\n\t    ",tlen);
                                 advance = 0;
-                               p = dat + len;
+                               tptr = pptr + len;
                                break;  
                             }
                             break;
@@ -603,62 +625,66 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *dat, int len)
                             case SAFNUM_UNICAST:
                             case SAFNUM_MULTICAST:
                             case SAFNUM_UNIMULTICAST:
-                               advance = decode_prefix6(p, buf, sizeof(buf));
+                               advance = decode_prefix6(tptr, buf, sizeof(buf));
                                printf("\n\t      %s", buf);
                                break;
                             default:
                                 printf("\n\t      no SAFI %u decoder ",safi);
+                                if (!vflag)
+                                    print_unknown_data(tptr-3,"\n\t    ",tlen);
                                 advance = 0;
-                               p = dat + len;
+                               tptr = ptr + len;
                                break;
                             }
                             break;
 #endif
                        default:
-                            printf("\n\t      no AF %u decoder ",af);
+                            printf("\n\t      no AFI %u decoder ",af);
+                            if (!vflag)
+                                    print_unknown_data(tptr-3,"\n\t    ",tlen);
                             advance = 0;
-                            p = dat + len;
+                            tptr = pptr + len;
                             break;
                        }
 
-                       p += advance;
+                       tptr += advance;
                }
 
                break;
 
        case BGPTYPE_MP_UNREACH_NLRI:
-               af = EXTRACT_16BITS(p);
-               safi = p[2];
+               af = EXTRACT_16BITS(tptr);
+               safi = tptr[2];
 
-                printf("\n\t    AFI %s (%u), %sSAFI %s (%u)",
+                printf("\n\t    AFI: %s (%u), %sSAFI: %s (%u)",
                        tok2str(bgp_afi_values, "Unknown AFI", af),
                        af,
                        (safi>128) ? "vendor specific " : "", /* 128 is meanwhile wellknown */
                        tok2str(bgp_safi_values, "Unknown SAFI", safi),
                        safi);
 
-               p += 3;
-
-               printf("\n\t    Withdrawn routes");
+               tptr += 3;
                 
-               while (len - (p - dat) > 0) {
+               while (len - (tptr - pptr) > 0) {
                        switch (af) {
                        case AFNUM_INET:
                             switch (safi) {
                             case SAFNUM_UNICAST:
                             case SAFNUM_MULTICAST:
                             case SAFNUM_UNIMULTICAST:
-                                advance = decode_prefix4(p, buf, sizeof(buf));
+                                advance = decode_prefix4(tptr, buf, sizeof(buf));
                                 printf("\n\t      %s", buf);
                                 break;
                             case SAFNUM_LABUNICAST:
-                                advance = decode_labeled_prefix4(p, buf, sizeof(buf));
+                                advance = decode_labeled_prefix4(tptr, buf, sizeof(buf));
                                 printf("\n\t      %s", buf);
                                 break;
                             default:
                                 printf("\n\t      no SAFI %u decoder",safi);
+                                if (!vflag)
+                                    print_unknown_data(tptr-3,"\n\t    ",tlen);
                                 advance = 0;
-                               p = dat + len;
+                               tptr = pptr + len;
                                break;  
                             }
                             break;
@@ -669,31 +695,95 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *dat, int len)
                             case SAFNUM_UNICAST:
                             case SAFNUM_MULTICAST:
                             case SAFNUM_UNIMULTICAST:
-                               advance = decode_prefix6(p, buf, sizeof(buf));
+                               advance = decode_prefix6(tptr, buf, sizeof(buf));
                                printf("\n\t      %s", buf);
                                break;
                             default:
                                 printf("\n\t      no SAFI %u decoder",safi);
+                                if (!vflag)
+                                    print_unknown_data(tptr-3,"\n\t    ",tlen);
                                 advance = 0;
-                               p = dat + len;
+                               tptr = pptr + len;
                                break;
                             }
                             break;
 #endif
                        default:
-                               printf("\n\t      no AF %u decoder",af);
+                               printf("\n\t    no AFI %u decoder",af);
+                                if (!vflag)
+                                    print_unknown_data(tptr-3,"\n\t    ",tlen);
                                advance = 0;
-                               p = dat + len;
+                               tptr = pptr + len;
                                break;
                        }
 
-                       p += advance;
+                       tptr += advance;
                }
                break;
+        case BGPTYPE_EXTD_COMMUNITIES:
+               if (len % 8) {
+                       printf("invalid len");
+                       break;
+               }
+                while (tlen>0) {
+                    u_int8_t extd_comm,extd_comm_type,extd_comm_subtype;
+                    extd_comm=*tptr;
+                    extd_comm_type=extd_comm&0x3f;
+                    extd_comm_subtype=*(tptr+1);
+                    switch(extd_comm_type) {
+                        case 0:
+                            printf("%s%s%s:%u:%s%s",
+                                   (extd_comm&0x80) ? "vendor-specific: " : "",
+                                   (extd_comm&0x40) ? "non-transitive:" : "",
+                                   tok2str(bgp_extd_comm_subtype_values,
+                                           "unknown",
+                                           extd_comm_subtype&0x3f),
+                                   EXTRACT_16BITS(tptr+2),
+                                   getname(tptr+4),
+                                   (tlen>8) ? ", " : "");
+                            break;
+                        case 1:
+                            printf("%s%s%s:%s:%u%s",
+                                   (extd_comm&0x80) ? "vendor-specific: " : "",
+                                   (extd_comm&0x40) ? "non-transitive:" : "",
+                                   tok2str(bgp_extd_comm_subtype_values,
+                                           "unknown",
+                                           extd_comm_subtype&0x3f),
+                                   getname(tptr+2),
+                                   EXTRACT_16BITS(tptr+6),
+                                   (tlen>8) ? ", " : "");
+                            break;
+                        case 2:
+                            printf("%s%s%s:%u:%u%s",
+                                   (extd_comm&0x80) ? "vendor-specific: " : "",
+                                   (extd_comm&0x40) ? "non-transitive:" : "",
+                                   tok2str(bgp_extd_comm_subtype_values,
+                                           "unknown",
+                                           extd_comm_subtype&0x3f),
+                                   EXTRACT_32BITS(tptr+2),
+                                   EXTRACT_16BITS(tptr+6),
+                                   (tlen>8) ? ", " : "");
+                            break;
+
+                        default:
+                            printf("\n\t      no typecode %u decoder",
+                               extd_comm_type);
+                            print_unknown_data(tptr,"\n\t      ",8);
+                            break;
+                    }
+                    tlen -=8;
+                    tptr +=8;
+                }
+                break;
+
        default:
-            printf("no decoder");
-               break;
+            printf("\n\t    no Attribute %u decoder",attr->bgpa_type); /* we have no decoder for the attribute */
+            if (!vflag)
+                print_unknown_data(pptr,"\n\t    ",len);
+            break;
        }
+        if (vflag&&len) /* omit zero length attributes*/
+            print_unknown_data(pptr,"\n\t    ",len);
 }
 
 static void
@@ -826,9 +916,13 @@ bgp_update_print(const u_char *dat, int length)
                        alen = bgp_attr_len(&bgpa);
                        aoff = bgp_attr_off(&bgpa);
 
-                       printf("\n\t  %s ", tok2str(bgp_attr_values, "Unknown Attribute", bgpa.bgpa_type));
+                      printf("\n\t  %s (%u), length: %u",
+                              tok2str(bgp_attr_values, "Unknown Attribute", bgpa.bgpa_type),
+                              bgpa.bgpa_type,
+                              alen);
+
                        if (bgpa.bgpa_flags) {
-                               printf("[%s%s%s%s",
+                               printf(", flags [%s%s%s%s",
                                        bgpa.bgpa_flags & 0x80 ? "O" : "",
                                        bgpa.bgpa_flags & 0x40 ? "T" : "",
                                        bgpa.bgpa_flags & 0x20 ? "P" : "",
@@ -837,7 +931,6 @@ bgp_update_print(const u_char *dat, int length)
                                        printf("+%x", bgpa.bgpa_flags & 0xf);
                                printf("]: ");
                        }
-
                        bgp_attr_print(&bgpa, &p[i + aoff], alen);
                        i += aoff + alen;
                }
@@ -899,7 +992,10 @@ bgp_header_print(const u_char *dat, int length)
 
        TCHECK2(dat[0], BGP_SIZE);
        memcpy(&bgp, dat, BGP_SIZE);
-       printf("\n\t%s Message", tok2str(bgp_msg_values, "Unknown Type", bgp.bgp_type));
+       printf("\n\t%s Message (%u), length: %u ",
+               tok2str(bgp_msg_values, "Unknown", bgp.bgp_type),
+               bgp.bgp_type,
+               length);
 
        switch (bgp.bgp_type) {
        case BGP_OPEN:
@@ -911,6 +1007,13 @@ bgp_header_print(const u_char *dat, int length)
        case BGP_NOTIFICATION:
                bgp_notification_print(dat, length);
                break;
+        case BGP_KEEPALIVE:
+                break;
+        default:
+            /* we have no decoder for the BGP message */
+            printf("\n\t  no Message %u decoder",bgp.bgp_type);
+            print_unknown_data(dat,"\n\t  ",length);
+                break;
        }
        return;
 trunc:
@@ -983,3 +1086,8 @@ trunc:
 
 
 
+
+
+
+
+