- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4415 - freeswitch/trunk/src/mod/event_handlers/mod_cdr
by Freeswitch SVN 28 Feb '07

28 Feb '07

Author: mishehu Date: Wed Feb 28 17:28:03 2007 New Revision: 4415 Added: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.conf.xml Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp Log: Minor changes for MikeJ's switch_strlen_zero() and a minor refactor of BaseCDR::BaseCDR(switch_mod_cdr_newchannel_t*). Added a sample config file, perhaps somebody can edit the makefile to copy this into the configuration when this module is enabled for build. Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp Wed Feb 28 17:28:03 2007 @@ -89,76 +89,71 @@ calltransferdate = newchannel->callerprofile->times->transferred; callenddate = newchannel->callerprofile->times->hungup; - if(newchannel->callerprofile->caller_id_name != 0) - { + if(!switch_strlen_zero(newchannel->callerprofile->caller_id_name)) strncpy(clid,newchannel->callerprofile->caller_id_name,strlen(newchannel->callerprofile->caller_id_name)); - strncat(clid," <",2); - if(newchannel->callerprofile->caller_id_number != 0 ) - strncat(clid,newchannel->callerprofile->caller_id_number,strlen(clid)+strlen(newchannel->callerprofile->caller_id_number)); - strncat(clid,">",1); - } // Get the ANI information if it's set - if(newchannel->callerprofile->ani != 0) + if(!switch_strlen_zero(newchannel->callerprofile->ani)) strncpy(ani,newchannel->callerprofile->ani,strlen(newchannel->callerprofile->ani)); - if(newchannel->callerprofile->aniii != 0) + if(!switch_strlen_zero(newchannel->callerprofile->aniii)) strncpy(aniii,newchannel->callerprofile->aniii,strlen(newchannel->callerprofile->aniii)); - if(newchannel->callerprofile->dialplan != 0) + if(!switch_strlen_zero(newchannel->callerprofile->dialplan)) strncpy(dialplan,newchannel->callerprofile->dialplan,strlen(newchannel->callerprofile->dialplan)); - if(newchannel->callerprofile->network_addr != 0) + if(!switch_strlen_zero(newchannel->callerprofile->network_addr)) strncpy(network_addr,newchannel->callerprofile->network_addr,strlen(newchannel->callerprofile->network_addr)); - } - - //switch_caller_profile_t *originateprofile = switch_channel_get_originator_caller_profile(newchannel->channel->callerprofile); - // Were we the receiver of the call? - if(newchannel->callerprofile->originator_caller_profile) - { - originated = 0; - if(newchannel->callerprofile->originator_caller_profile->uuid != 0) - strncpy(destuuid,newchannel->callerprofile->originator_caller_profile->uuid,strlen(newchannel->callerprofile->originator_caller_profile->uuid)); - if(newchannel->callerprofile) + // Were we the receiver of the call? + if(newchannel->callerprofile->originator_caller_profile) { - if(newchannel->callerprofile->destination_number) + originated = 0; + if(!switch_strlen_zero(newchannel->callerprofile->originator_caller_profile->uuid)) + strncpy(destuuid,newchannel->callerprofile->originator_caller_profile->uuid,strlen(newchannel->callerprofile->originator_caller_profile->uuid)); + + if(!switch_strlen_zero(newchannel->callerprofile->destination_number)) strncpy(src,newchannel->callerprofile->destination_number,strlen(newchannel->callerprofile->destination_number)); - if(newchannel->callerprofile->caller_id_number != 0) + if(!switch_strlen_zero(newchannel->callerprofile->caller_id_number)) strncpy(dst,newchannel->callerprofile->caller_id_number,strlen(newchannel->callerprofile->caller_id_number)); } - } - else - { - //originateprofile = switch_channel_get_originatee_profile(newchannel->channel->callerprofile); - // Or were we maybe we were the caller? - if(newchannel->callerprofile->originatee_caller_profile) + else { - if (newchannel->callerprofile) { - if(newchannel->callerprofile->caller_id_number != 0) + //originateprofile = switch_channel_get_originatee_profile(newchannel->channel->callerprofile); + // Or were we maybe we were the caller? + if(newchannel->callerprofile->originatee_caller_profile) + { + if(!switch_strlen_zero(newchannel->callerprofile->caller_id_number)) strncpy(src,newchannel->callerprofile->caller_id_number,strlen(newchannel->callerprofile->caller_id_number)); - if(newchannel->callerprofile->destination_number != 0) + if(!switch_strlen_zero(newchannel->callerprofile->destination_number)) strncpy(dst,newchannel->callerprofile->destination_number,strlen(newchannel->callerprofile->destination_number)); + if(!switch_strlen_zero(newchannel->callerprofile->originatee_caller_profile->chan_name)) + strncpy(dstchannel,newchannel->callerprofile->originatee_caller_profile->chan_name,strlen(newchannel->callerprofile->originatee_caller_profile->chan_name)); } - if(newchannel->callerprofile->originatee_caller_profile->chan_name != 0) - strncpy(dstchannel,newchannel->callerprofile->originatee_caller_profile->chan_name,strlen(newchannel->callerprofile->originatee_caller_profile->chan_name)); } } - strncpy(myuuid,newchannel->callerprofile->uuid,strlen(newchannel->callerprofile->uuid)); - strncpy(srcchannel,newchannel->callerprofile->chan_name,strlen(newchannel->callerprofile->chan_name)); + if(!switch_strlen_zero(newchannel->callerprofile->uuid)) + strncpy(myuuid,newchannel->callerprofile->uuid,strlen(newchannel->callerprofile->uuid)); + + if(!switch_strlen_zero(newchannel->callerprofile->chan_name)) + strncpy(srcchannel,newchannel->callerprofile->chan_name,strlen(newchannel->callerprofile->chan_name)); if(switch_channel_test_flag(newchannel->channel,CF_ANSWERED)) { disposition=1; - if(callstartdate) - billusec = callenddate - callanswerdate; - else - billusec = callenddate - calltransferdate; + if(callstartdate && callanswerdate) + { + if(callenddate) + billusec = callenddate - callanswerdate; + else if(calltransferdate) + billusec = calltransferdate - callanswerdate; + } } else if(switch_channel_test_flag(newchannel->channel,CF_TRANSFER)) { disposition=1; - billusec = callenddate - calltransferdate; + if(callanswerdate && calltransferdate) + billusec = calltransferdate - callanswerdate; } else { @@ -170,12 +165,12 @@ hangupcause = switch_channel_get_cause(newchannel->channel); hangupcause_text = switch_channel_cause2str(hangupcause); - if(newchannel->callerextension != 0) - if(newchannel->callerextension->last_application != 0) + if(newchannel->callerextension) + if(!newchannel->callerextension->last_application) { - if(newchannel->callerextension->last_application->application_name != 0) + if(!switch_strlen_zero(newchannel->callerextension->last_application->application_name)) strncpy(lastapp,newchannel->callerextension->last_application->application_name,strlen(newchannel->callerextension->last_application->application_name)); - if(newchannel->callerextension->last_application->application_data != 0) + if(!switch_strlen_zero(newchannel->callerextension->last_application->application_data)) strncpy(lastdata,newchannel->callerextension->last_application->application_data,strlen(newchannel->callerextension->last_application->application_data)); } @@ -320,7 +315,7 @@ std::pair<std::string,std::string> temppair; temppair.first = *iItr; - if(tempvariable != 0) + if(!switch_strlen_zero(tempvariable)) temppair.second = tempvariable; chanvars_fixed.push_back(temppair); @@ -359,7 +354,7 @@ char *tempvariable; tempvariable = switch_channel_get_variable(channel,tempstring); - if(tempvariable != 0) + if(!switch_strlen_zero(tempvariable)) chanvars_supp[*iItr] = tempvariable; } } Added: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.conf.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.conf.xml Wed Feb 28 17:28:03 2007 @@ -0,0 +1,32 @@ + + +<configuration name="mod_cdr.conf" description="CDR Configuration"> + <pddcdr> + <param name="path" value="/tmp/pddcdr"/> + <param name="chanvars" value="foo,accountcode"/> + <param name="chanvars_fixed" value="*"/> + </pddcdr> +  + <csvcdr> + <param name="path" value="/tmp/csvcdr"/> + </csvcdr> + <sqlitecdr> + <param name="path" value="/tmp/sqlitecdr"/> + <param name="chanvars_fixed" value="The_Kow=i,username=s"/> + <param name="chanvars_supp" value="*"/> + <param name="repeat_fixed_in_supp" value="1"/> + <param name="timezone" value="utc"/> + </sqlitecdr> +</configuration> +

