[Freeswitch-svn] [commit] r13166 - in freeswitch/trunk/src: . mod/applications/mod_dptools mod/endpoints/mod_sofia

[FreeSWITCH SVN]

Author: anthm
Date: Mon Apr 27 12:31:34 2009
New Revision: 13166

Log:
keep presence up to date

Modified:
   freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c
   freeswitch/trunk/src/switch_core_state_machine.c

Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c	Mon Apr 27 12:31:34 2009
@@ -1114,7 +1114,7 @@
 			goto error;
 		}
 
-		if (argc != need) {
+		if (argc < need) {
 			goto error;
 		}
 
@@ -1122,12 +1122,19 @@
 			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", "dp");
 			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", __FILE__);
 			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from", argv[1]);
+			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", argv[2]);
+			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", argv[3]);
 			if (type == SWITCH_EVENT_PRESENCE_IN) {
-				switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", argv[2]);
-				switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", argv[3]);
+				if (!strncasecmp(argv[3], "cs_", 3) || switch_stristr("hangup", argv[3])) {
+					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-state", "CS_HANGUP");
+					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", "CS_HANGUP");
+				}
+			} else {
+				switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", "CS_HANGUP");
 			}
 			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
 			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
+			switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", 0);
 			switch_event_fire(&event);
 		}
 		stream->write_function(stream, "Event Sent");

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	Mon Apr 27 12:31:34 2009
@@ -634,11 +634,15 @@
 								  event->event_id == SWITCH_EVENT_PRESENCE_IN ? "IN" : "OUT", profile->name);
 			}
 
-			if (mod_sofia_globals.debug_presence > 1) {
+			if (mod_sofia_globals.debug_presence) {
 				char *buf;
 				switch_event_serialize(event, &buf, SWITCH_FALSE);
 				switch_assert(buf);
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "DUMP PRESENCE SQL:\n%s\nEVENT DUMP:\n%s\n", sql, buf);
+				if (mod_sofia_globals.debug_presence > 1) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "DUMP PRESENCE SQL:\n%s\nEVENT DUMP:\n%s\n", sql, buf);
+				} else {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "EVENT DUMP:\n%s\n", buf);
+				}
 				free(buf);
 			}
 
@@ -946,16 +950,18 @@
 
 static char *gen_pidf(char *user_agent, char *id, char *url, char *open, char *rpid, char *prpid, char *status, const char **ct)
 {
+	char *ret = NULL;
+
 	if (switch_stristr("polycom", user_agent)) {
 		*ct = "application/xpidf+xml";
-
+		
 		/* of course!, lets make a big deal over dashes. Now the stupidity is complete. */
 
 		if (!strcmp(prpid, "on-the-phone")) {
 			prpid = "onthephone";
 		}
 
-		return switch_mprintf(
+		ret = switch_mprintf(
 							  "<?xml version=\"1.0\"?>\n"
 							  "<!DOCTYPE presence PUBLIC \"-//IETF//DTD RFCxxxx XPIDF 1.0//EN\" \"xpidf.dtd\">\n"
 							  "<presence>\n"
@@ -973,7 +979,7 @@
 							  );
 	} else {
 		*ct = "application/pidf+xml";
-		return switch_mprintf(
+		ret = switch_mprintf(
 							  "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?> \n"
 							  "<presence xmlns='urn:ietf:params:xml:ns:pidf' \n"
 							  "xmlns:dm='urn:ietf:params:xml:ns:pidf:data-model' \n"
@@ -993,6 +999,9 @@
 							  " </dm:person>\n"
 							  "</presence>", id, open, prpid, status);
 	}
+
+
+	return ret;
 }
 
 static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char **columnNames)
@@ -1305,6 +1314,12 @@
 		}
 	}
 
+	if (mod_sofia_globals.debug_presence > 0 && pl) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "send payload:\n%s\n", pl);
+	}
+
+
+
 	nua_notify(nh, 
 			   TAG_IF(*expires_str, SIPTAG_EXPIRES_STR(expires_str)),
 			   SIPTAG_SUBSCRIPTION_STATE_STR(sstr),

Modified: freeswitch/trunk/src/switch_core_state_machine.c
==============================================================================
--- freeswitch/trunk/src/switch_core_state_machine.c	(original)
+++ freeswitch/trunk/src/switch_core_state_machine.c	Mon Apr 27 12:31:34 2009
@@ -443,7 +443,7 @@
 					
 					switch_channel_set_variable(session->channel, "hangup_cause", switch_channel_cause2str(cause));
 					switch_channel_set_variable_printf(session->channel, "hangup_cause_q850", "%d", cause_q850);
-					switch_channel_presence(session->channel, "unavailable", switch_channel_cause2str(cause), NULL);
+					switch_channel_presence(session->channel, "unknown", switch_channel_cause2str(cause), NULL);
 					
 					switch_channel_set_timestamps(session->channel);