July 2006 - Freeswitch-branches - FreeSWITCH Mailing Lists

[commit] r2075 - freeswitch/branches/mishehu/src/mod/loggers/mod_cdr
by Freeswitch SVN 24 Jul '06

24 Jul '06

Author: mishehu Date: Mon Jul 24 11:15:33 2006 New Revision: 2075 Removed: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/mod_cdr.h Modified: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.cpp freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.h freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/cdrcontainer.cpp Log: Minor cleanup. Modified: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.cpp Mon Jul 24 11:15:33 2006 @@ -28,6 +28,7 @@ #include "basecdr.h" #include <iostream> +#include <string> #include <cstring> #include <switch.h> @@ -69,11 +70,6 @@ memset(ani2,0,80); memset(lastapp,0,80); memset(lastdata,0,255); - /* - memset(accountcode,0,20); - memset(uniqueid,0,32); - memset(userfield,0,255); - */ coresession = newchannel->session; callstartdate= newchannel->timetable->created; Modified: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.h ============================================================================== --- freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.h (original) +++ freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.h Mon Jul 24 11:15:33 2006 @@ -95,12 +95,6 @@ switch_core_session_t *coresession; std::list<std::pair<std::string,std::string> > chanvars_fixed; std::map<std::string,std::string> chanvars_supp; - /* - This is what happens when you base the ideas off of Asterisk... you end up with an inconvenient asteriskism. - char accountcode[20]; - char uniqueid[32]; - char userfield[255]; - */ bool errorstate; // True if there is an error writing the log }; Modified: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/cdrcontainer.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/cdrcontainer.cpp (original) +++ freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/cdrcontainer.cpp Mon Jul 24 11:15:33 2006 @@ -43,7 +43,6 @@ switch_xml_t cfg, xml, settings, param; switch_mod_cdr_newchannel_t *newchannel; // = new switch_mod_cdr_newchannel_t; - //memset(newchannel,0,sizeof(*newchannel)); newchannel = 0; if (!(xml = switch_xml_open_cfg(configfile, &cfg, NULL))) @@ -63,9 +62,7 @@ } } - switch_xml_free(xml); - - //delete newchannel; + switch_xml_free(xml); } CDRContainer::~CDRContainer() @@ -74,7 +71,6 @@ process_records(); switch_mod_cdr_newchannel_t *newchannel; //= new switch_mod_cdr_newchannel_t; - //memset(newchannel,0,sizeof(*newchannel)); newchannel = 0; BaseRegistry& registry(BaseRegistry::get()); @@ -87,12 +83,10 @@ } switch_console_printf(SWITCH_CHANNEL_LOG,"mod_cdr shutdown gracefully."); - // delete newchannel; } void CDRContainer::add_cdr(switch_core_session_t *session) { - //switch_channel_t *channel; switch_mod_cdr_newchannel_t *newchannel = new switch_mod_cdr_newchannel_t; memset(newchannel,0,sizeof(*newchannel));

1 0

[commit] r2073 - freeswitch/branches/undercalm
by Freeswitch SVN 24 Jul '06

24 Jul '06

Author: sphere Date: Mon Jul 24 01:04:06 2006 New Revision: 2073 Added: freeswitch/branches/undercalm/ Log: Creating empty folder for undercalm

1 0

[commit] r2072 - freeswitch/branches/mishehu/src/mod/loggers/mod_cdr
by Freeswitch SVN 24 Jul '06

24 Jul '06

Author: mishehu Date: Mon Jul 24 00:50:44 2006 New Revision: 2072 Modified: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.cpp Log: One string comparison in BaseCDR not yet fixed for Win32. Modified: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.cpp Mon Jul 24 00:50:44 2006 @@ -310,8 +310,8 @@ // This one is for processing of supplemental chanvars void BaseCDR::process_channel_variables(const std::list<std::string>& stringlist, const std::list<std::string>& fixedlist, switch_channel_t *channel,bool repeat) { - std::string tempstring = stringlist.front(); - if(tempstring == "*") + std::string tempstring = "*"; + if(stringlist.front() == tempstring) { switch_hash_index_t *hi; void *val;