1 0

[commit] r4414 - freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr
by Freeswitch SVN 28 Feb '07

28 Feb '07

Author: mishehu Date: Wed Feb 28 17:22:47 2007 New Revision: 4414 Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.cpp Log: Refactored basecdr.cpp just a little, changes for switch_strlen_zero() test out fine. Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.cpp Wed Feb 28 17:22:47 2007 @@ -103,39 +103,32 @@ if(!switch_strlen_zero(newchannel->callerprofile->network_addr)) strncpy(network_addr,newchannel->callerprofile->network_addr,strlen(newchannel->callerprofile->network_addr)); - } - - //switch_caller_profile_t *originateprofile = switch_channel_get_originator_caller_profile(newchannel->channel->callerprofile); - // Were we the receiver of the call? - if(newchannel->callerprofile->originator_caller_profile) - { - originated = 0; - if(!switch_strlen_zero(newchannel->callerprofile->originator_caller_profile->uuid)) - strncpy(destuuid,newchannel->callerprofile->originator_caller_profile->uuid,strlen(newchannel->callerprofile->originator_caller_profile->uuid)); - if(newchannel->callerprofile) + // Were we the receiver of the call? + if(newchannel->callerprofile->originator_caller_profile) { + originated = 0; + if(!switch_strlen_zero(newchannel->callerprofile->originator_caller_profile->uuid)) + strncpy(destuuid,newchannel->callerprofile->originator_caller_profile->uuid,strlen(newchannel->callerprofile->originator_caller_profile->uuid)); + if(!switch_strlen_zero(newchannel->callerprofile->destination_number)) strncpy(src,newchannel->callerprofile->destination_number,strlen(newchannel->callerprofile->destination_number)); if(!switch_strlen_zero(newchannel->callerprofile->caller_id_number)) strncpy(dst,newchannel->callerprofile->caller_id_number,strlen(newchannel->callerprofile->caller_id_number)); } - } - else - { - //originateprofile = switch_channel_get_originatee_profile(newchannel->channel->callerprofile); - // Or were we maybe we were the caller? - if(newchannel->callerprofile->originatee_caller_profile) + else { - if (newchannel->callerprofile) + //originateprofile = switch_channel_get_originatee_profile(newchannel->channel->callerprofile); + // Or were we maybe we were the caller? + if(newchannel->callerprofile->originatee_caller_profile) { if(!switch_strlen_zero(newchannel->callerprofile->caller_id_number)) strncpy(src,newchannel->callerprofile->caller_id_number,strlen(newchannel->callerprofile->caller_id_number)); if(!switch_strlen_zero(newchannel->callerprofile->destination_number)) strncpy(dst,newchannel->callerprofile->destination_number,strlen(newchannel->callerprofile->destination_number)); + if(!switch_strlen_zero(newchannel->callerprofile->originatee_caller_profile->chan_name)) + strncpy(dstchannel,newchannel->callerprofile->originatee_caller_profile->chan_name,strlen(newchannel->callerprofile->originatee_caller_profile->chan_name)); } - if(!switch_strlen_zero(newchannel->callerprofile->originatee_caller_profile->chan_name)) - strncpy(dstchannel,newchannel->callerprofile->originatee_caller_profile->chan_name,strlen(newchannel->callerprofile->originatee_caller_profile->chan_name)); } }

