<variables> section in user for local chan vars during authed calls

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5042 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.h b/src/mod/endpoints/mod_sofia/mod_sofia.h
index 327d5041cbc33f5a8f87e4eeceb13e1c4916c91f..3bfbc3bab100036a606bfbcb2532937ea083ce8b 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.h
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.h
@@ -414,7 +414,8 @@ void sofia_presence_event_handler(switch_event_t *event);
 void sofia_presence_mwi_event_handler(switch_event_t *event);
 void sofia_presence_cancel(void);
 switch_status_t config_sofia(int reload, char *profile_name);
-auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, const char *regstr, char *np, size_t nplen, char *ip);
+auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, 
+                                                               const char *regstr, char *np, size_t nplen, char *ip, switch_event_t **v_event);
 void sofia_reg_handle_sip_r_challenge(int status,
                                         char const *phrase,
                                         nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, switch_core_session_t *session, sip_t const *sip, tagi_t tags[]);
@@ -448,7 +449,8 @@ void sofia_glue_pass_sdp(private_object_t *tech_pvt, char *sdp);
 int sofia_glue_get_user_host(char *in, char **user, char **host);
 switch_call_cause_t sofia_glue_sip_cause_to_freeswitch(int status);
 void sofia_glue_do_xfer_invite(switch_core_session_t *session);
-uint8_t sofia_reg_handle_register(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip, sofia_regtype_t regtype, char *key, uint32_t keylen);
+uint8_t sofia_reg_handle_register(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip, 
+                                                                 sofia_regtype_t regtype, char *key, uint32_t keylen, switch_event_t **v_event);
 const switch_endpoint_interface_t sofia_endpoint_interface;
 void sofia_presence_set_chat_hash(private_object_t *tech_pvt, sip_t const *sip);
 switch_status_t sofia_on_hangup(switch_core_session_t *session);

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 8b67c476a3461d90869dc83ad5b7b1594c7dbe40..66472f9da4af932810e62333c9904d435b993189 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -52,7 +52,7 @@ void sofia_event_callback(nua_event_t event,
 
        if (sofia_private) {
                if (!switch_strlen_zero(sofia_private->uuid)) {
-
+                       
                        if ((session = switch_core_session_locate(sofia_private->uuid))) {
                                tech_pvt = switch_core_session_get_private(session);
                                channel = switch_core_session_get_channel(tech_pvt->session);
@@ -69,7 +69,6 @@ void sofia_event_callback(nua_event_t event,
                        }
                }
        }
-
        
        if (status != 100 && status != 200) {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "event [%s] status [%d][%s] session: %s\n",
@@ -89,7 +88,7 @@ void sofia_event_callback(nua_event_t event,
                        char network_ip[80];
                        get_addr(network_ip, sizeof(network_ip), &((struct sockaddr_in *) msg_addrinfo(nua_current_request(nua))->ai_addr)->sin_addr);
                        auth_res = sofia_reg_parse_auth(profile, authorization, 
-                                                                                       (char *) sip->sip_request->rq_method_name, tech_pvt->key, strlen(tech_pvt->key), network_ip);
+                                                                                       (char *) sip->sip_request->rq_method_name, tech_pvt->key, strlen(tech_pvt->key), network_ip, NULL);
                }
 
                if (auth_res != AUTH_OK) {
@@ -322,20 +321,11 @@ void *SWITCH_THREAD_FUNC sofia_profile_thread_run(switch_thread_t *thread, void
        gateway_loops = GATEWAY_SECONDS;
 
        if (switch_event_create(&s_event, SWITCH_EVENT_PUBLISH) == SWITCH_STATUS_SUCCESS) {
-               switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_sip._udp");
-               switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "port", "%d", profile->sip_port);
-               switch_event_fire(&s_event);
-       }
-
-       if (switch_event_create(&s_event, SWITCH_EVENT_PUBLISH) == SWITCH_STATUS_SUCCESS) {
-               switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_sip._tcp");
-               switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "port", "%d", profile->sip_port);
-               switch_event_fire(&s_event);
-       }
-
-       if (switch_event_create(&s_event, SWITCH_EVENT_PUBLISH) == SWITCH_STATUS_SUCCESS) {
-               switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_sip._sctp");
+               switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_sip._udp,_sip._tcp,_sip._sctp");
                switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "port", "%d", profile->sip_port);
+               switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "module_name", "%s", "mod_sofia");
+               switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile_name", "%s", profile->name);
+               switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile_uri", "%s", profile->url);
                switch_event_fire(&s_event);
        }
 
@@ -377,8 +367,11 @@ void *SWITCH_THREAD_FUNC sofia_profile_thread_run(switch_thread_t *thread, void
        }
 
        if (switch_event_create(&s_event, SWITCH_EVENT_UNPUBLISH) == SWITCH_STATUS_SUCCESS) {
-               switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_sip._udp");
+               switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_sip._udp,_sip._tcp,_sip._sctp");
                switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "port", "%d", profile->sip_port);
+               switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "module_name", "%s", "mod_sofia");
+               switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile_name", "%s", profile->name);
+               switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile_uri", "%s", profile->url);
                switch_event_fire(&s_event);
        }
 
