Changeset 706:4ffbc9f1e922 in freeDiameter for extensions/app_radgw/rgwx_acct.c

Timestamp:

Feb 9, 2011, 3:26:58 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Large UNTESTED commit with the following changes:

• Improved DiameterIdentity? handling (esp. interationalization issues), and improve efficiency of some string operations in peers, sessions, and dictionary modules (closes #7)
• Cleanup in the session module to free only unreferenced sessions (#16)
• Removed fd_cpu_flush_cache(), replaced by more robust alternatives.
• Improved peer state machine algorithm to counter SCTP multistream race condition.

File:

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

extensions/app_radgw/rgwx_acct.c

@@ -306 +306 @@
         const char * prefix = "Diameter/";
         size_t pref_len;
-        uint8_t * si = NULL;
+        os0_t si = NULL;
         size_t si_len = 0;
-        uint8_t * un = NULL;
+        os0_t un = NULL;
         size_t un_len = 0;
         
@@ -487 +487 @@
         /* Create the Session-Id AVP if needed */
         if (!*session) {
-                CHECK_FCT( fd_sess_fromsid ( (char *)/* cast should be removed later */si, si_len, session, NULL) );
+                CHECK_FCT( fd_sess_fromsid ( si, si_len, session, NULL) );
                 
                 TRACE_DEBUG(FULL, "[acct.rgwx] Translating new accounting message for session '%.*s'...", si_len, si);
@@ -663 +663 @@
                                         char * attr_val, *auth_val;
                                         attr_val = (char *)(attr + 1);
-                                        auth_val = attr_val + strlen(CLASS_AAI_PREFIX);
-                                        if (    (attr->length > sizeof(struct radius_attr_hdr) + strlen(CLASS_AAI_PREFIX)  )
-                                                && (attr->length < sizeof(struct radius_attr_hdr) + strlen(CLASS_AAI_PREFIX) + sizeof(buf))
-                                                && ! strncmp(attr_val, CLASS_AAI_PREFIX, strlen(CLASS_AAI_PREFIX))) {
+                                        auth_val = attr_val + CONSTSTRLEN(CLASS_AAI_PREFIX);
+                                        if (    (attr->length > sizeof(struct radius_attr_hdr) + CONSTSTRLEN(CLASS_AAI_PREFIX)  )
+                                                && (attr->length < sizeof(struct radius_attr_hdr) + CONSTSTRLEN(CLASS_AAI_PREFIX) + sizeof(buf))
+                                                && ! strncmp(attr_val, CLASS_AAI_PREFIX, CONSTSTRLEN(CLASS_AAI_PREFIX))) {
                                         
                                                 memset(buf, 0, sizeof(buf));
-                                                memcpy(buf, auth_val, attr->length - sizeof(struct radius_attr_hdr) - strlen(CLASS_AAI_PREFIX));
+                                                memcpy(buf, auth_val, attr->length - sizeof(struct radius_attr_hdr) - CONSTSTRLEN(CLASS_AAI_PREFIX));
                                                 if (sscanf(buf, "%u", &auth_appl) == 1) {
                                                         TRACE_DEBUG(ANNOYING, "Found Class attribute with '%s' prefix (attr #%d), AAI:%u.", CLASS_AAI_PREFIX, idx, auth_appl);
@@ -1301 +1301 @@
                 struct msg * str = NULL;
                 struct msg_hdr * hdr = NULL;
-                char * fqdn;
-                char * realm;
+                DiamId_t fqdn;
+                size_t fqdn_len;
+                DiamId_t realm;
+                size_t realm_len;
                 union avp_value avp_val;
                 
@@ -1323 +1325 @@
 
                 /* Get information on the NAS */
-                CHECK_FCT( rgw_clients_get_origin(cli, &fqdn, &realm) );
+                CHECK_FCT( rgw_clients_get_origin(cli, &fqdn, &fqdn_len, &realm, &realm_len) );
 
                 /* Add the Origin-Host as next AVP */
@@ -1329 +1331 @@
                 memset(&avp_val, 0, sizeof(avp_val));
                 avp_val.os.data = (unsigned char *)fqdn;
-                avp_val.os.len = strlen(fqdn);
+                avp_val.os.len = fqdn_len;
                 CHECK_FCT( fd_msg_avp_setvalue ( avp, &avp_val ) );
                 CHECK_FCT( fd_msg_avp_add ( str, MSG_BRW_LAST_CHILD, avp) );
@@ -1337 +1339 @@
                 memset(&avp_val, 0, sizeof(avp_val));
                 avp_val.os.data = (unsigned char *)realm;
-                avp_val.os.len = strlen(realm);
+                avp_val.os.len = realm_len;
                 CHECK_FCT( fd_msg_avp_setvalue ( avp, &avp_val ) );
                 CHECK_FCT( fd_msg_avp_add ( str, MSG_BRW_LAST_CHILD, avp) );