[Freeswitch-svn] [commit] r9287 - freeswitch/trunk/src/mod/endpoints/mod_sofia

[Freeswitch SVN]

Author: anthm
Date: Wed Aug 13 13:24:33 2008
New Revision: 9287

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c

Log:
fix MODAPP-126

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	Wed Aug 13 13:24:33 2008
@@ -1274,7 +1274,7 @@
 			if ((argv[1]) && (profile = sofia_glue_find_profile(argv[1]))) {
 				stream->write_function(stream, "%s\n", line);
 				stream->write_function(stream, "Name          \t\t%s\n", switch_str_nil(argv[1]));
-				stream->write_function(stream, "Domain Name   \t\t%s\n", switch_str_nil(profile->domain_name));
+				stream->write_function(stream, "Domain Name   \t\t%s\n", profile->domain_name ? profile->domain_name : "N/A");
 				if (strcasecmp(argv[1], profile->name)) {
 					stream->write_function(stream, "Alias Of      \t\t%s\n", switch_str_nil(profile->name));
 				}
@@ -1296,7 +1296,7 @@
 					stream->write_function(stream, "TLS-URL      \t\t%s\n", switch_str_nil(profile->tls_url));
 					stream->write_function(stream, "TLS-BIND-URL      \t%s\n", switch_str_nil(profile->tls_bindurl));
 				}
-				stream->write_function(stream, "HOLD-MUSIC    \t\t%s\n", switch_strlen_zero(profile->hold_music) ? "NONE" : profile->hold_music);
+				stream->write_function(stream, "HOLD-MUSIC    \t\t%s\n", switch_strlen_zero(profile->hold_music) ? "N/A" : profile->hold_music);
 				stream->write_function(stream, "CODECS        \t\t%s\n", switch_str_nil(profile->codec_string));
 				stream->write_function(stream, "TEL-EVENT     \t\t%d\n", profile->te);
 				if (profile->dtmf_type == DTMF_2833) {

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	Wed Aug 13 13:24:33 2008
@@ -994,6 +994,7 @@
 	if ((profiles = switch_xml_child(cfg, "profiles"))) {
 		for (xprofile = switch_xml_child(profiles, "profile"); xprofile; xprofile = xprofile->next) {
 			char *xprofilename = (char *) switch_xml_attr_soft(xprofile, "name");
+			char *xprofiledomain = (char *) switch_xml_attr(xprofile, "domain");
 
 			if (strcasecmp(profile->name, xprofilename)) {
 				continue;
@@ -1004,6 +1005,10 @@
 			profile->acl_count = 0;
 			profile->pflags |= PFLAG_STUN_ENABLED;
 
+			if (xprofiledomain) {
+				profile->domain_name = switch_core_strdup(profile->pool, xprofiledomain);
+			}
+
 			if ((settings = switch_xml_child(xprofile, "settings"))) {
 				for (param = switch_xml_child(settings, "param"); param; param = param->next) {
 					char *var = (char *) switch_xml_attr_soft(param, "name");
@@ -1377,8 +1382,6 @@
 
 				if (xprofiledomain) {
 					profile->domain_name = switch_core_strdup(profile->pool, xprofiledomain);
-				} else {
-					profile->domain_name = profile->name;
 				}
 
 				profile->dbname = switch_core_strdup(profile->pool, url);

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c	Wed Aug 13 13:24:33 2008
@@ -248,7 +248,7 @@
 		}
 	}
 
-	if (profile->domain_name && profile->domain_name != host) {
+	if (profile->domain_name && strcasecmp(profile->domain_name, host)) {
 		host = profile->domain_name;
 	}