Added RADCLIENT* pointer to the REQUEST structure. It makes some

	things easier, and will let us know on HUP which request is using
	what client

diff --git a/src/include/radiusd.h b/src/include/radiusd.h
index 56f8148..04d5f9b 100644 (file)
--- a/src/include/radiusd.h
+++ b/src/include/radiusd.h
@@ -41,6 +41,23 @@ typedef pid_t child_pid_t;
  */
 typedef struct request_data_t request_data_t;
 
+typedef struct rad_snmp_client_entry_t rad_snmp_client_entry_t;
+
+typedef struct radclient {
+       lrad_ipaddr_t           ipaddr;
+       int                     prefix;
+       char                    *longname;
+       char                    *secret;
+       char                    *shortname;
+       char                    *nastype;
+       char                    *login;
+       char                    *password;
+       int                     number; /* internal use only */
+#ifdef WITH_SNMP
+       rad_snmp_client_entry_t *auth, *acct;
+#endif
+} RADCLIENT;
+
 /*
  *     For listening on multiple IP's and ports.
  */
@@ -62,7 +79,7 @@ struct auth_req {
        VALUE_PAIR              *password;
 
        request_data_t          *data;
-       char                    secret[32];
+       RADCLIENT               *client;
        child_pid_t             child_pid;
        time_t                  timestamp;
        int                     number; /* internal server number */
@@ -106,6 +123,7 @@ struct auth_req {
 
 #define REQUEST_ACTIVE                 (1)
 #define REQUEST_STOP_PROCESSING (2)
+#define REQUEST_COUNTED                (3)
 
 #define REQUEST_QUEUED         (1)
 #define REQUEST_RUNNING                (2)
@@ -118,22 +136,6 @@ struct auth_req {
  *  Function handler for requests.
  */
 typedef                int (*RAD_REQUEST_FUNP)(REQUEST *);
-typedef struct rad_snmp_client_entry_t rad_snmp_client_entry_t;
-
-typedef struct radclient {
-       lrad_ipaddr_t           ipaddr;
-       int                     prefix;
-       char                    *longname;
-       char                    *secret;
-       char                    *shortname;
-       char                    *nastype;
-       char                    *login;
-       char                    *password;
-       int                     number; /* internal use only */
-#ifdef WITH_SNMP
-       rad_snmp_client_entry_t *auth, *acct;
-#endif
-} RADCLIENT;
 
 typedef struct radclient_list RADCLIENT_LIST;
 
@@ -456,8 +458,6 @@ int free_mainconfig(void);
 void listen_free(rad_listen_t **head);
 int listen_init(const char *filename, rad_listen_t **head);
 rad_listen_t *proxy_new_listener(void);
-RADCLIENT *client_listener_find(const rad_listen_t *listener,
-                               const lrad_ipaddr_t *ipaddr);
 
 /* event.c */
 int radius_event_init(int spawn_flag);

diff --git a/src/main/event.c b/src/main/event.c
index 7d3c4cf..7cb7d7d 100644 (file)
--- a/src/main/event.c
+++ b/src/main/event.c
@@ -94,8 +94,7 @@ static void tv_add(struct timeval *tv, int usec_delay)
 }
 
 #ifdef WITH_SNMP
-static void snmp_inc_client_responses(RADCLIENT *client,
-                                     REQUEST *request)
+static void snmp_inc_client_responses(REQUEST *request)
 {
        if (!mainconfig.do_snmp) return;
 
@@ -111,24 +110,24 @@ static void snmp_inc_client_responses(RADCLIENT *client,
        case PW_AUTHENTICATION_ACK:
                rad_snmp.auth.total_responses++;
                rad_snmp.auth.total_access_accepts++;
-               if (client) client->auth->accepts++;
+               if (request->client) request->client->auth->accepts++;
                break;
 
        case PW_AUTHENTICATION_REJECT:
                rad_snmp.auth.total_responses++;
                rad_snmp.auth.total_access_rejects++;
-               if (client) client->auth->rejects++;
+               if (request->client) request->client->auth->rejects++;
                break;
                
        case PW_ACCESS_CHALLENGE:
                rad_snmp.auth.total_responses++;
                rad_snmp.auth.total_access_challenges++;
-               if (client) client->auth->challenges++;
+               if (request->client) request->client->auth->challenges++;
                break;
                
        case PW_ACCOUNTING_RESPONSE:
                rad_snmp.acct.total_responses++;
-               if (client) client->auth->responses++;
+               if (request->client) request->client->auth->responses++;
                break;
 
                /*
@@ -138,7 +137,7 @@ static void snmp_inc_client_responses(RADCLIENT *client,
        case 0:
                if (request->packet->code == PW_AUTHENTICATION_REQUEST) {
                        rad_snmp.auth.total_bad_authenticators++;
-                       if (client) client->auth->bad_authenticators++;
+                       if (request->client) request->client->auth->bad_authenticators++;
                }
                break;
                
@@ -161,9 +160,7 @@ static void remove_from_request_hash(REQUEST *request)
 #ifdef WITH_SNMP
        if ((request->listener->type == RAD_LISTEN_AUTH) ||
            (request->listener->type == RAD_LISTEN_ACCT)) {
-               snmp_inc_client_responses(client_listener_find(request->listener,
-                                                              &request->packet->src_ipaddr),
-                                         request);
+               snmp_inc_client_responses(request);
        }
 #endif
 }
@@ -345,12 +342,6 @@ static void wait_for_proxy_id_to_expire(void *ctx)
        rad_assert(request->magic == REQUEST_MAGIC);
        rad_assert(request->proxy != NULL);
 
-       /*
-        *      FIXME: handle the case of RETRY from one home server
-        *      to another!
-        *
-        *      Do we even have to do anything?
-        */
        request->when = request->proxy_when;
        request->when.tv_sec += home->response_window;
 
@@ -1333,6 +1324,17 @@ static void request_post_handler(REQUEST *request)
                if (request->proxy_reply) {
                        pairfree(&request->proxy_reply->vps);
                }
+
+               /*
+                *      We're not tracking responses from the home
+                *      server, we can therefore free this memory in
+                *      the child thread.
+                */
+               if (!request->in_proxy_hash) {
+                       rad_free(&request->proxy);
+                       rad_free(&request->proxy_reply);
+                       request->home_server = NULL;
+               }
        }
 
        DEBUG2("Finished request %d state %d", request->number, child_state);
@@ -1615,10 +1617,10 @@ int received_request(rad_listen_t *listener,
        }
 
        request->listener = listener;
+       request->client = client;
        request->packet = packet;
        request->packet->timestamp = request->timestamp;
        request->number = request_num_counter++;
-       strlcpy(request->secret, client->secret, sizeof(request->secret));
        
        /*
         *      Remember the request in the list.

diff --git a/src/main/listen.c b/src/main/listen.c
index 888811c..f9f275d 100644 (file)
--- a/src/main/listen.c
+++ b/src/main/listen.c
@@ -87,8 +87,8 @@ typedef struct listen_detail_t {
 /*
  *     Find a per-socket client.
  */
-RADCLIENT *client_listener_find(const rad_listen_t *listener,
-                               const lrad_ipaddr_t *ipaddr)
+static RADCLIENT *client_listener_find(const rad_listen_t *listener,
+                                      const lrad_ipaddr_t *ipaddr)
 {
        const RADCLIENT_LIST *clients;
 
@@ -298,7 +298,8 @@ static int auth_socket_send(rad_listen_t *listener, REQUEST *request)
        rad_assert(request->listener == listener);
        rad_assert(listener->send == auth_socket_send);
 
-       return rad_send(request->reply, request->packet, request->secret);
+       return rad_send(request->reply, request->packet,
+                       request->client->secret);
 }
 
 
@@ -318,7 +319,8 @@ static int acct_socket_send(rad_listen_t *listener, REQUEST *request)
         */
        if (request->reply->code == 0) return 0;
 
-       return rad_send(request->reply, request->packet, request->secret);
+       return rad_send(request->reply, request->packet,
+                       request->client->secret);
 }
 
 
@@ -592,8 +594,10 @@ static int client_socket_encode(UNUSED rad_listen_t *listener, REQUEST *request)
 {
        if (!request->reply->code) return 0;
 
-       rad_encode(request->reply, request->packet, request->secret);
-       rad_sign(request->reply, request->packet, request->secret);
+       rad_encode(request->reply, request->packet,
+                  request->client->secret);
+       rad_sign(request->reply, request->packet,
+                request->client->secret);
 
        return 0;
 }
@@ -601,11 +605,13 @@ static int client_socket_encode(UNUSED rad_listen_t *listener, REQUEST *request)
 
 static int client_socket_decode(UNUSED rad_listen_t *listener, REQUEST *request)
 {
-       if (rad_verify(request->packet, NULL, request->secret) < 0) {
+       if (rad_verify(request->packet, NULL,
+                      request->client->secret) < 0) {
                return -1;
        }
 
-       return rad_decode(request->packet, NULL, request->secret);
+       return rad_decode(request->packet, NULL,
+                         request->client->secret);
 }
 
 static int proxy_socket_encode(UNUSED rad_listen_t *listener, REQUEST *request)

diff --git a/src/main/util.c b/src/main/util.c
index 49376b6..d5a4916 100644 (file)
--- a/src/main/util.c
+++ b/src/main/util.c
@@ -234,8 +234,9 @@ void request_free(REQUEST **request_ptr)
 
 #ifndef NDEBUG
        request->magic = 0x01020304;    /* set the request to be nonsense */
-       strcpy(request->secret, "REQUEST-DELETED");
 #endif
+       request->client = NULL;
+       request->home_server = NULL;
        free(request);
 
        *request_ptr = NULL;

diff --git a/src/modules/rlm_eap/rlm_eap.c b/src/modules/rlm_eap/rlm_eap.c
index daa66c1..fd72b14 100644 (file)
--- a/src/modules/rlm_eap/rlm_eap.c
+++ b/src/modules/rlm_eap/rlm_eap.c
@@ -615,7 +615,7 @@ static int eap_post_proxy(void *inst, REQUEST *request)
         *      Encrypt the session key again, using the request data.
         */
        rad_tunnel_pwencode(vp->vp_strvalue + 17, &len,
-                           request->secret,
+                           request->client->secret,
                            request->packet->vector);
 
        return RLM_MODULE_UPDATED;

diff --git a/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.c b/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.c
index bfc29b5..1595f23 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.c
@@ -377,7 +377,7 @@ LEAP_PACKET *eapleap_stage6(LEAP_PACKET *packet, REQUEST *request,
 
        i = 16;
        rad_tunnel_pwencode(vp->vp_strvalue + vp->length, &i,
-                           request->secret, request->packet->vector);
+                           request->client->secret, request->packet->vector);
        vp->length += i;
        pairadd(reply_vps, vp);