FS-6482 --resolve

diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index a69fb687d0992df2221d81fb98e83ed6dd7da136..f97ba35635e13cbdc814929b25578d6f063f5934 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -2630,6 +2630,7 @@ switch_status_t sofia_glue_send_notify(sofia_profile_t *profile, const char *use
        sofia_destination_t *dst = NULL;
        char *contact_str, *contact, *user_via = NULL;
        char *route_uri = NULL, *p;
+       char *ptr;
 
        contact = sofia_glue_get_url_from_contact((char *) o_contact, 1);
 
@@ -2638,16 +2639,12 @@ switch_status_t sofia_glue_send_notify(sofia_profile_t *profile, const char *use
        }
 
        if (!zstr(network_ip) && sofia_glue_check_nat(profile, network_ip)) {
-               char *ptr = NULL;
-               //const char *transport_str = NULL;
-
-
                id = switch_mprintf("sip:%s@%s", user, profile->extsipip);
                switch_assert(id);
 
                if ((ptr = sofia_glue_find_parameter(o_contact, "transport="))) {
-                       sofia_transport_t transport = sofia_glue_str2transport(ptr);
-                       //transport_str = sofia_glue_transport2str(transport);
+                       sofia_transport_t transport = sofia_glue_str2transport( ptr + 10 );
+
                        switch (transport) {
                        case SOFIA_TRANSPORT_TCP:
                                contact_str = profile->tcp_public_contact;
@@ -2662,12 +2659,30 @@ switch_status_t sofia_glue_send_notify(sofia_profile_t *profile, const char *use
                        user_via = sofia_glue_create_external_via(NULL, profile, transport);
                } else {
                        user_via = sofia_glue_create_external_via(NULL, profile, SOFIA_TRANSPORT_UDP);
-                       contact_str = profile->public_url;
+                       contact_str = profile->public_url;              
                }
-
        } else {
-               contact_str = profile->url;
                id = switch_mprintf("sip:%s@%s", user, host);
+               switch_assert(id);
+               
+               if ((ptr = sofia_glue_find_parameter(o_contact, "transport="))) {
+                       sofia_transport_t transport = sofia_glue_str2transport( ptr + 10 );
+
+                       switch (transport) {
+                       case SOFIA_TRANSPORT_TCP:
+                               contact_str = profile->tcp_contact;
+                               break;
+                       case SOFIA_TRANSPORT_TCP_TLS:
+                               contact_str = profile->tls_contact;
+                               break;
+                       default:
+                               contact_str = profile->url;
+                               break;
+                       }
+               } else {
+                       user_via = sofia_glue_create_external_via(NULL, profile, SOFIA_TRANSPORT_UDP);
+                       contact_str = profile->url;
+               }
        }
 
        dst = sofia_glue_get_destination((char *) o_contact);

diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index 8d5d7fb0da7893367f471752bdfea150da0d0f62..bf5c0197dd6566015054190a81b449404a47b135 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -309,18 +309,8 @@ switch_status_t sofia_presence_chat_send(switch_event_t *message_event)
 
                if (!zstr(remote_ip) && sofia_glue_check_nat(profile, remote_ip)) {
                        char *ptr = NULL;
-                       //const char *transport_str = NULL;
                        if ((ptr = sofia_glue_find_parameter(dst->contact, "transport="))) {
-                               sofia_transport_t transport = sofia_glue_str2transport(ptr);
-                               //transport_str = sofia_glue_transport2str(transport);
-                               switch (transport) {
-                               case SOFIA_TRANSPORT_TCP:
-                                       break;
-                               case SOFIA_TRANSPORT_TCP_TLS:
-                                       break;
-                               default:
-                                       break;
-                               }
+                               sofia_transport_t transport = sofia_glue_str2transport( ptr + 10 );
                                user_via = sofia_glue_create_external_via(NULL, profile, transport);
                        } else {
                                user_via = sofia_glue_create_external_via(NULL, profile, SOFIA_TRANSPORT_UDP);
@@ -2202,30 +2192,33 @@ static void _send_presence_notify(sofia_profile_t *profile,
 
 
        if (!zstr(remote_ip) && sofia_glue_check_nat(profile, remote_ip)) {
-               char *ptr = NULL;
-
-               if ((ptr = sofia_glue_find_parameter(o_contact, "transport="))) {
-                       sofia_transport_t transport = sofia_glue_str2transport(ptr);
-
-                       switch (transport) {
-                       case SOFIA_TRANSPORT_TCP:
-                               contact_str = profile->tcp_public_contact;
-                               break;
-                       case SOFIA_TRANSPORT_TCP_TLS:
-                               contact_str = profile->tls_public_contact;
-                               break;
-                       default:
-                               contact_str = profile->public_url;
-                               break;
-                       }
-                       user_via = sofia_glue_create_external_via(NULL, profile, transport);
-               } else {
-                       user_via = sofia_glue_create_external_via(NULL, profile, SOFIA_TRANSPORT_UDP);
+               sofia_transport_t transport = sofia_glue_str2transport(tp);
+               
+               switch (transport) {
+               case SOFIA_TRANSPORT_TCP:
+                       contact_str = profile->tcp_public_contact;
+                       break;
+               case SOFIA_TRANSPORT_TCP_TLS:
+                       contact_str = profile->tls_public_contact;
+                       break;
+               default:
                        contact_str = profile->public_url;
+                       break;
                }
-
+               user_via = sofia_glue_create_external_via(NULL, profile, transport);
        } else {
-               contact_str = our_contact;
+               sofia_transport_t transport = sofia_glue_str2transport(tp);
+               switch (transport) {
+               case SOFIA_TRANSPORT_TCP:
+                       contact_str = profile->tcp_contact;
+                       break;
+               case SOFIA_TRANSPORT_TCP_TLS:
+                       contact_str = profile->tls_contact;
+                       break;
+               default:
+                       contact_str = profile->url;
+                       break;
+               }
        }
 
 
@@ -2585,7 +2578,6 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
        struct presence_helper *helper = (struct presence_helper *) pArg;
        char *pl = NULL;
        char *clean_id = NULL, *id = NULL;
-
        char *proto = argv[0];
        char *user = argv[1];
        char *host = argv[2];
@@ -2595,7 +2587,6 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
        char *call_id = argv[7];
        char *full_from = argv[8];
        //char *full_via = argv[9];
-
        char *expires = argv[10];
        char *user_agent = argv[11];
        char *profile_name = argv[13];
@@ -2631,7 +2622,7 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
        const char *astate = NULL;
        const char *event_status = NULL;
        const char *force_event_status = NULL;
-
+       char *contact_str, *contact_stripped;
 
        if (mod_sofia_globals.debug_presence > 0) {
                int i;
@@ -2662,6 +2653,46 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
                port = argv[27];
        }
 
+       if (!zstr(ip) && sofia_glue_check_nat(profile, ip)) {
+               char *ptr;
+               if ((ptr = sofia_glue_find_parameter(contact, "transport="))) {
+                       sofia_transport_t transport = sofia_glue_str2transport( ptr + 10 );
+
+                       switch (transport) {
+                       case SOFIA_TRANSPORT_TCP:
+                               contact_str = profile->tcp_public_contact;
+                               break;
+                       case SOFIA_TRANSPORT_TCP_TLS:
+                               contact_str = profile->tls_public_contact;
+                               break;
+                       default:
+                               contact_str = profile->public_url;
+                               break;
+                       }
+               } else {
+                       contact_str = profile->public_url;              
+               }
+       } else {
+               char *ptr;
+               if ((ptr = sofia_glue_find_parameter(contact, "transport="))) {
+                       sofia_transport_t transport = sofia_glue_str2transport( ptr + 10 );
+
+                       switch (transport) {
+                       case SOFIA_TRANSPORT_TCP:
+                               contact_str = profile->tcp_contact;
+                               break;
+                       case SOFIA_TRANSPORT_TCP_TLS:
+                               contact_str = profile->tls_contact;
+                               break;
+                       default:
+                               contact_str = profile->url;
+                               break;
+                       }
+               } else {
+                       contact_str = profile->url;
+               }
+       }
+
 
        if (!zstr(presence_id) && strchr(presence_id, '@')) {
                char *p;
@@ -3111,18 +3142,17 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
                                switch_set_string(status_line, status);
                        }
 
-
-
                        if (!zstr(force_event_status)) {
                                switch_set_string(status_line, force_event_status);
                        }
 
-
                        if (!zstr(dialog_rpid)) {
                                prpid = rpid = dialog_rpid;
                        }
 
-                       pl = gen_pidf(user_agent, clean_id, profile->url, open, rpid, prpid, status_line, &ct);
+                       contact_stripped = sofia_glue_strip_uri(contact_str);
+                       pl = gen_pidf(user_agent, clean_id, contact_stripped, open, rpid, prpid, status_line, &ct);
+                       free(contact_stripped);
                }
 
        } else {
@@ -3146,8 +3176,9 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
                        prpid = rpid = dialog_rpid;
                }
 
-
-               pl = gen_pidf(user_agent, clean_id, profile->url, open, rpid, prpid, status, &ct);
+               contact_stripped = sofia_glue_strip_uri(contact_str); 
+               pl = gen_pidf(user_agent, clean_id, contact_stripped, open, rpid, prpid, status, &ct);
+               free(contact_stripped);
        }