1 0

[commit] r4413 - in freeswitch/trunk: conf src/include src/mod/loggers/mod_console
by Freeswitch SVN 28 Feb '07

28 Feb '07

Author: anthm Date: Wed Feb 28 13:28:07 2007 New Revision: 4413 Modified: freeswitch/trunk/conf/console.conf.xml freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Log: add colorize option to mod_console (see in-tree conf/console.conf.xml) Modified: freeswitch/trunk/conf/console.conf.xml ============================================================================== --- freeswitch/trunk/conf/console.conf.xml (original) +++ freeswitch/trunk/conf/console.conf.xml Wed Feb 28 13:28:07 2007 @@ -5,4 +5,8 @@  <param name="all" value="DEBUG"/> </mappings> + <settings> +  +  + </settings> </configuration> Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed Feb 28 13:28:07 2007 @@ -38,6 +38,68 @@ #include <ctype.h> SWITCH_BEGIN_EXTERN_C +#define SWITCH_SEQ_ESC "\033[" + +/* Ansi Control character suffixes */ +#define SWITCH_SEQ_HOME_CHAR 'H' +#define SWITCH_SEQ_HOME_CHAR_STR "H" +#define SWITCH_SEQ_CLEARLINE_CHAR '1' +#define SWITCH_SEQ_CLEARLINE_CHAR_STR "1" +#define SWITCH_SEQ_CLEARLINEEND_CHAR "K" +#define SWITCH_SEQ_CLEARSCR_CHAR0 '2' +#define SWITCH_SEQ_CLEARSCR_CHAR1 'J' +#define SWITCH_SEQ_CLEARSCR_CHAR "2J" + +#define SWITCH_SEQ_DEFAULT_COLOR SWITCH_SEQ_ESC SWITCH_SEQ_END_COLOR /* Reset to Default fg/bg color */ +#define SWITCH_SEQ_AND_COLOR ";" /* To add multiple color definitions */ +#define SWITCH_SEQ_END_COLOR "m" /* To end color definitions */ + +/* Foreground colors values */ +#define SWITCH_SEQ_F_BLACK "30" +#define SWITCH_SEQ_F_RED "31" +#define SWITCH_SEQ_F_GREEN "32" +#define SWITCH_SEQ_F_YELLOW "33" +#define SWITCH_SEQ_F_BLUE "34" +#define SWITCH_SEQ_F_MAGEN "35" +#define SWITCH_SEQ_F_CYAN "36" +#define SWITCH_SEQ_F_WHITE "37" + +/* Background colors values */ +#define SWITCH_SEQ_B_BLACK "40" +#define SWITCH_SEQ_B_RED "41" +#define SWITCH_SEQ_B_GREEN "42" +#define SWITCH_SEQ_B_YELLOW "43" +#define SWITCH_SEQ_B_BLUE "44" +#define SWITCH_SEQ_B_MAGEN "45" +#define SWITCH_SEQ_B_CYAN "46" +#define SWITCH_SEQ_B_WHITE "47" + +/* Preset escape sequences - Change foreground colors only */ +#define SWITCH_SEQ_FBLACK SWITCH_SEQ_ESC SWITCH_SEQ_F_BLACK SWITCH_SEQ_END_COLOR +#define SWITCH_SEQ_FRED SWITCH_SEQ_ESC SWITCH_SEQ_F_RED SWITCH_SEQ_END_COLOR +#define SWITCH_SEQ_FGREEN SWITCH_SEQ_ESC SWITCH_SEQ_F_GREEN SWITCH_SEQ_END_COLOR +#define SWITCH_SEQ_FYELLOW SWITCH_SEQ_ESC SWITCH_SEQ_F_YELLOW SWITCH_SEQ_END_COLOR +#define SWITCH_SEQ_FBLUE SWITCH_SEQ_ESC SWITCH_SEQ_F_BLUE SWITCH_SEQ_END_COLOR +#define SWITCH_SEQ_FMAGEN SWITCH_SEQ_ESC SWITCH_SEQ_F_MAGEN SWITCH_SEQ_END_COLOR +#define SWITCH_SEQ_FCYAN SWITCH_SEQ_ESC SWITCH_SEQ_F_CYAN SWITCH_SEQ_END_COLOR +#define SWITCH_SEQ_FWHITE SWITCH_SEQ_ESC SWITCH_SEQ_F_WHITE SWITCH_SEQ_END_COLOR + +#define SWITCH_SEQ_BBLACK SWITCH_SEQ_ESC SWITCH_SEQ_B_BLACK SWITCH_SEQ_END_COLOR +#define SWITCH_SEQ_BRED SWITCH_SEQ_ESC SWITCH_SEQ_B_RED SWITCH_SEQ_END_COLOR +#define SWITCH_SEQ_BGREEN SWITCH_SEQ_ESC SWITCH_SEQ_B_GREEN SWITCH_SEQ_END_COLOR +#define SWITCH_SEQ_BYELLOW SWITCH_SEQ_ESC SWITCH_SEQ_B_YELLOW SWITCH_SEQ_END_COLOR +#define SWITCH_SEQ_BBLUE SWITCH_SEQ_ESC SWITCH_SEQ_B_BLUE SWITCH_SEQ_END_COLOR +#define SWITCH_SEQ_BMAGEN SWITCH_SEQ_ESC SWITCH_SEQ_B_MAGEN SWITCH_SEQ_END_COLOR +#define SWITCH_SEQ_BCYAN SWITCH_SEQ_ESC SWITCH_SEQ_B_CYAN SWITCH_SEQ_END_COLOR +#define SWITCH_SEQ_BWHITE SWITCH_SEQ_ESC SWITCH_SEQ_B_WHITE SWITCH_SEQ_END_COLOR + +/* Preset escape sequences */ +#define SWITCH_SEQ_HOME SWITCH_SEQ_ESC SWITCH_SEQ_HOME_CHAR_STR +#define SWITCH_SEQ_CLEARLINE SWITCH_SEQ_ESC SWITCH_SEQ_CLEARLINE_CHAR_STR +#define SWITCH_SEQ_CLEARLINEEND SWITCH_SEQ_ESC SWITCH_SEQ_CLEARLINEEND_CHAR +#define SWITCH_SEQ_CLEARSCR SWITCH_SEQ_ESC SWITCH_SEQ_CLEARSCR_CHAR SWITCH_SEQ_HOME + + #ifdef WIN32 #define SWITCH_PATH_SEPARATOR "\\" #else Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Wed Feb 28 13:28:07 2007 @@ -33,6 +33,9 @@ static const char modname[] = "mod_console"; static const uint8_t STATIC_LEVELS[] = {0, 1, 2, 3, 4, 5, 6, 7, 8}; +static int COLORIZE = 0; +static const char *COLORS[] = + { SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FMAGEN, SWITCH_SEQ_FCYAN, SWITCH_SEQ_FGREEN, SWITCH_SEQ_FYELLOW, "" }; static switch_loadable_module_interface_t console_module_interface = { /*.module_name */ modname, @@ -100,6 +103,17 @@ } } + if ((settings = switch_xml_child(cfg, "settings"))) { + for (param = switch_xml_child(settings, "param"); param; param = param->next) { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + + if (!strcasecmp(var, "colorize") && switch_true(val)) { + COLORIZE = 1; + } + } + } + switch_xml_free(xml); return SWITCH_STATUS_SUCCESS; @@ -128,7 +142,11 @@ } if (!log_hash || (((all_level > - 1) || lookup) && level >= node->level)) { - fprintf(handle, "%s", node->data); + if (COLORIZE) { + fprintf(handle, "%s%s%s", COLORS[node->level], node->data, SWITCH_SEQ_DEFAULT_COLOR); + } else { + fprintf(handle, "%s", node->data); + } } } else { fprintf(stderr, "HELP I HAVE NO CONSOLE TO LOG TO!\n");

