- Freeswitch-svn - FreeSWITCH Mailing Lists

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

19 Feb '07

Author: mikej Date: Mon Feb 19 11:56:48 2007 New Revision: 4324 Added: freeswitch/trunk/libs/iax/.update Modified: freeswitch/trunk/libs/iax/src/iax.c Log: don't create new iax sessions when we shouldn't Added: freeswitch/trunk/libs/iax/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/iax/.update Mon Feb 19 11:56:48 2007 @@ -0,0 +1 @@ +Mon Feb 19 12:03:56 EST 2007 \ No newline at end of file Modified: freeswitch/trunk/libs/iax/src/iax.c ============================================================================== --- freeswitch/trunk/libs/iax/src/iax.c (original) +++ freeswitch/trunk/libs/iax/src/iax.c Mon Feb 19 11:56:48 2007 @@ -2916,17 +2916,29 @@ struct iax_session *session; if (ntohs(fh->scallno) & IAX_FLAG_FULL) { + int subclass = uncompress_subclass(fh->csub); + int makenew = 0; + /* Full size header */ if (len < sizeof(struct ast_iax2_full_hdr)) { DEBU(G "Short header received from %s\n", inet_ntoa(sin->sin_addr)); IAXERROR "Short header received from %s\n", inet_ntoa(sin->sin_addr)); } + /* Only allow it to make new sessions on types where that makes sense */ + if ((fh->type == AST_FRAME_IAX) && ((subclass == IAX_COMMAND_NEW) || + (subclass == IAX_COMMAND_POKE) || + (subclass == IAX_COMMAND_REGREL) || + (subclass == IAX_COMMAND_REGREQ))) { + makenew = 1; + } + /* We have a full header, process appropriately */ - session = iax_find_session(sin, ntohs(fh->scallno) & ~IAX_FLAG_FULL, ntohs(fh->dcallno) & ~IAX_FLAG_RETRANS, 1); + session = iax_find_session(sin, ntohs(fh->scallno) & ~IAX_FLAG_FULL, ntohs(fh->dcallno) & ~IAX_FLAG_RETRANS, makenew); if (!session) session = iax_txcnt_session(fh, len-sizeof(struct ast_iax2_full_hdr), sin, ntohs(fh->scallno) & ~IAX_FLAG_FULL, ntohs(fh->dcallno) & ~IAX_FLAG_RETRANS); if (session) return iax_header_to_event(session, fh, len - sizeof(struct ast_iax2_full_hdr), sin); + /* if we get here, the frame was invalid for some reason, we should probably send IAX_COMMAND_INVAL (as long as the subclass was not already IAX_COMMAND_INVAL) */ DEBU(G "No session?\n"); return NULL; } else {

1 0

[commit] r4323 - freeswitch/trunk/src
by Freeswitch SVN 19 Feb '07

19 Feb '07

Author: anthm Date: Mon Feb 19 10:20:16 2007 New Revision: 4323 Modified: freeswitch/trunk/src/switch_ivr.c Log: add rwlocks to bridge Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Feb 19 10:20:16 2007 @@ -1965,7 +1965,8 @@ pre_b = switch_channel_test_flag(chan_a, CF_EARLY_MEDIA); ans_b = switch_channel_test_flag(chan_b, CF_ANSWERED); } - + switch_core_session_read_lock(session_a); + switch_core_session_read_lock(session_b); switch_channel_set_flag(chan_a, CF_BRIDGED); @@ -2091,6 +2092,9 @@ switch_mutex_lock(data->mutex); data->running = 0; switch_mutex_unlock(data->mutex); + + switch_core_session_rwunlock(session_a); + switch_core_session_rwunlock(session_b); return NULL; }

1 0

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

19 Feb '07