1 0

[commit] r2071 - freeswitch/branches/mishehu/src/mod/loggers/mod_cdr
by Freeswitch SVN 24 Jul '06

24 Jul '06

Author: mishehu Date: Mon Jul 24 00:47:50 2006 New Revision: 2071 Modified: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.cpp freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/pddcdr.cpp Log: Fixed two minor bugs found when building BaseCDR on Win32. Modified: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.cpp Mon Jul 24 00:47:50 2006 @@ -172,8 +172,7 @@ void BaseCDR::parse_channel_variables_xconfig(std::string& unparsed,std::list<std::string>& chanvarlist,bool fixed) { std::string tempstring; - long j = 0; - for(std::string::size_type i = 0; j != -1; ) + for(std::string::size_type i = 0, j = 0; j != std::string::npos; ) { j = unparsed.find(',',i); if(j > 0) @@ -311,7 +310,8 @@ // This one is for processing of supplemental chanvars void BaseCDR::process_channel_variables(const std::list<std::string>& stringlist, const std::list<std::string>& fixedlist, switch_channel_t *channel,bool repeat) { - if(stringlist.front() == "*") + std::string tempstring = stringlist.front(); + if(tempstring == "*") { switch_hash_index_t *hi; void *val; Modified: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/pddcdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/pddcdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/pddcdr.cpp Mon Jul 24 00:47:50 2006 @@ -5,8 +5,7 @@ * <freeswitch AT cartissolutions.com> * * Description: This C++ source file describes the PddCDR class which handles formatting a CDR out to -* individual text files in a Perl Data Dumper format. It is named in honor of Anthony Minnesale, as he -* was the initial requester of this format. +* individual text files in a Perl Data Dumper format. * * * Version: MPL 1.1

1 0

[commit] r2069 - freeswitch/branches/yafmf
by Freeswitch SVN 24 Jul '06

24 Jul '06

Author: sphere Date: Mon Jul 24 00:21:02 2006 New Revision: 2069 Added: freeswitch/branches/yafmf/ Log: Creating empty folder for yafmf

1 0

[commit] r2068 - freeswitch/branches/mishehu/src/mod/loggers/mod_cdr
by Freeswitch SVN 24 Jul '06

24 Jul '06

Author: mishehu Date: Mon Jul 24 00:13:57 2006 New Revision: 2068 Added: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/pddcdr.cpp - copied unchanged from r2067, /freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/anthmcdr.cpp freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/pddcdr.h - copied unchanged from r2067, /freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/anthmcdr.h Removed: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/anthmcdr.cpp freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/anthmcdr.h Log: Renamed anthmcdr files to pddcdr as per MikeJ's request.

1 0

[commit] r2067 - freeswitch/branches/mishehu/src/mod/loggers/mod_cdr
by Freeswitch SVN 24 Jul '06

24 Jul '06

Author: mishehu Date: Mon Jul 24 00:13:01 2006 New Revision: 2067 Modified: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/Makefile freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/README freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/anthmcdr.cpp freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/anthmcdr.h Log: Renaming of AnthmCDR and all its related files/settings to PddCDR for Perl Data Dumper, at MikeJ's request Modified: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/Makefile ============================================================================== --- freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/Makefile (original) +++ freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/Makefile Mon Jul 24 00:13:01 2006 @@ -1,7 +1,7 @@ LDFLAGS += -I/usr/include/mysql -L/usr/lib64/mysql -lmysqlclient -lz -lcrypt -lnsl -lm -lssl -lcrypto CFLAGS += -I/usr/include/mysql -L/usr/lib64/mysql CPPCC = g++ -OBJS=cdrcontainer.o basecdr.o baseregistry.o mysqlcdr.o +OBJS=cdrcontainer.o basecdr.o baseregistry.o mysqlcdr.o pddcdr.o all: depends $(OBJS) $(MODNAME).$(DYNAMIC_LIB_EXTEN) Modified: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/README ============================================================================== --- freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/README (original) +++ freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/README Mon Jul 24 00:13:01 2006 @@ -40,10 +40,10 @@ <param name="chanvars_supp" value=""/> value is a comma separated list of supplemental channel variables to log. It can be a wildcard (*). (optional) <param name="repeat_fixed_in_supp" value=""/> value is a 0 for no, 1 for yes, and is for the case that you might want any fixed channel variables to be repeated in the supplemental list. -Class: AnthmCDR, located in anthmcdr.h and anthmcdr.cpp +Class: PddCDR, located in pddcdr.h and pddcdr.cpp Description: This is the Perl Data Dumper output class. It writes each record to an individual text file containing all the information. It does not distinguish between fixed and supplemental channel variables. If you are running freeswitch in a high volume environment, it is important to note that these individual files are small, often times between 750 and 1500 bytes. It is therefore recommended to use a partition with small cluster sizes or (on systems supporting) on reiserfs or reiser4 filesystems which are both excellent handlers of large numbers of small files. -Configuration: Section name: <anthmcdr> +Configuration: Section name: <pddcdr> <param name="path" value=""/> value is the path where you want the output files (required) <param name="chanvars" value=""/> value is a comma separated list of channel variables to log. It can accept a wildcard (*) (optional) @@ -71,11 +71,11 @@ A: Here is an excerpt from the freeswitch XML configuration file: <configuration name="mod_cdr.conf" description="CDR Configuration"> - <anthmcdr> - <param name="path" value="/work/temp/anthmcdr"/> + <pddcdr> + <param name="path" value="/work/temp/pddcdr"/> <param name="chanvars" value="username,accountcode"/> <param name="chanvars_fixed" value="*"/> - </anthmcdr> + </pddcdr> <csvcdr> <param name="path" value="/work/temp/csvcdr"/> <param name="size_limit" value="25"/> Modified: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/anthmcdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/anthmcdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/anthmcdr.cpp Mon Jul 24 00:13:01 2006 @@ -4,7 +4,7 @@ * Copyright 2006, Author: Yossi Neiman, president of Cartis Solutions, Inc. * <freeswitch AT cartissolutions.com> * -* Description: This C++ source file describes the AnthmCDR class which handles formatting a CDR out to +* Description: This C++ source file describes the PddCDR class which handles formatting a CDR out to * individual text files in a Perl Data Dumper format. It is named in honor of Anthony Minnesale, as he * was the initial requester of this format. * @@ -23,21 +23,21 @@ * The Core API is the FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application by * Anthony Minnesale II <anthmct(a)yahoo.com> * -* anthmcdr.cpp +* pddcdr.cpp * */ #include <switch.h> -#include "anthmcdr.h" +#include "pddcdr.h" -AnthmCDR::AnthmCDR() : BaseCDR() +PddCDR::PddCDR() : BaseCDR() { memset(formattedcallstartdate,0,100); memset(formattedcallanswerdate,0,100); memset(formattedcallenddate,0,100); } -AnthmCDR::AnthmCDR(switch_mod_cdr_newchannel_t *newchannel) : BaseCDR(newchannel) +PddCDR::PddCDR(switch_mod_cdr_newchannel_t *newchannel) : BaseCDR(newchannel) { memset(formattedcallstartdate,0,100); memset(formattedcallanswerdate,0,100); @@ -69,7 +69,7 @@ outputfile_name.append(callenddate_forfile); // Make sorting a bit easier, kinda like Maildir does outputfile_name.append("."); outputfile_name.append(myuuid); // The goal is to have a resulting filename of "/path/to/myuuid" - outputfile_name.append(".atm"); // The extension is in honor of anthm + outputfile_name.append(".pdd"); // .pdd - "perl data dumper" outputfile.open(outputfile_name.c_str()); @@ -78,25 +78,25 @@ } } -AnthmCDR::~AnthmCDR() +PddCDR::~PddCDR() { outputfile.close(); } -bool AnthmCDR::activated=0; -bool AnthmCDR::logchanvars=0; -bool AnthmCDR::connectionstate=0; -std::string AnthmCDR::outputfile_path; -std::list<std::string> AnthmCDR::chanvars_fixed_list; -std::list<std::string> AnthmCDR::chanvars_supp_list; +bool PddCDR::activated=0; +bool PddCDR::logchanvars=0; +bool PddCDR::connectionstate=0; +std::string PddCDR::outputfile_path; +std::list<std::string> PddCDR::chanvars_fixed_list; +std::list<std::string> PddCDR::chanvars_supp_list; -void AnthmCDR::connect(switch_xml_t& cfg, switch_xml_t& xml, switch_xml_t& settings, switch_xml_t& param) +void PddCDR::connect(switch_xml_t& cfg, switch_xml_t& xml, switch_xml_t& settings, switch_xml_t& param) { - switch_console_printf(SWITCH_CHANNEL_LOG, "AnthmCDR::connect() - Loading configuration file.\n"); + switch_console_printf(SWITCH_CHANNEL_LOG, "PddCDR::connect() - Loading configuration file.\n"); activated = 0; // Set it as inactive initially connectionstate = 0; // Initialize it to false to show that we aren't yet connected. - if ((settings = switch_xml_child(cfg, "anthmcdr"))) + if ((settings = switch_xml_child(cfg, "pddcdr"))) { int count_config_params = 0; // Need to make sure all params are set before we load for (param = switch_xml_child(settings, "param"); param; param = param->next) @@ -126,26 +126,26 @@ } else if (!strcmp(var, "chanvars_fixed")) { - switch_console_printf(SWITCH_CHANNEL_LOG,"AnthmCDR has no need for a fixed or supplemental list of channel variables due to the nature of the format. Please use the setting parameter of \"chanvars\" instead and try again.\n"); + switch_console_printf(SWITCH_CHANNEL_LOG,"PddCDR has no need for a fixed or supplemental list of channel variables due to the nature of the format. Please use the setting parameter of \"chanvars\" instead and try again.\n"); } else if (!strcmp(var, "chanvars_supp")) { - switch_console_printf(SWITCH_CHANNEL_LOG,"AnthmCDR has no need for a fixed or supplemental list of channel variables due to the nature of the format. Please use the setting parameter of \"chanvars\" instead and try again.\n"); + switch_console_printf(SWITCH_CHANNEL_LOG,"PddCDR has no need for a fixed or supplemental list of channel variables due to the nature of the format. Please use the setting parameter of \"chanvars\" instead and try again.\n"); } } if(count_config_params > 0) activated = 1; else - switch_console_printf(SWITCH_CHANNEL_LOG,"AnthmCDR::connect(): You did not specify the minimum parameters for using this module. You must specify at least a path to have the records logged to.\n"); + switch_console_printf(SWITCH_CHANNEL_LOG,"PddCDR::connect(): You did not specify the minimum parameters for using this module. You must specify at least a path to have the records logged to.\n"); } } -bool AnthmCDR::process_record() +bool PddCDR::process_record() { bool retval = 0; if(!outputfile) - switch_console_printf(SWITCH_CHANNEL_LOG, "AnthmCDR::process_record(): Unable to open file %s to commit the call record to. Invalid path name, invalid permissions, or no space available?\n",outputfile_name.c_str()); + switch_console_printf(SWITCH_CHANNEL_LOG, "PddCDR::process_record(): Unable to open file %s to commit the call record to. Invalid path name, invalid permissions, or no space available?\n",outputfile_name.c_str()); else { // Format the call record and proceed from here... @@ -188,24 +188,24 @@ return retval; } -bool AnthmCDR::is_activated() +bool PddCDR::is_activated() { return activated; } -void AnthmCDR::tempdump_record() +void PddCDR::tempdump_record() { } -void AnthmCDR::reread_tempdumped_records() +void PddCDR::reread_tempdumped_records() { } -void AnthmCDR::disconnect() +void PddCDR::disconnect() { - switch_console_printf(SWITCH_CHANNEL_LOG,"Shutting down AnthmCDR... Done!"); + switch_console_printf(SWITCH_CHANNEL_LOG,"Shutting down PddCDR... Done!"); } -AUTO_REGISTER_BASECDR(AnthmCDR); +AUTO_REGISTER_BASECDR(PddCDR); Modified: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/anthmcdr.h ============================================================================== --- freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/anthmcdr.h (original) +++ freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/anthmcdr.h Mon Jul 24 00:13:01 2006 @@ -4,9 +4,8 @@ * Copyright 2006, Author: Yossi Neiman, president of Cartis Solutions, Inc. * <freeswitch AT cartissolutions.com> * -* Description: This C++ header file describes the AnthmCDR class which handles formatting a CDR out to -* individual text files in a Perl Data Dumper format. It is named in honor of Anthony Minnesale, as he -* was the initial requester of this format. +* Description: This C++ header file describes the PddCDR class which handles formatting a CDR out to +* individual text files in a Perl Data Dumper format. * * * Version: MPL 1.1 @@ -23,7 +22,7 @@ * The Core API is the FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application by * Anthony Minnesale II <anthmct(a)yahoo.com> * -* anthmcdr.h +* pddcdr.h * */ @@ -34,15 +33,15 @@ #include <fstream> #include <list> -#ifndef ANTHMCDR -#define ANTHMCDR +#ifndef PDDCDR +#define PDDMCDR -class AnthmCDR : public BaseCDR { +class PddCDR : public BaseCDR { public: - AnthmCDR(); - AnthmCDR(switch_mod_cdr_newchannel_t *newchannel); - //AnthmCDR(const AnthmCDR& copyFrom); - virtual ~AnthmCDR(); + PddCDR(); + PddCDR(switch_mod_cdr_newchannel_t *newchannel); + //PddCDR(const PddCDR& copyFrom); + virtual ~PddCDR(); virtual bool process_record(); virtual void connect(switch_xml_t& cfg, switch_xml_t& xml, switch_xml_t& settings, switch_xml_t& param); // connect and disconnect need to be static because we're persisting connections until shutdown virtual void disconnect();

1 0

[commit] r2066 - freeswitch/branches/mishehu/src/mod/loggers/mod_cdr
by Freeswitch SVN 24 Jul '06

24 Jul '06

Author: mishehu Date: Sun Jul 23 23:49:20 2006 New Revision: 2066 Removed: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/syslogcdr.cpp freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/syslogcdr.h Modified: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/Makefile Log: Removed old testing syslogcdr source files, removed from Makefile. Modified: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/Makefile ============================================================================== --- freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/Makefile (original) +++ freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/Makefile Sun Jul 23 23:49:20 2006 @@ -1,7 +1,7 @@ LDFLAGS += -I/usr/include/mysql -L/usr/lib64/mysql -lmysqlclient -lz -lcrypt -lnsl -lm -lssl -lcrypto CFLAGS += -I/usr/include/mysql -L/usr/lib64/mysql CPPCC = g++ -OBJS=cdrcontainer.o basecdr.o baseregistry.o mysqlcdr.o syslogcdr.o +OBJS=cdrcontainer.o basecdr.o baseregistry.o mysqlcdr.o all: depends $(OBJS) $(MODNAME).$(DYNAMIC_LIB_EXTEN)

1 0

[commit] r2065 - freeswitch/branches/mishehu/src/mod/loggers/mod_cdr
by Freeswitch SVN 24 Jul '06

24 Jul '06

Author: mishehu Date: Sun Jul 23 21:08:50 2006 New Revision: 2065 Modified: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/anthmcdr.cpp freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/anthmcdr.h Log: Cleaned up file generation a bit for AnthmCDR. Modified: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/anthmcdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/anthmcdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/anthmcdr.cpp Sun Jul 23 21:08:50 2006 @@ -54,15 +54,16 @@ switch_time_exp_lt(&tempcallend, callenddate); // Format the times - size_t retsizecsd, retsizecad, retsizeced, retsizeceff; //csd == callstartdate, cad == callanswerdate, ced == callenddate, ceff == callenddate_forfile + size_t retsizecsd, retsizecad, retsizeced; //csd == callstartdate, cad == callanswerdate, ced == callenddate, ceff == callenddate_forfile char format[] = "%F %T"; switch_strftime(formattedcallstartdate,&retsizecsd,sizeof(formattedcallstartdate),format,&tempcallstart); switch_strftime(formattedcallanswerdate,&retsizecad,sizeof(formattedcallanswerdate),format,&tempcallanswer); switch_strftime(formattedcallenddate,&retsizeced,sizeof(formattedcallenddate),format,&tempcallend); - char format_forfile[] = "%s"; - char callenddate_forfile[25]; - switch_strftime(callenddate_forfile,&retsizeceff,sizeof(callenddate_forfile),format_forfile,&tempcallend); + std::ostringstream ostring; + ostring << (callenddate/1000000); + std::string callenddate_forfile = ostring.str(); + outputfile_name = outputfile_path; outputfile_name.append(SWITCH_PATH_SEPARATOR); outputfile_name.append(callenddate_forfile); // Make sorting a bit easier, kinda like Maildir does Modified: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/anthmcdr.h ============================================================================== --- freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/anthmcdr.h (original) +++ freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/anthmcdr.h Sun Jul 23 21:08:50 2006 @@ -30,6 +30,7 @@ #include "baseregistry.h" #include <switch.h> #include <iostream> +#include <sstream> #include <fstream> #include <list>

1 0

[commit] r2064 - freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip
by Freeswitch SVN 23 Jul '06

23 Jul '06

Author: stkn Date: Sun Jul 23 19:59:57 2006 New Revision: 2064 Modified: freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip.c Log: Only use IP addresses in SIP messages. Modified: freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip.c ============================================================================== --- freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip.c (original) +++ freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip.c Sun Jul 23 19:59:57 2006 @@ -1273,7 +1273,7 @@ sdp->origin.version = sdp->origin.id = 0; sdp->origin.net_type = pj_str( "IN" ); sdp->origin.addr_type = pj_str( "IP4" ); - sdp->origin.addr = *pj_gethostname(); + sdp->origin.addr = pj_str( profile->local_addr ); sdp->name = pj_str( "pjsip" ); sdp->conn = pj_pool_zalloc( pool, sizeof(pjmedia_sdp_conn) ); @@ -1683,16 +1683,22 @@ #endif /* */ { - const pj_str_t *hostname; - pj_sockaddr_in tmp_addr; char *addr; char local_uri[64]; - hostname = pj_gethostname(); - pj_sockaddr_in_init( &tmp_addr, hostname, 0 ); - addr = pj_inet_ntoa( tmp_addr.sin_addr ); + /* if bind addr is 0.0.0.0 use local hostname to get the primary ip */ + if( !profile->sip_addr.sin_addr.s_addr ) { + const pj_str_t *hostname; + pj_sockaddr_in tmp_addr; + + hostname = pj_gethostname(); + pj_sockaddr_in_init( &tmp_addr, hostname, 0 ); + addr = pj_inet_ntoa( tmp_addr.sin_addr ); + } else + addr = profile->sip_ip; + pj_ansi_strcpy( profile->local_addr, addr ); - pj_ansi_sprintf( local_uri, "sip:%s:%d", hostname->ptr, profile->sip_port ); + pj_ansi_sprintf( local_uri, "sip:%s:%d", addr, profile->sip_port ); pj_strdup2( pjsip_pool, &profile->local_uri, local_uri ); pj_strdup2( pjsip_pool, &profile->local_contact, local_uri ); }

1 0