From 351a8ca34c390333ced203172368761bc11e0e59 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Thu, 30 Jul 2015 11:44:38 -0400 Subject: [PATCH] Revert "FS-7917 add check for ipv6 in sofia_glue_create_via" This reverts commit 4c8bf297fb9c78fc59dc607c5c4fb221a873f731. This behavior change was incorrect, sorry --- src/mod/endpoints/mod_sofia/sofia_glue.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c index ec25e3645d..0a46691a0e 100644 --- a/src/mod/endpoints/mod_sofia/sofia_glue.c +++ b/src/mod/endpoints/mod_sofia/sofia_glue.c @@ -455,18 +455,17 @@ char *sofia_glue_create_external_via(switch_core_session_t *session, sofia_profi char *sofia_glue_create_via(switch_core_session_t *session, const char *ip, switch_port_t port, sofia_transport_t transport) { - char *ipv6 = strchr(ip, ':'); if (port && port != 5060) { if (session) { - return switch_core_session_sprintf(session, "SIP/2.0/%s %s%s%s:%d;rport", sofia_glue_transport2str(transport), ipv6 ? "[" : "", ip, ipv6 ? "]" : "", port); + return switch_core_session_sprintf(session, "SIP/2.0/%s %s:%d;rport", sofia_glue_transport2str(transport), ip, port); } else { - return switch_mprintf("SIP/2.0/%s %s%s%s:%d;rport", sofia_glue_transport2str(transport), ipv6 ? "[" : "", ip, ipv6 ? "]" : "", port); + return switch_mprintf("SIP/2.0/%s %s:%d;rport", sofia_glue_transport2str(transport), ip, port); } } else { if (session) { - return switch_core_session_sprintf(session, "SIP/2.0/%s %s%s%s;rport", sofia_glue_transport2str(transport), ipv6 ? "[" : "", ip, ipv6 ? "]" : ""); + return switch_core_session_sprintf(session, "SIP/2.0/%s %s;rport", sofia_glue_transport2str(transport), ip); } else { - return switch_mprintf("SIP/2.0/%s %s%s%s;rport", sofia_glue_transport2str(transport), ipv6 ? "[" : "", ip, ipv6 ? "]" : ""); + return switch_mprintf("SIP/2.0/%s %s;rport", sofia_glue_transport2str(transport), ip); } } }