Define PW_NAS_IP6_ADDRESS and use it in rlm_preprocess

diff --git a/src/include/radius.h b/src/include/radius.h
index 30fdf0a..d6b71ae 100644 (file)
--- a/src/include/radius.h
+++ b/src/include/radius.h
@@ -111,6 +111,7 @@
 #define PW_ARAP_CHALLENGE_RESPONSE     84
 #define PW_NAS_PORT_ID_STRING                  87
 #define PW_FRAMED_POOL                 88
+#define PW_NAS_IPV6_ADDRESS            95
 
 #define PW_DIGEST_RESPONSE             206
 #define PW_DIGEST_ATTRIBUTES           207

diff --git a/src/modules/rlm_preprocess/rlm_preprocess.c b/src/modules/rlm_preprocess/rlm_preprocess.c
index e4a093a..9ca71e4 100644 (file)
--- a/src/modules/rlm_preprocess/rlm_preprocess.c
+++ b/src/modules/rlm_preprocess/rlm_preprocess.c
@@ -394,7 +394,8 @@ static int add_nas_attr(REQUEST *request)
 {
        VALUE_PAIR *nas;
 
-       if (request->packet->src_ipaddr.af == AF_INET) {
+       switch (request->packet->src_ipaddr.af) {
+       case AF_INET:
                nas = pairfind(request->packet->vps, PW_NAS_IP_ADDRESS);
                if (!nas) {
                        nas = paircreate(PW_NAS_IP_ADDRESS, PW_TYPE_IPADDR);
@@ -408,7 +409,29 @@ static int add_nas_attr(REQUEST *request)
                        nas->lvalue = request->packet->src_ipaddr.ipaddr.ip4addr.s_addr;
                        pairadd(&request->packet->vps, nas);
                }
-       } else rad_assert(0 == 1); /* AF_INET6 */
+               break;
+
+       case AF_INET6:
+               nas = pairfind(request->packet->vps, PW_NAS_IPV6_ADDRESS);
+               if (!nas) {
+                       nas = paircreate(PW_NAS_IPV6_ADDRESS, PW_TYPE_IPV6ADDR);
+                       if (!nas) {
+                               radlog(L_ERR, "No memory");
+                               return -1;
+                       }
+                       
+                       memcpy(nas->strvalue,
+                              &request->packet->src_ipaddr.ipaddr,
+                              sizeof(request->packet->src_ipaddr.ipaddr));
+                       pairadd(&request->packet->vps, nas);
+               }
+               break;
+
+       default:
+               radlog(L_ERR, "Unknown address family for packet");
+               return -1;
+       }
+
 
        /*
         *      Add in a Client-IP-Address, to tell the user
@@ -423,8 +446,8 @@ static int add_nas_attr(REQUEST *request)
         */
        nas = paircreate(PW_CLIENT_IP_ADDRESS, PW_TYPE_IPADDR);
        if (!nas) {
-         radlog(L_ERR, "No memory");
-         return -1;
+               radlog(L_ERR, "No memory");
+               return -1;
        }
        nas->lvalue = request->packet->src_ipaddr.ipaddr.ip4addr.s_addr;
        ip_ntoh(&request->packet->src_ipaddr,