Author: mishehu Date: Mon Feb 19 00:21:40 2007 New Revision: 4322 Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.cpp Log: Fixed basecdr.cpp to use switch_strlen_zero() in order to properly check whether the char*'s contain any strings. This reflects changes by MikeJ to the core. Still need to test. 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 Mon Feb 19 00:21:40 2007 @@ -89,25 +89,19 @@ 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)); } @@ -117,13 +111,13 @@ if(newchannel->callerprofile->originator_caller_profile) { originated = 0; - if(newchannel->callerprofile->originator_caller_profile->uuid != 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) { - if(newchannel->callerprofile->destination_number) + 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)); } } @@ -133,19 +127,23 @@ // Or were we maybe we were the caller? if(newchannel->callerprofile->originatee_caller_profile) { - if (newchannel->callerprofile) { - if(newchannel->callerprofile->caller_id_number != 0) + if (newchannel->callerprofile) + { + 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(newchannel->callerprofile->originatee_caller_profile->chan_name != 0) + 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)); } } - 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)) { @@ -174,12 +172,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(!switch_strlen_zero(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)); } @@ -324,7 +322,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); @@ -363,7 +361,7 @@ char *tempvariable; tempvariable = switch_channel_get_variable(channel,tempstring); - if(tempvariable != 0) + if(!switch_strlen_zero(tempvariable)) chanvars_supp[*iItr] = tempvariable; } }

1 0

[commit] r4321 - in freeswitch/trunk/src: . include
by Freeswitch SVN 19 Feb '07

19 Feb '07

Author: mikej Date: Sun Feb 18 22:23:02 2007 New Revision: 4321 Modified: freeswitch/trunk/src/include/switch_caller.h freeswitch/trunk/src/switch_caller.c Log: constify switch_caller_profile_new Modified: freeswitch/trunk/src/include/switch_caller.h ============================================================================== --- freeswitch/trunk/src/include/switch_caller.h (original) +++ freeswitch/trunk/src/include/switch_caller.h Sun Feb 18 22:23:02 2007 @@ -171,17 +171,17 @@ \return a new profile object allocated from the session's memory pool */ SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_new(switch_memory_pool_t *pool, - char *username, - char *dialplan, - char *caller_id_name, - char *caller_id_number, - char *network_addr, - char *ani, - char *aniii, - char *rdnis, - char *source, - char *context, - char *destination_number); + const char *username, + const char *dialplan, + const char *caller_id_name, + const char *caller_id_number, + const char *network_addr, + const char *ani, + const char *aniii, + const char *rdnis, + const char *source, + const char *context, + const char *destination_number); /*! \brief Clone an existing caller profile object Modified: freeswitch/trunk/src/switch_caller.c ============================================================================== --- freeswitch/trunk/src/switch_caller.c (original) +++ freeswitch/trunk/src/switch_caller.c Sun Feb 18 22:23:02 2007 @@ -33,17 +33,17 @@ #include <switch_caller.h> SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_new(switch_memory_pool_t *pool, - char *username, - char *dialplan, - char *caller_id_name, - char *caller_id_number, - char *network_addr, - char *ani, - char *aniii, - char *rdnis, - char *source, - char *context, - char *destination_number) + const char *username, + const char *dialplan, + const char *caller_id_name, + const char *caller_id_number, + const char *network_addr, + const char *ani, + const char *aniii, + const char *rdnis, + const char *source, + const char *context, + const char *destination_number) {

1 0

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

19 Feb '07

