From 187a577c3299be432111a5ae483339fbc2f44e33 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 2 Jun 2008 15:42:59 +0000 Subject: [PATCH] some more presence changes git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8737 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/endpoints/mod_sofia/sofia_presence.c | 73 ++++++++++++-------- 1 file changed, 44 insertions(+), 29 deletions(-) diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c index 4656919b11..067a8ecd05 100644 --- a/src/mod/endpoints/mod_sofia/sofia_presence.c +++ b/src/mod/endpoints/mod_sofia/sofia_presence.c @@ -743,7 +743,7 @@ 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, char *note, const char **ct) +static char *gen_pidf(char *user_agent, char *id, char *url, char *open, char *rpid, char *prpid, char *status, const char **ct) { if (switch_stristr("polycom", user_agent)) { *ct = "application/xpidf+xml"; @@ -751,6 +751,9 @@ static char *gen_pidf(char *user_agent, char *id, char *url, char *open, char *r "\n" "\n" "\n" + " \n" + " %s\n" + " \n" " \n" " \n" "
\n" @@ -758,20 +761,17 @@ static char *gen_pidf(char *user_agent, char *id, char *url, char *open, char *r " \n" "
\n" " \n" - "\n", id, id, url, open, prpid + "\n", status, id, id, url, open, prpid ); } else { *ct = "application/pidf+xml"; return switch_mprintf( - "\n" - "\n" - " \n" - " %s\n" - " \n" + " \n" + "\n" + " \n" " \r\n" " %s\n" @@ -780,9 +780,10 @@ static char *gen_pidf(char *user_agent, char *id, char *url, char *open, char *r " \n" " \r\n" " \n" - " " + " \n" + " %s" " \n" - "", id, status, prpid, rpid); + "", id, prpid, rpid, status); } } @@ -792,7 +793,7 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char * struct presence_helper *helper = (struct presence_helper *) pArg; sofia_profile_t *profile = helper->profile; char *pl = NULL; - char *clean_id = NULL, *id = NULL, *note = NULL; + char *clean_id = NULL, *id = NULL; uint32_t in = atoi(argv[13]); char *status = argv[14]; char *rpid = argv[15]; @@ -910,9 +911,19 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char * if (!strcasecmp(state, "cs_hangup")) { astate = "terminated"; } else if (switch_strlen_zero(astate)) { + //char *buf; + //switch_event_serialize(helper->event, &buf, SWITCH_FALSE); + //switch_assert(buf); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "CHANNEL_DATA:\n%s\n", buf); + //free(buf); + astate = switch_str_nil(switch_event_get_header(helper->event, "answer-state")); if (switch_strlen_zero(astate)) { - astate = dft_state; + if (is_dialog) { + astate = dft_state; + } else { + astate = "terminated"; + } } } @@ -989,11 +1000,10 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char * if (!is_dialog) { + char status_line[256] = ""; if (in) { - char status_line[256] = ""; - if (!strcmp(astate, "early")) { - switch_snprintf(status_line, sizeof(status_line), "R %s", switch_str_nil(from_id)); + switch_snprintf(status_line, sizeof(status_line), "Ring %s", switch_str_nil(from_id)); rpid = "on-the-phone"; } else if (!strcmp(astate, "confirmed")) { char *dest = switch_event_get_header(helper->event, "Caller-Destination-Number"); @@ -1002,36 +1012,42 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char * } if (switch_strlen_zero(from_id)) { - switch_snprintf(status_line, sizeof(status_line), "Available"); + switch_snprintf(status_line, sizeof(status_line), "On The Phone"); } else { - switch_snprintf(status_line, sizeof(status_line), "T %s", switch_str_nil(from_id)); - rpid = "on-the-phone"; + switch_snprintf(status_line, sizeof(status_line), "Talk %s", switch_str_nil(from_id)); } + rpid = "on-the-phone"; } else if (!strcmp(astate, "terminated")) { - switch_snprintf(status_line, sizeof(status_line), "Available"); + if (!strcasecmp(rpid, "on-the-phone")) { + switch_snprintf(status_line, sizeof(status_line), "Dialing"); + } else { + switch_snprintf(status_line, sizeof(status_line), "Available"); + } + } else { + switch_set_string(status_line, status); } - note = switch_mprintf("%s", status_line); open = "open"; } else { - note = NULL; open = "closed"; } + + if (!strncasecmp(status_line, "registered", 10)) { + switch_snprintf(status_line, sizeof(status_line), "Available"); + } prpid = translate_rpid(rpid); - pl = gen_pidf(user_agent, id, profile->url, open, rpid, prpid, status, note, &ct); + pl = gen_pidf(user_agent, clean_id, profile->url, open, rpid, prpid, status_line, &ct); } } else { if (in) { - note = switch_mprintf("%s", status); open = "open"; } else { - note = NULL; open = "closed"; } prpid = translate_rpid(rpid); - pl = gen_pidf(user_agent, id, profile->url, open, rpid, prpid, status, note, &ct); + pl = gen_pidf(user_agent, clean_id, profile->url, open, rpid, prpid, status, &ct); } switch_snprintf(exp, sizeof(exp), "active;expires=%ld", (long) exptime); @@ -1042,7 +1058,6 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char * switch_safe_free(id); switch_safe_free(clean_id); - switch_safe_free(note); switch_safe_free(pl); switch_safe_free(to);