@@ -1639,6 +1632,7 @@ void sofia_handle_sip_i_invite(nua_t *nua, sofia_profile_t *profile, nua_handle_
        const char *from_user = NULL, *from_host = NULL;
        const char *context = NULL;
        char network_ip[80];
+       switch_event_t *v_event = NULL;
 
        if (!sip || !sip->sip_request || !sip->sip_request->rq_method_name) {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received an invalid packet!\n");
@@ -1654,11 +1648,14 @@ void sofia_handle_sip_i_invite(nua_t *nua, sofia_profile_t *profile, nua_handle_
        }
 
        if ((profile->pflags & PFLAG_AUTH_CALLS)) {
-               if (sofia_reg_handle_register(nua, profile, nh, sip, REG_INVITE, key, sizeof(key))) {
+               if (sofia_reg_handle_register(nua, profile, nh, sip, REG_INVITE, key, sizeof(key), &v_event)) {
+                       if (v_event) {
+                               switch_event_destroy(&v_event);
+                       }
                        return;
                }
        }
-
+       
        if (!(session = switch_core_session_request(&sofia_endpoint_interface, NULL))) {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Session Alloc Failed!\n");
                nua_respond(nh, SIP_503_SERVICE_UNAVAILABLE, TAG_END());
@@ -1681,6 +1678,16 @@ void sofia_handle_sip_i_invite(nua_t *nua, sofia_profile_t *profile, nua_handle_
 
        channel = switch_core_session_get_channel(session);
 
+       if (v_event) {
+               switch_event_header_t *hp;
+               
+               for(hp = v_event->headers; hp; hp = hp->next) {
+                       switch_channel_set_variable(channel, hp->name, hp->value);
+               }
+               
+               switch_event_destroy(&v_event);
+       }
+
        if (sip->sip_from && sip->sip_from->a_url) {
                from_user = sip->sip_from->a_url->url_user;
                from_host = sip->sip_from->a_url->url_host;

diff --git a/src/mod/endpoints/mod_sofia/sofia_reg.c b/src/mod/endpoints/mod_sofia/sofia_reg.c
index 679a8c017e95c458e92998336209d351e6a528bc..ba5c0ea457d3d3166a3bc7deab10e3495ee9fc11 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_reg.c
+++ b/src/mod/endpoints/mod_sofia/sofia_reg.c
@@ -244,7 +244,7 @@ char *sofia_reg_find_reg_url(sofia_profile_t *profile, const char *user, const c
 }
 
 uint8_t sofia_reg_handle_register(nua_t * nua, sofia_profile_t *profile, nua_handle_t * nh, sip_t const *sip, sofia_regtype_t regtype, char *key,
-                                                          uint32_t keylen)
+                                                                 uint32_t keylen, switch_event_t **v_event)
 {
        sip_from_t const *from = NULL;
        sip_expires_t const *expires = NULL;
@@ -327,10 +327,10 @@ uint8_t sofia_reg_handle_register(nua_t * nua, sofia_profile_t *profile, nua_han
        }
 
        if (authorization) {
-               if ((auth_res = sofia_reg_parse_auth(profile, authorization, sip->sip_request->rq_method_name, key, keylen, network_ip)) == AUTH_STALE) {
+               if ((auth_res = sofia_reg_parse_auth(profile, authorization, sip->sip_request->rq_method_name, key, keylen, network_ip, v_event)) == AUTH_STALE) {
                        stale = 1;
                }
-
+               
                if (auth_res != AUTH_OK && !stale) {
                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "send %s for [%s@%s]\n", forbidden ? "forbidden" : "challange", from_user, from_host);
                        if (auth_res == AUTH_FORBIDDEN) {
@@ -472,7 +472,7 @@ void sofia_reg_handle_sip_i_register(nua_t * nua, sofia_profile_t *profile, nua_
                return;
        }
 
-       sofia_reg_handle_register(nua, profile, nh, sip, REG_REGISTER, key, sizeof(key));
+       sofia_reg_handle_register(nua, profile, nh, sip, REG_REGISTER, key, sizeof(key), NULL);
 }
 
 
@@ -630,7 +630,8 @@ void sofia_reg_handle_sip_r_challenge(int status,
        
 }
 
-auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, const char *regstr, char *np, size_t nplen, char *ip)
+auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, 
+                                                               const char *regstr, char *np, size_t nplen, char *ip, switch_event_t **v_event)
 {
        int indexnum;
        const char *cur;
@@ -641,8 +642,9 @@ auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t co
        auth_res_t ret = AUTH_FORBIDDEN;
        char *npassword = NULL;
        int cnt = 0;
-       username = realm = nonce = uri = qop = cnonce = nc = response = NULL;
 
+       username = realm = nonce = uri = qop = cnonce = nc = response = NULL;
+       
        if (authorization->au_params) {
                for (indexnum = 0; (cur = authorization->au_params[indexnum]); indexnum++) {
                        char *var, *val, *p, *work;
@@ -734,7 +736,21 @@ auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t co
                                a1_hash = val;
                        }
                }
-               
+
+               if (v_event && (xparams = switch_xml_child(user, "variables"))) {
+                       if (switch_event_create(v_event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) {
+                               for (param = switch_xml_child(xparams, "variable"); param; param = param->next) {
+                                       const char *var = switch_xml_attr_soft(param, "name");
+                                       const char *val = switch_xml_attr_soft(param, "value");
+
+                                       if (!switch_strlen_zero(var) && !switch_strlen_zero(val)) {
+                                               switch_event_add_header(*v_event, SWITCH_STACK_BOTTOM, var, "%s", val);
+                                       }
+                               }
+                       }
+               }
+
+
                if (switch_strlen_zero(passwd) && switch_strlen_zero(a1_hash)) {
                        ret = AUTH_OK;
                        goto end;