Author: mishehu Date: Sun Feb 18 22:01:34 2007 New Revision: 4320 Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/Makefile freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.h freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/baseregistry.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/baseregistry.h freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/cdrcontainer.h freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.h freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mod_cdr.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.h freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/pddcdr.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/pddcdr.h freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/xmlcdr.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/xmlcdr.h Log: Merged in changes from trunk, thanks to MikeJ for any changes he made so far. Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/Makefile ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/Makefile (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/Makefile Sun Feb 18 22:01:34 2007 @@ -1,11 +1,13 @@ - -#CFLAGS += $(shell mysql_config --include) #CFLAGS += -DSWITCH_QUEUE_ENHANCED -#LDFLAGS += $(shell mysql_config --libs) #LDFLAGS += -lcurl - CPPCC = g++ -OBJS=cdrcontainer.o basecdr.o baseregistry.o mysqlcdr.o pddcdr.o csvcdr.o xmlcdr.o sqlitecdr.o +OBJS=cdrcontainer.o basecdr.o baseregistry.o pddcdr.o csvcdr.o xmlcdr.o sqlitecdr.o + +ifneq ($(shell which mysql_config),) + CFLAGS += $(shell mysql_config --include) + LDFLAGS += $(shell mysql_config --libs) + OBJS += mysqlcdr.o +endif all: depends $(OBJS) $(MODNAME).$(DYNAMIC_LIB_EXTEN) 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 Sun Feb 18 22:01:34 2007 @@ -150,15 +150,19 @@ 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 { @@ -409,7 +413,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.h ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.h (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.h Sun Feb 18 22:01:34 2007 @@ -121,7 +121,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/baseregistry.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/baseregistry.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/baseregistry.cpp Sun Feb 18 22:01:34 2007 @@ -83,7 +83,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/baseregistry.h ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/baseregistry.h (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/baseregistry.h Sun Feb 18 22:01:34 2007 @@ -80,7 +80,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp Sun Feb 18 22:01:34 2007 @@ -111,12 +111,12 @@ switch_xml_t xml_root; if ((xml_root = switch_xml_open_root(1, &err))) { - switch_console_printf(SWITCH_CHANNEL_LOG,"Reloading the XML file...\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Reloading the XML file...\n"); switch_xml_free(xml_root); } if (!(xml = switch_xml_open_cfg(configfile, &cfg, NULL))) - switch_console_printf(SWITCH_CHANNEL_LOG,"open of %s failed\n", configfile); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "open of %s failed\n", configfile); else { BaseRegistry& registry(BaseRegistry::get()); @@ -144,7 +144,7 @@ switch_xml_free(xml); switch_queue_unblockpop(cdrqueue); - switch_console_printf(SWITCH_CHANNEL_LOG,"mod_cdr configuration reloaded."); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "mod_cdr configuration reloaded."); } void CDRContainer::queue_pause(switch_stream_handle_t *stream) @@ -250,7 +250,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/cdrcontainer.h ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/cdrcontainer.h (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/cdrcontainer.h Sun Feb 18 22:01:34 2007 @@ -83,7 +83,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.cpp Sun Feb 18 22:01:34 2007 @@ -182,7 +182,7 @@ if(outputfile.good()) { activated = 1; - switch_console_printf(SWITCH_CHANNEL_LOG,"CsvCDR activated, log rotation will occur at or after %d MB\n",(filesize_limit/1024/1024)); + switch_console_printf(SWITCH_CHANNEL_LOG,"CsvCDR activated, log rotation will occur at or after %d MB\n",(int)(filesize_limit >> 20)); } } else @@ -340,7 +340,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.h ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.h (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.h Sun Feb 18 22:01:34 2007 @@ -83,7 +83,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mod_cdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mod_cdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mod_cdr.cpp Sun Feb 18 22:01:34 2007 @@ -205,7 +205,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp Sun Feb 18 22:01:34 2007 @@ -659,7 +659,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.h ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.h (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.h Sun Feb 18 22:01:34 2007 @@ -108,7 +108,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/pddcdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/pddcdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/pddcdr.cpp Sun Feb 18 22:01:34 2007 @@ -255,7 +255,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/pddcdr.h ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/pddcdr.h (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/pddcdr.h Sun Feb 18 22:01:34 2007 @@ -77,7 +77,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/xmlcdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/xmlcdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/xmlcdr.cpp Sun Feb 18 22:01:34 2007 @@ -257,7 +257,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/xmlcdr.h ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/xmlcdr.h (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/xmlcdr.h Sun Feb 18 22:01:34 2007 @@ -78,7 +78,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End:

1 0

[commit] r4319 - in freeswitch/trunk/src: . include
by Freeswitch SVN 19 Feb '07

19 Feb '07

Author: mikej Date: Sun Feb 18 21:21:27 2007 New Revision: 4319 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_core.c Log: add switch_core_session_sprintf which allocates from the session pool Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Sun Feb 18 21:21:27 2007 @@ -393,6 +393,15 @@ */ SWITCH_DECLARE(char *) switch_core_strdup(switch_memory_pool_t *pool, const char *todup); +/*! + \brief printf-style style printing routine. The data is output to a string allocated from the session + \param session a session to use for allocation + \param fmt The format of the string + \param ... The arguments to use while printing the data + \return The new string +*/ +SWITCH_DECLARE(char *) switch_core_session_sprintf(switch_core_session_t *session, const char *fmt, ...); + /*! \brief Retrieve the memory pool from a session \param session the session to retrieve the pool from Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Sun Feb 18 21:21:27 2007 @@ -1465,6 +1465,22 @@ return duped; } +SWITCH_DECLARE(char *) switch_core_session_sprintf(switch_core_session_t *session, const char *fmt, ...) +{ + va_list ap; + char *result = NULL; + + assert(session != NULL); + assert(session->pool != NULL); + va_start(ap, fmt); + + result = apr_pvsprintf(session->pool ,fmt, ap); + + va_end(ap); + + return result; +} + SWITCH_DECLARE(char *) switch_core_session_strdup(switch_core_session_t *session, const char *todup) {

1 0

[commit] r4318 - freeswitch/trunk/src
by Freeswitch SVN 18 Feb '07

18 Feb '07

Author: anthm Date: Sun Feb 18 11:51:11 2007 New Revision: 4318 Modified: freeswitch/trunk/src/switch_rtp.c Log: update Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sun Feb 18 11:51:11 2007 @@ -491,7 +491,6 @@ } } - rtp_session->ready++; *new_rtp_session = rtp_session; return SWITCH_STATUS_SUCCESS; @@ -524,6 +523,8 @@ return NULL; } + rtp_session->ready = 1; + return rtp_session; }

1 0

[commit] r4317 - freeswitch/trunk/src
by Freeswitch SVN 18 Feb '07

18 Feb '07

Author: mikej Date: Sun Feb 18 09:33:55 2007 New Revision: 4317 Modified: freeswitch/trunk/src/switch_rtp.c Log: fix typo to fix build Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sun Feb 18 09:33:55 2007 @@ -279,9 +279,9 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_set_local_address(switch_rtp_t *rtp_session, char *host, switch_port_t port, const char **err) { - *err = NULL; switch_socket_t *new_sock = NULL, *old_sock = NULL; switch_status_t status = SWITCH_STATUS_FALSE; + *err = NULL; if (switch_sockaddr_info_get(&rtp_session->local_addr, host, SWITCH_UNSPEC, port, 0, rtp_session->pool) != SWITCH_STATUS_SUCCESS) { *err = "Local Address Error!"; @@ -576,7 +576,7 @@ return; } - rtp_session->ready = 0; + (*rtp_session)->ready = 0; switch_mutex_lock((*rtp_session)->flag_mutex);

1 0

[commit] r4315 - freeswitch/trunk/src
by Freeswitch SVN 18 Feb '07

18 Feb '07

Author: anthm Date: Sat Feb 17 23:37:06 2007 New Revision: 4315 Modified: freeswitch/trunk/src/switch_rtp.c Log: update Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sat Feb 17 23:37:06 2007 @@ -567,7 +567,7 @@ SWITCH_DECLARE(uint8_t) switch_rtp_ready(switch_rtp_t *rtp_session) { - return (rtp_session != NULL && rtp_session->ready) ? 1 : 0; + return (rtp_session != NULL && rtp_session->sock && rtp_session->ready) ? 1 : 0; } SWITCH_DECLARE(void) switch_rtp_destroy(switch_rtp_t **rtp_session) @@ -576,6 +576,8 @@ return; } + rtp_session->ready = 0; + switch_mutex_lock((*rtp_session)->flag_mutex); if ((*rtp_session)->dtmf_data.dtmf_buffer) { @@ -760,7 +762,7 @@ rtp_session->last_time = switch_time_now(); } - while(rtp_session->ready) { + while(switch_rtp_ready(rtp_session)) { bytes = sizeof(rtp_msg_t); status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock, 0, (void *)&rtp_session->recv_msg, &bytes);

1 0

[commit] r4314 - freeswitch/trunk/src
by Freeswitch SVN 17 Feb '07

17 Feb '07

Author: anthm Date: Sat Feb 17 17:22:52 2007 New Revision: 4314 Modified: freeswitch/trunk/src/switch_rtp.c Log: tweak Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sat Feb 17 17:22:52 2007 @@ -323,7 +323,7 @@ done: if (status != SWITCH_STATUS_SUCCESS) { - rtp_session->ready = NULL; + rtp_session->ready = 0; } if (new_sock) {

1 0