Changeset 428:260b8e10f471 in freeDiameter

Timestamp:

Jul 26, 2010, 9:52:23 PM (14 years ago)

Author:

Alexandre Westfahl <awestfahl@freediameter.net>

Branch:

default

Phase:

public

Message:

Removed warning in SIP plugin (gateway)

File:

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

extensions/app_radgw/rgwx_sip.c

@@ -178 +178 @@
         return 0;
 }
-
+/*
 static void nonce_del_element(char * nonce, struct rgwp_config *state)
 {
@@ -199 +199 @@
         }
 }
-
+*/
 //Retrieve sid from nonce
 static char * nonce_get_sid(char * nonce, size_t noncelen, size_t * sidlen, struct rgwp_config *state)
@@ -206 +206 @@
         char *sid=NULL;
         
-        CHECK_PARAMS_DO(nonce && state && noncelen && sidlen, return);
+        CHECK_PARAMS_DO(nonce && state && noncelen && sidlen, return NULL);
         *sidlen=0;
         
@@ -344 +344 @@
         char * un=NULL;
         size_t  un_len;
-        uint32_t status_type;
         size_t nattr_used = 0;
         struct avp *auth_data=NULL, *auth=NULL, *avp = NULL;
@@ -468 +467 @@
         if (i == 0) {
                 /* Not found in the User-Name => we use the local domain of this gateway */
-                value.os.data = fd_g_config->cnf_diamrlm;
+                value.os.data = (unsigned char *)fd_g_config->cnf_diamrlm;
                 value.os.len  = fd_g_config->cnf_diamrlm_len;
         } else {
-                value.os.data = un + i;
+                value.os.data = (unsigned char *)(un + i);
                 value.os.len  = un_len - i;
         }
@@ -653 +652 @@
                         CHECK_MALLOC(sipuri=malloc(attr->length +3));
                         strcpy(sipuri,"sip:");
-                        strcat(sipuri,(unsigned char *)temp);
+                        strcat(sipuri,(const char *)temp);
                         value.os.data=(unsigned char *)sipuri;
                         value.os.len=attr->length +2;
@@ -695 +694 @@
                                                                                 
                                 CHECK_FCT( fd_msg_avp_new ( cs->dict.Digest_Algorithm, 0, &avp ) );                     
-                                value.os.len = 3;                                               
-                                value.os.data = "MD5";                                  
+                                                                                
+                                value.os.data = (unsigned char *)"MD5";
+                                value.os.len = strlen((const char *)value.os.data);
                                 CHECK_FCT( fd_msg_avp_setvalue ( avp, &value ) );                                       
                                 CHECK_FCT( fd_msg_avp_add ( auth, MSG_BRW_LAST_CHILD, avp) );   
@@ -706 +706 @@
                                 //We give a fake nonce because it will be calculated at the server.
                                 CHECK_FCT( fd_msg_avp_new ( cs->dict.Digest_Nonce, 0, &avp ) );
-                                value.os.data="nonce";
-                                value.os.len=5;
+                                value.os.data=(unsigned char *)"nonce";
+                                value.os.len=strlen((const char *)value.os.data);
                                 CHECK_FCT( fd_msg_avp_setvalue ( avp, &value ) );
                                 CHECK_FCT( fd_msg_avp_add ( auth, MSG_BRW_LAST_CHILD, avp) );   
@@ -741 +741 @@
 {
         
-        struct msg_hdr * hdr;
+        
         struct avp *avp, *next, *asid;
         struct avp_hdr *ahdr, *sid;
@@ -839 +839 @@
                                                 sidlen=strlen(sid);
                                                 
-                                                nonce_add_element(ahdr->avp_value->os.data,ahdr->avp_value->os.len, sid,sidlen, cs);
+                                                nonce_add_element((char *)ahdr->avp_value->os.data,ahdr->avp_value->os.len, sid,sidlen, cs);
                                         }
                                         break;