1 0

[commit] r4412 - freeswitch/trunk/src/mod/codecs/mod_amr
by Freeswitch SVN 28 Feb '07

28 Feb '07

Author: anthm Date: Wed Feb 28 13:24:41 2007 New Revision: 4412 Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c Log: reflect bit properly Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c Wed Feb 28 13:24:41 2007 @@ -202,7 +202,7 @@ context->enc_mode = globals.default_bitrate; } - snprintf(fmtptmp, sizeof(fmtptmp), "octet-align=0; mode-set=%d", context->enc_mode); + snprintf(fmtptmp, sizeof(fmtptmp), "octet-align=%d; mode-set=%d", switch_test_flag(context, AMR_OPT_OCTET_ALIGN) ? 1 : 0, context->enc_mode); codec->fmtp_out = switch_core_strdup(codec->memory_pool, fmtptmp); context->enc_mode = AMR_DEFAULT_BITRATE;

1 0

[commit] r4411 - in freeswitch/trunk/src: include mod/endpoints/mod_sofia
by Freeswitch SVN 28 Feb '07

28 Feb '07

Author: anthm Date: Wed Feb 28 10:48:17 2007 New Revision: 4411 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: move string to constant Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed Feb 28 10:48:17 2007 @@ -76,6 +76,7 @@ #define SWITCH_GRAMMAR_DIR SWITCH_PREFIX_DIR SWITCH_PATH_SEPARATOR "grammar" #endif +#define SWITCH_ENDPOINT_DISPOSITION_VARIABLE "endpoint_disposition" #define SWITCH_EXPORT_VARS_VARIABLE "export_vars" #define SWITCH_R_SDP_VARIABLE "switch_r_sdp" #define SWITCH_L_SDP_VARIABLE "switch_l_sdp" 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 Wed Feb 28 10:48:17 2007 @@ -1631,7 +1631,7 @@ return SWITCH_STATUS_FALSE; } activate_rtp(tech_pvt); - switch_channel_set_variable(channel, "endpoint_disposition", "EARLY MEDIA"); + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "EARLY MEDIA"); switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); switch_channel_mark_pre_answered(channel); return SWITCH_STATUS_SUCCESS; @@ -1669,7 +1669,7 @@ if (switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION)) { char *r_sdp = switch_channel_get_variable(channel, SWITCH_R_SDP_VARIABLE); if (tech_media(tech_pvt, r_sdp) != SWITCH_STATUS_SUCCESS) { - switch_channel_set_variable(channel, "endpoint_disposition", "CODEC NEGOTIATION ERROR"); + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR"); nua_respond(tech_pvt->nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); return SWITCH_STATUS_FALSE; } @@ -2084,7 +2084,7 @@ if (switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION)) { char *r_sdp = switch_channel_get_variable(channel, SWITCH_R_SDP_VARIABLE); if (tech_media(tech_pvt, r_sdp) != SWITCH_STATUS_SUCCESS) { - switch_channel_set_variable(channel, "endpoint_disposition", "CODEC NEGOTIATION ERROR"); + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR"); nua_respond(tech_pvt->nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); return SWITCH_STATUS_FALSE; } @@ -2873,10 +2873,10 @@ goto done; } else { if (switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION)) { - switch_channel_set_variable(channel, "endpoint_disposition", "DELAYED NEGOTIATION"); + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "DELAYED NEGOTIATION"); } else { if (tech_media(tech_pvt, (char *)r_sdp) != SWITCH_STATUS_SUCCESS) { - switch_channel_set_variable(channel, "endpoint_disposition", "CODEC NEGOTIATION ERROR"); + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR"); nua_respond(nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); } } @@ -2897,7 +2897,7 @@ if (channel) { if (r_sdp) { if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { - switch_channel_set_variable(channel, "endpoint_disposition", "RECEIVED_NOMEDIA"); + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "RECEIVED_NOMEDIA"); switch_channel_set_state(channel, CS_INIT); switch_set_flag_locked(tech_pvt, TFLAG_READY); switch_core_session_thread_launch(session); @@ -2920,7 +2920,7 @@ if (match) { nua_handle_t *bnh; sip_replaces_t *replaces; - switch_channel_set_variable(channel, "endpoint_disposition", "RECEIVED"); + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "RECEIVED"); switch_channel_set_state(channel, CS_INIT); switch_set_flag_locked(tech_pvt, TFLAG_READY); @@ -2940,14 +2940,14 @@ if (br_b) { switch_ivr_uuid_bridge(br_a, br_b); - switch_channel_set_variable(channel, "endpoint_disposition", "ATTENDED_TRANSFER"); + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "ATTENDED_TRANSFER"); switch_channel_hangup(channel, SWITCH_CAUSE_ATTENDED_TRANSFER); } else { - switch_channel_set_variable(channel, "endpoint_disposition", "ATTENDED_TRANSFER_ERROR"); + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "ATTENDED_TRANSFER_ERROR"); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); } } else { - switch_channel_set_variable(channel, "endpoint_disposition", "ATTENDED_TRANSFER_ERROR"); + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "ATTENDED_TRANSFER_ERROR"); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); } nua_handle_unref(bnh); @@ -2955,7 +2955,7 @@ goto done; } - switch_channel_set_variable(channel, "endpoint_disposition", "NO CODECS"); + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "NO CODECS"); nua_respond(nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); } @@ -3061,7 +3061,7 @@ } } - switch_channel_set_variable(channel, "endpoint_disposition", "NO CODECS"); + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "NO CODECS"); nua_respond(nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); } } @@ -3905,7 +3905,7 @@ if (br_a && br_b) { switch_ivr_uuid_bridge(br_a, br_b); - switch_channel_set_variable(channel_b, "endpoint_disposition", "ATTENDED_TRANSFER"); + switch_channel_set_variable(channel_b, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "ATTENDED_TRANSFER"); switch_set_flag_locked(tech_pvt, TFLAG_BYE); switch_set_flag_locked(b_tech_pvt, TFLAG_BYE); nua_notify(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), @@ -4004,7 +4004,7 @@ switch_core_session_rwunlock(a_session); tuuid_str = switch_core_session_get_uuid(tsession); switch_ivr_uuid_bridge(br_a, tuuid_str); - switch_channel_set_variable(channel_a, "endpoint_disposition", "ATTENDED_TRANSFER"); + switch_channel_set_variable(channel_a, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "ATTENDED_TRANSFER"); switch_set_flag_locked(tech_pvt, TFLAG_BYE); nua_notify(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), NUTAG_SUBSTATE(nua_substate_terminated), @@ -4017,7 +4017,7 @@ } else { error: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Transfer! [%s]\n", br_a); - switch_channel_set_variable(channel_a, "endpoint_disposition", "ATTENDED_TRANSFER_ERROR"); + switch_channel_set_variable(channel_a, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "ATTENDED_TRANSFER_ERROR"); nua_notify(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 403 Forbidden"), @@ -4049,7 +4049,7 @@ switch_core_session_rwunlock(b_session); } - switch_channel_set_variable(channel, "endpoint_disposition", "BLIND_TRANSFER"); + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "BLIND_TRANSFER"); /* nua_notify(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), @@ -4443,7 +4443,7 @@ attach_private(session, profile, tech_pvt, channel_name); tech_set_codecs(tech_pvt); - switch_channel_set_variable(channel, "endpoint_disposition", "INBOUND CALL"); + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "INBOUND CALL"); set_chat_hash(tech_pvt, sip); if (switch_test_flag(tech_pvt, TFLAG_INB_NOMEDIA)) {

