Added RADIUS attributes from RFC 5447

* MIP6-Feature-Vector (124) (with extra attributes from RFC 6572)
* MIP6-Home-Link-Prefix (125)

diff --git a/print-radius.c b/print-radius.c
index 7f9ea5f2d99711a35f61c9e19e18897797d4d19b..9066d8fe01343e2e671971e7e76ac21b71c1d227 100644 (file)
--- a/print-radius.c
+++ b/print-radius.c
@@ -65,9 +65,15 @@
  * RFC 5176:
  *      "Dynamic Authorization Extensions to RADIUS"
  *
+ * RFC 5447:
+ *      "Diameter Mobile IPv6"
+ *
  * RFC 5580:
  *      "Carrying Location Objects in RADIUS and Diameter"
  *
+ * RFC 6572:
+ *      "RADIUS Support for Proxy Mobile IPv6"
+ *
  * RFC 7155:
  *      "Diameter Network Access Server Application"
  *
@@ -196,7 +202,9 @@ static void print_vendor_attr(netdissect_options *, const u_char *, u_int, u_sho
 static void print_attr_address(netdissect_options *, const u_char *, u_int, u_short);
 static void print_attr_address6(netdissect_options *, const u_char *, u_int, u_short);
 static void print_attr_netmask6(netdissect_options *, const u_char *, u_int, u_short);
+static void print_attr_mip6_home_link_prefix(netdissect_options *, const u_char *, u_int, u_short);
 static void print_attr_time(netdissect_options *, const u_char *, u_int, u_short);
+static void print_attr_vector64(netdissect_options *, register const u_char *, u_int, u_short);
 static void print_attr_strange(netdissect_options *, const u_char *, u_int, u_short);
 
 
@@ -436,6 +444,27 @@ static const struct tok errorcausetype[] = {
                                                                                                                                 { 0, NULL }
                                };
 
+/* MIP6-Feature-Vector standard values */
+#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 IP4_TRANSPORT_SUPPORTED 0x0000800000000000
+#define IP4_HOA_ONLY_SUPPORTED 0x0001000000000000
+static struct mip6_feature_vector {
+                  uint64_t v;
+                  const char *s;
+                } mip6_feature_vector[] = {
+                                 { MIP6_INTEGRATED,             "MIP6_INTEGRATED" },
+                                 { LOCAL_HOME_AGENT_ASSIGNMENT, "LOCAL_HOME_AGENT_ASSIGNMENT" },
+                                 { PMIP6_SUPPORTED,             "PMIP6_SUPPORTED" },
+                                 { IP4_HOA_SUPPORTED,           "IP4_HOA_SUPPORTED" },
+                                 { LOCAL_MAG_ROUTING_SUPPORTED, "LOCAL_MAG_ROUTING_SUPPORTED" },
+                                 { IP4_TRANSPORT_SUPPORTED,     "IP4_TRANSPORT_SUPPORTED" },
+                                 { IP4_HOA_ONLY_SUPPORTED,      "IP4_HOA_ONLY_SUPPORTED" }
+                               };
+
 
 static struct attrtype {
                   const char *name;      /* Attribute name                 */
@@ -569,6 +598,8 @@ static struct attrtype {
      { "Digest-HA1",                      NULL, 0, 0, print_attr_string },
      { "SIP-AOR",                         NULL, 0, 0, print_attr_string },
      { "Delegated-IPv6-Prefix",           NULL, 0, 0, print_attr_netmask6 },
+     { "MIP6-Feature-Vector",             NULL, 0, 0, print_attr_vector64 },
+     { "MIP6-Home-Link-Prefix",           NULL, 0, 0, print_attr_mip6_home_link_prefix },
   };
 
 
@@ -927,6 +958,30 @@ print_attr_netmask6(netdissect_options *ndo,
      nd_print_trunc(ndo);
 }
 
+static void
+print_attr_mip6_home_link_prefix(netdissect_options *ndo,
+                    const u_char *data, u_int length, u_short attr_code _U_)
+{
+   if (length != 17)
+   {
+      ND_PRINT("ERROR: length %u != 17", length);
+      return;
+   }
+   ND_TCHECK_LEN(data, length);
+   if (EXTRACT_U_1(data) > 128)
+   {
+      ND_PRINT("ERROR: netmask %u not in range (0..128)", EXTRACT_U_1(data));
+      return;
+   }
+
+   ND_PRINT("%s/%u", ip6addr_string(ndo, data + 1), EXTRACT_U_1(data));
+
+   return;
+
+   trunc:
+     nd_print_trunc(ndo);
+}
+
 /*************************************/
 /* Print an attribute of 'secs since */
 /* January 1, 1970 00:00 UTC' value  */
@@ -961,6 +1016,33 @@ print_attr_time(netdissect_options *ndo,
      nd_print_trunc(ndo);
 }
 
+static void
+print_attr_vector64(netdissect_options *ndo,
+                 register const u_char *data, u_int length, u_short attr_code _U_)
+{
+   uint64_t data_value, i;
+
+   if (length != 8)
+   {
+       ND_PRINT("ERROR: length %u != 8", length);
+       return;
+   }
+
+   ND_TCHECK_8(data[0]);
+
+   data_value = EXTRACT_BE_U_8(data);
+   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);
+       }
+   }
+
+   return;
+
+   trunc:
+     nd_print_trunc(ndo);
+}
+
 /***********************************/
 /* Print an attribute of 'strange' */
 /* data format pointed by 'data'   */

diff --git a/tests/RADIUS-RFC5447.pcap b/tests/RADIUS-RFC5447.pcap
new file mode 100644 (file)
index 0000000..9e586e8
Binary files /dev/null and b/tests/RADIUS-RFC5447.pcap differ

diff --git a/tests/TESTLIST b/tests/TESTLIST
index 74ec85fa5b90f23d8162ee8834fd7d54195d2ba5..4b54d82ee09ce8cb8cd65c669da3cf2a30053cc0 100644 (file)
--- a/tests/TESTLIST
+++ b/tests/TESTLIST
@@ -286,6 +286,7 @@ radius-rfc4675      RADIUS-RFC4675.pcap     radius-rfc4675-v.out    -v
 radius-rfc5176 RADIUS-RFC5176.pcap     radius-rfc5176-v.out    -v
 radius-port1700        RADIUS-port1700.pcap    radius-port1700-v.out   -v
 radius-rfc5176-2       RADIUS-RFC5176-2.pcap   radius-rfc5176-2-v.out  -v
+radius-rfc5447 RADIUS-RFC5447.pcap     radius-rfc5447-v.out    -v
 
 # link-level protocols
 dtp-v          DTP.pcap                dtp-v.out               -v

diff --git a/tests/radius-rfc5447-v.out b/tests/radius-rfc5447-v.out
new file mode 100644 (file)
index 0000000..7a80bfb
--- /dev/null
+++ b/tests/radius-rfc5447-v.out
@@ -0,0 +1,6 @@
+IP (tos 0x0, ttl 64, id 47488, offset 0, flags [none], proto UDP (17), length 84)
+    127.0.0.1.55520 > 127.0.0.1.1812: RADIUS, length: 56
+       Access-Request (1), id: 0x4f, Authenticator: 5bec15a7f3ac1590f65629a9f979c340
+         User-Name Attribute (1), length: 7, Value: luser
+         MIP6-Feature-Vector Attribute (124), length: 10, Value:  MIP6_INTEGRATED IP4_HOA_SUPPORTED LOCAL_MAG_ROUTING_SUPPORTED
+         MIP6-Home-Link-Prefix Attribute (125), length: 19, Value: 2001:db8::/32