kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

keep presence up to date 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13166 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-04-27 17:31:34 +00:00
parent 580b7818a3
commit b9dea85eb7
3 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod/applications/mod_dptools/mod_dptools.c
View File

@ -1114,7 +1114,7 @@ SWITCH_STANDARD_API(presence_api_function)
goto error;
}
if (argc != need) {
if (argc < need) {
goto error;
}
@ -1122,12 +1122,19 @@ SWITCH_STANDARD_API(presence_api_function)
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]);
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 (type == SWITCH_EVENT_PRESENCE_IN) {
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");

21
src/mod/endpoints/mod_sofia/sofia_presence.c
View File

@ -634,11 +634,15 @@ static void actual_sofia_presence_event_handler(switch_event_t *event)
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);
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,6 +950,8 @@ static char *translate_rpid(char *in)
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";
@ -955,7 +961,7 @@ static char *gen_pidf(char *user_agent, char *id, char *url, char *open, char *r
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 @@ static char *gen_pidf(char *user_agent, char *id, char *url, char *open, char *r
);
} 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 @@ static char *gen_pidf(char *user_agent, char *id, char *url, char *open, char *r
" </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 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
}
}
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),

2
src/switch_core_state_machine.c
View File

@ -443,7 +443,7 @@ SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session)
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);