- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r3066 - freeswitch/branches/william
by Freeswitch SVN 17 Oct '06

17 Oct '06

Author: sphere Date: Mon Oct 16 20:08:51 2006 New Revision: 3066 Added: freeswitch/branches/william/ Log: Creating empty folder for william

1 0

[commit] r3065 - freeswitch/trunk/src/mod/applications/mod_playback
by Freeswitch SVN 16 Oct '06

16 Oct '06

Author: anthm Date: Mon Oct 16 16:24:11 2006 New Revision: 3065 Modified: freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c Log: let * be end playback not hangup Modified: freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c (original) +++ freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c Mon Oct 16 16:24:11 2006 @@ -47,7 +47,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Digits %s\n", dtmf); if (*dtmf == '*') { - return SWITCH_STATUS_FALSE; + return SWITCH_STATUS_BREAK; } } break; @@ -101,6 +101,7 @@ switch_channel_t *channel; char *timer_name = NULL; char *file_name = NULL; + switch_status_t status; file_name = switch_core_session_strdup(session, data); @@ -113,7 +114,9 @@ switch_channel_pre_answer(channel); - if (switch_ivr_play_file(session, NULL, file_name, timer_name, on_dtmf, NULL, 0) != SWITCH_STATUS_SUCCESS) { + status = switch_ivr_play_file(session, NULL, file_name, timer_name, on_dtmf, NULL, 0); + + if (!switch_channel_ready(channel) || (status != SWITCH_STATUS_SUCCESS && !SWITCH_STATUS_IS_BREAK(status))) { switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); }

1 0

[commit] r3064 - freeswitch/trunk/src
by Freeswitch SVN 16 Oct '06

16 Oct '06

Author: anthm Date: Mon Oct 16 15:56:42 2006 New Revision: 3064 Modified: freeswitch/trunk/src/switch_console.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_log.c Log: find missing ret = and put them back Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Mon Oct 16 15:56:42 2006 @@ -52,7 +52,7 @@ ret = vasprintf(&data, fmt, ap); #else if ((data = (char *) malloc(2048))) { - vsnprintf(data, 2048, fmt, ap); + ret = vsnprintf(data, 2048, fmt, ap); } #endif va_end(ap); @@ -152,7 +152,7 @@ ret = vasprintf(&data, fmt, ap); #else data = (char *) malloc(2048); - vsnprintf(data, 2048, fmt, ap); + ret = vsnprintf(data, 2048, fmt, ap); #endif va_end(ap); if (ret == -1) { Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Oct 16 15:56:42 2006 @@ -479,7 +479,7 @@ va_list ap; va_start(ap, fmt); - vsnprintf(data, sizeof(data), fmt, ap); + ret = vsnprintf(data, sizeof(data), fmt, ap); va_end(ap); if (ret == -1) { @@ -604,7 +604,7 @@ ret = vasprintf(&data, fmt, ap); #else data = (char *) malloc(2048); - vsnprintf(data, 2048, fmt, ap); + return = vsnprintf(data, 2048, fmt, ap); #endif va_end(ap); if (ret == -1) { @@ -674,7 +674,7 @@ ret = vasprintf(&data, fmt, ap); #else data = (char *) malloc(2048); - vsnprintf(data, 2048, fmt, ap); + ret = vsnprintf(data, 2048, fmt, ap); #endif va_end(ap); if (ret == -1) { Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Mon Oct 16 15:56:42 2006 @@ -196,7 +196,7 @@ ret = vasprintf(&data, fmt, ap); #else data = (char *) malloc(2048); - vsnprintf(data, 2048, fmt, ap); + ret = vsnprintf(data, 2048, fmt, ap); #endif va_end(ap); if (ret == -1) {

1 0

[commit] r3063 - freeswitch/branches/enterux
by Freeswitch SVN 16 Oct '06

16 Oct '06

Author: sphere Date: Mon Oct 16 15:02:55 2006 New Revision: 3063 Added: freeswitch/branches/enterux/ Log: Creating empty folder for enterux

1 0

[commit] r3062 - freeswitch/branches/anevilyak
by Freeswitch SVN 16 Oct '06

16 Oct '06

Author: sphere Date: Mon Oct 16 13:23:56 2006 New Revision: 3062 Added: freeswitch/branches/anevilyak/ Log: Creating empty folder for anevilyak

1 0

[commit] r3061 - freeswitch/branches/marv
by Freeswitch SVN 16 Oct '06

16 Oct '06

Author: sphere Date: Mon Oct 16 13:03:54 2006 New Revision: 3061 Added: freeswitch/branches/marv/ Log: Creating empty folder for marv

1 0

[commit] r3060 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 16 Oct '06

16 Oct '06

Author: mikej Date: Mon Oct 16 12:06:44 2006 New Revision: 3060 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: Make error message more descriptive, and less antagonistic. 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 Oct 16 12:06:44 2006 @@ -124,7 +124,7 @@ } else if (!strcasecmp(arg, "number")) { switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID privacy mode specified. Use a valid mode ASSHAT\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID privacy mode specified. Use a valid mode [no|yes|name|full|number].\n"); } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Privacy to %s [%d]\n", arg, caller_profile->flags); }

