Changeset 500:d4fc98a3b79c in freeDiameter for extensions/app_radgw

Timestamp:

Aug 17, 2010, 4:35:19 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Handle more nicely the local RADIUS clients in the gateway

File:

• extensions/app_radgw/rgw_clients.c (modified) (7 diffs)

extensions/app_radgw/rgw_clients.c

@@ -66 +66 @@
         
         /* The FQDN, realm, and optional aliases */
+        int                      is_local; /* true if the RADIUS client runs on the same host -- we use Diameter Identity in that case */
         char                    *fqdn;
         size_t                   fqdn_len;
@@ -95 +96 @@
         char buf[255];
         int ret;
-        
-        /* Search FQDN for the client */
-        ret = getnameinfo( *ip_port, sizeof(struct sockaddr_storage), &buf[0], sizeof(buf), NULL, 0, 0 );
-        if (ret) {
-                TRACE_DEBUG(INFO, "Unable to resolve peer name: %s", gai_strerror(ret));
-                return EINVAL;
+        int loc = 0;
+        
+        /* Check if the IP address is local */
+        if (   ( ((*ip_port)->sa_family == AF_INET ) && (   IN_IS_ADDR_LOOPBACK( &((struct sockaddr_in  *)(*ip_port))->sin_addr ) ) )
+             ||( ((*ip_port)->sa_family == AF_INET6) && (  IN6_IS_ADDR_LOOPBACK( &((struct sockaddr_in6 *)(*ip_port))->sin6_addr) ) )) {
+                /* The client is local */
+                loc = 1;
+        } else {
+        
+                /* Search FQDN for the client */
+                ret = getnameinfo( *ip_port, sizeof(struct sockaddr_storage), &buf[0], sizeof(buf), NULL, 0, 0 );
+                if (ret) {
+                        TRACE_DEBUG(INFO, "Unable to resolve peer name: %s", gai_strerror(ret));
+                        return EINVAL;
+                }
         }
         
@@ -108 +118 @@
         fd_list_init(&tmp->chain, NULL);
         
-        /* Copy the fqdn */
-        CHECK_MALLOC( tmp->fqdn = strdup(buf) );
-        tmp->fqdn_len = strlen(tmp->fqdn);
-        /* Find an appropriate realm */
-        tmp->realm = strchr(tmp->fqdn, '.');
-        if (tmp->realm)
-                tmp->realm += 1;
-        if ((!tmp->realm) || (*tmp->realm == '\0')) /* in case the fqdn was "localhost." for example, if it is possible... */
-                tmp->realm = fd_g_config->cnf_diamrlm;
+        if (loc) {
+                tmp->is_local = 1;
+        } else {
+                /* Copy the fqdn */
+                CHECK_MALLOC( tmp->fqdn = strdup(buf) );
+                tmp->fqdn_len = strlen(tmp->fqdn);
+                /* Find an appropriate realm */
+                tmp->realm = strchr(tmp->fqdn, '.');
+                if (tmp->realm)
+                        tmp->realm += 1;
+                if ((!tmp->realm) || (*tmp->realm == '\0')) /* in case the fqdn was "localhost." for example, if it is possible... */
+                        tmp->realm = fd_g_config->cnf_diamrlm;
+        }
         
         /* move the sa info reference */
@@ -155 +169 @@
 
 
-/* Macro to avoid duplicting the code in the next function */
+/* Macro to avoid duplicating the code in the next function */
 #define client_search_family( _family_ )                                                                                                \
                 case AF_INET##_family_: {                                                                                               \
@@ -370 +384 @@
         }
         
-        /* Now check the nas_id */
-        if (nas_id) {
+        /* Now check the nas_id, but only for non-local hosts */
+        if (nas_id && (! cli->is_local) ) {
                 char * str;
                 int found, ret;
@@ -464 +478 @@
         CHECK_PARAMS(cli && fqdn);
         
-        *fqdn = cli->fqdn;
-        if (realm)
-                *realm= cli->realm;
+        if (cli->is_local) {
+                *fqdn = fd_g_config->cnf_diamid;
+                if (realm)
+                        *realm= fd_g_config->cnf_diamrlm;
+        } else {
+                *fqdn = cli->fqdn;
+                if (realm)
+                        *realm= cli->realm;
+        }
+                
         return 0;
 }
@@ -472 +493 @@
 char * rgw_clients_id(struct rgw_client *cli)
 {
-        return cli->fqdn;
+        return cli->is_local ? "(local)" : cli->fqdn;
 }