Changeset 1088:1d1a20a0779d in freeDiameter for extensions/app_radgw/rgwx_auth.c

Timestamp:

May 5, 2013, 4:25:27 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Second part of changeset 1083, now the code compiles again. Still missing some functions implementation, though

File:

• extensions/app_radgw/rgwx_auth.c (modified) (10 diffs)

extensions/app_radgw/rgwx_auth.c

@@ -125 +125 @@
 };
 
+struct sess_state {
+        char req_auth[16];
+};
+
+
 /* Initialize the plugin */
 static int auth_conf_parse(char * confstr, struct rgwp_config ** state)
@@ -137 +142 @@
         memset(new, 0, sizeof(struct rgwp_config));
         
-        CHECK_FCT( fd_sess_handler_create( &new->sess_hdl, free, NULL ) );
+        CHECK_FCT( fd_sess_handler_create( &new->sess_hdl, (void *)free, NULL, NULL ) );
         new->confstr = confstr;
         
@@ -1057 +1062 @@
         /* Store the request identifier in the session (if provided) */
         {
-                unsigned char * req_auth;
-                CHECK_MALLOC(req_auth = malloc(16));
-                memcpy(req_auth, &rad_req->hdr->authenticator[0], 16);
+                struct sess_state  *st;
+                CHECK_MALLOC(st = malloc(sizeof(struct sess_state)));
+                memcpy(st->req_auth, &rad_req->hdr->authenticator[0], 16);
                 
-                CHECK_FCT( fd_sess_state_store( cs->sess_hdl, sess, &req_auth ) );
+                CHECK_FCT( fd_sess_state_store( cs->sess_hdl, sess, &st ) );
         }
         
@@ -1077 +1082 @@
         int no_str = 0; /* indicate if an STR is required for this server */
         uint8_t tuntag = 0;
-        unsigned char * req_auth = NULL;
+        struct sess_state  *st;
         int error_cause = 0;
         struct session * sess;
@@ -1089 +1094 @@
         CHECK_FCT( fd_msg_sess_get(fd_g_config->cnf_dict, *diam_ans, &sess, NULL) );
         if (sess) {
-                CHECK_FCT( fd_sess_state_retrieve( cs->sess_hdl, sess, &req_auth ) );
+                CHECK_FCT( fd_sess_state_retrieve( cs->sess_hdl, sess, &st ) );
                 CHECK_FCT( fd_sess_getsid(sess, &sid, &sidlen) );
         } /* else ? */
@@ -1759 +1764 @@
                                                                                         
                                                                                         /* We need the request authenticator */
-                                                                                        CHECK_PARAMS(req_auth);
+                                                                                        CHECK_PARAMS(st);
 
                                                                                         /* Retrieve the shared secret */
@@ -1778 +1783 @@
                                                                                         addr[0] = secret;
                                                                                         len[0] = secret_len;
-                                                                                        addr[1] = req_auth;
+                                                                                        addr[1] = st->req_auth;
                                                                                         len[1] = 16;
                                                                                         addr[2] = &buf[1];
@@ -1853 +1858 @@
 
                                                 /* We need the request authenticator */
-                                                CHECK_PARAMS(req_auth);
+                                                CHECK_PARAMS(st);
 
                                                 /* Retrieve the shared secret */
@@ -1866 +1871 @@
                                                 send_len = ahdr->avp_value->os.len - recv_len;
                                                 
-                                                if ( ! radius_msg_add_mppe_keys(*rad_fw, req_auth, secret, secret_len, 
+                                                if ( ! radius_msg_add_mppe_keys(*rad_fw, st->req_auth, secret, secret_len, 
                                                                 ahdr->avp_value->os.data + recv_len, send_len,
                                                                 ahdr->avp_value->os.data, recv_len) ) {
@@ -1925 +1930 @@
         
         CHECK_FCT( fd_msg_free( aoh ) );
-        free(req_auth);
+        free(st);
         
         if (error_cause) {