Changeset 368:a1f26147ec61 in freeDiameter for extensions/app_sip

Timestamp:

Jul 3, 2010, 12:40:00 AM (14 years ago)

Author:

Alexandre Westfahl <awestfahl@freediameter.net>

Branch:

default

Phase:

public

Message:

Corrected bugs on app_sip and rgwx_sip

Location:

extensions/app_sip

Files:

• diamsip.c (modified) (4 diffs)
• diamsip.h (modified) (4 diffs)
• multimediaauth.c (modified) (4 diffs)

extensions/app_sip/diamsip.c

@@ -36 +36 @@
 #include "diamsip.h"
 
-static struct disp_hdl * diamsip_MAR_hdl=NULL;
-static struct disp_hdl * diamsip_default_hdl=NULL;
+struct disp_hdl * diamsip_MAR_hdl=NULL;
+struct disp_hdl * diamsip_default_hdl=NULL;
+struct session_handler * ds_sess_hdl;
+
+struct diamsip_dict sip_dict;
 
 int diamsip_default_cb( struct msg ** msg, struct avp * avp, struct session * sess, enum disp_action * act)
@@ -48 +51 @@
 }
 
-
-
-
 /* entry point */
-static int ds_entry()
+int ds_entry()
 {
         struct dict_object * app=NULL;
@@ -110 +110 @@
         CHECK_FCT(fd_sess_handler_create(&ds_sess_hdl, free));
         
-
-        //listnonce=NULL;
         return 0;
 }
@@ -127 +125 @@
         close_mysql_connection();
         
-        //We delete the chained list of nonces
-        //nonce_deletelistnonce();
-        //TODO:NONCE
+
         
         TRACE_ENTRY();

extensions/app_sip/diamsip.h

@@ -84 +84 @@
 
 
-static int ds_entry();
+int ds_entry();
 void fd_ext_fini(void);
 int diamsip_default_cb( struct msg ** msg, struct avp * avp, struct session * sess, enum disp_action * act);
@@ -103 +103 @@
 #define SQL_CLEARFLAG_LEN 74
 
-static struct session_handler * ds_sess_hdl;
-static struct session *dssess;
+extern struct session_handler * ds_sess_hdl;
 
 
@@ -114 +113 @@
 
 //Storage for some usefull AVPs
-static struct {
+struct diamsip_dict{
         struct dict_object * Auth_Session_State;
         struct dict_object * Auth_Application_Id;
@@ -139 +138 @@
         struct dict_object * Digest_Algorithm;
         struct dict_object * Digest_HA1;
-} sip_dict;
+};
+
+extern  struct diamsip_dict  sip_dict;

extensions/app_sip/multimediaauth.c

@@ -37 +37 @@
 
 
-int diamsip_MAR_cb( struct msg ** msg, struct avp * avp, struct session * sess, enum disp_action * act)
+int diamsip_MAR_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, enum disp_action * act)
 {
         struct msg *ans, *qry;
-        struct avp *a2, *authdataitem;
+        struct avp *avp, *a2, *authdataitem;
         struct msg_hdr * header = NULL;
         struct avp_hdr * avphdr=NULL, *avpheader=NULL, *avpheader_auth=NULL,*digestheader=NULL;
@@ -48 +48 @@
         char * result;
         char password[51];
-        int idx=0, idx2=0, number_of_auth_items=0,i=0;;
+        int idx=0, idx2=0, number_of_auth_items=0,i=0;
         //Flags and variables for Database
         int sipurinotstored=0, authenticationpending=0, querylen=0, usernamelen=0;
@@ -82 +82 @@
                 {
                         CHECK_FCT( fd_msg_avp_new ( sip_dict.Auth_Application_Id, 0, &avp ) );
+                        ASSERT(avp);
                         val.i32 = header->msg_appl;
                         CHECK_FCT( fd_msg_avp_setvalue ( avp, &val ) );
@@ -670 +671 @@
                                                                         DigestCalcResponseAuth(HA1, digest_nonce, digest_noncecount, digest_cnonce, digest_qop,digest_method, digest_uri, HA2, responseauth);
                                                                         
-                                                                        
+                                                                        TRACE_DEBUG(FULL,"Response calculated by Diameter server:%s",response);
+                                                                                TRACE_DEBUG(FULL,"Response calculated by UA:%s",digest_response);
                                                                         if(strcmp(digest_qop,"auth-int")==0)
                                                                         {