rpid for sofia

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3058 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/include/switch_caller.h b/src/include/switch_caller.h
index 4a26cf9b228ebf56920953304e653d3ae875ed8f..33b9a06d3102ea282b12f57b0992826f15b18618 100644 (file)
--- a/src/include/switch_caller.h
+++ b/src/include/switch_caller.h
@@ -86,6 +86,8 @@ struct switch_caller_profile {
        char *uuid;
        /*! context */
        char *context;
+       /*! flags */
+       switch_caller_profile_flag_t flags;
        struct switch_caller_profile *next;
 };
 

diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index 4587325201e0fb545ae377851907d1f2b3613f86..313c70c5bd0fa77b98b45e39b944f3f94dad059e 100644 (file)
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -131,6 +131,11 @@ SWITCH_DECLARE_DATA extern switch_directories SWITCH_GLOBAL_dirs;
 #define SWITCH_FALSE 0
 #define SWITCH_CORE_QUEUE_LEN 100000
 
+typedef enum {
+       SWITCH_CPF_SCREEN = (1 << 0),
+       SWITCH_CPF_HIDE_NAME = (1 << 1),
+       SWITCH_CPF_HIDE_NUMBER = (1 << 2)
+} switch_caller_profile_flag_t;
 
 typedef enum {
        SWITCH_AUDIO_COL_STR_TITLE                    = 0x01,

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index b79a59659a1098d0b8c32f337f16af3ec762ba27..fb643221d2eeba23a8fab82a95c588e3e368b7f4 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -842,6 +842,7 @@ static switch_status_t tech_choose_port(private_object_t *tech_pvt)
 
 static void do_invite(switch_core_session_t *session)
 {
+       char rpid[1024];
        private_object_t *tech_pvt;
     switch_channel_t *channel = NULL;
        switch_caller_profile_t *caller_profile;
@@ -869,6 +870,23 @@ static void do_invite(switch_core_session_t *session)
 
                switch_set_flag_locked(tech_pvt, TFLAG_READY);
 
+               // forge a RPID for now KHR  -- Should wrap this in an if statement so it can be turned on and off
+               if (switch_test_flag(caller_profile, SWITCH_CPF_SCREEN)) {
+                       char *priv = "no";
+                       
+                       if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NAME)) {
+                               priv = "name";
+                               if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER)) {
+                                       priv = "yes";
+                               }
+                       } else if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER)) {
+                               priv = "yes";
+                       }
+
+                       snprintf(rpid, sizeof(rpid) - 1, "Remote-Party-ID: %s;party=calling;screen=yes;privacy=%s", tech_pvt->from_str, priv);
+                                                               
+               }
+
                if (!tech_pvt->nh) {
                        tech_pvt->nh = nua_handle(tech_pvt->profile->nua, NULL,
                                                                          SIPTAG_TO_STR(tech_pvt->dest),
@@ -882,6 +900,7 @@ static void do_invite(switch_core_session_t *session)
                }
 
                nua_invite(tech_pvt->nh,
+                                  TAG_IF(rpid, SIPTAG_HEADER_STR(rpid)),
                                   SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str),
                                   SOATAG_RTP_SORT(SOA_RTP_SORT_REMOTE),
                                   SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL),
