]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-bgp.c
cleaned up bgp_attr_print{}
[tcpdump] / print-bgp.c
index 6d17f6f6b606ce7cab7229828f024b457c570ba3..fe87a9f8d6cc84df785b98db51b10c44dfe6f70a 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 1999 WIDE Project.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-bgp.c,v 1.22 2001-01-28 09:52:47 itojun 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,6 +63,16 @@ 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}
+};
 
 struct bgp_open {
        u_int8_t bgpo_marker[16];
@@ -75,12 +85,14 @@ struct bgp_open {
        u_int8_t bgpo_optlen;
        /* options should follow */
 };
+#define BGP_OPEN_SIZE          29      /* unaligned */
 
 struct bgp_opt {
        u_int8_t bgpopt_type;
        u_int8_t bgpopt_len;
        /* variable length */
 };
+#define BGP_OPT_SIZE           2       /* some compilers may pad to 4 bytes */
 
 struct bgp_notification {
        u_int8_t bgpn_marker[16];
@@ -90,6 +102,7 @@ struct bgp_notification {
        u_int8_t bgpn_minor;
        /* data should follow */
 };
+#define BGP_NOTIFICATION_SIZE          21      /* unaligned */
 
 struct bgp_attr {
        u_int8_t bgpa_flags;
@@ -115,88 +128,134 @@ struct bgp_attr {
 #define        BGPTYPE_COMMUNITIES             8       /* RFC1997 */
 #define        BGPTYPE_ORIGINATOR_ID           9       /* RFC1998 */
 #define        BGPTYPE_CLUSTER_LIST            10      /* RFC1998 */
-#define        BGPTYPE_DPA                     11      /* work in progress */
+#define        BGPTYPE_DPA                     11      /* draft-ietf-idr-bgp-dpa */
 #define        BGPTYPE_ADVERTISERS             12      /* RFC1863 */
 #define        BGPTYPE_RCID_PATH               13      /* RFC1863 */
 #define BGPTYPE_MP_REACH_NLRI          14      /* RFC2283 */
 #define BGPTYPE_MP_UNREACH_NLRI                15      /* RFC2283 */
+#define BGPTYPE_EXTD_COMMUNITIES        16      /* draft-ietf-idr-bgp-ext-communities */
+
+static struct tok bgp_attr_values[] = {
+    { BGPTYPE_ORIGIN,           "Origin"},
+    { BGPTYPE_AS_PATH,          "AS Path"},
+    { BGPTYPE_NEXT_HOP,         "Next Hop"},
+    { BGPTYPE_MULTI_EXIT_DISC,  "Multi Exit Discriminator"},
+    { BGPTYPE_LOCAL_PREF,       "Local Preference"},
+    { BGPTYPE_ATOMIC_AGGREGATE, "Atomic Aggregate"},
+    { BGPTYPE_AGGREGATOR,       "Aggregator"},
+    { BGPTYPE_COMMUNITIES,      "Community"},
+    { BGPTYPE_ORIGINATOR_ID,    "Originator ID"},
+    { BGPTYPE_CLUSTER_LIST,     "Cluster List"},
+    { BGPTYPE_DPA,              "DPA"},
+    { BGPTYPE_ADVERTISERS,      "Advertisers"},
+    { BGPTYPE_RCID_PATH,        "RCID Path / Cluster ID"},
+    { BGPTYPE_MP_REACH_NLRI,    "Multi-Protocol Reach NLRI"},
+    { BGPTYPE_MP_UNREACH_NLRI,  "Multi-Protocol Unreach NLRI"},
+    { BGPTYPE_EXTD_COMMUNITIES, "Extended Community"},
+    { 255,                      "Reserved for development"},
+    { 0, NULL}
+};
 
+#define BGP_OPT_AUTH                    1
+#define BGP_OPT_CAP                     2
 
-static const char *bgptype[] = {
-       NULL, "OPEN", "UPDATE", "NOTIFICATION", "KEEPALIVE",
-};
-#define bgp_type(x) num_or_str(bgptype, sizeof(bgptype)/sizeof(bgptype[0]), (x))
 
-static const char *bgpopt_type[] = {
-       NULL, "Authentication Information",
+static struct tok bgp_opt_values[] = {
+    { BGP_OPT_AUTH,             "Authentication Information"},
+    { BGP_OPT_CAP,              "Capabilities Advertisement"},
+    { 0, NULL}
 };
-#define bgp_opttype(x) \
-       num_or_str(bgpopt_type, sizeof(bgpopt_type)/sizeof(bgpopt_type[0]), (x))
-
-static const char *bgpnotify_major[] = {
-       NULL, "Message Header Error",
-       "OPEN Message Error", "UPDATE Message Error",
-       "Hold Timer Expired", "Finite State Machine Error",
-       "Cease",
-};
-#define bgp_notify_major(x) \
-       num_or_str(bgpnotify_major, \
-               sizeof(bgpnotify_major)/sizeof(bgpnotify_major[0]), (x))
 
-static const char *bgpnotify_minor_1[] = {
-       NULL, "Connection Not Synchronized",
-       "Bad Message Length", "Bad Message Type",
-};
+#define BGP_CAPCODE_MP                  1
+#define BGP_CAPCODE_RR                  2
+#define BGP_CAPCODE_RR_CISCO          128
 
-static const char *bgpnotify_minor_2[] = {
-       NULL, "Unsupported Version Number",
-       "Bad Peer AS", "Bad BGP Identifier",
-       "Unsupported Optional Parameter", "Authentication Failure",
-       "Unacceptable Hold Time",
+static struct tok bgp_capcode_values[] = {
+    { BGP_CAPCODE_MP,           "Multiprotocol Extensions"},
+    { BGP_CAPCODE_RR,           "Route Refresh"},
+    { BGP_CAPCODE_RR_CISCO,     "Route Refresh (Cisco)"},
+    { 0, NULL}
 };
 
-static const char *bgpnotify_minor_3[] = {
-       NULL, "Malformed Attribute List",
-       "Unrecognized Well-known Attribute", "Missing Well-known Attribute",
-       "Attribute Flags Error", "Attribute Length Error",
-       "Invalid ORIGIN Attribute", "AS Routing Loop",
-       "Invalid NEXT_HOP Attribute", "Optional Attribute Error",
-       "Invalid Network Field", "Malformed AS_PATH",
+#define BGP_NOTIFY_MAJOR_MSG            1
+#define BGP_NOTIFY_MAJOR_OPEN           2
+#define BGP_NOTIFY_MAJOR_UPDATE         3
+#define BGP_NOTIFY_MAJOR_HOLDTIME       4
+#define BGP_NOTIFY_MAJOR_FSM            5
+#define BGP_NOTIFY_MAJOR_CEASE          6
+
+static struct tok bgp_notify_major_values[] = {
+    { BGP_NOTIFY_MAJOR_MSG,     "Message Header Error"},
+    { BGP_NOTIFY_MAJOR_OPEN,    "OPEN Message Error"},
+    { BGP_NOTIFY_MAJOR_UPDATE,  "UPDATE Message Error"},
+    { BGP_NOTIFY_MAJOR_HOLDTIME,"Hold Timer Expired"},
+    { BGP_NOTIFY_MAJOR_FSM,     "Finite State Machine Error"},
+    { BGP_NOTIFY_MAJOR_CEASE,   "Cease"},
+    { 0, NULL}
 };
 
-static const char **bgpnotify_minor[] = {
-       NULL, bgpnotify_minor_1, bgpnotify_minor_2, bgpnotify_minor_3,
+static struct tok bgp_notify_minor_msg_values[] = {
+    { 1,                        "Connection Not Synchronized"},
+    { 2,                        "Bad Message Length"},
+    { 3,                        "Bad Message Type"},
+    { 0, NULL}
 };
-static const int bgpnotify_minor_siz[] = {
-       0, sizeof(bgpnotify_minor_1)/sizeof(bgpnotify_minor_1[0]),
-       sizeof(bgpnotify_minor_2)/sizeof(bgpnotify_minor_2[0]),
-       sizeof(bgpnotify_minor_3)/sizeof(bgpnotify_minor_3[0]),
+
+static struct tok bgp_notify_minor_open_values[] = {
+    { 1,                        "Unsupported Version Number"},
+    { 2,                        "Bad Peer AS"},
+    { 3,                        "Bad BGP Identifier"},
+    { 4,                        "Unsupported Optional Parameter"},
+    { 5,                        "Authentication Failure"},
+    { 6,                        "Unacceptable Hold Time"},
+    { 0, NULL}
 };
 
-static const char *bgpattr_origin[] = {
-       "IGP", "EGP", "INCOMPLETE",
+static struct tok bgp_notify_minor_update_values[] = {
+    { 1,                        "Malformed Attribute List"},
+    { 2,                        "Unrecognized Well-known Attribute"},
+    { 3,                        "Missing Well-known Attribute"},
+    { 4,                        "Attribute Flags Error"},
+    { 5,                        "Attribute Length Error"},
+    { 6,                        "Invalid ORIGIN Attribute"},
+    { 7,                        "AS Routing Loop"},
+    { 8,                        "Invalid NEXT_HOP Attribute"},
+    { 9,                        "Optional Attribute Error"},
+    { 10,                       "Invalid Network Field"},
+    { 11,                       "Malformed AS_PATH"},
+    { 0, NULL}
 };
-#define bgp_attr_origin(x) \
-       num_or_str(bgpattr_origin, \
-               sizeof(bgpattr_origin)/sizeof(bgpattr_origin[0]), (x))
-
-static const char *bgpattr_type[] = {
-       NULL, "ORIGIN", "AS_PATH", "NEXT_HOP",
-       "MULTI_EXIT_DISC", "LOCAL_PREF", "ATOMIC_AGGREGATE", "AGGREGATOR",
-       "COMMUNITIES", "ORIGINATOR_ID", "CLUSTER_LIST", "DPA",
-       "ADVERTISERS", "RCID_PATH", "MP_REACH_NLRI", "MP_UNREACH_NLRI",
+
+static struct tok bgp_origin_values[] = {
+    { 0,                        "IGP"},
+    { 1,                        "EGP"},
+    { 2,                        "Incomplete"},
+    { 0, NULL}
 };
-#define bgp_attr_type(x) \
-       num_or_str(bgpattr_type, \
-               sizeof(bgpattr_type)/sizeof(bgpattr_type[0]), (x))
 
 /* Subsequent address family identifier, RFC2283 section 7 */
-static const char *bgpattr_nlri_safi[] = {
-       "Reserved", "Unicast", "Multicast", "Unicast+Multicast",
+#define SAFNUM_RES                      0
+#define SAFNUM_UNICAST                  1
+#define SAFNUM_MULTICAST                2
+#define SAFNUM_UNIMULTICAST             3
+/* labeled BGP RFC3107 */
+#define SAFNUM_LABUNICAST               4
+/* Section 4.3.4 of draft-rosen-rfc2547bis-03.txt  */
+#define SAFNUM_VPNUNICAST               128
+#define SAFNUM_VPNMULTICAST             129
+#define SAFNUM_VPNUNIMULTICAST          130
+
+static struct tok bgp_safi_values[] = {
+    { SAFNUM_RES,               "Reserved"},
+    { SAFNUM_UNICAST,           "Unicast"},
+    { SAFNUM_MULTICAST,         "Multicast"},
+    { SAFNUM_UNIMULTICAST,      "Unicast+Multicast"},
+    { SAFNUM_LABUNICAST,        "labeled Unicast"},
+    { SAFNUM_VPNUNICAST,        "labeled VPN Unicast"},
+    { SAFNUM_VPNMULTICAST,      "labeled VPN Multicast"},
+    { SAFNUM_VPNUNIMULTICAST,   "labeled VPN Unicast+Multicast"},
+    { 0, NULL }
 };
-#define bgp_attr_nlri_safi(x) \
-       num_or_str(bgpattr_nlri_safi, \
-               sizeof(bgpattr_nlri_safi)/sizeof(bgpattr_nlri_safi[0]), (x))
 
 /* well-known community */
 #define BGP_COMMUNITY_NO_EXPORT                        0xffffff01
@@ -219,61 +278,42 @@ static const char *bgpattr_nlri_safi[] = {
 #define AFNUM_DECNET   13
 #define AFNUM_BANYAN   14
 #define AFNUM_E164NSAP 15
-
-static const char *afnumber[] = {
-       "Reserved", "IPv4", "IPv6", "NSAP", "HDLC",
-       "BBN 1822", "802", "E.163", "E.164", "F.69",
-       "X.121", "IPX", "Appletalk", "Decnet IV", "Banyan Vines",
-       "E.164 with NSAP subaddress",
+/* draft-kompella-ppvpn-l2vpn */
+#define AFNUM_L2VPN     196 /* still to be approved by IANA */
+
+static struct tok bgp_afi_values[] = {
+    { 0,                      "Reserved"},
+    { AFNUM_INET,             "IPv4"},
+    { AFNUM_INET6,            "IPv6"},
+    { AFNUM_NSAP,             "NSAP"},
+    { AFNUM_HDLC,             "HDLC"},
+    { AFNUM_BBN1822,          "BBN 1822"},
+    { AFNUM_802,              "802"},
+    { AFNUM_E163,             "E.163"},
+    { AFNUM_E164,             "E.164"},
+    { AFNUM_F69,              "F.69"},
+    { AFNUM_X121,             "X.121"},
+    { AFNUM_IPX,              "Novell IPX"},
+    { AFNUM_ATALK,            "Appletalk"},
+    { AFNUM_DECNET,           "Decnet IV"},
+    { AFNUM_BANYAN,           "Banyan Vines"},
+    { AFNUM_E164NSAP,         "E.164 with NSAP subaddress"},
+    { AFNUM_L2VPN,            "Layer-2 VPN"},
+    { 0, NULL},
 };
-#define af_name(x) \
-       (((x) == 65535) ? afnumber[0] : \
-               num_or_str(afnumber, \
-                       sizeof(afnumber)/sizeof(afnumber[0]), (x)))
-
-
-static const char *
-num_or_str(const char **table, size_t siz, int value)
-{
-       static char buf[20];
-       if (value < 0 || siz <= value || table[value] == NULL) {
-               snprintf(buf, sizeof(buf), "#%d", value);
-               return buf;
-       } else
-               return table[value];
-}
 
-static const char *
-bgp_notify_minor(int major, int minor)
-{
-       static const char **table;
-       int siz;
-       static char buf[20];
-       const char *p;
-
-       if (0 <= major
-        && major < sizeof(bgpnotify_minor)/sizeof(bgpnotify_minor[0])
-        && bgpnotify_minor[major]) {
-               table = bgpnotify_minor[major];
-               siz = bgpnotify_minor_siz[major];
-               if (0 <= minor && minor < siz && table[minor])
-                       p = table[minor];
-               else
-                       p = NULL;
-       } else
-               p = NULL;
-       if (p == NULL) {
-               snprintf(buf, sizeof(buf), "#%d", minor);
-               return buf;
-       } else
-               return p;
-}
+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, int buflen)
+decode_prefix4(const u_char *pd, char *buf, u_int buflen)
 {
        struct in_addr addr;
-       int plen;
+       u_int plen;
 
        plen = pd[0];
        if (plen < 0 || 32 < plen)
@@ -289,12 +329,49 @@ decode_prefix4(const u_char *pd, char *buf, int buflen)
        return 1 + (plen + 7) / 8;
 }
 
+static int
+decode_labeled_prefix4(const u_char *pd, char *buf, u_int buflen)
+{
+       struct in_addr addr;
+       u_int plen;
+
+       plen = pd[0];   /* get prefix length */
+
+        /* this is one of the weirdnesses of rfc3107
+           the label length (actually the label + COS bits)
+           is added of the prefix length;
+           we also do only read out just one label -
+           there is no real application for advertisment of
+           stacked labels in a a single BGP message
+        */
+
+        plen-=24; /* adjust prefixlen - labellength */
+
+       if (plen < 0 || 32 < plen)
+               return -1;
+
+       memset(&addr, 0, sizeof(addr));
+       memcpy(&addr, &pd[4], (plen + 7) / 8);
+       if (plen % 8) {
+               ((u_char *)&addr)[(plen + 7) / 8 - 1] &=
+                       ((0xff00 >> (plen % 8)) & 0xff);
+       }
+        /* the label may get offsetted by 4 bits so lets shift it right */
+       snprintf(buf, buflen, "%s/%d label:%u %s",
+                 getname((u_char *)&addr),
+                 plen,
+                 EXTRACT_24BITS(pd+1)>>4,
+                 ((pd[3]&1)==0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
+
+       return 4 + (plen + 7) / 8;
+}
+
 #ifdef INET6
 static int
-decode_prefix6(const u_char *pd, char *buf, int buflen)
+decode_prefix6(const u_char *pd, char *buf, u_int buflen)
 {
        struct in6_addr addr;
-       int plen;
+       u_int plen;
 
        plen = pd[0];
        if (plen < 0 || 128 < plen)
@@ -306,87 +383,91 @@ decode_prefix6(const u_char *pd, char *buf, int buflen)
                addr.s6_addr[(plen + 7) / 8 - 1] &=
                        ((0xff00 >> (plen % 8)) & 0xff);
        }
-       snprintf(buf, buflen, "%s/%d", getname6((char *)&addr), plen);
+       snprintf(buf, buflen, "%s/%d", getname6((u_char *)&addr), plen);
        return 1 + (plen + 7) / 8;
 }
 #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) {
        case BGPTYPE_ORIGIN:
                if (len != 1)
-                       printf(" invalid len");
+                       printf("invalid len");
                else
-                       printf(" %s", bgp_attr_origin(p[0]));
+                       printf("%s", tok2str(bgp_origin_values, "Unknown Origin Typecode", tptr[0]));
                break;
        case BGPTYPE_AS_PATH:
                if (len % 2) {
-                       printf(" invalid len");
+                       printf("invalid len");
                        break;
                }
-               while (p < dat + len) {
+                if (!len) {
+                       printf("empty");
+                       break;
+                }
+               while (tptr < pptr + len) {
                        /*
                         * under RFC1965, p[0] means:
                         * 1: AS_SET 2: AS_SEQUENCE
                         * 3: AS_CONFED_SET 4: AS_CONFED_SEQUENCE
                         */
-                       printf(" ");
-                       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]; i += 2) {
+                       printf("%s", (tptr[0] & 1) ? "{" : "");
+                       for (i = 0; i < tptr[1] * 2; i += 2) {
                                printf("%s%u", i == 0 ? "" : " ",
-                                       ntohs(*(u_int16_t *)&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");
+                       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");
+                       printf("invalid len");
                else
-                       printf(" %u", (u_int32_t)ntohl(*(u_int32_t *)p));
+                       printf("%u", EXTRACT_32BITS(tptr));
                break;
        case BGPTYPE_ATOMIC_AGGREGATE:
                if (len != 0)
-                       printf(" invalid len");
+                       printf("invalid len");
                break;
        case BGPTYPE_AGGREGATOR:
                if (len != 6) {
-                       printf(" invalid len");
+                       printf("invalid len");
                        break;
                }
-               printf(" AS #%u, origin %s", ntohs(*(u_int16_t *)p),
-                       getname(p + 2));
+               printf(" AS #%u, origin %s", EXTRACT_16BITS(tptr),
+                       getname(tptr + 2));
                break;
        case BGPTYPE_COMMUNITIES:
                if (len % 4) {
-                       printf(" invalid len");
+                       printf("invalid len");
                        break;
                }
-               for (i = 0; i < len; i += 4) {
+               while (tlen>0) {
                        u_int32_t comm;
-                       comm = (u_int32_t)ntohl(*(u_int32_t *)&p[i]);
+                       comm = EXTRACT_32BITS(tptr);
                        switch (comm) {
                        case BGP_COMMUNITY_NO_EXPORT:
                                printf(" NO_EXPORT");
@@ -398,22 +479,42 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *dat, int len)
                                printf(" NO_EXPORT_SUBCONFED");
                                break;
                        default:
-                               printf(" (AS #%d value 0x%04x)",
-                                       (comm >> 16) & 0xffff, comm & 0xffff);
+                               printf("%u:%u%s",
+                                       (comm >> 16) & 0xffff,
+                                       comm & 0xffff,
+                                       (tlen>4) ? ", " : "");
                                break;
                        }
+                        tlen -=4;
+                        tptr +=4;
                }
                break;
-       case BGPTYPE_MP_REACH_NLRI:
-               af = ntohs(*(u_int16_t *)p);
-               safi = p[2];
-               if (safi >= 128)
-                       printf(" %s vendor specific,", af_name(af));
-               else {
-                       printf(" %s %s,", af_name(af),
-                               bgp_attr_nlri_safi(safi));
+        case BGPTYPE_ORIGINATOR_ID:
+               if (len != 4) {
+                       printf("invalid len");
+                       break;
                }
-               p += 3;
+                printf("%s",getname(tptr));
+                break;
+        case BGPTYPE_CLUSTER_LIST:
+                while (tlen>0) {
+                        printf("%s%s",
+                               getname(tptr),
+                                (tlen>4) ? ", " : "");
+                        tlen -=4;
+                        tptr +=4;
+                }
+                break;
+       case BGPTYPE_MP_REACH_NLRI:
+               af = EXTRACT_16BITS(tptr);
+               safi = tptr[2];
+       
+                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);
 
                if (af == AFNUM_INET)
                        ;
@@ -421,108 +522,268 @@ 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(" nexthop");
-                       i = 0;
-                       while (i < tlen) {
+                       printf("\n\t    nexthop: ");
+                       while (tlen > 0) {
                                switch (af) {
                                case AFNUM_INET:
-                                       printf(" %s", getname(p + 1 + i));
-                                       i += sizeof(struct in_addr);
+                                    switch(safi) {
+                                    case SAFNUM_UNICAST:
+                                    case SAFNUM_MULTICAST:
+                                    case SAFNUM_UNIMULTICAST:
+                                    case SAFNUM_LABUNICAST:
+                                       printf("%s", getname(tptr));
+                                       tlen -= sizeof(struct in_addr);
+                                        tptr += sizeof(struct in_addr);
                                        break;
+                                    default:
+                                        printf("no SAFI %u decoder",safi);                                        
+                                        if (!vflag)
+                                            print_unknown_data(tptr,"\n\t    ",tlen);
+                                        break;
+                                    }
+                                    break;
 #ifdef INET6
                                case AFNUM_INET6:
-                                       printf(" %s", getname6(p + 1 + i));
-                                       i += sizeof(struct in6_addr);
-                                       break;
+                                    switch(safi) {
+                                    case SAFNUM_UNICAST:
+                                    case SAFNUM_MULTICAST:
+                                    case SAFNUM_UNIMULTICAST:
+                                    case SAFNUM_LABUNICAST:
+                                        printf("%s", getname6(tptr));
+                                        tlen -= sizeof(struct in6_addr);
+                                        tptr += sizeof(struct in6_addr);
+                                        break;
+                                    default:
+                                        printf("no SAFI %u decoder",safi);
+                                        if (!vflag)
+                                            print_unknown_data(tptr,"\n\t    ",tlen);                                        
+                                        break;
+                                    }
 #endif
                                default:
-                                       printf(" (unknown af)");
-                                       i = tlen;       /*exit loop*/
-                                       break;
+                                    printf("no AFI %u decoder",af);
+                                    if (!vflag)
+                                      print_unknown_data(tptr,"\n\t    ",tlen);
+                                    break;
                                }
                        }
-                       printf(",");
                }
-               p += 1 + tlen;
+               tptr += tlen;
+
+               snpa = tptr[0];
+               tptr++;
 
-               snpa = p[0];
-               p++;
                if (snpa) {
-                       printf(" %u snpa", snpa);
+                       printf("\n\t    %u SNPA", snpa);
                        for (/*nothing*/; snpa > 0; snpa--) {
-                               printf("(%d bytes)", p[0]);
-                               p += p[0] + 1;
+                               printf("\n\t      %d bytes", tptr[0]);
+                               tptr += tptr[0] + 1;
                        }
-                       printf(",");
-               }
+               } else {
+                printf(", no SNPA");
+                }
 
-               printf(" NLRI");
-               while (len - (p - dat) > 0) {
+               while (len - (tptr - pptr) > 0) {
                        switch (af) {
                        case AFNUM_INET:
-                               advance = decode_prefix4(p, buf, sizeof(buf));
-                               printf(" %s", buf);
-                               break;
+                            switch (safi) {
+                            case SAFNUM_UNICAST:
+                            case SAFNUM_MULTICAST:
+                            case SAFNUM_UNIMULTICAST:
+                                advance = decode_prefix4(tptr, buf, sizeof(buf));
+                                printf("\n\t      %s", buf);
+                                break;
+                            case SAFNUM_LABUNICAST:
+                                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;
+                               tptr = pptr + len;
+                               break;  
+                            }
+                            break;
 #ifdef INET6
                        case AFNUM_INET6:
-                               advance = decode_prefix6(p, buf, sizeof(buf));
-                               printf(" %s", buf);
+                            switch (safi) {
+                            case SAFNUM_UNICAST:
+                            case SAFNUM_MULTICAST:
+                            case SAFNUM_UNIMULTICAST:
+                               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;
+                               tptr = ptr + len;
+                               break;
+                            }
+                            break;
 #endif
                        default:
-                               printf(" (unknown af)");
-                               advance = 0;
-                               p = dat + len;
-                               break;
+                            printf("\n\t      no AFI %u decoder ",af);
+                            if (!vflag)
+                                    print_unknown_data(tptr-3,"\n\t    ",tlen);
+                            advance = 0;
+                            tptr = pptr + len;
+                            break;
                        }
 
-                       p += advance;
+                       tptr += advance;
                }
 
                break;
 
        case BGPTYPE_MP_UNREACH_NLRI:
-               af = ntohs(*(u_int16_t *)p);
-               safi = p[2];
-               if (safi >= 128)
-                       printf(" %s vendor specific,", af_name(af));
-               else {
-                       printf(" %s %s,", af_name(af),
-                               bgp_attr_nlri_safi(safi));
-               }
-               p += 3;
-
-               printf(" Withdraw");
-               while (len - (p - dat) > 0) {
+               af = EXTRACT_16BITS(tptr);
+               safi = tptr[2];
+
+                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);
+
+               tptr += 3;
+                
+               while (len - (tptr - pptr) > 0) {
                        switch (af) {
                        case AFNUM_INET:
-                               advance = decode_prefix4(p, buf, sizeof(buf));
-                               printf(" %s", buf);
-                               break;
+                            switch (safi) {
+                            case SAFNUM_UNICAST:
+                            case SAFNUM_MULTICAST:
+                            case SAFNUM_UNIMULTICAST:
+                                advance = decode_prefix4(tptr, buf, sizeof(buf));
+                                printf("\n\t      %s", buf);
+                                break;
+                            case SAFNUM_LABUNICAST:
+                                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;
+                               tptr = pptr + len;
+                               break;  
+                            }
+                            break;
+
 #ifdef INET6
                        case AFNUM_INET6:
-                               advance = decode_prefix6(p, buf, sizeof(buf));
-                               printf(" %s", buf);
+                            switch (safi) {
+                            case SAFNUM_UNICAST:
+                            case SAFNUM_MULTICAST:
+                            case SAFNUM_UNIMULTICAST:
+                               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;
+                               tptr = pptr + len;
                                break;
+                            }
+                            break;
 #endif
                        default:
-                               printf(" (unknown 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:
-               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
@@ -532,32 +793,69 @@ bgp_open_print(const u_char *dat, int length)
        struct bgp_opt bgpopt;
        int hlen;
        const u_char *opt;
-       int i;
+       int i,cap_type,cap_len;
 
-       TCHECK2(dat[0], sizeof(bgpo));
-       memcpy(&bgpo, dat, sizeof(bgpo));
+       TCHECK2(dat[0], BGP_OPEN_SIZE);
+       memcpy(&bgpo, dat, BGP_OPEN_SIZE);
        hlen = ntohs(bgpo.bgpo_len);
 
-       printf(": Version %d,", bgpo.bgpo_version);
-       printf(" AS #%u,", ntohs(bgpo.bgpo_myas));
-       printf(" Holdtime %u,", ntohs(bgpo.bgpo_holdtime));
-       printf(" ID %s,", getname((u_char *)&bgpo.bgpo_id));
-       printf(" Option length %u", bgpo.bgpo_optlen);
+       printf("\n\t  Version %d, ", bgpo.bgpo_version);
+       printf("my AS %u, ", ntohs(bgpo.bgpo_myas));
+       printf("Holdtime %us, ", ntohs(bgpo.bgpo_holdtime));
+       printf("ID %s", getname((u_char *)&bgpo.bgpo_id));
+       printf("\n\t  Optional parameters, length %u", bgpo.bgpo_optlen);
 
        /* ugly! */
-       opt = &((struct bgp_open *)dat)->bgpo_optlen;
+       opt = &((const struct bgp_open *)dat)->bgpo_optlen;
        opt++;
 
-       for (i = 0; i < bgpo.bgpo_optlen; i++) {
-               memcpy(&bgpopt, &opt[i], sizeof(bgpopt));
+       i = 0;
+       while (i < bgpo.bgpo_optlen) {
+               TCHECK2(opt[i], BGP_OPT_SIZE);
+               memcpy(&bgpopt, &opt[i], BGP_OPT_SIZE);
                if (i + 2 + bgpopt.bgpopt_len > bgpo.bgpo_optlen) {
-                       printf(" [|opt %d %d]", bgpopt.bgpopt_len, bgpopt.bgpopt_type);
+                        printf("\n\t     Option %d, length %d", bgpopt.bgpopt_type, bgpopt.bgpopt_len);
                        break;
                }
 
-               printf(" (option %s, len=%d)", bgp_opttype(bgpopt.bgpopt_type),
-                       bgpopt.bgpopt_len);
-               i += sizeof(bgpopt) + bgpopt.bgpopt_len;
+               printf("\n\t    Option %s (%u), length %d",
+                       tok2str(bgp_opt_values,"Unknown", bgpopt.bgpopt_type),
+                       bgpopt.bgpopt_type,
+                       bgpopt.bgpopt_len);
+
+                /* now lets decode the options we know*/
+                switch(bgpopt.bgpopt_type) {
+                case BGP_OPT_CAP:
+                    cap_type=opt[i+BGP_OPT_SIZE];
+                    cap_len=opt[i+BGP_OPT_SIZE+1];
+                    printf("\n\t      %s, length %u",
+                           tok2str(bgp_capcode_values,"Unknown", cap_type),
+                           cap_len);
+                    switch(cap_type) {
+                    case BGP_CAPCODE_MP:
+                        printf("\n\t\tAFI %s (%u), SAFI %s (%u)",
+                               tok2str(bgp_afi_values,"Unknown", EXTRACT_16BITS(opt+i+BGP_OPT_SIZE+2)),
+                               EXTRACT_16BITS(opt+i+BGP_OPT_SIZE+2),
+                               tok2str(bgp_safi_values,"Unknown", opt[i+BGP_OPT_SIZE+5]),
+                               opt[i+BGP_OPT_SIZE+5]);
+                        break;
+                    case BGP_CAPCODE_RR:
+                    case BGP_CAPCODE_RR_CISCO:
+                        break;
+                    default:
+                        printf("\n\t\tno decoder for Capability %u",
+                               cap_type);
+                        break;
+                    }
+                    break;
+                case BGP_OPT_AUTH:
+                default:
+                       printf("\n\t      no decoder for option %u",
+                           bgpopt.bgpopt_type);
+                       break;
+                }
+
+               i += BGP_OPT_SIZE + bgpopt.bgpopt_len;
        }
        return;
 trunc:
@@ -573,13 +871,11 @@ bgp_update_print(const u_char *dat, int length)
        const u_char *p;
        int len;
        int i;
-       int newline;
 
-       TCHECK2(dat[0], sizeof(bgp));
-       memcpy(&bgp, dat, sizeof(bgp));
+       TCHECK2(dat[0], BGP_SIZE);
+       memcpy(&bgp, dat, BGP_SIZE);
        hlen = ntohs(bgp.bgp_len);
        p = dat + BGP_SIZE;     /*XXX*/
-       printf(":");
 
        /* Unfeasible routes */
        len = EXTRACT_16BITS(p);
@@ -590,20 +886,19 @@ bgp_update_print(const u_char *dat, int length)
                 * so only try to decode it if we're not v6 enabled.
                 */
 #ifdef INET6
-               printf(" (Withdrawn routes: %d bytes)", len);
-#else  
+               printf("\n\t  Withdrawn routes: %d bytes", len);
+#else
                char buf[MAXHOSTNAMELEN + 100];
 
                TCHECK2(p[2], len);
-               i = 2;
+               i = 2;
+
+               printf("\n\t  Withdrawn routes:");
 
-               printf(" (Withdrawn routes:");
-                       
                while(i < 2 + len) {
                        i += decode_prefix4(&p[i], buf, sizeof(buf));
-                       printf(" %s", buf);
+                       printf("\n\t    %s", buf);
                }
-               printf(")\n");
 #endif
        }
        p += 2 + len;
@@ -613,8 +908,6 @@ bgp_update_print(const u_char *dat, int length)
        if (len) {
                /* do something more useful!*/
                i = 2;
-               printf(" (Path attributes:");   /* ) */
-               newline = 0;
                while (i < 2 + len) {
                        int alen, aoff;
 
@@ -623,52 +916,37 @@ bgp_update_print(const u_char *dat, int length)
                        alen = bgp_attr_len(&bgpa);
                        aoff = bgp_attr_off(&bgpa);
 
-                       if (vflag && newline)
-                               printf("\n\t\t");
-                       else
-                               printf(" ");
-                       printf("(");            /* ) */
-                       printf("%s", bgp_attr_type(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" : "",
                                        bgpa.bgpa_flags & 0x10 ? "E" : "");
                                if (bgpa.bgpa_flags & 0xf)
                                        printf("+%x", bgpa.bgpa_flags & 0xf);
-                               printf("]");
+                               printf("]");
                        }
-
                        bgp_attr_print(&bgpa, &p[i + aoff], alen);
-                       newline = 1;
-
-                       /* ( */
-                       printf(")");    
-
                        i += aoff + alen;
                }
-
-               /* ( */
-               printf(")");
        }
        p += 2 + len;
 
-       if (len && dat + length > p)
-               printf("\n\t\t");
        if (dat + length > p) {
-               printf("(NLRI:");       /* ) */
+            printf("\n\t  Updated routes:");
                while (dat + length > p) {
                        char buf[MAXHOSTNAMELEN + 100];
                        i = decode_prefix4(p, buf, sizeof(buf));
-                       printf(" %s", buf);
+                       printf("\n\t    %s", buf);
                        if (i < 0)
                                break;
                        p += i;
                }
-
-               /* ( */
-               printf(")");
        }
        return;
 trunc:
@@ -681,13 +959,27 @@ bgp_notification_print(const u_char *dat, int length)
        struct bgp_notification bgpn;
        int hlen;
 
-       TCHECK2(dat[0], sizeof(bgpn));
-       memcpy(&bgpn, dat, sizeof(bgpn));
+       TCHECK2(dat[0], BGP_NOTIFICATION_SIZE);
+       memcpy(&bgpn, dat, BGP_NOTIFICATION_SIZE);
        hlen = ntohs(bgpn.bgpn_len);
 
-       printf(": error %s,", bgp_notify_major(bgpn.bgpn_major));
-       printf(" subcode %s",
-               bgp_notify_minor(bgpn.bgpn_major, bgpn.bgpn_minor));
+       printf(", Error - %s", tok2str(bgp_notify_major_values, "Unknown", bgpn.bgpn_major));
+
+        switch (bgpn.bgpn_major) {
+
+        case BGP_NOTIFY_MAJOR_MSG:
+            printf(" subcode %s", tok2str(bgp_notify_minor_msg_values, "Unknown", bgpn.bgpn_minor));
+            break;
+        case BGP_NOTIFY_MAJOR_OPEN:
+            printf(" subcode %s", tok2str(bgp_notify_minor_open_values, "Unknown", bgpn.bgpn_minor));
+            break;
+        case BGP_NOTIFY_MAJOR_UPDATE:
+            printf(" subcode %s", tok2str(bgp_notify_minor_update_values, "Unknown", bgpn.bgpn_minor));
+            break;
+        default:
+            break;
+        }
+
        return;
 trunc:
        printf("[|BGP]");
@@ -698,9 +990,12 @@ bgp_header_print(const u_char *dat, int length)
 {
        struct bgp bgp;
 
-       TCHECK2(dat[0], sizeof(bgp));
-       memcpy(&bgp, dat, sizeof(bgp));
-       printf("(%s", bgp_type(bgp.bgp_type));          /* ) */
+       TCHECK2(dat[0], BGP_SIZE);
+       memcpy(&bgp, dat, BGP_SIZE);
+       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:
@@ -712,10 +1007,14 @@ 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;
        }
-
-       /* ( */
-       printf(")");
        return;
 trunc:
        printf("[|BGP]");
@@ -728,12 +1027,11 @@ bgp_print(const u_char *dat, int length)
        const u_char *ep;
        const u_char *start;
        const u_char marker[] = {
-               0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-               0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+               0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+               0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
        };
        struct bgp bgp;
        u_int16_t hlen;
-       int newline;
 
        ep = dat + length;
        if (snapend < dat + length)
@@ -742,7 +1040,6 @@ bgp_print(const u_char *dat, int length)
        printf(": BGP");
 
        p = dat;
-       newline = 0;
        start = p;
        while (p < snapend) {
                if (!TTEST2(p[0], 1))
@@ -760,24 +1057,20 @@ bgp_print(const u_char *dat, int length)
                }
 
                /* found BGP header */
-               TCHECK2(p[0], sizeof(bgp));     /*XXX*/
-               memcpy(&bgp, p, sizeof(bgp));
+               TCHECK2(p[0], BGP_SIZE);        /*XXX*/
+               memcpy(&bgp, p, BGP_SIZE);
 
                if (start != p)
                        printf(" [|BGP]");
 
                hlen = ntohs(bgp.bgp_len);
-               if (vflag && newline)
-                       printf("\n\t");
-               else
-                       printf(" ");
+
                if (TTEST2(p[0], hlen)) {
                        bgp_header_print(p, hlen);
-                       newline = 1;
                        p += hlen;
                        start = p;
                } else {
-                       printf("[|BGP %s]", bgp_type(bgp.bgp_type));
+                       printf("[|BGP %s]", tok2str(bgp_msg_values, "Unknown Message Type",bgp.bgp_type));
                        break;
                }
        }
@@ -787,3 +1080,14 @@ bgp_print(const u_char *dat, int length)
 trunc:
        printf(" [|BGP]");
 }
+
+
+
+
+
+
+
+
+
+
+