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

reverse perspective of dialog events on non-registered entities

This commit is contained in:
Anthony Minessale 2010-10-22 15:13:44 -05:00
parent 9187055301
commit 7d7d66342f
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,6 +61,7 @@ struct resub_helper {
sofia_profile_t *profile; sofia_profile_t *profile;
switch_event_t *event; switch_event_t *event;
int rowcount; int rowcount;
int noreg;
}; };
struct presence_helper { struct presence_helper {
@ -615,6 +616,7 @@ static void actual_sofia_presence_event_handler(switch_event_t *event)
if (!h.rowcount) { if (!h.rowcount) {
h.noreg++;
switch_safe_free(sql); switch_safe_free(sql);
/* find ones with presence_id defined that are not registred */ /* find ones with presence_id defined that are not registred */
sql = switch_mprintf("select sip_from_user, sip_from_host, 'Registered', '', '', " sql = switch_mprintf("select sip_from_user, sip_from_host, 'Registered', '', '', "
@ -1036,7 +1038,6 @@ static int sofia_presence_resub_callback(void *pArg, int argc, char **argv, char
if ((p = strchr(free_me, '@'))) *p = '\0'; if ((p = strchr(free_me, '@'))) *p = '\0';
user = free_me; user = free_me;
} }
} }
if (zstr(proto)) { if (zstr(proto)) {
@ -1053,6 +1054,9 @@ static int sofia_presence_resub_callback(void *pArg, int argc, char **argv, char
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", user, host); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", user, host);
if (h->noreg) {
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Force-Direction", "inbound");
}
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", status); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", status);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", rpid); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", rpid);
@ -1373,6 +1377,7 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
if (helper->event) { if (helper->event) {
switch_stream_handle_t stream = { 0 }; switch_stream_handle_t stream = { 0 };
const char *direction = switch_str_nil(switch_event_get_header(helper->event, "presence-call-direction")); const char *direction = switch_str_nil(switch_event_get_header(helper->event, "presence-call-direction"));
const char *force_direction = switch_str_nil(switch_event_get_header(helper->event, "force-direction"));
const char *uuid = switch_str_nil(switch_event_get_header(helper->event, "unique-id")); const char *uuid = switch_str_nil(switch_event_get_header(helper->event, "unique-id"));
const char *event_status = switch_str_nil(switch_event_get_header(helper->event, "status")); const char *event_status = switch_str_nil(switch_event_get_header(helper->event, "status"));
const char *astate = switch_str_nil(switch_event_get_header(helper->event, "astate")); const char *astate = switch_str_nil(switch_event_get_header(helper->event, "astate"));
@ -1395,6 +1400,10 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
if (is_dialog) { if (is_dialog) {
SWITCH_STANDARD_STREAM(stream); SWITCH_STANDARD_STREAM(stream);
} }
if (!zstr(force_direction)) {
direction = force_direction;
}
if (!strcasecmp(direction, "outbound")) { if (!strcasecmp(direction, "outbound")) {
direction = "recipient"; direction = "recipient";