1 0

[commit] r3059 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 16 Oct '06

16 Oct '06

Author: mikej Date: Mon Oct 16 11:04:54 2006 New Revision: 3059 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: add privacy application, thanks ken. 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 Oct 16 11:04:54 2006 @@ -24,6 +24,7 @@ * Contributor(s): * * Anthony Minessale II <anthmct(a)yahoo.com> + * Ken Rice, Asteria Solutions Group, Inc <ken(a)asteriasgi.com> * * * mod_dptools.c -- Raw Audio File Streaming Application Module @@ -93,6 +94,42 @@ } } +static void privacy_function(switch_core_session_t *session, char *data) +{ + switch_channel_t *channel; + switch_caller_profile_t *caller_profile; + char *arg; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + caller_profile = switch_channel_get_caller_profile(channel); + + if (switch_strlen_zero(data)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No privacy mode specified.\n"); + } else { + arg = switch_core_session_strdup(session, data); + + switch_set_flag(caller_profile, SWITCH_CPF_SCREEN); + + if(!strcasecmp(arg, "no")) { + switch_clear_flag(caller_profile, SWITCH_CPF_HIDE_NAME); + switch_clear_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER); + } else if (!strcasecmp(arg, "yes")) { + switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER); + } else if (!strcasecmp(arg, "full")) { + switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER); + } else if (!strcasecmp(arg, "name")) { + switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME); + } else if (!strcasecmp(arg, "number")) { + switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID privacy mode specified. Use a valid mode ASSHAT\n"); + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Privacy to %s [%d]\n", arg, caller_profile->flags); + } +} + static void strftime_function(switch_core_session_t *session, char *data) { char *argv[2]; @@ -183,13 +220,22 @@ /* next */ &sleep_application_interface }; +static const switch_application_interface_t privacy_application_interface = { + /*.interface_name */ "privacy", + /*.application_function */ privacy_function, + /* long_desc */ "Set caller privacy on calls.", + /* short_desc */ "Set privacy on calls", + /* syntax */ "off|on|name|full|number", + /*.next */ &transfer_application_interface +}; + static const switch_loadable_module_interface_t mod_dptools_module_interface = { /*.module_name = */ modname, /*.endpoint_interface = */ NULL, /*.timer_interface = */ NULL, /*.dialplan_interface = */ NULL, /*.codec_interface = */ NULL, - /*.application_interface */ &transfer_application_interface, + /*.application_interface */ &privacy_application_interface, /*.api_interface */ &dptools_api_interface };

1 0

[commit] r3058 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 16 Oct '06

16 Oct '06

Author: anthm Date: Mon Oct 16 00:39:00 2006 New Revision: 3058 Modified: freeswitch/trunk/src/include/switch_caller.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_caller.c freeswitch/trunk/src/switch_core.c Log: rpid for sofia Modified: freeswitch/trunk/src/include/switch_caller.h ============================================================================== --- freeswitch/trunk/src/include/switch_caller.h (original) +++ freeswitch/trunk/src/include/switch_caller.h Mon Oct 16 00:39:00 2006 @@ -86,6 +86,8 @@ char *uuid; /*! context */ char *context; + /*! flags */ + switch_caller_profile_flag_t flags; struct switch_caller_profile *next; }; Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Oct 16 00:39:00 2006 @@ -131,6 +131,11 @@ #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, Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Oct 16 00:39:00 2006 @@ -842,6 +842,7 @@ 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 @@ 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 @@ } 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_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 @@ ))) { 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 @@ 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 @@ { switch_core_session_t *session = sofia_private ? sofia_private->session : NULL; char key[128] = ""; + sip_unknown_t *un; if (!session) { @@ -3212,10 +3233,62 @@ (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); Modified: freeswitch/trunk/src/switch_caller.c ============================================================================== --- freeswitch/trunk/src/switch_caller.c (original) +++ freeswitch/trunk/src/switch_caller.c Mon Oct 16 00:39:00 2006 @@ -64,6 +64,7 @@ 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 @@ 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; @@ -195,6 +197,17 @@ snprintf(header_name, sizeof(header_name), "%s-Channel-Name", prefix); 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"); + + } Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Oct 16 00:39:00 2006 @@ -1335,7 +1335,7 @@ caller_profile->source, caller_profile->context, caller_profile->destination_number); - + outgoing_profile->flags = caller_profile->flags; } } }

1 0

[commit] r3057 - freeswitch/branches/edpimentl
by Freeswitch SVN 16 Oct '06

16 Oct '06

Author: sphere Date: Sun Oct 15 20:28:49 2006 New Revision: 3057 Added: freeswitch/branches/edpimentl/ Log: Creating empty folder for edpimentl

1 0