Handle rpcaps:// URLs as well, for rpcap-over-TLS.

[tcpdump] / print-radius.c

diff --git a/print-radius.c b/print-radius.c
index 9066d8fe01343e2e671971e7e76ac21b71c1d227..c723fd5a2d64550e095e0c9973dbfd3fde6eeb20 100644 (file)
--- a/print-radius.c
+++ b/print-radius.c
@@ -445,14 +445,20 @@ static const struct tok errorcausetype[] = {
                                };
 
 /* MIP6-Feature-Vector standard values */
+/* https://www.iana.org/assignments/aaa-parameters/aaa-parameters.xhtml */
 #define MIP6_INTEGRATED 0x0000000000000001
 #define LOCAL_HOME_AGENT_ASSIGNMENT 0x0000000000000002
 #define PMIP6_SUPPORTED 0x0000010000000000
 #define IP4_HOA_SUPPORTED 0x0000020000000000
 #define LOCAL_MAG_ROUTING_SUPPORTED 0x0000040000000000
+#define ASSIGN_LOCAL_IP 0x0000080000000000
+#define MIP4_SUPPORTED 0x0000100000000000
+#define OPTIMIZED_IDLE_MODE_MOBILITY 0x0000200000000000
+#define GTPv2_SUPPORTED 0x0000400000000000
 #define IP4_TRANSPORT_SUPPORTED 0x0000800000000000
 #define IP4_HOA_ONLY_SUPPORTED 0x0001000000000000
-static struct mip6_feature_vector {
+#define INTER_MAG_ROUTING_SUPPORTED 0x0002000000000000
+static const struct mip6_feature_vector {
                   uint64_t v;
                   const char *s;
                 } mip6_feature_vector[] = {
@@ -461,12 +467,17 @@ static struct mip6_feature_vector {
                                  { PMIP6_SUPPORTED,             "PMIP6_SUPPORTED" },
                                  { IP4_HOA_SUPPORTED,           "IP4_HOA_SUPPORTED" },
                                  { LOCAL_MAG_ROUTING_SUPPORTED, "LOCAL_MAG_ROUTING_SUPPORTED" },
+                                 { ASSIGN_LOCAL_IP,             "ASSIGN_LOCAL_IP" },
+                                 { MIP4_SUPPORTED,              "MIP4_SUPPORTED" },
+                                 { OPTIMIZED_IDLE_MODE_MOBILITY, "OPTIMIZED_IDLE_MODE_MOBILITY" },
+                                 { GTPv2_SUPPORTED,             "GTPv2_SUPPORTED" },
                                  { IP4_TRANSPORT_SUPPORTED,     "IP4_TRANSPORT_SUPPORTED" },
-                                 { IP4_HOA_ONLY_SUPPORTED,      "IP4_HOA_ONLY_SUPPORTED" }
+                                 { IP4_HOA_ONLY_SUPPORTED,      "IP4_HOA_ONLY_SUPPORTED" },
+                                 { INTER_MAG_ROUTING_SUPPORTED, "INTER_MAG_ROUTING_SUPPORTED" },
                                };
 
 
-static struct attrtype {
+static const struct attrtype {
                   const char *name;      /* Attribute name                 */
                   const char **subtypes; /* Standard Values (if any)       */
                   u_char siz_subtypes;   /* Size of total standard values  */
@@ -1021,6 +1032,7 @@ print_attr_vector64(netdissect_options *ndo,
                  register const u_char *data, u_int length, u_short attr_code _U_)
 {
    uint64_t data_value, i;
+   const char *sep = "";
 
    if (length != 8)
    {
@@ -1028,15 +1040,23 @@ print_attr_vector64(netdissect_options *ndo,
        return;
    }
 
+   ND_PRINT("[");
    ND_TCHECK_8(data[0]);
 
    data_value = EXTRACT_BE_U_8(data);
+   /* Print the 64-bit field in a format similar to bittok2str(), less
+    * flagging any unknown bits. This way it should be easier to replace
+    * the custom code with a library function later.
+    */
    for (i = 0; i < TAM_SIZE(mip6_feature_vector); i++) {
        if (data_value & mip6_feature_vector[i].v) {
-           ND_PRINT(" %s", mip6_feature_vector[i].s);
+           ND_PRINT("%s%s", sep, mip6_feature_vector[i].s);
+           sep = ", ";
        }
    }
 
+   ND_PRINT("]");
+
    return;
 
    trunc:
@@ -1154,26 +1174,22 @@ radius_attrs_print(netdissect_options *ndo,
        attr_string = attr_type[type].name;
      else
        attr_string = "Unknown";
-     if (len < 2)
-     {
-       ND_PRINT("\n\t  %s Attribute (%u), length: %u (bogus, must be >= 2)",
+
+     ND_PRINT("\n\t  %s Attribute (%u), length: %u",
                attr_string,
                type,
                len);
-       return;
+     if (len < 2)
+     {
+       ND_PRINT(" (bogus, must be >= 2)");
+       return;
      }
      if (len > length)
      {
-       ND_PRINT("\n\t  %s Attribute (%u), length: %u (bogus, goes past end of packet)",
-               attr_string,
-               type,
-               len);
+        ND_PRINT(" (bogus, goes past end of packet)");
         return;
      }
-     ND_PRINT("\n\t  %s Attribute (%u), length: %u, Value: ",
-            attr_string,
-            type,
-            len);
+     ND_PRINT(", Value: ");
 
      if (type < TAM_SIZE(attr_type))
      {