X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/b751376719cfe1924aa07ab8fd364ec1a55c04b3..a63600a1fc28dbc7ae7ce9f996829c49a25fb33c:/print-lldp.c

diff --git a/print-lldp.c b/print-lldp.c
index 54745e5b..6a41d187 100644
--- a/print-lldp.c
+++ b/print-lldp.c
@@ -136,19 +136,21 @@ static const struct tok lldp_cap_values[] = {
 #define LLDP_PRIVATE_8021_SUBTYPE_PROTOCOL_VLAN_ID	2
 #define LLDP_PRIVATE_8021_SUBTYPE_VLAN_NAME		3
 #define LLDP_PRIVATE_8021_SUBTYPE_PROTOCOL_IDENTITY	4
+#define LLDP_PRIVATE_8021_SUBTYPE_LINKAGGR		7
 #define LLDP_PRIVATE_8021_SUBTYPE_CONGESTION_NOTIFICATION 8
 #define LLDP_PRIVATE_8021_SUBTYPE_ETS_CONFIGURATION       9
 #define LLDP_PRIVATE_8021_SUBTYPE_ETS_RECOMMENDATION     10
 #define LLDP_PRIVATE_8021_SUBTYPE_PFC_CONFIGURATION      11
 #define LLDP_PRIVATE_8021_SUBTYPE_APPLICATION_PRIORITY   12
 #define LLDP_PRIVATE_8021_SUBTYPE_EVB                    13
-#define LLDP_PRIVATE_8021_SUBTYPE_CDCP 			 14
+#define LLDP_PRIVATE_8021_SUBTYPE_CDCP			 14
 
 static const struct tok lldp_8021_subtype_values[] = {
     { LLDP_PRIVATE_8021_SUBTYPE_PORT_VLAN_ID, "Port VLAN Id"},
     { LLDP_PRIVATE_8021_SUBTYPE_PROTOCOL_VLAN_ID, "Port and Protocol VLAN ID"},
     { LLDP_PRIVATE_8021_SUBTYPE_VLAN_NAME, "VLAN name"},
     { LLDP_PRIVATE_8021_SUBTYPE_PROTOCOL_IDENTITY, "Protocol Identity"},
+    { LLDP_PRIVATE_8021_SUBTYPE_LINKAGGR, "Link aggregation"},
     { LLDP_PRIVATE_8021_SUBTYPE_CONGESTION_NOTIFICATION, "Congestion Notification"},
     { LLDP_PRIVATE_8021_SUBTYPE_ETS_CONFIGURATION, "ETS Configuration"},
     { LLDP_PRIVATE_8021_SUBTYPE_ETS_RECOMMENDATION, "ETS Recommendation"},
@@ -509,10 +511,10 @@ static const struct tok lldp_pmd_capability_values[] = {
 #define LLDP_MDI_PAIR_CONTROL_ABILITY		(1 <<  3)
 
 static const struct tok lldp_mdi_values[] = {
-    { LLDP_MDI_PORT_CLASS, 		"PSE"},
-    { LLDP_MDI_POWER_SUPPORT, 		"supported"},
-    { LLDP_MDI_POWER_STATE, 		"enabled"},
-    { LLDP_MDI_PAIR_CONTROL_ABILITY, 	"can be controlled"},
+    { LLDP_MDI_PORT_CLASS,		"PSE"},
+    { LLDP_MDI_POWER_SUPPORT,		"supported"},
+    { LLDP_MDI_POWER_STATE,		"enabled"},
+    { LLDP_MDI_PAIR_CONTROL_ABILITY,	"can be controlled"},
     { 0, NULL}
 };
 
@@ -699,7 +701,7 @@ lldp_private_8021_print(netdissect_options *ndo,
             return hexdump;
         }
         ND_PRINT("\n\t    vlan name: ");
-        (void)nd_printzp(ndo, tptr + 7, sublen, NULL);
+        nd_printjnp(ndo, tptr + 7, sublen);
         break;
     case LLDP_PRIVATE_8021_SUBTYPE_PROTOCOL_IDENTITY:
         if (tlv_len < 5) {
@@ -710,8 +712,18 @@ lldp_private_8021_print(netdissect_options *ndo,
             return hexdump;
         }
         ND_PRINT("\n\t    protocol identity: ");
-        (void)nd_printzp(ndo, tptr + 5, sublen, NULL);
+        nd_printjnp(ndo, tptr + 5, sublen);
         break;
+
+    case LLDP_PRIVATE_8021_SUBTYPE_LINKAGGR:
+        if (tlv_len < 9) {
+            return hexdump;
+        }
+        ND_PRINT("\n\t    aggregation status [%s], aggregation port ID %u",
+               bittok2str(lldp_aggregation_values, "none", GET_U_1((tptr + 4))),
+               GET_BE_U_4(tptr + 5));
+        break;
+
     case LLDP_PRIVATE_8021_SUBTYPE_CONGESTION_NOTIFICATION:
         if(tlv_len<LLDP_PRIVATE_8021_SUBTYPE_CONGESTION_NOTIFICATION_LENGTH){
 		return hexdump;
@@ -958,7 +970,7 @@ lldp_private_iana_print(netdissect_options *ndo,
     switch (subtype) {
     case LLDP_IANA_SUBTYPE_MUDURL:
         ND_PRINT("\n\t  MUD-URL=");
-        (void)nd_printn(ndo, tptr+4, tlv_len-4, NULL);
+        nd_printjn(ndo, tptr+4, tlv_len-4);
         break;
     default:
         hexdump=TRUE;
@@ -1070,7 +1082,7 @@ lldp_private_tia_print(netdissect_options *ndo,
                    GET_U_1(tptr + 6));
 
             /* Country code */
-            (void)nd_printzp(ndo, tptr + 7, 2, NULL);
+            nd_printjnp(ndo, tptr + 7, 2);
 
             lci_len = lci_len-3;
             tptr = tptr + 9;
@@ -1098,7 +1110,7 @@ lldp_private_tia_print(netdissect_options *ndo,
 		    return hexdump;
 		}
 
-                (void)nd_printzp(ndo, tptr, ca_len, NULL);
+                nd_printjnp(ndo, tptr, ca_len);
                 tptr += ca_len;
                 lci_len -= ca_len;
             }
@@ -1106,7 +1118,7 @@ lldp_private_tia_print(netdissect_options *ndo,
 
         case LLDP_TIA_LOCATION_DATA_FORMAT_ECS_ELIN:
             ND_PRINT("\n\t    ECS ELIN id ");
-            (void)nd_printzp(ndo, tptr + 5, tlv_len - 5, NULL);
+            nd_printjnp(ndo, tptr + 5, tlv_len - 5);
             break;
 
         default:
@@ -1143,7 +1155,7 @@ lldp_private_tia_print(netdissect_options *ndo,
     case LLDP_PRIVATE_TIA_SUBTYPE_INVENTORY_ASSET_ID:
         ND_PRINT("\n\t  %s ",
                tok2str(lldp_tia_inventory_values, "unknown", subtype));
-        (void)nd_printzp(ndo, tptr + 4, tlv_len - 4, NULL);
+        nd_printjnp(ndo, tptr + 4, tlv_len - 4);
         break;
 
     default:
@@ -1337,20 +1349,18 @@ lldp_network_addr_print(netdissect_options *ndo, const u_char *tptr, u_int len)
     len--;
     af = GET_U_1(tptr);
     switch (af) {
-    case AFNUM_INET:
-        if (len < 4)
+    case AFNUM_IP:
+        if (len < sizeof(nd_ipv4))
           return NULL;
-        /* This cannot be assigned to ipaddr_string(), which is a macro. */
         pfunc = ipaddr_string;
         break;
-    case AFNUM_INET6:
-        if (len < 16)
+    case AFNUM_IP6:
+        if (len < sizeof(nd_ipv6))
           return NULL;
-        /* This cannot be assigned to ip6addr_string(), which is a macro. */
         pfunc = ip6addr_string;
         break;
     case AFNUM_802:
-        if (len < 6)
+        if (len < MAC_ADDR_LEN)
           return NULL;
         pfunc = etheraddr_string;
         break;
@@ -1426,7 +1436,7 @@ lldp_mgmt_addr_tlv_print(netdissect_options *ndo,
         }
         if (oid_len) {
             ND_PRINT("\n\t  OID length %u", oid_len);
-            (void)nd_printzp(ndo, tptr + 1, oid_len, NULL);
+            nd_printjnp(ndo, tptr + 1, oid_len);
         }
     }
 
@@ -1503,7 +1513,7 @@ lldp_print(netdissect_options *ndo,
                 case LLDP_CHASSIS_CHASSIS_COMP_SUBTYPE:
                 case LLDP_CHASSIS_INTF_ALIAS_SUBTYPE:
                 case LLDP_CHASSIS_PORT_COMP_SUBTYPE:
-                    (void)nd_printzp(ndo, tptr + 1, tlv_len - 1, NULL);
+                    nd_printjnp(ndo, tptr + 1, tlv_len - 1);
                     break;
 
                 case LLDP_CHASSIS_NETWORK_ADDR_SUBTYPE:
@@ -1544,7 +1554,7 @@ lldp_print(netdissect_options *ndo,
                 case LLDP_PORT_AGENT_CIRC_ID_SUBTYPE:
                 case LLDP_PORT_INTF_ALIAS_SUBTYPE:
                 case LLDP_PORT_PORT_COMP_SUBTYPE:
-                    (void)nd_printzp(ndo, tptr + 1, tlv_len - 1, NULL);
+                    nd_printjnp(ndo, tptr + 1, tlv_len - 1);
                     break;
 
                 case LLDP_PORT_NETWORK_ADDR_SUBTYPE:
@@ -1574,7 +1584,7 @@ lldp_print(netdissect_options *ndo,
         case LLDP_PORT_DESCR_TLV:
             if (ndo->ndo_vflag) {
                 ND_PRINT(": ");
-                (void)nd_printzp(ndo, tptr, tlv_len, NULL);
+                nd_printjnp(ndo, tptr, tlv_len);
             }
             break;
 
@@ -1584,13 +1594,13 @@ lldp_print(netdissect_options *ndo,
              * similar to the CDP printer.
              */
             ND_PRINT(": ");
-            (void)nd_printzp(ndo, tptr, tlv_len, NULL);
+            nd_printjnp(ndo, tptr, tlv_len);
             break;
 
         case LLDP_SYSTEM_DESCR_TLV:
             if (ndo->ndo_vflag) {
                 ND_PRINT("\n\t  ");
-                (void)nd_printzp(ndo, tptr, tlv_len, NULL);
+                nd_printjnp(ndo, tptr, tlv_len);
             }
             break;