don't use < > on request uri's.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6561 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 a19cc47707dce8db60b33602787809cb12e3dfe0..064840d799b97d26c7caed2d44819ffcb8844951 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.h
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.h
@@ -468,7 +468,7 @@ char *sofia_glue_get_url_from_contact(char *buf, uint8_t to_dup);
 void sofia_presence_set_hash_key(char *hash_key, int32_t len, sip_t const *sip);
 void sofia_glue_sql_close(sofia_profile_t *profile);
 int sofia_glue_init_sql(sofia_profile_t *profile);
-char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char *uri, const char *transport);
+char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char *uri, const char *transport, switch_bool_t uri_only);
 switch_bool_t sofia_glue_execute_sql_callback(sofia_profile_t *profile,
                                                                                          switch_bool_t master,
                                                                                          switch_mutex_t *mutex,

diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index d08e34d5c56b06672c43254e029793f5748d7813..b56d78d7523b43fb55a3a3797d3eb55bd4f13d4b 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -447,7 +447,7 @@ switch_status_t sofia_glue_tech_choose_video_port(private_object_t *tech_pvt)
        return SWITCH_STATUS_SUCCESS;
 }
 
-char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char *uri, const char *transport)
+char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char *uri, const char *transport, switch_bool_t uri_only)
 {
        char *stripped = switch_core_session_strdup(session, uri);
        char *new_uri = NULL;
@@ -455,12 +455,12 @@ char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char
        stripped = sofia_glue_get_url_from_contact(stripped, 0);
        if (transport && strcasecmp(transport, "udp")) {
                if (switch_stristr("port=", stripped)) {
-                       new_uri = switch_core_session_sprintf(session, "<%s>", stripped);
+                       new_uri = switch_core_session_sprintf(session, "%s%s%s", uri_only ? "" : "<", stripped, uri_only ? "" : ">");
                } else {
                        if (strchr(stripped, ';')) {
-                               new_uri = switch_core_session_sprintf(session, "<%s&transport=%s>", stripped, transport);
+                               new_uri = switch_core_session_sprintf(session, "%s%s&transport=%s%s", uri_only ? "" : "<", stripped, transport, uri_only ? "" : ">");
                        } else {
-                               new_uri = switch_core_session_sprintf(session, "<%s;transport=%s>", stripped, transport);
+                               new_uri = switch_core_session_sprintf(session, "%s%s;transport=%s%s", uri_only ? "" : "<", stripped, transport, uri_only ? "" : ">");
                        }
                }
        } else {
@@ -593,10 +593,10 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session)
                        }
                }
 
-               url_str = sofia_overcome_sip_uri_weakness(session, url, transport);
-               invite_contact = sofia_overcome_sip_uri_weakness(session, tech_pvt->invite_contact, transport);
-               from_str = sofia_overcome_sip_uri_weakness(session, use_from_str, NULL);
-               to_str = sofia_overcome_sip_uri_weakness(session, tech_pvt->dest_to, NULL);
+               url_str = sofia_overcome_sip_uri_weakness(session, url, transport, SWITCH_TRUE);
+               invite_contact = sofia_overcome_sip_uri_weakness(session, tech_pvt->invite_contact, transport, SWITCH_FALSE);
+               from_str = sofia_overcome_sip_uri_weakness(session, use_from_str, NULL, SWITCH_FALSE);
+               to_str = sofia_overcome_sip_uri_weakness(session, tech_pvt->dest_to, NULL, SWITCH_FALSE);
                
                /* 
                   Does the "genius" who wanted SIP to be "text-based" so it was "easier to read" even use it now,