Changeset 1088:1d1a20a0779d in freeDiameter for extensions/app_sip

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

Location:

extensions/app_sip

Files:

• app_sip.c (modified) (3 diffs)
• app_sip.h (modified) (1 diff)
• multimediaauth.c (modified) (3 diffs)

extensions/app_sip/app_sip.c

@@ -50 +50 @@
 
 struct disp_hdl * app_sip_default_hdl=NULL;
-struct session_handler * ds_sess_hdl;
 
 //configuration stucture
@@ -213 +212 @@
                 return EINVAL;
         
-        CHECK_FCT(fd_sess_handler_create(&ds_sess_hdl, free, NULL));
-        
         //Creation of thread for Registration Termination       
         if(pthread_create(&rtr_thread, NULL,rtr_socket, NULL))
@@ -238 +235 @@
         
         (void) fd_disp_unregister(&app_sip_MAR_hdl, NULL);
-        CHECK_FCT_DO( fd_sess_handler_destroy(&ds_sess_hdl, NULL),return);
         
         

extensions/app_sip/app_sip.h

@@ -212 +212 @@
 #define CODE_SIP_USER_DATA_TYPE 388
 #define CODE_SIP_AOR    122
-
-struct ds_nonce
-{
-        char *nonce;
-};
 
 //Storage for some useful AVPs

extensions/app_sip/multimediaauth.c

@@ -36 +36 @@
 #include "app_sip.h"
 
+struct sess_state
+{
+        char *nonce;
+};
+
 
 int app_sip_MAR_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, void * opaque, enum disp_action * act)
@@ -56 +61 @@
         
         //The nonce we will store and retrieve in session
-        struct ds_nonce *storednonce=NULL;
+        struct sess_state *storednonce=NULL;
         
         
@@ -362 +367 @@
                                                                         
                                                                         //We store the nonce (storednonce structure) inside the session
-                                                                        storednonce=malloc(sizeof(struct ds_nonce));
-                                                                        memset(storednonce,0,sizeof(struct ds_nonce));
+                                                                        storednonce=malloc(sizeof(struct sess_state));
+                                                                        memset(storednonce,0,sizeof(struct sess_state));
                                                                         CHECK_MALLOC(storednonce->nonce=malloc(NONCE_SIZE*2+1));
                                                                         memcpy(storednonce->nonce,(char *)nonce,NONCE_SIZE*2+1);