eap-radius: Add support for some basic IPv6-specific RADIUS attributes

These are defined in RFC 6911.

Fixes #1001.

diff --git a/src/libcharon/plugins/eap_radius/eap_radius.c b/src/libcharon/plugins/eap_radius/eap_radius.c
index 60d12dc1d312b52c56ef80f1292206bba0890ae0..8618ecfcf9537549bfac03d4067d6921fed27d95 100644 (file)
--- a/src/libcharon/plugins/eap_radius/eap_radius.c
+++ b/src/libcharon/plugins/eap_radius/eap_radius.c
@@ -434,6 +434,9 @@ static void add_nameserver_attribute(eap_radius_provider_t *provider,
                case 31: /* MS-Secondary-NBNS-Server */
                        provider->add_attribute(provider, id, INTERNAL_IP4_NBNS, data);
                        break;
+               case RAT_FRAMED_IPV6_DNS_SERVER:
+                       provider->add_attribute(provider, id, INTERNAL_IP6_DNS, data);
+                       break;
        }
 }
 
@@ -515,7 +518,8 @@ static void process_cfg_attributes(radius_message_t *msg)
                enumerator = msg->create_enumerator(msg);
                while (enumerator->enumerate(enumerator, &type, &data))
                {
-                       if (type == RAT_FRAMED_IP_ADDRESS && data.len == 4)
+                       if ((type == RAT_FRAMED_IP_ADDRESS && data.len == 4) ||
+                               (type == RAT_FRAMED_IPV6_ADDRESS && data.len == 16))
                        {
                                host = host_create_from_chunk(AF_INET, data, 0);
                                if (host)
@@ -529,6 +533,11 @@ static void process_cfg_attributes(radius_message_t *msg)
                                provider->add_attribute(provider, ike_sa->get_unique_id(ike_sa),
                                                                                INTERNAL_IP4_NETMASK, data);
                        }
+                       else if (type == RAT_FRAMED_IPV6_DNS_SERVER && data.len == 16)
+                       {
+                               add_nameserver_attribute(provider,
+                                                                       ike_sa->get_unique_id(ike_sa), type, data);
+                       }
                }
                enumerator->destroy(enumerator);
 

diff --git a/src/libradius/radius_message.c b/src/libradius/radius_message.c
index e6abfe2c2640b7d3000734084e8e246b7ff30d0d..01c8298411c749732d06459a72ab07e4fc8c5347 100644 (file)
--- a/src/libradius/radius_message.c
+++ b/src/libradius/radius_message.c
@@ -97,7 +97,7 @@ ENUM_NEXT(radius_message_code_names, RMC_DISCONNECT_REQUEST, RMC_COA_NAK, RMC_AC
        "CoA-NAK");
 ENUM_END(radius_message_code_names, RMC_COA_NAK);
 
-ENUM(radius_attribute_type_names, RAT_USER_NAME, RAT_MIP6_HOME_LINK_PREFIX,
+ENUM_BEGIN(radius_attribute_type_names, RAT_USER_NAME, RAT_MIP6_HOME_LINK_PREFIX,
        "User-Name",
        "User-Password",
        "CHAP-Password",
@@ -223,6 +223,13 @@ ENUM(radius_attribute_type_names, RAT_USER_NAME, RAT_MIP6_HOME_LINK_PREFIX,
        "Delegated-IPv6-Prefix",
        "MIP6-Feature-Vector",
        "MIP6-Home-Link-Prefix");
+ENUM_NEXT(radius_attribute_type_names, RAT_FRAMED_IPV6_ADDRESS, RAT_STATEFUL_IPV6_ADDRESS_POOL, RAT_MIP6_HOME_LINK_PREFIX,
+       "Framed-IPv6-Address",
+       "DNS-Server-IPv6-Address",
+       "Route-IPv6-Information",
+       "Delegated-IPv6-Prefix-Pool",
+       "Stateful-IPv6-Address-Pool");
+ENUM_END(radius_attribute_type_names, RAT_STATEFUL_IPV6_ADDRESS_POOL);
 
 /**
  * Attribute enumerator implementation

diff --git a/src/libradius/radius_message.h b/src/libradius/radius_message.h
index 4ce03a44eb3359856c24d77f603f6a9ae4c27b64..e6cb40b18546e29f303dcf94b9c0e703f1253023 100644 (file)
--- a/src/libradius/radius_message.h
+++ b/src/libradius/radius_message.h
@@ -186,6 +186,11 @@ enum radius_attribute_type_t {
        RAT_DELEGATED_IPV6_PREFIX = 123,
        RAT_MIP6_FEATURE_VECTOR = 124,
        RAT_MIP6_HOME_LINK_PREFIX = 125,
+       RAT_FRAMED_IPV6_ADDRESS = 168,
+       RAT_FRAMED_IPV6_DNS_SERVER = 169,
+       RAT_ROUTE_IPV6_INFORMATION = 170,
+       RAT_DELEGATED_IPV6_PREFIX_POOL = 171,
+       RAT_STATEFUL_IPV6_ADDRESS_POOL = 172,
 };
 
 /**