@@ -897,6 +916,7 @@ static void do_invite(switch_core_session_t *session)
 
 static void do_xfer_invite(switch_core_session_t *session)
 {
+       char rpid[1024];
        private_object_t *tech_pvt;
     switch_channel_t *channel = NULL;
        switch_caller_profile_t *caller_profile;
@@ -918,7 +938,6 @@ static void do_xfer_invite(switch_core_session_t *session)
                                                                                                         ))) {
 
                char *rep = switch_channel_get_variable(channel, SOFIA_REPLACES_HEADER);
-               
 
                tech_pvt->nh2 = nua_handle(tech_pvt->profile->nua, NULL,
                                                                  SIPTAG_TO_STR(tech_pvt->dest),
@@ -932,6 +951,7 @@ static void do_xfer_invite(switch_core_session_t *session)
 
 
                nua_invite(tech_pvt->nh2,
+                                  TAG_IF(rpid, SIPTAG_HEADER_STR(rpid)),
                                   SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str),
                                   SOATAG_RTP_SORT(SOA_RTP_SORT_REMOTE),
                                   SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL),
@@ -3115,6 +3135,7 @@ static void sip_i_invite(nua_t *nua,
 {
        switch_core_session_t *session = sofia_private ? sofia_private->session : NULL;
        char key[128] = "";
+       sip_unknown_t *un;
 
 
        if (!session) {
@@ -3212,10 +3233,62 @@ static void sip_i_invite(nua_t *nua,
                                                                                                                                          (profile->pflags & PFLAG_FULL_ID) ? 
                                                                                                                                          to_username : (char *) to_user
                                                                                                                                          )) != 0) {
+
+                               
+                               for (un=sip->sip_unknown; un; un=un->un_next) {
+                                       // Loop thru Known Headers Here so we can do something with them
+                                       // John Doe <sip:+19018577141@209.247.16.1>;party=calling;screen=yes;privacy=off
+                                       if (!strncasecmp(un->un_name, "Remote-Party-ID", 15)) {
+                                               int argc, x, screen = 1;
+                                               char *mydata, *argv[10] = { 0 };
+                                               if (!switch_strlen_zero(un->un_value)) { 
+                                                       if ((mydata = strdup(un->un_value))) {
+                                                               argc = switch_separate_string(mydata, ';', argv, (sizeof(argv) / sizeof(argv[0]))); 
+
+                                                               // Do We really need this at this time 
+                                                               // clid_uri = argv[0];
+
+                                                               for (x=1; x < argc && argv[x]; x++){
+                                                                       // we dont need to do anything with party yet we should only be seeing party=calling here anyway
+                                                                       // maybe thats a dangerous assumption bit oh well yell at me later
+                                                                       // if (!strncasecmp(argv[x], "party", 5)) {
+                                                                       //      party = argv[x];
+                                                                       // } else 
+                                                                       if (!strncasecmp(argv[x], "privacy=", 8)) {
+                                                                               char *arg = argv[x] + 9;
+
+                                                                               if(!strcasecmp(arg, "no")) {
+                                                                                       switch_clear_flag(tech_pvt->caller_profile, SWITCH_CPF_HIDE_NAME);
+                                                                                       switch_clear_flag(tech_pvt->caller_profile, SWITCH_CPF_HIDE_NUMBER);
+                                                                               } else if (!strcasecmp(arg, "yes")) {
+                                                                                       switch_set_flag(tech_pvt->caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER);
+                                                                               } else if (!strcasecmp(arg, "full")) {
+                                                                                       switch_set_flag(tech_pvt->caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER);
+                                                                               } else if (!strcasecmp(arg, "name")) {
+                                                                                       switch_set_flag(tech_pvt->caller_profile, SWITCH_CPF_HIDE_NAME);
+                                                                               } else if (!strcasecmp(arg, "number")) {
+                                                                                       switch_set_flag(tech_pvt->caller_profile, SWITCH_CPF_HIDE_NUMBER);
+                                                                               }
+                                                                       } else if (!strncasecmp(argv[x], "screen=", 7) && screen > 0) {
+                                                                               char *arg = argv[x] + 8;
+                                                                               if (!strcasecmp(arg, "no")) {
+                                                                                       screen = 0;
+                                                                                       switch_clear_flag(tech_pvt->caller_profile, SWITCH_CPF_SCREEN);
+                                                                               }
+                                                                       }
+                                                               }
+                                                               free(mydata);
+                                                       }
+                                               }
+                                               break;
+                                       }
+                               }
+
                                switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
                                switch_core_db_free(username);
                                switch_core_db_free(to_username);
                        }
+
                        switch_set_flag_locked(tech_pvt, TFLAG_INBOUND);
                        tech_pvt->sofia_private.session = session;
                        nua_handle_bind(nh, &tech_pvt->sofia_private);

diff --git a/src/switch_caller.c b/src/switch_caller.c
index 03ec4e9bbcc91a13f33252d9a014987377ffc69d..e1801576cea843d99eebf66e803f7250e3346e35 100644 (file)
--- a/src/switch_caller.c
+++ b/src/switch_caller.c
@@ -64,6 +64,7 @@ SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_new(switch_memor
                profile->source = switch_core_strdup(pool, source);
                profile->context = switch_core_strdup(pool, context);
                profile->destination_number = switch_core_strdup(pool, destination_number);
+               switch_set_flag(profile, SWITCH_CPF_SCREEN);
        }
 
        return profile;
@@ -88,6 +89,7 @@ SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_clone(switch_cor
                profile->source = switch_core_session_strdup(session, tocopy->source);
                profile->context = switch_core_session_strdup(session, tocopy->context);
                profile->chan_name = switch_core_session_strdup(session, tocopy->chan_name);
+               profile->flags = tocopy->flags;
        }
 
        return profile;
@@ -196,6 +198,17 @@ SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_
                switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->chan_name);
        }
 
+       snprintf(header_name, sizeof(header_name), "%s-Screen-Bit", prefix);
+       switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, switch_test_flag(caller_profile, SWITCH_CPF_SCREEN) ? "yes" : "no");
+
+       snprintf(header_name, sizeof(header_name), "%s-Privacy-Hide-Name", prefix);
+       switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NAME) ? "yes" : "no");
+
+       snprintf(header_name, sizeof(header_name), "%s-Privacy-Hide-Number", prefix);
+       switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER) ? "yes" : "no");
+
+
+
 }
 
 SWITCH_DECLARE(switch_caller_extension_t *) switch_caller_extension_new(switch_core_session_t *session,

diff --git a/src/switch_core.c b/src/switch_core.c
index 482c810c4a1b10aed2f88ea17a06b127612d3855..c7575fda403d7d0114c6c0c5cc5cf98bebc5b6bc 100644 (file)
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -1335,7 +1335,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_outgoing_channel(switch_core
                                                                                                                                 caller_profile->source,
                                                                                                                                 caller_profile->context,
                                                                                                                                 caller_profile->destination_number);
-                                       
+                                       outgoing_profile->flags = caller_profile->flags;
                                }
                        }
                }