[Freeswitch-svn] [commit] r3130 - in freeswitch/trunk/src/mod: applications/mod_conference endpoints/mod_sofia

[Freeswitch SVN]

Author: anthm
Date: Fri Oct 20 21:20:46 2006
New Revision: 3130

Modified:
   freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c

Log:
update

Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	Fri Oct 20 21:20:46 2006
@@ -1363,12 +1363,13 @@
 	conference_member_t *member = NULL;
 
 	switch_mutex_lock(conference->member_mutex);
+	stream->write_function(stream, "<pre>Current Callers:\n");
 
 	for (member = conference->members; member; member = member->next) {
 		switch_channel_t *channel = switch_core_session_get_channel(member->session);
 		switch_caller_profile_t *profile = switch_channel_get_caller_profile(channel);
 
-		stream->write_function(stream, "Caller %s <%s>\n", 
+		stream->write_function(stream, "*) %s (%s)\n", 
 							   profile->caller_id_name,
 							   profile->caller_id_number
 							   );
@@ -2741,6 +2742,10 @@
 	conference_obj_t *conference = NULL;
 	switch_stream_handle_t stream = {0};
 
+	if (!body) {
+		return SWITCH_STATUS_SUCCESS;
+	}
+	
 	if (!(ci = switch_loadable_module_get_chat_interface(proto))) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invaid Chat Interface [%s]!\n", proto);
 	}

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	Fri Oct 20 21:20:46 2006
@@ -2127,8 +2127,10 @@
 		const char *subject = "n/a";
 		char *msg = NULL;
 
-		if (strstr((char*)sip->sip_content_type->c_subtype, "composing")) {
-			return;
+		if (sip->sip_content_type) {
+			if (strstr((char*)sip->sip_content_type->c_subtype, "composing")) {
+				return;
+			}
 		}
 
 		if (from) {