1 0

[commit] r4410 - freeswitch/trunk/src/mod/timers/mod_softtimer
by Freeswitch SVN 28 Feb '07

28 Feb '07

Author: anthm Date: Wed Feb 28 10:14:39 2007 New Revision: 4410 Modified: freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c Log: fix possible endless loop race during shutdown Modified: freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c ============================================================================== --- freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c (original) +++ freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c Wed Feb 28 10:14:39 2007 @@ -62,6 +62,10 @@ { timer_private_t *private_info; + if (globals.RUNNING != 1) { + return SWITCH_STATUS_FALSE; + } + if ((private_info = switch_core_alloc(timer->memory_pool, sizeof(*private_info)))) { switch_mutex_lock(globals.mutex); TIMER_MATRIX[timer->interval].count++; @@ -78,6 +82,10 @@ { timer_private_t *private_info = timer->private_info; + if (globals.RUNNING != 1) { + return SWITCH_STATUS_FALSE; + } + private_info->reference += timer->interval; return SWITCH_STATUS_SUCCESS; } @@ -88,11 +96,17 @@ timer_private_t *private_info = timer->private_info; timer_step(timer); - while (TIMER_MATRIX[timer->interval].tick < private_info->reference) { + + while (globals.RUNNING == 1 && TIMER_MATRIX[timer->interval].tick < private_info->reference) { switch_yield(1000); } - timer->samplecount += timer->samples; - return SWITCH_STATUS_SUCCESS; + + if (globals.RUNNING == 1) { + timer->samplecount += timer->samples; + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; } static inline switch_status_t timer_check(switch_timer_t *timer) @@ -102,6 +116,10 @@ switch_status_t status = SWITCH_STATUS_SUCCESS; uint64_t diff; + if (globals.RUNNING != 1) { + return SWITCH_STATUS_SUCCESS; + } + if (TIMER_MATRIX[timer->interval].tick < private_info->reference) { diff = private_info->reference - TIMER_MATRIX[timer->interval].tick; } else {

1 0

[commit] r4409 - in freeswitch/trunk/libs/iax: . src
by Freeswitch SVN 28 Feb '07

28 Feb '07

Author: mikej Date: Tue Feb 27 19:28:23 2007 New Revision: 4409 Added: freeswitch/trunk/libs/iax/src/iax-mutex.c freeswitch/trunk/libs/iax/src/iax-mutex.h Modified: freeswitch/trunk/libs/iax/libiax2.vcproj freeswitch/trunk/libs/iax/src/Makefile.am Log: add cross platform mutex abstraction. Modified: freeswitch/trunk/libs/iax/libiax2.vcproj ============================================================================== --- freeswitch/trunk/libs/iax/libiax2.vcproj (original) +++ freeswitch/trunk/libs/iax/libiax2.vcproj Tue Feb 27 19:28:23 2007 @@ -148,6 +148,10 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File + RelativePath=".\src\iax-mutex.c" + > + </File> + <File RelativePath=".\src\iax.c" > </File> @@ -190,6 +194,10 @@ > </File> <File + RelativePath=".\src\iax-mutex.h" + > + </File> + <File RelativePath=".\src\iax.h" > </File> Modified: freeswitch/trunk/libs/iax/src/Makefile.am ============================================================================== --- freeswitch/trunk/libs/iax/src/Makefile.am (original) +++ freeswitch/trunk/libs/iax/src/Makefile.am Tue Feb 27 19:28:23 2007 @@ -8,8 +8,8 @@ pkgdir = $(libdir) pkg_LTLIBRARIES=libiax.la -libiax_la_SOURCES = iax2-parser.c iax.c md5.c jitterbuf.c +libiax_la_SOURCES = iax2-parser.c iax.c md5.c jitterbuf.c iax-mutex.c library_includedir = $(prefix)/include/iax -library_include_HEADERS = md5.h frame.h iax-client.h iax2.h iax2-parser.h iax.h +library_include_HEADERS = md5.h frame.h iax-client.h iax2.h iax2-parser.h iax.h iax-mutex.h noinst_HEADERS = jitterbuf.h Added: freeswitch/trunk/libs/iax/src/iax-mutex.c ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/iax/src/iax-mutex.c Tue Feb 27 19:28:23 2007 @@ -0,0 +1,105 @@ +/* + * Simple Mutex abstraction + * Copyright(C) 2007 Michael Jerris + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so. + * + * This work is provided under this license on an "as is" basis, without warranty of any kind, + * either expressed or implied, including, without limitation, warranties that the covered code + * is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire + * risk as to the quality and performance of the covered code is with you. Should any covered + * code prove defective in any respect, you (not the initial developer or any other contributor) + * assume the cost of any necessary servicing, repair or correction. This disclaimer of warranty + * constitutes an essential part of this license. No use of any covered code is authorized hereunder + * except under this disclaimer. + * + */ + + +#include "iax-mutex.h" + + +#ifdef WIN32 +#define _WIN32_WINNT 0x0400 +#include <windows.h> +struct mutex { + CRITICAL_SECTION mutex; +}; + +#else + +#include <pthread.h> +struct mutex { + pthread_mutex_t mutex; +}; + +#endif + + +mutex_status_t mutex_create(mutex_t **mutex) +{ + mutex_t *check = NULL; + + check = (mutex_t *)malloc(sizeof(**mutex)); + if (!check) + return MUTEX_FAILURE; +#ifdef WIN32 + InitializeCriticalSection(&check->mutex); +#else + if (pthread_mutex_init(&check->mutex, NULL)) + return MUTEX_FAILURE; + +#endif + + *mutex = check; + + return MUTEX_SUCCESS; +} + +mutex_status_t mutex_destroy(mutex_t *mutex) +{ +#ifdef WIN32 + DeleteCriticalSection(&mutex->mutex); +#else + if (pthread_mutex_destroy(&mutex->mutex)) + return MUTEX_FAILURE; +#endif + free(mutex); + return MUTEX_SUCCESS; +} + +mutex_status_t mutex_lock(mutex_t *mutex) +{ +#ifdef WIN32 + EnterCriticalSection(&mutex->mutex); +#else + if (pthread_mutex_lock(&mutex->mutex)) + return MUTEX_FAILURE; +#endif + return MUTEX_SUCCESS; +} + +mutex_status_t mutex_trylock(mutex_t *mutex) +{ +#ifdef WIN32 + if (!TryEnterCriticalSection(&mutex->mutex)) + return MUTEX_FAILURE; +#else + if (pthread_mutex_trylock(&mutex->mutex)) + return MUTEX_FAILURE; +#endif + return MUTEX_SUCCESS; +} + +mutex_status_t mutex_unlock(mutex_t *mutex) +{ +#ifdef WIN32 + LeaveCriticalSection(&mutex->mutex); +#else + if (pthread_mutex_unlock(&mutex->mutex)) + return MUTEX_FAILURE; +#endif + return MUTEX_SUCCESS; +} Added: freeswitch/trunk/libs/iax/src/iax-mutex.h ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/iax/src/iax-mutex.h Tue Feb 27 19:28:23 2007 @@ -0,0 +1,37 @@ +/* + * Simple Mutex abstraction + * Copyright(C) 2007 Michael Jerris + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so. + * + * This work is provided under this license on an "as is" basis, without warranty of any kind, + * either expressed or implied, including, without limitation, warranties that the covered code + * is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire + * risk as to the quality and performance of the covered code is with you. Should any covered + * code prove defective in any respect, you (not the initial developer or any other contributor) + * assume the cost of any necessary servicing, repair or correction. This disclaimer of warranty + * constitutes an essential part of this license. No use of any covered code is authorized hereunder + * except under this disclaimer. + * + */ + + +#ifndef _SIMPLE_ABSTRACT_MUTEX_H +#define _SIMPLE_ABSTRACT_MUTEX_H + +typedef struct mutex mutex_t; + +typedef enum mutex_status { + MUTEX_SUCCESS, + MUTEX_FAILURE +} mutex_status_t; + +mutex_status_t mutex_create(mutex_t **mutex); +mutex_status_t mutex_destroy(mutex_t *mutex); +mutex_status_t mutex_lock(mutex_t *mutex); +mutex_status_t mutex_trylock(mutex_t *mutex); +mutex_status_t mutex_unlock(mutex_t *mutex); + +#endif

1 0

[commit] r4408 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 27 Feb '07

27 Feb '07

Author: anthm Date: Tue Feb 27 17:53:57 2007 New Revision: 4408 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: thanks _Vile Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Feb 27 17:53:57 2007 @@ -511,7 +511,7 @@ if (switch_ivr_originate(NULL, &caller_session, &cause, aleg, timeout, &noop_state_handler, cid_name, cid_num, NULL) != SWITCH_STATUS_SUCCESS) { if (machine) { - stream->write_function(stream, "fail: %s", switch_channel_cause2str(cause)); + stream->write_function(stream, "fail: %s\n", switch_channel_cause2str(cause)); } else { stream->write_function(stream, "Cannot Create Outgoing Channel! [%s] cause: %s\n", aleg, switch_channel_cause2str(cause)); }

1 0

[commit] r4407 - freeswitch/trunk/src
by Freeswitch SVN 27 Feb '07

27 Feb '07

Author: anthm Date: Tue Feb 27 17:52:37 2007 New Revision: 4407 Modified: freeswitch/trunk/src/switch_core.c Log: be more specific Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Feb 27 17:52:37 2007 @@ -2552,6 +2552,14 @@ return status; } +static char *SIG_NAMES[] = { + "NONE", + "KILL", + "XFER", + "BREAK", + NULL +}; + SWITCH_DECLARE(switch_status_t) switch_core_session_perform_kill_channel(switch_core_session_t *session, const char *file, const char *func, @@ -2561,8 +2569,8 @@ switch_io_event_hook_kill_channel_t *ptr; switch_status_t status = SWITCH_STATUS_FALSE; - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_INFO, "Kill %s [%d]\n", switch_channel_get_name(session->channel), sig); - + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_INFO, "Kill %s [%s]\n", switch_channel_get_name(session->channel), SIG_NAMES[sig]); + if (session->endpoint_interface->io_routines->kill_channel) { if ((status = session->endpoint_interface->io_routines->kill_channel(session, sig)) == SWITCH_STATUS_SUCCESS) { for (ptr = session->event_hooks.kill_channel; ptr; ptr = ptr->next) {

1 0

[commit] r4403 - freeswitch/trunk/libs/win32/sqlite
by Freeswitch SVN 27 Feb '07

27 Feb '07

Author: mikej Date: Tue Feb 27 14:33:10 2007 New Revision: 4403 Modified: freeswitch/trunk/libs/win32/sqlite/sqlite.vcproj Log: copy missing header file to the right place. Modified: freeswitch/trunk/libs/win32/sqlite/sqlite.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/sqlite/sqlite.vcproj (original) +++ freeswitch/trunk/libs/win32/sqlite/sqlite.vcproj Tue Feb 27 14:33:10 2007 @@ -78,7 +78,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\sqlite\src\*.h" "$(ProjectDir)..\..\include\" /C /D /Y

" + CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\sqlite\src\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
xcopy "$(ProjectDir)*.h" "$(ProjectDir)..\..\include\" /C /D /Y

" /> </Configuration> <Configuration @@ -142,7 +142,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\sqlite\src\*.h" "$(ProjectDir)..\..\include\" /C /D /Y

" + CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\sqlite\src\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
xcopy "$(ProjectDir)*.h" "$(ProjectDir)..\..\include\" /C /D /Y

" /> </Configuration> <Configuration @@ -224,7 +224,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\sqlite\src\*.h" "$(ProjectDir)..\..\include\" /C /D /Y

" + CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\sqlite\src\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
xcopy "$(ProjectDir)*.h" "$(ProjectDir)..\..\include\" /C /D /Y

" /> </Configuration> <Configuration @@ -299,7 +299,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\sqlite\src\*.h" "$(ProjectDir)..\..\include\" /C /D /Y

" + CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\sqlite\src\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
xcopy "$(ProjectDir)*.h" "$(ProjectDir)..\..\include\" /C /D /Y

" /> </Configuration> </Configurations>

1 0