April 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4920 - freeswitch/trunk/src/mod/event_handlers/mod_cdr
by Freeswitch SVN 12 Apr '07

12 Apr '07

Author: mikej Date: Thu Apr 12 14:14:30 2007 New Revision: 4920 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/curlcdr.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/odbccdr.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/sqlitecdr.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.cpp Log: change switch_console_printf to switch_log_printf in mod_cdr. Patch from MODAPP-6, thanks Marcel. 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 Thu Apr 12 14:14:30 2007 @@ -24,6 +24,7 @@ * Contributor(s): * * Yossi Neiman <freeswitch AT cartissolutions.com> + * Marcel Barbulescu <marcelbarbulescu(a)gmail.com> * * Description: This C++ source file describes the BaseCDR class that all other CDR classes inherit from. * It handles the bulk of the processing of data from the switch_channel_t objects. @@ -214,7 +215,7 @@ { if(fixed) { - switch_console_printf(SWITCH_CHANNEL_LOG,"Wildcards are not allow in the fixed chanvars list. Item removed.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Wildcards are not allow in the fixed chanvars list. Item removed.\n"); iItr = chanvarlist.erase(iItr); } else @@ -271,19 +272,19 @@ sql_type = CDR_TINY; break; default: - switch_console_printf(SWITCH_CHANNEL_LOG,"Valid fixed channel variable types are x (decimal), d (double), i (integer), t (tiny), s (string). You tried to give a type of %s to chanvar %s.\nReverting this chanvar type to a string type.\n",tempstring2.c_str(),tempstring.c_str()); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Valid fixed channel variable types are x (decimal), d (double), i (integer), t (tiny), s (string). You tried to give a type of %s to chanvar %s.\nReverting this chanvar type to a string type.\n", tempstring2.c_str(), tempstring.c_str()); sql_type = CDR_STRING; } } else { - switch_console_printf(SWITCH_CHANNEL_LOG,"Valid fixed channel variable types are x (decimal), d (double), i (integer), t (tiny), s (string). You tried to give a type of %s to chanvar %s.\nReverting this chanvar type to a string type.\n",tempstring2.c_str(),tempstring.c_str()); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Valid fixed channel variable types are x (decimal), d (double), i (integer), t (tiny), s (string). You tried to give a type of %s to chanvar %s.\nReverting this chanvar type to a string type.\n", tempstring2.c_str(), tempstring.c_str()); sql_type = CDR_STRING; } } else { - switch_console_printf(SWITCH_CHANNEL_LOG,"No parameter set, for channel variable %s, using default type of string.\n",iItr->c_str()); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No parameter set, for channel variable %s, using default type of string.\n", iItr->c_str()); sql_type = CDR_STRING; tempstring = *iItr; } Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp Thu Apr 12 14:14:30 2007 @@ -24,6 +24,7 @@ * Contributor(s): * * Yossi Neiman <freeswitch AT cartissolutions.com> + * Marcel Barbulescu <marcelbarbulescu(a)gmail.com> * * Description: This C++ source file describes the CDRContainer singleton object used by mod_cdr to control * the creation, processing, and destruction of various CDR logger objects. @@ -53,7 +54,7 @@ newchannel = 0; 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_ERROR, "open of %s failed\n", configfile); else { BaseRegistry& registry(BaseRegistry::get()); @@ -89,7 +90,7 @@ ptr->disconnect(); } - switch_console_printf(SWITCH_CHANNEL_LOG,"mod_cdr shutdown gracefully."); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "mod_cdr shutdown gracefully."); } #ifdef SWITCH_QUEUE_ENHANCED @@ -225,7 +226,7 @@ basecdr_creator func = *it; BaseCDR* newloggerobject = func(newchannel); - switch_console_printf(SWITCH_CHANNEL_LOG,"Adding a new logger object to the queue.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Adding a new logger object to the queue.\n"); switch_queue_push(cdrqueue,newloggerobject); } newchannel->callerprofile = newchannel->callerprofile->next; Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp Thu Apr 12 14:14:30 2007 @@ -24,6 +24,7 @@ * Contributor(s): * * Yossi Neiman <freeswitch AT cartissolutions.com> + * Marcel Barbulescu <marcelbarbulescu(a)gmail.com> * * Description: This C++ source file describes the CsvCDR class that handles processing CDRs to a CSV format. * This is the standard CSV module, and has a list of predefined variables to log out which can be @@ -101,7 +102,7 @@ void CsvCDR::connect(switch_xml_t& cfg, switch_xml_t& xml, switch_xml_t& settings, switch_xml_t& param) { - switch_console_printf(SWITCH_CHANNEL_LOG, "CsvCDR::connect() - Loading configuration file.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CsvCDR::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. @@ -170,7 +171,7 @@ convert_time = switch_time_exp_lt; else { - switch_console_printf(SWITCH_CHANNEL_LOG,"Invalid configuration parameter for timezone. Possible values are utc and local. You entered: %s\nDefaulting to local.\n",val); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid configuration parameter for timezone. Possible values are utc and local. You entered: %s\nDefaulting to local.\n", val); convert_time = switch_time_exp_lt; } } @@ -182,11 +183,11 @@ if(outputfile.good()) { activated = 1; - switch_console_printf(SWITCH_CHANNEL_LOG,"CsvCDR activated, log rotation will occur at or after %d MB\n",(int)(filesize_limit >> 20)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CsvCDR activated, log rotation will occur at or after %d MB\n", (int)(filesize_limit >> 20)); } } else - switch_console_printf(SWITCH_CHANNEL_LOG,"CsvCDR::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_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "CsvCDR::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"); } } @@ -228,7 +229,7 @@ outputfile.open(filename.c_str(),std::ios_base::app|std::ios_base::binary); if(outputfile.fail()) { - switch_console_printf(SWITCH_CHANNEL_LOG,"Could not open the CSV file %s . CsvCDR logger will not be functional until this is resolved and a reload is issued. Failbit is set to %d.\n",filename.c_str(),outputfile.fail()); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not open the CSV file %s . CsvCDR logger will not be functional until this is resolved and a reload is issued. Failbit is set to %d.\n", filename.c_str(), outputfile.fail()); activated = 0; } else @@ -332,7 +333,7 @@ chanvars_fixed_list.clear(); chanvars_supp_list.clear(); connectionstate = 0; - switch_console_printf(SWITCH_CHANNEL_LOG,"Shutting down CsvCDR... Done!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Shutting down CsvCDR... Done!\n"); } AUTO_REGISTER_BASECDR(CsvCDR); Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/curlcdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/curlcdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/curlcdr.cpp Thu Apr 12 14:14:30 2007 @@ -28,6 +28,7 @@ * Yossi Neiman <freeswitch AT cartissolutions.com> * Bret McDanel <trixter AT 0xdecafbad.com> * Anthony Minessale II <anthmct(a)yahoo.com> + * Marcel Barbulescu <marcelbarbulescu(a)gmail.com> * * Description: This C++ source file describes the CurlCDR class that handles processing CDRs to HTTP endpoint. * This is the standard Curl module, and has a list of predefined variables to log out which can be @@ -106,14 +107,14 @@ void CurlCDR::connect(switch_xml_t& cfg, switch_xml_t& xml, switch_xml_t& settings, switch_xml_t& param) { - switch_console_printf(SWITCH_CHANNEL_LOG, "CurlCDR::connect() - Loading configuration file.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CurlCDR::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. - switch_console_printf(SWITCH_CHANNEL_LOG,"Checking to see if curlcdr is valid\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking to see if curlcdr is valid\n"); if ((settings = switch_xml_child(cfg, "curlcdr"))) { - switch_console_printf(SWITCH_CHANNEL_LOG,"curlcdr appears to be!!!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "curlcdr appears to be!!!\n"); 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) { @@ -168,7 +169,7 @@ convert_time = switch_time_exp_lt; else { - switch_console_printf(SWITCH_CHANNEL_LOG,"Invalid configuration parameter for timezone. Possible values are utc and local. You entered: %s\nDefaulting to local.\n",val); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid configuration parameter for timezone. Possible values are utc and local. You entered: %s\nDefaulting to local.\n", val); convert_time = switch_time_exp_lt; } } @@ -179,13 +180,13 @@ if(strlen(gateway_url)) { activated = 1; - switch_console_printf(SWITCH_CHANNEL_LOG,"CurlCDR activated"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CurlCDR activated"); } else - switch_console_printf(SWITCH_CHANNEL_LOG,"CurlCDR::connect(): You must specify a gateway_url to have the records logged to.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "CurlCDR::connect(): You must specify a gateway_url to have the records logged to.\n"); } else - switch_console_printf(SWITCH_CHANNEL_LOG,"CurlCDR::connect(): You did not specify the minimum parameters for using this module. You must specify at least a gateway_url to have the records logged to.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "CurlCDR::connect(): You did not specify the minimum parameters for using this module. You must specify at least a gateway_url to have the records logged to.\n"); } } @@ -370,7 +371,7 @@ chanvars_fixed_list.clear(); chanvars_supp_list.clear(); connectionstate = 0; - switch_console_printf(SWITCH_CHANNEL_LOG,"Shutting down CurlCDR... Done!"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Shutting down CurlCDR... Done!"); } AUTO_REGISTER_BASECDR(CurlCDR); Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp Thu Apr 12 14:14:30 2007 @@ -24,6 +24,7 @@ * Contributor(s): * * Yossi Neiman <freeswitch AT cartissolutions.com> + * Marcel Barbulescu <marcelbarbulescu(a)gmail.com> * * Description: This source file describes the most basic portions of the CDR module. These are the functions * and structures that the Freeswitch core looks for when opening up the DSO file to create the load, shutdown @@ -130,7 +131,7 @@ if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) { - switch_console_printf(SWITCH_CHANNEL_LOG, "OH OH - Can't swim, no pool\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "OH OH - Can't swim, no pool\n"); return SWITCH_STATUS_TERM; } @@ -144,7 +145,7 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_runtime(void) { RUNNING = 1; - switch_console_printf(SWITCH_CHANNEL_LOG, "mod_cdr made it to runtime. Wee!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "mod_cdr made it to runtime. Wee!\n"); newcdrcontainer->process_records(); return RUNNING ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_TERM; Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp Thu Apr 12 14:14:30 2007 @@ -24,6 +24,7 @@ * Contributor(s): * * Yossi Neiman <freeswitch AT cartissolutions.com> + * Marcel Barbulescu <marcelbarbulescu(a)gmail.com> * * Description: This C++ source file describes the MysqlCDR class which handles formatting a CDR out to * a MySQL 4.1.x or greater server using prepared statements. @@ -183,7 +184,7 @@ convert_time = switch_time_exp_lt; else { - switch_console_printf(SWITCH_CHANNEL_LOG,"Invalid configuration parameter for timezone. Possible values are utc and local. You entered: %s\nDefaulting to local.\n",val); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid configuration parameter for timezone. Possible values are utc and local. You entered: %s\nDefaulting to local.\n", val); convert_time = switch_time_exp_lt; } } @@ -192,7 +193,7 @@ if (count_config_params==4) activated = 1; else - switch_console_printf(SWITCH_CHANNEL_LOG,"You did not specify the minimum parameters for using this module. You must specify a hostname, username, password, and database to use MysqlCDR. You only supplied %d parameters.\n",count_config_params); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "You did not specify the minimum parameters for using this module. You must specify a hostname, username, password, and database to use MysqlCDR. You only supplied %d parameters.\n", count_config_params); if(activated) { @@ -241,7 +242,7 @@ if(mysql_real_connect(conn,hostname,username,password,dbname,0,NULL,0) == NULL) { const char *error1 = mysql_error(conn); - switch_console_printf(SWITCH_CHANNEL_LOG,"Cannot connect to MySQL Server. The error was: %s\n",error1); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot connect to MySQL Server. The error was: %s\n", error1); } else connectionstate = 1; @@ -446,7 +447,7 @@ break; } default: - switch_console_printf(SWITCH_CHANNEL_LOG,"We should not get to this point in this switch/case statement.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "We should not get to this point in this switch/case statement.\n"); } i++; } @@ -466,13 +467,13 @@ case CR_SERVER_GONE_ERROR: case CR_SERVER_LOST: { - switch_console_printf(SWITCH_CHANNEL_LOG,"We lost connection to the MySQL server. Trying to reconnect.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "We lost connection to the MySQL server. Trying to reconnect.\n"); connect_to_database(); break; } default: { - switch_console_printf(SWITCH_CHANNEL_LOG,"We have encountered an unknown error when pinging the MySQL server. Attempting to reconnect anyways.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "We have encountered an unknown error when pinging the MySQL server. Attempting to reconnect anyways.\n"); connect_to_database(); } } @@ -485,10 +486,10 @@ if(mysql_stmt_error_code != 0) { errorstate = 1; - switch_console_printf(SWITCH_CHANNEL_LOG,"MysqlCDR::process_record() - Statement executed? Error: %d\n",mysql_stmt_error_code); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "MysqlCDR::process_record() - Statement executed? Error: %d\n", mysql_stmt_error_code); const char* mysql_stmt_error_string = mysql_stmt_error(stmt); - switch_console_printf(SWITCH_CHANNEL_LOG,"MySQL encountered error: %s\n",mysql_stmt_error_string); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "MySQL encountered error: %s\n", mysql_stmt_error_string); } else errorstate = 0; @@ -585,7 +586,7 @@ break; } default: - switch_console_printf(SWITCH_CHANNEL_LOG,"We should not get to this point in this switch/case statement.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "We should not get to this point in this switch/case statement.\n"); } bool* tempbool = (bool*) temp_chanvars_holder.front(); Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/odbccdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/odbccdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/odbccdr.cpp Thu Apr 12 14:14:30 2007 @@ -24,6 +24,7 @@ * Contributor(s): * * Yossi Neiman <freeswitch AT cartissolutions.com> + * Marcel Barbulescu <marcelbarbulescu(a)gmail.com> * * Description: This C++ source file describes the OdbcCDR class which handles formatting a CDR out to * an ODBC backend using prepared statements. @@ -201,7 +202,7 @@ convert_time = switch_time_exp_lt; else { - switch_console_printf(SWITCH_CHANNEL_LOG,"Invalid configuration parameter for timezone. Possible values are utc and local. You entered: %s\nDefaulting to local.\n",val); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid configuration parameter for timezone. Possible values are utc and local. You entered: %s\nDefaulting to local.\n", val); convert_time = switch_time_exp_lt; } } @@ -216,7 +217,7 @@ if (count_config_params==4) activated = 1; else - switch_console_printf(SWITCH_CHANNEL_LOG,"You did not specify the minimum parameters for using this module. You must specify a DSN,hostname, username, password, and database to use OdbcCDR. You only supplied %d parameters.\n",count_config_params); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "You did not specify the minimum parameters for using this module. You must specify a DSN,hostname, username, password, and database to use OdbcCDR. You only supplied %d parameters.\n", count_config_params); if(activated) { @@ -275,7 +276,7 @@ ODBC_res = SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, &ODBC_env); if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) { - switch_console_printf(SWITCH_CHANNEL_LOG,"Error allocating a new ODBC handle.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error allocating a new ODBC handle.\n"); connectionstate = 0; } } @@ -284,7 +285,7 @@ if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) { - switch_console_printf(SWITCH_CHANNEL_LOG,"Error with ODBCSetEnv\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error with ODBCSetEnv\n"); SQLFreeHandle(SQL_HANDLE_ENV, ODBC_env); connectionstate = 0; } @@ -293,7 +294,7 @@ if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) { - switch_console_printf(SWITCH_CHANNEL_LOG,"Error AllocHDB %d\n",ODBC_res); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error AllocHDB %d\n", ODBC_res); SQLFreeHandle(SQL_HANDLE_ENV, ODBC_env); connectionstate = 0; } @@ -306,14 +307,14 @@ ODBC_res = SQLConnect(ODBC_con, (SQLCHAR*)dsn, SQL_NTS, (SQLCHAR*)username, SQL_NTS, (SQLCHAR*)password, SQL_NTS); if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) { - switch_console_printf(SWITCH_CHANNEL_LOG,"Error connecting to the ODBC database on %d\n",ODBC_res); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error connecting to the ODBC database on %d\n", ODBC_res); SQLFreeHandle(SQL_HANDLE_DBC, ODBC_con); SQLFreeHandle(SQL_HANDLE_ENV, ODBC_env); connectionstate = 0; } else { - switch_console_printf(SWITCH_CHANNEL_LOG,"Connected to %s\n", dsn); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connected to %s\n", dsn); connectionstate = 1; } @@ -325,7 +326,7 @@ if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) { - switch_console_printf(SWITCH_CHANNEL_LOG,"Failure in allocating a prepared statement %d\n", ODBC_res); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failure in allocating a prepared statement %d\n", ODBC_res); SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt); } @@ -333,7 +334,7 @@ if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) { - switch_console_printf(SWITCH_CHANNEL_LOG,"Error in preparing a statement: %d\n", ODBC_res); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error in preparing a statement: %d\n", ODBC_res); SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt); } @@ -343,7 +344,7 @@ if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) { - switch_console_printf(SWITCH_CHANNEL_LOG,"Failure in allocating a prepared statement %d\n", ODBC_res); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failure in allocating a prepared statement %d\n", ODBC_res); SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt_chanvars); } @@ -351,7 +352,7 @@ if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) { - switch_console_printf(SWITCH_CHANNEL_LOG,"Error in preparing a statement: %d\n", ODBC_res); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error in preparing a statement: %d\n", ODBC_res); SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt); } } @@ -360,7 +361,7 @@ if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) { - switch_console_printf(SWITCH_CHANNEL_LOG,"Failure in allocating a prepared statement %d\n", ODBC_res); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failure in allocating a prepared statement %d\n", ODBC_res); SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt_ping); } @@ -368,7 +369,7 @@ if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) { - switch_console_printf(SWITCH_CHANNEL_LOG,"Error in preparing a statement: %d\n", ODBC_res); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error in preparing a statement: %d\n", ODBC_res); SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt_ping); } @@ -400,7 +401,7 @@ if(ODBC_res != SQL_SUCCESS && ODBC_res != SQL_SUCCESS_WITH_INFO) { // Try to reconnect and reprepare - switch_console_printf(SWITCH_CHANNEL_LOG,"Error pinging the ODBC backend. Attempt #%d to reconnect.\n",count+1); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Error pinging the ODBC backend. Attempt #%d to reconnect.\n", count+1); connect_to_database(); } } @@ -502,7 +503,7 @@ break; } default: - switch_console_printf(SWITCH_CHANNEL_LOG,"We should not get to this point in this switch/case statement.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "We should not get to this point in this switch/case statement.\n"); } i++; } @@ -585,7 +586,7 @@ break; } default: - switch_console_printf(SWITCH_CHANNEL_LOG,"We should not get to this point in this switch/case statement.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "We should not get to this point in this switch/case statement.\n"); } } } Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.cpp Thu Apr 12 14:14:30 2007 @@ -24,6 +24,7 @@ * Contributor(s): * * Yossi Neiman <freeswitch AT cartissolutions.com> + * Marcel Barbulescu <marcelbarbulescu(a)gmail.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. @@ -101,7 +102,7 @@ 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, "PddCDR::connect() - Loading configuration file.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "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. @@ -135,11 +136,11 @@ } else if (!strcmp(var, "chanvars_fixed")) { - 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"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "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,"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"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "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,"timezone")) { @@ -149,7 +150,7 @@ convert_time = switch_time_exp_lt; else { - switch_console_printf(SWITCH_CHANNEL_LOG,"Invalid configuration parameter for timezone. Possible values are utc and local. You entered: %s\nDefaulting to local.\n",val); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid configuration parameter for timezone. Possible values are utc and local. You entered: %s\nDefaulting to local.\n", val); convert_time = switch_time_exp_lt; } } @@ -158,7 +159,7 @@ if(count_config_params > 0) activated = 1; else - 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"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "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"); } } @@ -168,7 +169,7 @@ bool retval = 0; if(!outputfile) - 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()); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "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... @@ -247,7 +248,7 @@ logchanvars = 0; outputfile_path.clear(); chanvars_supp_list.clear(); - switch_console_printf(SWITCH_CHANNEL_LOG,"Shutting down PddCDR... Done!"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Shutting down PddCDR... Done!"); } AUTO_REGISTER_BASECDR(PddCDR); Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/sqlitecdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/sqlitecdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/sqlitecdr.cpp Thu Apr 12 14:14:30 2007 @@ -24,6 +24,7 @@ * Contributor(s): * * Yossi Neiman <freeswitch AT cartissolutions.com> + * Marcel Barbulescu <marcelbarbulescu(a)gmail.com> * * Description: his C++ header file describes the SqliteCDR class which handles formatting a CDR out to * a SQLite database using prepared statements. @@ -141,7 +142,7 @@ use_utc_time = 0; else { - switch_console_printf(SWITCH_CHANNEL_LOG,"Invalid configuration parameter for timezone. Possible values are utc and local. You entered: %s\nDefaulting to local.\n",val); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid configuration parameter for timezone. Possible values are utc and local. You entered: %s\nDefaulting to local.\n", val); use_utc_time = 0; } } @@ -150,7 +151,7 @@ if (count_config_params==1) activated = 1; else - switch_console_printf(SWITCH_CHANNEL_LOG,"You did not specify the minimum parameters for using this module. You must specify an explicit (complete) path to the location of the database file in order to use SqliteCDR.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "You did not specify the minimum parameters for using this module. You must specify an explicit (complete) path to the location of the database file in order to use SqliteCDR.\n"); if(activated) { @@ -192,7 +193,7 @@ if(sql_rc != SWITCH_CORE_DB_OK) { - switch_console_printf(SWITCH_CHANNEL_LOG,"There was an error opening database filename %s. The error was: %s. SqliteCDR logging has been disabled until the problem is resolved and modcdr_reload is initiated.\n",db_filename.c_str(),switch_core_db_errmsg(db)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "There was an error opening database filename %s. The error was: %s. SqliteCDR logging has been disabled until the problem is resolved and modcdr_reload is initiated.\n", db_filename.c_str(), switch_core_db_errmsg(db)); activated = 0; switch_core_db_close(db); } @@ -223,13 +224,13 @@ } } else - switch_console_printf(SWITCH_CHANNEL_LOG,"There was an error in executing query %s: The error was %s.\n",sql_query_check_tables,errormessage); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "There was an error in executing query %s: The error was %s.\n", sql_query_check_tables, errormessage); switch_core_db_free_table(result); if(!temp_sql_tables["freeswitchcdr"]) { - switch_console_printf(SWITCH_CHANNEL_LOG,"Creating the freeswitchcdr table in the SQLite mod_cdr database file.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Creating the freeswitchcdr table in the SQLite mod_cdr database file.\n"); // Must create the missing freeswitchcdr table. char sql_query_create_freeswitchcdr[] = "CREATE TABLE freeswitchcdr (\n" "callid INTEGER PRIMARY KEY AUTOINCREMENT,\n" @@ -262,7 +263,7 @@ if(!temp_sql_tables["chanvars"]) { - switch_console_printf(SWITCH_CHANNEL_LOG,"Creating the chanvars table in the SQLite mod_cdr database file.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Creating the chanvars table in the SQLite mod_cdr database file.\n"); // Must create the missing chanvars table. char sql_query_create_chanvars[] = "CREATE TABLE chanvars (\n" "callid INTEGER default 0,\n" @@ -321,13 +322,13 @@ tempstring2 = resultstring.substr(i,(j-i)); freeswitchcdr_columns[tempstring1] = tempstring2; - // switch_console_printf(SWITCH_CHANNEL_LOG,"tempstring1 = %s, tempstring2 = %s\n",tempstring1.c_str(),tempstring2.c_str()); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "tempstring1 = %s, tempstring2 = %s\n", tempstring1.c_str(), tempstring2.c_str()); if(resultstring.find('\n',j+1) == (j+1)) j++; i = j+1; } else - switch_console_printf(SWITCH_CHANNEL_LOG,"There has been a parsing problem with the freeswitchcdr schema.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "There has been a parsing problem with the freeswitchcdr schema.\n"); } } } @@ -346,9 +347,9 @@ case CDR_TINY: if(freeswitchcdr_columns.find(*iItr) != freeswitchcdr_columns.end()) { - //switch_console_printf(SWITCH_CHANNEL_LOG,"freeswitchcdr_columns[%s] == %s.\n",iItr->c_str(),freeswitchcdr_columns[*iItr].c_str()); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "freeswitchcdr_columns[%s] == %s.\n", iItr->c_str(), freeswitchcdr_columns[*iItr].c_str()); if(freeswitchcdr_columns[*iItr].find("INTEGER",0) == std::string::npos) - switch_console_printf(SWITCH_CHANNEL_LOG,"WARNING: SqliteCDR freeswitchcdr table column type mismatch: Column \"%s\" is not of an INTEGER type. This is not necessarily fatal, but may result in unexpected behavior.\n",iItr->c_str()); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "SqliteCDR freeswitchcdr table column type mismatch: Column \"%s\" is not of an INTEGER type. This is not necessarily fatal, but may result in unexpected behavior.\n", iItr->c_str()); } else freeswitchcdr_add_columns[*iItr] = "INTEGER"; @@ -357,7 +358,7 @@ if(freeswitchcdr_columns.find(*iItr) != freeswitchcdr_columns.end()) { if(freeswitchcdr_columns[*iItr].find("REAL",0) == std::string::npos) - switch_console_printf(SWITCH_CHANNEL_LOG,"WARNING: SqliteCDR freeswitchcdr table column type mismatch: Column \"%s\" is not of a REAL type. This is not necessarily fatal, but may result in unexpected behavior.\n",iItr->c_str()); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "SqliteCDR freeswitchcdr table column type mismatch: Column \"%s\" is not of a REAL type. This is not necessarily fatal, but may result in unexpected behavior.\n", iItr->c_str()); } else freeswitchcdr_add_columns[*iItr] = "REAL"; @@ -367,19 +368,19 @@ if(freeswitchcdr_columns.find(*iItr) != freeswitchcdr_columns.end()) { if(freeswitchcdr_columns[*iItr].find("TEXT",0) == std::string::npos) - switch_console_printf(SWITCH_CHANNEL_LOG,"WARNING: SqliteCDR freeswitchcdr table column type mismatch: Column \"%s\" is not of a TEXT type. This is not necessarily fatal, but may result in unexpected behavior.\n",iItr->c_str()); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "SqliteCDR freeswitchcdr table column type mismatch: Column \"%s\" is not of a TEXT type. This is not necessarily fatal, but may result in unexpected behavior.\n", iItr->c_str()); } else freeswitchcdr_add_columns[*iItr] = "TEXT"; break; default: - switch_console_printf(SWITCH_CHANNEL_LOG,"Oh bother, I should not have fallen into this hole in the switch/case statement. Please notify the author.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Oh bother, I should not have fallen into this hole in the switch/case statement. Please notify the author.\n"); } } if(freeswitchcdr_add_columns.size()) { - switch_console_printf(SWITCH_CHANNEL_LOG,"Updating the freeswitchcdr table schema.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Updating the freeswitchcdr table schema.\n"); std::string tempsql_freeswitchcdr_alter_table = "ALTER TABLE freeswitchcdr ADD "; std::map<std::string, std::string>::iterator iItr, iEnd; for(iItr = freeswitchcdr_add_columns.begin(), iEnd = freeswitchcdr_add_columns.end(); iItr != iEnd; iItr++) @@ -388,7 +389,7 @@ sql_query_freeswitchcdr_alter_table.append(iItr->first); sql_query_freeswitchcdr_alter_table.append(" "); sql_query_freeswitchcdr_alter_table.append(iItr->second); - switch_console_printf(SWITCH_CHANNEL_LOG,"Updating the freeswitchcdr table with the following SQL command: %s.\n",sql_query_freeswitchcdr_alter_table.c_str()); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Updating the freeswitchcdr table with the following SQL command: %s.\n", sql_query_freeswitchcdr_alter_table.c_str()); switch_core_db_exec(db, sql_query_freeswitchcdr_alter_table.c_str(), NULL, NULL, NULL); } } @@ -514,7 +515,7 @@ break; } default: - switch_console_printf(SWITCH_CHANNEL_LOG,"Oh bother, I should not have fallen into this hole in the switch/case statement. Please notify the author.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Oh bother, I should not have fallen into this hole in the switch/case statement. Please notify the author.\n"); } } } @@ -525,7 +526,7 @@ if(sql_rc == SWITCH_CORE_DB_BUSY) sql_rc = switch_core_db_step(stmt); else if (sql_rc == SWITCH_CORE_DB_ERROR || sql_rc == SWITCH_CORE_DB_MISUSE) - switch_console_printf(SWITCH_CHANNEL_LOG,"There was an error executing switch_core_db_step on SqliteCDR::stmt. The error was: %s\n",switch_core_db_errmsg(db)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "There was an error executing switch_core_db_step on SqliteCDR::stmt. The error was: %s\n", switch_core_db_errmsg(db)); } sql_rc = switch_core_db_reset(stmt); @@ -546,7 +547,7 @@ if(sql_rc == SWITCH_CORE_DB_BUSY) sql_rc = switch_core_db_step(stmt_chanvars); else if (sql_rc == SWITCH_CORE_DB_ERROR || sql_rc == SWITCH_CORE_DB_MISUSE) - switch_console_printf(SWITCH_CHANNEL_LOG,"There was an error executing switch_core_db_step on SqliteCDR::stmt_chanvars. The error was: %s\n",switch_core_db_errmsg(db)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "There was an error executing switch_core_db_step on SqliteCDR::stmt_chanvars. The error was: %s\n", switch_core_db_errmsg(db)); } switch_core_db_reset(stmt_chanvars); Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.cpp Thu Apr 12 14:14:30 2007 @@ -25,6 +25,7 @@ * * Yossi Neiman <freeswitch AT cartissolutions.com> * Ken Rice of Asteria Solutions Group, INC <ken AT asteriasgi.com> + * Marcel Barbulescu <marcelbarbulescu(a)gmail.com> * * Description: This C++ source file describes the XmlCDR class which handles formatting a CDR out to * individual text files in a XML format. @@ -103,7 +104,7 @@ void XmlCDR::connect(switch_xml_t& cfg, switch_xml_t& xml, switch_xml_t& settings, switch_xml_t& param) { - switch_console_printf(SWITCH_CHANNEL_LOG, "XmlCDR::connect() - Loading configuration file.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "XmlCDR::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. @@ -137,11 +138,11 @@ } else if (!strcmp(var, "chanvars_fixed")) { - switch_console_printf(SWITCH_CHANNEL_LOG,"XmlCDR 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_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "XmlCDR 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,"XmlCDR 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_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "XmlCDR 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,"timezone")) { @@ -151,7 +152,7 @@ convert_time = switch_time_exp_lt; else { - switch_console_printf(SWITCH_CHANNEL_LOG,"Invalid configuration parameter for timezone. Possible values are utc and local. You entered: %s\nDefaulting to local.\n",val); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid configuration parameter for timezone. Possible values are utc and local. You entered: %s\nDefaulting to local.\n", val); convert_time = switch_time_exp_lt; } } @@ -160,7 +161,7 @@ if(count_config_params > 0) activated = 1; else - switch_console_printf(SWITCH_CHANNEL_LOG,"XmlCDR::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_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "XmlCDR::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"); } } @@ -170,10 +171,10 @@ outputfile.open(outputfile_name.c_str()); if(!outputfile) - switch_console_printf(SWITCH_CHANNEL_LOG, "XmlCDR::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_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "XmlCDR::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 { - //switch_console_printf(SWITCH_CHANNEL_LOG, "XmlCDR::process_record(): Preping the CDR to %s.\n",outputfile_name.c_str()); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "XmlCDR::process_record(): Preping the CDR to %s.\n", outputfile_name.c_str()); // Format the call record and proceed from here... outputfile << "<?xml version=\"1.0\"?>" << std::endl; outputfile << "<document type=\"freeswitch-cdr/xml\">" << std::endl; @@ -215,7 +216,7 @@ } outputfile << "\t</chanvars>" << std::endl << "</document>" << std::endl << std::endl; - //switch_console_printf(SWITCH_CHANNEL_LOG, "XmlCDR::process_record(): Dumping the CDR to %s.\n",outputfile_name.c_str()); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "XmlCDR::process_record(): Dumping the CDR to %s.\n", outputfile_name.c_str()); retval = 1; } @@ -249,7 +250,7 @@ logchanvars = 0; outputfile_path.clear(); chanvars_supp_list.clear(); - switch_console_printf(SWITCH_CHANNEL_LOG,"Shutting down XmlCDR... Done!"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Shutting down XmlCDR... Done!"); } AUTO_REGISTER_BASECDR(XmlCDR);

1 0

[commit] r4919 - in freeswitch/trunk: libs/udns src/mod/applications/mod_enum
by Freeswitch SVN 11 Apr '07

11 Apr '07

Author: mikej Date: Wed Apr 11 10:37:40 2007 New Revision: 4919 Modified: freeswitch/trunk/libs/udns/udns_resolver.c freeswitch/trunk/src/mod/applications/mod_enum/Makefile Log: move udns build directly into the mod_enum makefile so it gets all our cflags Modified: freeswitch/trunk/libs/udns/udns_resolver.c ============================================================================== --- freeswitch/trunk/libs/udns/udns_resolver.c (original) +++ freeswitch/trunk/libs/udns/udns_resolver.c Wed Apr 11 10:37:40 2007 @@ -46,9 +46,6 @@ # include <unistd.h> # include <fcntl.h> # include <sys/time.h> -# ifdef HAVE_CONFIG_H -# include <config.h> -# endif # ifdef HAVE_POLL # include <sys/poll.h> # endif @@ -77,7 +74,7 @@ # define EAFNOSUPPORT EINVAL #endif -union sockaddr_ns { +union usockaddr_ns { struct sockaddr sa; struct sockaddr_in sin; #if HAVE_INET6 @@ -184,7 +181,7 @@ unsigned dnsc_port; /* default port (DNS_PORT) */ unsigned dnsc_udpbuf; /* size of UDP buffer */ /* array of nameserver addresses */ - union sockaddr_ns dnsc_serv[DNS_MAXSERV]; + union usockaddr_ns dnsc_serv[DNS_MAXSERV]; unsigned dnsc_nserv; /* number of nameservers */ unsigned dnsc_salen; /* length of socket addresses */ /* search list for unqualified names */ @@ -272,7 +269,7 @@ }; static int dns_add_serv_internal(struct dns_ctx *ctx, const char *serv) { - union sockaddr_ns *sns; + union usockaddr_ns *sns; if (!serv) return (ctx->dnsc_nserv = 0); if (ctx->dnsc_nserv >= DNS_MAXSERV) @@ -688,7 +685,7 @@ dns_socket sock; unsigned i; int port; - union sockaddr_ns *sns; + union usockaddr_ns *sns; #if HAVE_INET6 unsigned have_inet6 = 0; #endif @@ -922,7 +919,7 @@ return; } DNS_DBGQ(ctx, q, 1, - &ctx->dnsc_serv[q->dnsq_servi].sa, sizeof(union sockaddr_ns), + &ctx->dnsc_serv[q->dnsq_servi].sa, sizeof(union usockaddr_ns), q->dnsq_buf, q->dnsq_len); q->dnsq_servwait |= 1 << q->dnsq_servi; /* expect reply from this ns */ @@ -1045,7 +1042,7 @@ dnsc_t *pbuf; dnscc_t *pend, *pcur; void *result; - union sockaddr_ns sns; + union usockaddr_ns sns; socklen_t slen; SETCTX(ctx); Modified: freeswitch/trunk/src/mod/applications/mod_enum/Makefile ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/Makefile (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/Makefile Wed Apr 11 10:37:40 2007 @@ -1,11 +1,10 @@ BASE=../../../.. UDNS_DIR=$(BASE)/libs/udns -UDNSA=$(UDNS_DIR)/libudns.a -LOCAL_CFLAGS=-I$(UDNS_DIR) -LOCAL_LIBADD=$(UDNSA) -include $(BASE)/build/modmake.rules +LOCAL_CFLAGS=-I$(UDNS_DIR) -DHAVE_POLL +LOCAL_OBJS=$(UDNS_DIR)/udns_dn.o $(UDNS_DIR)/udns_dntosp.o $(UDNS_DIR)/udns_parse.o $(UDNS_DIR)/udns_misc.o \ +$(UDNS_DIR)/udns_rr_a.o $(UDNS_DIR)/udns_rr_ptr.o $(UDNS_DIR)/udns_rr_mx.o $(UDNS_DIR)/udns_rr_txt.o $(UDNS_DIR)/udns_bl.o \ +$(UDNS_DIR)/udns_rr_srv.o $(UDNS_DIR)/udns_rr_naptr.o $(UDNS_DIR)/udns_codes.o $(UDNS_DIR)/udns_resolver.o + -$(UDNSA): $(UDNS_DIR) $(UDNS_DIR)/.update - cd $(UDNS_DIR) && $(MAKE) staticlib - $(TOUCH_TARGET) +include $(BASE)/build/modmake.rules

1 0

[commit] r4918 - in freeswitch/trunk/libs: apr/include/arch/unix curl
by Freeswitch SVN 11 Apr '07

11 Apr '07

Author: mikej Date: Wed Apr 11 02:18:22 2007 New Revision: 4918 Modified: freeswitch/trunk/libs/apr/include/arch/unix/ (props changed) freeswitch/trunk/libs/curl/ (props changed) Log: svn:ignore props

1 0

[commit] r4917 - freeswitch/trunk/libs/apr-util
by Freeswitch SVN 11 Apr '07

11 Apr '07

Author: mikej Date: Wed Apr 11 02:13:08 2007 New Revision: 4917 Modified: freeswitch/trunk/libs/apr-util/build-outputs.mk freeswitch/trunk/libs/apr-util/build.conf freeswitch/trunk/libs/apr-util/configure.in Log: no need to build the xml or expat stuff Modified: freeswitch/trunk/libs/apr-util/build-outputs.mk ============================================================================== --- freeswitch/trunk/libs/apr-util/build-outputs.mk (original) +++ freeswitch/trunk/libs/apr-util/build-outputs.mk Wed Apr 11 02:13:08 2007 @@ -38,7 +38,6 @@ misc/apu_version.lo: misc/apu_version.c .make.dirs include/apu_version.h misc/apr_queue.lo: misc/apr_queue.c .make.dirs include/apr_queue.h uri/apr_uri.lo: uri/apr_uri.c .make.dirs include/apr_uri.h -xml/apr_xml.lo: xml/apr_xml.c .make.dirs include/apr_xml.h include/apr_xlate.h strmatch/apr_strmatch.lo: strmatch/apr_strmatch.c .make.dirs include/apr_strmatch.h xlate/xlate.lo: xlate/xlate.c .make.dirs include/apr_xlate.h dbd/apr_dbd_sqlite2.lo: dbd/apr_dbd_sqlite2.c .make.dirs @@ -46,7 +45,7 @@ dbd/apr_dbd.lo: dbd/apr_dbd.c .make.dirs include/apr_dbd.h dbd/apr_dbd_sqlite3.lo: dbd/apr_dbd_sqlite3.c .make.dirs -OBJECTS_all = buckets/apr_buckets_file.lo buckets/apr_brigade.lo buckets/apr_buckets_mmap.lo buckets/apr_buckets_heap.lo buckets/apr_buckets.lo buckets/apr_buckets_socket.lo buckets/apr_buckets_pool.lo buckets/apr_buckets_alloc.lo buckets/apr_buckets_pipe.lo buckets/apr_buckets_eos.lo buckets/apr_buckets_flush.lo buckets/apr_buckets_refcount.lo buckets/apr_buckets_simple.lo crypto/apr_md5.lo crypto/uuid.lo crypto/apr_sha1.lo crypto/getuuid.lo crypto/apr_md4.lo dbm/apr_dbm_berkeleydb.lo dbm/apr_dbm_gdbm.lo dbm/apr_dbm_ndbm.lo dbm/apr_dbm.lo dbm/apr_dbm_sdbm.lo dbm/sdbm/sdbm_hash.lo dbm/sdbm/sdbm.lo dbm/sdbm/sdbm_lock.lo dbm/sdbm/sdbm_pair.lo encoding/apr_base64.lo hooks/apr_hooks.lo ldap/apr_ldap_option.lo ldap/apr_ldap_init.lo ldap/apr_ldap_url.lo misc/apr_reslist.lo misc/apr_rmm.lo misc/apr_date.lo misc/apu_version.lo misc/apr_queue.lo uri/apr_uri.lo xml/apr_xml.lo strmatch/apr_strmatch.lo xlate/xlate.lo dbd/apr_dbd_sqlite2.lo dbd/apr_dbd_pgsql.lo dbd/apr_dbd.lo dbd/apr_dbd_sqlite3.lo +OBJECTS_all = buckets/apr_buckets_file.lo buckets/apr_brigade.lo buckets/apr_buckets_mmap.lo buckets/apr_buckets_heap.lo buckets/apr_buckets.lo buckets/apr_buckets_socket.lo buckets/apr_buckets_pool.lo buckets/apr_buckets_alloc.lo buckets/apr_buckets_pipe.lo buckets/apr_buckets_eos.lo buckets/apr_buckets_flush.lo buckets/apr_buckets_refcount.lo buckets/apr_buckets_simple.lo crypto/apr_md5.lo crypto/uuid.lo crypto/apr_sha1.lo crypto/getuuid.lo crypto/apr_md4.lo dbm/apr_dbm_berkeleydb.lo dbm/apr_dbm_gdbm.lo dbm/apr_dbm_ndbm.lo dbm/apr_dbm.lo dbm/apr_dbm_sdbm.lo dbm/sdbm/sdbm_hash.lo dbm/sdbm/sdbm.lo dbm/sdbm/sdbm_lock.lo dbm/sdbm/sdbm_pair.lo encoding/apr_base64.lo hooks/apr_hooks.lo ldap/apr_ldap_option.lo ldap/apr_ldap_init.lo ldap/apr_ldap_url.lo misc/apr_reslist.lo misc/apr_rmm.lo misc/apr_date.lo misc/apu_version.lo misc/apr_queue.lo uri/apr_uri.lo strmatch/apr_strmatch.lo xlate/xlate.lo dbd/apr_dbd_sqlite2.lo dbd/apr_dbd_pgsql.lo dbd/apr_dbd.lo dbd/apr_dbd_sqlite3.lo OBJECTS_unix = $(OBJECTS_all) @@ -58,11 +57,11 @@ OBJECTS_os390 = $(OBJECTS_all) -HEADERS = $(top_srcdir)/include/apr_optional.h $(top_srcdir)/include/apu_version.h $(top_srcdir)/include/apr_dbm.h $(top_srcdir)/include/apr_strmatch.h $(top_srcdir)/include/apr_buckets.h $(top_srcdir)/include/apr_optional_hooks.h $(top_srcdir)/include/apr_sdbm.h $(top_srcdir)/include/apr_md4.h $(top_srcdir)/include/apr_reslist.h $(top_srcdir)/include/apr_base64.h $(top_srcdir)/include/apr_ldap_option.h $(top_srcdir)/include/apr_xml.h $(top_srcdir)/include/apr_anylock.h $(top_srcdir)/include/apr_rmm.h $(top_srcdir)/include/apr_ldap_init.h $(top_srcdir)/include/apr_ldap_url.h $(top_srcdir)/include/apr_md5.h $(top_srcdir)/include/apr_date.h $(top_srcdir)/include/apr_hooks.h $(top_srcdir)/include/apr_xlate.h $(top_srcdir)/include/apr_queue.h $(top_srcdir)/include/apr_uri.h $(top_srcdir)/include/apr_uuid.h $(top_srcdir)/include/apr_sha1.h $(top_srcdir)/include/apr_dbd.h +HEADERS = $(top_srcdir)/include/apr_optional.h $(top_srcdir)/include/apu_version.h $(top_srcdir)/include/apr_dbm.h $(top_srcdir)/include/apr_strmatch.h $(top_srcdir)/include/apr_buckets.h $(top_srcdir)/include/apr_optional_hooks.h $(top_srcdir)/include/apr_sdbm.h $(top_srcdir)/include/apr_md4.h $(top_srcdir)/include/apr_reslist.h $(top_srcdir)/include/apr_base64.h $(top_srcdir)/include/apr_ldap_option.h $(top_srcdir)/include/apr_anylock.h $(top_srcdir)/include/apr_rmm.h $(top_srcdir)/include/apr_ldap_init.h $(top_srcdir)/include/apr_ldap_url.h $(top_srcdir)/include/apr_md5.h $(top_srcdir)/include/apr_date.h $(top_srcdir)/include/apr_hooks.h $(top_srcdir)/include/apr_xlate.h $(top_srcdir)/include/apr_queue.h $(top_srcdir)/include/apr_uri.h $(top_srcdir)/include/apr_uuid.h $(top_srcdir)/include/apr_sha1.h $(top_srcdir)/include/apr_dbd.h -SOURCE_DIRS = xml dbd dbm encoding hooks buckets misc crypto uri strmatch dbm/sdbm ldap xlate $(EXTRA_SOURCE_DIRS) +SOURCE_DIRS = dbd dbm encoding hooks buckets misc crypto uri strmatch dbm/sdbm ldap xlate $(EXTRA_SOURCE_DIRS) -BUILD_DIRS = buckets crypto dbd dbm dbm/sdbm encoding hooks ldap misc strmatch uri xlate xml +BUILD_DIRS = buckets crypto dbd dbm dbm/sdbm encoding hooks ldap misc strmatch uri xlate .make.dirs: $(srcdir)/build-outputs.mk @for d in $(BUILD_DIRS); do test -d $$d || mkdir $$d; done Modified: freeswitch/trunk/libs/apr-util/build.conf ============================================================================== --- freeswitch/trunk/libs/apr-util/build.conf (original) +++ freeswitch/trunk/libs/apr-util/build.conf Wed Apr 11 02:13:08 2007 @@ -15,10 +15,10 @@ ldap/*.c misc/*.c uri/apr_uri.c - xml/*.c strmatch/*.c xlate/*.c dbd/*.c +# xml/*.c # we have no platform-specific subdirs platform_dirs = Modified: freeswitch/trunk/libs/apr-util/configure.in ============================================================================== --- freeswitch/trunk/libs/apr-util/configure.in (original) +++ freeswitch/trunk/libs/apr-util/configure.in Wed Apr 11 02:13:08 2007 @@ -122,7 +122,7 @@ APU_CHECK_DBD_MYSQL APU_CHECK_DBD_SQLITE3 APU_CHECK_DBD_SQLITE2 -APU_FIND_EXPAT +#APU_FIND_EXPAT APU_FIND_ICONV AC_SEARCH_LIBS(crypt, crypt ufc)

1 0

[commit] r4916 - in freeswitch/trunk: . build/config libs/apr/include/arch/unix
by Freeswitch SVN 11 Apr '07

11 Apr '07

Author: mikej Date: Wed Apr 11 01:36:29 2007 New Revision: 4916 Added: freeswitch/trunk/build/config/libcurl.m4 Removed: freeswitch/trunk/libs/apr/include/arch/unix/apr_private.h.in Modified: freeswitch/trunk/acinclude.m4 Log: remove a generated file, add libcurl.m4 back. this will require a fresh bootstrap and configure Modified: freeswitch/trunk/acinclude.m4 ============================================================================== --- freeswitch/trunk/acinclude.m4 (original) +++ freeswitch/trunk/acinclude.m4 Wed Apr 11 01:36:29 2007 @@ -6,4 +6,4 @@ m4_include([build/config/ac_gcc_x86_cpuid.m4]) m4_include([build/config/ax_lib_mysql.m4]) m4_include([libs/apr/build/apr_common.m4]) -m4_include([libs/curl/docs/libcurl/libcurl.m4]) +m4_include([build/config/libcurl.m4]) Added: freeswitch/trunk/build/config/libcurl.m4 ============================================================================== --- (empty file) +++ freeswitch/trunk/build/config/libcurl.m4 Wed Apr 11 01:36:29 2007 @@ -0,0 +1,239 @@ +# LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION], +# [ACTION-IF-YES], [ACTION-IF-NO]) +# ---------------------------------------------------------- +# David Shaw <dshaw(a)jabberwocky.com> May-09-2006 +# +# Checks for libcurl. DEFAULT-ACTION is the string yes or no to +# specify whether to default to --with-libcurl or --without-libcurl. +# If not supplied, DEFAULT-ACTION is yes. MINIMUM-VERSION is the +# minimum version of libcurl to accept. Pass the version as a regular +# version number like 7.10.1. If not supplied, any version is +# accepted. ACTION-IF-YES is a list of shell commands to run if +# libcurl was successfully found and passed the various tests. +# ACTION-IF-NO is a list of shell commands that are run otherwise. +# Note that using --without-libcurl does run ACTION-IF-NO. +# +# This macro #defines HAVE_LIBCURL if a working libcurl setup is +# found, and sets @LIBCURL@ and @LIBCURL_CPPFLAGS@ to the necessary +# values. Other useful defines are LIBCURL_FEATURE_xxx where xxx are +# the various features supported by libcurl, and LIBCURL_PROTOCOL_yyy +# where yyy are the various protocols supported by libcurl. Both xxx +# and yyy are capitalized. See the list of AH_TEMPLATEs at the top of +# the macro for the complete list of possible defines. Shell +# variables $libcurl_feature_xxx and $libcurl_protocol_yyy are also +# defined to 'yes' for those features and protocols that were found. +# Note that xxx and yyy keep the same capitalization as in the +# curl-config list (e.g. it's "HTTP" and not "http"). +# +# Users may override the detected values by doing something like: +# LIBCURL="-lcurl" LIBCURL_CPPFLAGS="-I/usr/myinclude" ./configure +# +# For the sake of sanity, this macro assumes that any libcurl that is +# found is after version 7.7.2, the first version that included the +# curl-config script. Note that it is very important for people +# packaging binary versions of libcurl to include this script! +# Without curl-config, we can only guess what protocols are available, +# or use curl_version_info to figure it out at runtime. + +AC_DEFUN([LIBCURL_CHECK_CONFIG], +[ + AH_TEMPLATE([LIBCURL_FEATURE_SSL],[Defined if libcurl supports SSL]) + AH_TEMPLATE([LIBCURL_FEATURE_KRB4],[Defined if libcurl supports KRB4]) + AH_TEMPLATE([LIBCURL_FEATURE_IPV6],[Defined if libcurl supports IPv6]) + AH_TEMPLATE([LIBCURL_FEATURE_LIBZ],[Defined if libcurl supports libz]) + AH_TEMPLATE([LIBCURL_FEATURE_ASYNCHDNS],[Defined if libcurl supports AsynchDNS]) + AH_TEMPLATE([LIBCURL_FEATURE_IDN],[Defined if libcurl supports IDN]) + AH_TEMPLATE([LIBCURL_FEATURE_SSPI],[Defined if libcurl supports SSPI]) + AH_TEMPLATE([LIBCURL_FEATURE_NTLM],[Defined if libcurl supports NTLM]) + + AH_TEMPLATE([LIBCURL_PROTOCOL_HTTP],[Defined if libcurl supports HTTP]) + AH_TEMPLATE([LIBCURL_PROTOCOL_HTTPS],[Defined if libcurl supports HTTPS]) + AH_TEMPLATE([LIBCURL_PROTOCOL_FTP],[Defined if libcurl supports FTP]) + AH_TEMPLATE([LIBCURL_PROTOCOL_FTPS],[Defined if libcurl supports FTPS]) + AH_TEMPLATE([LIBCURL_PROTOCOL_FILE],[Defined if libcurl supports FILE]) + AH_TEMPLATE([LIBCURL_PROTOCOL_TELNET],[Defined if libcurl supports TELNET]) + AH_TEMPLATE([LIBCURL_PROTOCOL_LDAP],[Defined if libcurl supports LDAP]) + AH_TEMPLATE([LIBCURL_PROTOCOL_DICT],[Defined if libcurl supports DICT]) + AH_TEMPLATE([LIBCURL_PROTOCOL_TFTP],[Defined if libcurl supports TFTP]) + + AC_ARG_WITH(libcurl, + AC_HELP_STRING([--with-libcurl=DIR],[look for the curl library in DIR]), + [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])]) + + if test "$_libcurl_with" != "no" ; then + + AC_PROG_AWK + + _libcurl_version_parse="eval $AWK '{split(\$NF,A,\".\"); X=256*256*A[[1]]+256*A[[2]]+A[[3]]; print X;}'" + + _libcurl_try_link=yes + + if test -d "$_libcurl_with" ; then + LIBCURL_CPPFLAGS="-I$withval/include" + _libcurl_ldflags="-L$withval/lib" + AC_PATH_PROG([_libcurl_config],["$withval/bin/curl-config"]) + else + AC_PATH_PROG([_libcurl_config],[curl-config]) + fi + + if test x$_libcurl_config != "x" ; then + AC_CACHE_CHECK([for the version of libcurl], + [libcurl_cv_lib_curl_version], + [libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $[]2}'`]) + + _libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse` + _libcurl_wanted=`echo ifelse([$2],,[0],[$2]) | $_libcurl_version_parse` + + if test $_libcurl_wanted -gt 0 ; then + AC_CACHE_CHECK([for libcurl >= version $2], + [libcurl_cv_lib_version_ok], + [ + if test $_libcurl_version -ge $_libcurl_wanted ; then + libcurl_cv_lib_version_ok=yes + else + libcurl_cv_lib_version_ok=no + fi + ]) + fi + + if test $_libcurl_wanted -eq 0 || test x$libcurl_cv_lib_version_ok = xyes ; then + if test x"$LIBCURL_CPPFLAGS" = "x" ; then + LIBCURL_CPPFLAGS=`$_libcurl_config --cflags` + fi + if test x"$LIBCURL" = "x" ; then + LIBCURL=`$_libcurl_config --libs` + + # This is so silly, but Apple actually has a bug in their + # curl-config script. Fixed in Tiger, but there are still + # lots of Panther installs around. + case "${host}" in + powerpc-apple-darwin7*) + LIBCURL=`echo $LIBCURL | sed -e 's|-arch i386||g'` + ;; + esac + fi + + # All curl-config scripts support --feature + _libcurl_features=`$_libcurl_config --feature` + + # Is it modern enough to have --protocols? (7.12.4) + if test $_libcurl_version -ge 461828 ; then + _libcurl_protocols=`$_libcurl_config --protocols` + fi + else + _libcurl_try_link=no + fi + + unset _libcurl_wanted + fi + + if test $_libcurl_try_link = yes ; then + + # we didn't find curl-config, so let's see if the user-supplied + # link line (or failing that, "-lcurl") is enough. + LIBCURL=${LIBCURL-"$_libcurl_ldflags -lcurl"} + + AC_CACHE_CHECK([whether libcurl is usable], + [libcurl_cv_lib_curl_usable], + [ + _libcurl_save_cppflags=$CPPFLAGS + CPPFLAGS="$LIBCURL_CPPFLAGS $CPPFLAGS" + _libcurl_save_libs=$LIBS + LIBS="$LIBCURL $LIBS" + + AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <curl/curl.h>],[ +/* Try and use a few common options to force a failure if we are + missing symbols or can't link. */ +int x; +curl_easy_setopt(NULL,CURLOPT_URL,NULL); +x=CURL_ERROR_SIZE; +x=CURLOPT_WRITEFUNCTION; +x=CURLOPT_FILE; +x=CURLOPT_ERRORBUFFER; +x=CURLOPT_STDERR; +x=CURLOPT_VERBOSE; +]),libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no) + + CPPFLAGS=$_libcurl_save_cppflags + LIBS=$_libcurl_save_libs + unset _libcurl_save_cppflags + unset _libcurl_save_libs + ]) + + if test $libcurl_cv_lib_curl_usable = yes ; then + + # Does curl_free() exist in this version of libcurl? + # If not, fake it with free() + + _libcurl_save_cppflags=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS" + _libcurl_save_libs=$LIBS + LIBS="$LIBS $LIBCURL" + + AC_CHECK_FUNC(curl_free,, + AC_DEFINE(curl_free,free, + [Define curl_free() as free() if our version of curl lacks curl_free.])) + + CPPFLAGS=$_libcurl_save_cppflags + LIBS=$_libcurl_save_libs + unset _libcurl_save_cppflags + unset _libcurl_save_libs + + AC_DEFINE(HAVE_LIBCURL,1, + [Define to 1 if you have a functional curl library.]) + AC_SUBST(LIBCURL_CPPFLAGS) + AC_SUBST(LIBCURL) + + for _libcurl_feature in $_libcurl_features ; do + AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_feature_$_libcurl_feature),[1]) + eval AS_TR_SH(libcurl_feature_$_libcurl_feature)=yes + done + + if test "x$_libcurl_protocols" = "x" ; then + + # We don't have --protocols, so just assume that all + # protocols are available + _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT" + + if test x$libcurl_feature_SSL = xyes ; then + _libcurl_protocols="$_libcurl_protocols HTTPS" + + # FTPS wasn't standards-compliant until version + # 7.11.0 + if test $_libcurl_version -ge 461568; then + _libcurl_protocols="$_libcurl_protocols FTPS" + fi + fi + fi + + for _libcurl_protocol in $_libcurl_protocols ; do + AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_protocol_$_libcurl_protocol),[1]) + eval AS_TR_SH(libcurl_protocol_$_libcurl_protocol)=yes + done + else + unset LIBCURL + unset LIBCURL_CPPFLAGS + fi + fi + + unset _libcurl_try_link + unset _libcurl_version_parse + unset _libcurl_config + unset _libcurl_feature + unset _libcurl_features + unset _libcurl_protocol + unset _libcurl_protocols + unset _libcurl_version + unset _libcurl_ldflags + fi + + if test x$_libcurl_with = xno || test x$libcurl_cv_lib_curl_usable != xyes ; then + # This is the IF-NO path + ifelse([$4],,:,[$4]) + else + # This is the IF-YES path + ifelse([$3],,:,[$3]) + fi + + unset _libcurl_with +])dnl

1 0

[commit] r4915 - in freeswitch/trunk/libs/curl: . docs lib src tests
by Freeswitch SVN 11 Apr '07

11 Apr '07

Author: mikej Date: Wed Apr 11 01:00:38 2007 New Revision: 4915 Removed: freeswitch/trunk/libs/curl/docs/ freeswitch/trunk/libs/curl/tests/ Modified: freeswitch/trunk/libs/curl/Makefile.am freeswitch/trunk/libs/curl/configure.ac freeswitch/trunk/libs/curl/lib/config.h.in freeswitch/trunk/libs/curl/src/Makefile.am freeswitch/trunk/libs/curl/src/Makefile.inc Log: remove docs and tests from our in tree libcurl. You will need to do a fresh bootstrap or autoreconf -fi in the libs/curl directory. Modified: freeswitch/trunk/libs/curl/Makefile.am ============================================================================== --- freeswitch/trunk/libs/curl/Makefile.am (original) +++ freeswitch/trunk/libs/curl/Makefile.am Wed Apr 11 01:00:38 2007 @@ -29,13 +29,12 @@ bin_SCRIPTS = curl-config SUBDIRS = lib src -DIST_SUBDIRS = $(SUBDIRS) tests include packages docs +DIST_SUBDIRS = $(SUBDIRS) include packages pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libcurl.pc dist-hook: - rm -rf $(top_builddir)/tests/log find $(distdir) -name "*.dist" -exec rm {} \; (distit=`find $(srcdir) -name "*.dist"`; \ for file in $$distit; do \ @@ -43,88 +42,11 @@ cp $$file $(distdir)$$strip; \ done) -html: - cd docs; make html - -pdf: - cd docs; make pdf - -check: test - -if CROSSCOMPILING -test-full: test -test-torture: test - -test: - @echo "NOTICE: we can't run the tests when cross-compiling!" - -else - -test: - @(cd tests; $(MAKE) all quiet-test) - -test-full: - @(cd tests; $(MAKE) all full-test) - -test-torture: - @(cd tests; $(MAKE) all torture-test) - -endif - -# -# Build source and binary rpms. For rpm-3.0 and above, the ~/.rpmmacros -# must contain the following line: -# %_topdir /home/loic/local/rpm -# and that /home/loic/local/rpm contains the directory SOURCES, BUILD etc. -# -# cd /home/loic/local/rpm ; mkdir -p SOURCES BUILD RPMS/i386 SPECS SRPMS -# -# If additional configure flags are needed to build the package, add the -# following in ~/.rpmmacros -# %configure CFLAGS="%{optflags}" ./configure %{_target_platform} --prefix=%{_prefix} ${AM_CONFIGFLAGS} -# and run make rpm in the following way: -# AM_CONFIGFLAGS='--with-uri=/home/users/loic/local/RedHat-6.2' make rpm -# - -rpms: - $(MAKE) RPMDIST=curl rpm - $(MAKE) RPMDIST=curl-ssl rpm - -rpm: - RPM_TOPDIR=`rpm --showrc | $(PERL) -n -e 'print if(s/.*_topdir\s+(.*)/$$1/)'` ; \ - cp $(srcdir)/packages/Linux/RPM/$(RPMDIST).spec $$RPM_TOPDIR/SPECS ; \ - cp $(PACKAGE)-$(VERSION).tar.gz $$RPM_TOPDIR/SOURCES ; \ - rpm -ba --clean --rmsource $$RPM_TOPDIR/SPECS/$(RPMDIST).spec ; \ - mv $$RPM_TOPDIR/RPMS/i386/$(RPMDIST)-*.rpm . ; \ - mv $$RPM_TOPDIR/SRPMS/$(RPMDIST)-*.src.rpm . - -# -# Build a Solaris pkkgadd format file -# run 'make pkgadd' once you've done './configure' and 'make' to make a Solaris pkgadd format -# file (which ends up back in this directory). -# The pkgadd file is in 'pkgtrans' format, so to install on Solaris, do -# pkgadd -d ./HAXXcurl-* -# - -# gak - libtool requires an absoulte directory, hence the pwd below... -pkgadd: - umask 022 ; \ - make install DESTDIR=`/bin/pwd`/packages/Solaris/root ; \ - cat COPYING > $(srcdir)/packages/Solaris/copyright ; \ - cd $(srcdir)/packages/Solaris && $(MAKE) package - -# -# Build a cygwin binary tarball installation file -# resulting .tar.bz2 file will end up at packages/Win32/cygwin -cygwinbin: - $(MAKE) -C packages/Win32/cygwin cygwinbin - # We extend the standard install with a custom hook: install-data-hook: cd include && $(MAKE) install - cd docs && $(MAKE) install # We extend the standard uninstall with a custom hook: uninstall-hook: cd include && $(MAKE) uninstall - cd docs && $(MAKE) uninstall + Modified: freeswitch/trunk/libs/curl/configure.ac ============================================================================== --- freeswitch/trunk/libs/curl/configure.ac (original) +++ freeswitch/trunk/libs/curl/configure.ac Wed Apr 11 01:00:38 2007 @@ -34,7 +34,7 @@ AC_CONFIG_SRCDIR([lib/urldata.h]) AM_CONFIG_HEADER(lib/config.h src/config.h) -AM_MAINTAINER_MODE +#AM_MAINTAINER_MODE dnl SED is needed by some of the tools AC_PATH_PROG( SED, sed, sed-was-not-found-by-configure, @@ -2038,17 +2038,10 @@ AM_CONDITIONAL(CROSSCOMPILING, test x$cross_compiling = xyes) AC_CONFIG_FILES([Makefile \ - docs/Makefile \ - docs/examples/Makefile \ - docs/libcurl/Makefile \ include/Makefile \ include/curl/Makefile \ src/Makefile \ lib/Makefile \ - tests/Makefile \ - tests/data/Makefile \ - tests/server/Makefile \ - tests/libtest/Makefile \ packages/Makefile \ packages/Win32/Makefile \ packages/Win32/cygwin/Makefile \ Modified: freeswitch/trunk/libs/curl/lib/config.h.in ============================================================================== --- freeswitch/trunk/libs/curl/lib/config.h.in (original) +++ freeswitch/trunk/libs/curl/lib/config.h.in Wed Apr 11 01:00:38 2007 @@ -621,16 +621,16 @@ /* Define to the function return type for send. */ #undef SEND_TYPE_RETV -/* The size of `curl_off_t', as computed by sizeof. */ +/* The size of a `curl_off_t', as computed by sizeof. */ #undef SIZEOF_CURL_OFF_T -/* The size of `long', as computed by sizeof. */ +/* The size of a `long', as computed by sizeof. */ #undef SIZEOF_LONG -/* The size of `size_t', as computed by sizeof. */ +/* The size of a `size_t', as computed by sizeof. */ #undef SIZEOF_SIZE_T -/* The size of `time_t', as computed by sizeof. */ +/* The size of a `time_t', as computed by sizeof. */ #undef SIZEOF_TIME_T /* Define to 1 if you have the ANSI C header files. */ @@ -685,7 +685,7 @@ /* type to use in place of in_addr_t if not defined */ #undef in_addr_t -/* Define to `unsigned int' if <sys/types.h> does not define. */ +/* Define to `unsigned' if <sys/types.h> does not define. */ #undef size_t /* type to use in place of socklen_t if not defined */ Modified: freeswitch/trunk/libs/curl/src/Makefile.am ============================================================================== --- freeswitch/trunk/libs/curl/src/Makefile.am (original) +++ freeswitch/trunk/libs/curl/src/Makefile.am Wed Apr 11 01:00:38 2007 @@ -33,50 +33,11 @@ -I$(top_srcdir)/lib \ -I$(top_srcdir)/src -bin_PROGRAMS = curl - include Makefile.inc -curl_LDADD = ../lib/libcurl.la -curl_DEPENDENCIES = ../lib/libcurl.la -BUILT_SOURCES = hugehelp.c -CLEANFILES = hugehelp.c -NROFF=@NROFF@ @MANOPT@ # figured out by the configure script - EXTRA_DIST = mkhelp.pl makefile.dj Makefile.vc6 Makefile.b32 Makefile.m32 \ Makefile.riscos config.h.in macos/curl.mcp.xml.sit.hqx \ macos/MACINSTALL.TXT macos/src/curl_GUSIConfig.cpp \ macos/src/macos_main.cpp config-amigaos.h makefile.amiga curl.rc \ Makefile.netware Makefile.inc Makefile.Watcom -MANPAGE=$(top_srcdir)/docs/curl.1 -README=$(top_srcdir)/docs/MANUAL -MKHELP=$(top_srcdir)/src/mkhelp.pl -HUGE=hugehelp.c - -if USE_MANUAL -# Here are the stuff to create a built-in manual - -if HAVE_LIBZ -# This generates the hugehelp.c file in both uncompressed and compressed formats -$(HUGE): $(README) $(MANPAGE) mkhelp.pl - echo '#include "setup.h"' > $(HUGE) - echo '#ifndef HAVE_LIBZ' >> $(HUGE) - $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE) - echo '#else' >> $(HUGE) - $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) -c $(README) >> $(HUGE) - echo '#endif /* HAVE_LIBZ */' >> $(HUGE) -else # HAVE_LIBZ -# This generates the hugehelp.c file uncompressed only -$(HUGE): $(README) $(MANPAGE) mkhelp.pl - echo '#include "setup.h"' > $(HUGE) - $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE) -endif - -else # USE_MANUAL -# built-in manual has been disabled, make a blank file -$(HUGE): - echo "/* built-in manual is disabled, blank function */" > $(HUGE) - echo '#include "hugehelp.h"' >> $(HUGE) - echo "void hugehelp(void) {}" >>$(HUGE) -endif Modified: freeswitch/trunk/libs/curl/src/Makefile.inc ============================================================================== --- freeswitch/trunk/libs/curl/src/Makefile.inc (original) +++ freeswitch/trunk/libs/curl/src/Makefile.inc Wed Apr 11 01:00:38 2007 @@ -5,13 +5,13 @@ CURLX_ONES = $(top_srcdir)/lib/strtoofft.c $(top_srcdir)/lib/timeval.c \ $(top_srcdir)/lib/strdup.c -CURL_SOURCES = main.c hugehelp.c urlglob.c writeout.c writeenv.c \ - getpass.c homedir.c +#CURL_SOURCES = main.c hugehelp.c urlglob.c writeout.c writeenv.c \ +# getpass.c homedir.c CURL_HFILES = hugehelp.h setup.h config-win32.h config-mac.h \ config-riscos.h urlglob.h version.h \ writeout.h writeenv.h getpass.h homedir.h -curl_SOURCES = $(CURL_SOURCES) $(CURLX_ONES) $(CURL_HFILES) +#curl_SOURCES = $(CURL_SOURCES) $(CURLX_ONES) $(CURL_HFILES)

1 0

[commit] r4914 - in freeswitch/trunk/libs/js/nsprpub/pr/src: . io malloc md/unix memory misc pthreads threads
by Freeswitch SVN 11 Apr '07

11 Apr '07

Author: mikej Date: Tue Apr 10 20:57:46 2007 New Revision: 4914 Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/Makefile.in freeswitch/trunk/libs/js/nsprpub/pr/src/io/Makefile.in freeswitch/trunk/libs/js/nsprpub/pr/src/io/pripv6.c freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/Makefile.in freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/prmem.c freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/Makefile.in freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/objs.mk freeswitch/trunk/libs/js/nsprpub/pr/src/memory/Makefile.in freeswitch/trunk/libs/js/nsprpub/pr/src/misc/Makefile.in freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/Makefile.in freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptio.c freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptthread.c freeswitch/trunk/libs/js/nsprpub/pr/src/threads/Makefile.in Log: working nspr slimmed down build Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/Makefile.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/Makefile.in (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/Makefile.in Tue Apr 10 20:57:46 2007 @@ -46,7 +46,7 @@ include $(topsrcdir)/config/config.mk -DIRS = io linking malloc md memory misc threads +DIRS = io malloc md memory misc threads # For VAC++ 4 geticcdata rule in config/OS2.mk ifeq ($(MOZ_OS2_TOOLS),VACPP) @@ -62,7 +62,7 @@ endif ifeq ($(USE_CPLUS), 1) - DIRS += cplus +# DIRS += cplus endif # @@ -222,45 +222,24 @@ $(OBJDIR)/prvrsion.$(OBJ_SUFFIX) \ io/$(OBJDIR)/prfdcach.$(OBJ_SUFFIX) \ io/$(OBJDIR)/prmwait.$(OBJ_SUFFIX) \ -# io/$(OBJDIR)/prmapopt.$(OBJ_SUFFIX) \ io/$(OBJDIR)/priometh.$(OBJ_SUFFIX) \ -# io/$(OBJDIR)/pripv6.$(OBJ_SUFFIX) \ + io/$(OBJDIR)/prmapopt.$(OBJ_SUFFIX) \ io/$(OBJDIR)/prlayer.$(OBJ_SUFFIX) \ io/$(OBJDIR)/prlog.$(OBJ_SUFFIX) \ io/$(OBJDIR)/prmmap.$(OBJ_SUFFIX) \ -# io/$(OBJDIR)/prpolevt.$(OBJ_SUFFIX) \ + io/$(OBJDIR)/pripv6.$(OBJ_SUFFIX) \ io/$(OBJDIR)/prprf.$(OBJ_SUFFIX) \ -# io/$(OBJDIR)/prscanf.$(OBJ_SUFFIX) \ -# io/$(OBJDIR)/prstdio.$(OBJ_SUFFIX) \ -# threads/$(OBJDIR)/prcmon.$(OBJ_SUFFIX) \ -# threads/$(OBJDIR)/prrwlock.$(OBJ_SUFFIX) \ threads/$(OBJDIR)/prtpd.$(OBJ_SUFFIX) \ -# linking/$(OBJDIR)/prlink.$(OBJ_SUFFIX) \ malloc/$(OBJDIR)/prmem.$(OBJ_SUFFIX) \ md/$(OBJDIR)/prosdep.$(OBJ_SUFFIX) \ -# memory/$(OBJDIR)/prshm.$(OBJ_SUFFIX) \ -# memory/$(OBJDIR)/prshma.$(OBJ_SUFFIX) \ memory/$(OBJDIR)/prseg.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/pralarm.$(OBJ_SUFFIX) \ + misc/$(OBJDIR)/prnetdb.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/pratom.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prcountr.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prdtoa.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prenv.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prerr.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/prerror.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prerrortable.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/prinit.$(OBJ_SUFFIX) \ + misc/$(OBJDIR)/pripc.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/prinrval.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/pripc.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prlog2.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prlong.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prnetdb.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/prolock.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prrng.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prsystem.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prthinfo.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prtpool.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prtrace.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/prtime.$(OBJ_SUFFIX) # ilib now rejects empty objects @@ -278,16 +257,12 @@ OBJS += \ io/$(OBJDIR)/prdir.$(OBJ_SUFFIX) \ io/$(OBJDIR)/prfile.$(OBJ_SUFFIX) \ - io/$(OBJDIR)/prio.$(OBJ_SUFFIX) \ -# io/$(OBJDIR)/prsocket.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/pripcsem.$(OBJ_SUFFIX) + io/$(OBJDIR)/prio.$(OBJ_SUFFIX) + ifndef USE_BTHREADS OBJS += \ threads/$(OBJDIR)/prcthr.$(OBJ_SUFFIX) \ -# threads/$(OBJDIR)/prdump.$(OBJ_SUFFIX) \ -# threads/$(OBJDIR)/prmon.$(OBJ_SUFFIX) \ -# threads/$(OBJDIR)/prsem.$(OBJ_SUFFIX) \ threads/combined/$(OBJDIR)/prucpu.$(OBJ_SUFFIX) \ threads/combined/$(OBJDIR)/prucv.$(OBJ_SUFFIX) \ threads/combined/$(OBJDIR)/prulock.$(OBJ_SUFFIX) \ Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/io/Makefile.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/io/Makefile.in (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/io/Makefile.in Tue Apr 10 20:57:46 2007 @@ -58,14 +58,11 @@ prmwait.c \ priometh.c \ pripv6.c \ - prmapopt.c \ + prmapopt.c \ prlayer.c \ prlog.c \ prmmap.c \ - prpolevt.c \ prprf.c \ - prscanf.c \ - prstdio.c \ $(NULL) ifndef USE_PTHREADS @@ -73,7 +70,6 @@ prdir.c \ prfile.c \ prio.c \ - prsocket.c \ $(NULL) endif Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/io/pripv6.c ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/io/pripv6.c (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/io/pripv6.c Tue Apr 10 20:57:46 2007 @@ -279,7 +279,6 @@ #if defined(_PR_INET6_PROBE) PRBool _pr_ipv6_is_present; -extern PRBool _pr_test_ipv6_socket(void); #if !defined(_PR_INET6) && defined(_PR_HAVE_GETIPNODEBYNAME) extern PRStatus _pr_find_getipnodebyname(void); @@ -292,17 +291,7 @@ static PRBool _pr_probe_ipv6_presence(void) { -#if !defined(_PR_INET6) && defined(_PR_HAVE_GETIPNODEBYNAME) - if (_pr_find_getipnodebyname() != PR_SUCCESS) return PR_FALSE; -#endif - -#if !defined(_PR_INET6) && defined(_PR_HAVE_GETADDRINFO) - if (_pr_find_getaddrinfo() != PR_SUCCESS) - return PR_FALSE; -#endif - - return _pr_test_ipv6_socket(); } #endif /* _PR_INET6_PROBE */ Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/Makefile.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/Makefile.in (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/Makefile.in Tue Apr 10 20:57:46 2007 @@ -59,7 +59,7 @@ DEFINES += -D_NSPR_BUILD_ -CSRCS = prmalloc.c prmem.c +CSRCS = prmem.c include $(topsrcdir)/config/rules.mk Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/prmem.c ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/prmem.c (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/prmem.c Tue Apr 10 20:57:46 2007 @@ -210,25 +210,6 @@ return; } -PR_IMPLEMENT(void) -PR_FPrintZoneStats(PRFileDesc *debug_out) -{ - int i, j; - - for (j = 0; j < THREAD_POOLS; j++) { - for (i = 0; i < MEM_ZONES; i++) { - MemoryZone *mz = &zones[i][j]; - MemoryZone zone = *mz; - if (zone.elements || zone.misses || zone.hits) { - PR_fprintf(debug_out, -"pool: %d, zone: %d, size: %d, free: %d, hit: %d, miss: %d, contend: %d\n", - j, i, zone.blockSize, zone.elements, - zone.hits, zone.misses, zone.contention); - } - } - } -} - static void * pr_ZoneMalloc(PRUint32 size) { Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/Makefile.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/Makefile.in (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/Makefile.in Tue Apr 10 20:57:46 2007 @@ -49,8 +49,6 @@ unix.c \ unix_errors.c \ uxproces.c \ - uxrng.c \ - uxshm.c \ uxwrap.c \ $(NULL) Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/objs.mk ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/objs.mk (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/objs.mk Tue Apr 10 20:57:46 2007 @@ -42,8 +42,6 @@ unix.c \ unix_errors.c \ uxproces.c \ - uxrng.c \ - uxshm.c \ uxwrap.c \ $(NULL) Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/memory/Makefile.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/memory/Makefile.in (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/memory/Makefile.in Tue Apr 10 20:57:46 2007 @@ -46,7 +46,7 @@ include $(topsrcdir)/config/config.mk -CSRCS = prseg.c prshm.c prshma.c +CSRCS = prseg.c ifdef GC_LEAK_DETECTOR CSRCS += prgcleak.c Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/misc/Makefile.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/misc/Makefile.in (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/misc/Makefile.in Tue Apr 10 20:57:46 2007 @@ -47,35 +47,16 @@ include $(topsrcdir)/config/config.mk CSRCS = \ - pralarm.c \ pratom.c \ - prcountr.c \ - prdtoa.c \ - prenv.c \ - prerr.c \ prerror.c \ - prerrortable.c \ + pripc.c \ prinit.c \ + prnetdb.c \ prinrval.c \ - pripc.c \ - prlog2.c \ - prlong.c \ - prnetdb.c \ prolock.c \ - prrng.c \ - prsystem.c \ prtime.c \ - prthinfo.c \ - prtpool.c \ - prtrace.c \ $(NULL) -ifndef USE_PTHREADS -CSRCS += \ - pripcsem.c \ - $(NULL) -endif - TARGETS = $(OBJS) INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/Makefile.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/Makefile.in (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/Makefile.in Tue Apr 10 20:57:46 2007 @@ -55,8 +55,8 @@ endif CSRCS = \ + ptsynch.c \ ptio.c \ - ptsynch.c \ ptthread.c \ ptmisc.c \ $(NULL) Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptio.c ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptio.c (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptio.c Tue Apr 10 20:57:46 2007 @@ -374,46 +374,13 @@ PTDebug pt_debug; /* this is shared between several modules */ -PR_IMPLEMENT(void) PT_FPrintStats(PRFileDesc *debug_out, const char *msg) -{ - PTDebug stats; - char buffer[100]; - PRExplodedTime tod; - PRInt64 elapsed, aMil; - stats = pt_debug; /* a copy */ - PR_ExplodeTime(stats.timeStarted, PR_LocalTimeParameters, &tod); - (void)PR_FormatTime(buffer, sizeof(buffer), "%T", &tod); - - LL_SUB(elapsed, PR_Now(), stats.timeStarted); - LL_I2L(aMil, 1000000); - LL_DIV(elapsed, elapsed, aMil); - - if (NULL != msg) PR_fprintf(debug_out, "%s", msg); - PR_fprintf( - debug_out, "\tstarted: %s[%lld]\n", buffer, elapsed); - PR_fprintf( - debug_out, "\tlocks [created: %u, destroyed: %u]\n", - stats.locks_created, stats.locks_destroyed); - PR_fprintf( - debug_out, "\tlocks [acquired: %u, released: %u]\n", - stats.locks_acquired, stats.locks_released); - PR_fprintf( - debug_out, "\tcvars [created: %u, destroyed: %u]\n", - stats.cvars_created, stats.cvars_destroyed); - PR_fprintf( - debug_out, "\tcvars [notified: %u, delayed_delete: %u]\n", - stats.cvars_notified, stats.delayed_cv_deletes); -} /* PT_FPrintStats */ - -#else +#endif /* DEBUG */ PR_IMPLEMENT(void) PT_FPrintStats(PRFileDesc *debug_out, const char *msg) { /* do nothing */ } /* PT_FPrintStats */ -#endif /* DEBUG */ - #if defined(_PR_POLL_WITH_SELECT) /* * OSF1 and HPUX report the POLLHUP event for a socket when the @@ -3374,6 +3341,8 @@ return fd; } /* PR_AllocFileDesc */ +#if 0 + #if !defined(_PR_INET6) || defined(_PR_INET6_PROBE) PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd); #if defined(_PR_INET6_PROBE) @@ -3484,7 +3453,7 @@ #endif return fd; } /* PR_Socket */ - +#endif /*****************************************************************************/ /****************************** I/O public methods ***************************/ /*****************************************************************************/ @@ -4312,6 +4281,7 @@ return &dir->d; } /* PR_ReadDir */ +#if 0 PR_IMPLEMENT(PRFileDesc*) PR_NewUDPSocket(void) { PRIntn domain = PF_INET; @@ -4336,6 +4306,8 @@ return PR_Socket(af, SOCK_STREAM, 0); } /* PR_NewTCPSocket */ +#endif + PR_IMPLEMENT(PRStatus) PR_NewTCPSocketPair(PRFileDesc *fds[2]) { PRInt32 osfd[2]; Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptthread.c ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptthread.c (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptthread.c Tue Apr 10 20:57:46 2007 @@ -938,9 +938,9 @@ PR_Unlock(pt_book.ml); _PR_CleanupMW(); - _PR_CleanupDtoa(); + //_PR_CleanupDtoa(); _PR_CleanupCallOnce(); - _PR_ShutdownLinker(); + //_PR_ShutdownLinker(); _PR_LogCleanup(); _PR_CleanupNet(); /* Close all the fd's before calling _PR_CleanupIO */ @@ -963,7 +963,7 @@ PR_DestroyLock(_pr_sleeplock); _pr_sleeplock = NULL; _PR_CleanupLayerCache(); - _PR_CleanupEnv(); + //_PR_CleanupEnv(); #ifdef _PR_ZONE_ALLOCATOR _PR_DestroyZones(); #endif Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/threads/Makefile.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/threads/Makefile.in (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/threads/Makefile.in Tue Apr 10 20:57:46 2007 @@ -58,24 +58,15 @@ ifdef USE_PTHREADS CSRCS = \ - prcmon.c \ - prrwlock.c \ prtpd.c \ $(NULL) else ifdef USE_BTHREADS CSRCS = \ - prcmon.c \ - prrwlock.c \ prtpd.c \ $(NULL) else CSRCS = \ - prcmon.c \ - prdump.c \ - prmon.c \ - prsem.c \ - prrwlock.c \ prcthr.c \ prtpd.c \ $(NULL)

1 0

[commit] r4913 - in freeswitch/trunk/libs/js/nsprpub/pr/src: . misc
by Freeswitch SVN 10 Apr '07

10 Apr '07

Author: mikej Date: Tue Apr 10 18:13:27 2007 New Revision: 4913 Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/Makefile.in freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prinit.c Log: slim down nspr build on *nix Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/Makefile.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/Makefile.in (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/Makefile.in Tue Apr 10 18:13:27 2007 @@ -222,50 +222,50 @@ $(OBJDIR)/prvrsion.$(OBJ_SUFFIX) \ io/$(OBJDIR)/prfdcach.$(OBJ_SUFFIX) \ io/$(OBJDIR)/prmwait.$(OBJ_SUFFIX) \ - io/$(OBJDIR)/prmapopt.$(OBJ_SUFFIX) \ +# io/$(OBJDIR)/prmapopt.$(OBJ_SUFFIX) \ io/$(OBJDIR)/priometh.$(OBJ_SUFFIX) \ - io/$(OBJDIR)/pripv6.$(OBJ_SUFFIX) \ +# io/$(OBJDIR)/pripv6.$(OBJ_SUFFIX) \ io/$(OBJDIR)/prlayer.$(OBJ_SUFFIX) \ io/$(OBJDIR)/prlog.$(OBJ_SUFFIX) \ io/$(OBJDIR)/prmmap.$(OBJ_SUFFIX) \ - io/$(OBJDIR)/prpolevt.$(OBJ_SUFFIX) \ +# io/$(OBJDIR)/prpolevt.$(OBJ_SUFFIX) \ io/$(OBJDIR)/prprf.$(OBJ_SUFFIX) \ - io/$(OBJDIR)/prscanf.$(OBJ_SUFFIX) \ - io/$(OBJDIR)/prstdio.$(OBJ_SUFFIX) \ - threads/$(OBJDIR)/prcmon.$(OBJ_SUFFIX) \ - threads/$(OBJDIR)/prrwlock.$(OBJ_SUFFIX) \ +# io/$(OBJDIR)/prscanf.$(OBJ_SUFFIX) \ +# io/$(OBJDIR)/prstdio.$(OBJ_SUFFIX) \ +# threads/$(OBJDIR)/prcmon.$(OBJ_SUFFIX) \ +# threads/$(OBJDIR)/prrwlock.$(OBJ_SUFFIX) \ threads/$(OBJDIR)/prtpd.$(OBJ_SUFFIX) \ - linking/$(OBJDIR)/prlink.$(OBJ_SUFFIX) \ +# linking/$(OBJDIR)/prlink.$(OBJ_SUFFIX) \ malloc/$(OBJDIR)/prmem.$(OBJ_SUFFIX) \ md/$(OBJDIR)/prosdep.$(OBJ_SUFFIX) \ - memory/$(OBJDIR)/prshm.$(OBJ_SUFFIX) \ - memory/$(OBJDIR)/prshma.$(OBJ_SUFFIX) \ +# memory/$(OBJDIR)/prshm.$(OBJ_SUFFIX) \ +# memory/$(OBJDIR)/prshma.$(OBJ_SUFFIX) \ memory/$(OBJDIR)/prseg.$(OBJ_SUFFIX) \ - misc/$(OBJDIR)/pralarm.$(OBJ_SUFFIX) \ +# misc/$(OBJDIR)/pralarm.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/pratom.$(OBJ_SUFFIX) \ - misc/$(OBJDIR)/prcountr.$(OBJ_SUFFIX) \ - misc/$(OBJDIR)/prdtoa.$(OBJ_SUFFIX) \ - misc/$(OBJDIR)/prenv.$(OBJ_SUFFIX) \ - misc/$(OBJDIR)/prerr.$(OBJ_SUFFIX) \ +# misc/$(OBJDIR)/prcountr.$(OBJ_SUFFIX) \ +# misc/$(OBJDIR)/prdtoa.$(OBJ_SUFFIX) \ +# misc/$(OBJDIR)/prenv.$(OBJ_SUFFIX) \ +# misc/$(OBJDIR)/prerr.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/prerror.$(OBJ_SUFFIX) \ - misc/$(OBJDIR)/prerrortable.$(OBJ_SUFFIX) \ +# misc/$(OBJDIR)/prerrortable.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/prinit.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/prinrval.$(OBJ_SUFFIX) \ - misc/$(OBJDIR)/pripc.$(OBJ_SUFFIX) \ - misc/$(OBJDIR)/prlog2.$(OBJ_SUFFIX) \ - misc/$(OBJDIR)/prlong.$(OBJ_SUFFIX) \ - misc/$(OBJDIR)/prnetdb.$(OBJ_SUFFIX) \ +# misc/$(OBJDIR)/pripc.$(OBJ_SUFFIX) \ +# misc/$(OBJDIR)/prlog2.$(OBJ_SUFFIX) \ +# misc/$(OBJDIR)/prlong.$(OBJ_SUFFIX) \ +# misc/$(OBJDIR)/prnetdb.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/prolock.$(OBJ_SUFFIX) \ - misc/$(OBJDIR)/prrng.$(OBJ_SUFFIX) \ - misc/$(OBJDIR)/prsystem.$(OBJ_SUFFIX) \ - misc/$(OBJDIR)/prthinfo.$(OBJ_SUFFIX) \ - misc/$(OBJDIR)/prtpool.$(OBJ_SUFFIX) \ - misc/$(OBJDIR)/prtrace.$(OBJ_SUFFIX) \ +# misc/$(OBJDIR)/prrng.$(OBJ_SUFFIX) \ +# misc/$(OBJDIR)/prsystem.$(OBJ_SUFFIX) \ +# misc/$(OBJDIR)/prthinfo.$(OBJ_SUFFIX) \ +# misc/$(OBJDIR)/prtpool.$(OBJ_SUFFIX) \ +# misc/$(OBJDIR)/prtrace.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/prtime.$(OBJ_SUFFIX) # ilib now rejects empty objects ifneq ($(MOZ_OS2_TOOLS),VACPP) -OBJS += malloc/$(OBJDIR)/prmalloc.$(OBJ_SUFFIX) +#OBJS += malloc/$(OBJDIR)/prmalloc.$(OBJ_SUFFIX) endif ifdef USE_PTHREADS @@ -279,15 +279,15 @@ io/$(OBJDIR)/prdir.$(OBJ_SUFFIX) \ io/$(OBJDIR)/prfile.$(OBJ_SUFFIX) \ io/$(OBJDIR)/prio.$(OBJ_SUFFIX) \ - io/$(OBJDIR)/prsocket.$(OBJ_SUFFIX) \ - misc/$(OBJDIR)/pripcsem.$(OBJ_SUFFIX) +# io/$(OBJDIR)/prsocket.$(OBJ_SUFFIX) \ +# misc/$(OBJDIR)/pripcsem.$(OBJ_SUFFIX) ifndef USE_BTHREADS OBJS += \ threads/$(OBJDIR)/prcthr.$(OBJ_SUFFIX) \ - threads/$(OBJDIR)/prdump.$(OBJ_SUFFIX) \ - threads/$(OBJDIR)/prmon.$(OBJ_SUFFIX) \ - threads/$(OBJDIR)/prsem.$(OBJ_SUFFIX) \ +# threads/$(OBJDIR)/prdump.$(OBJ_SUFFIX) \ +# threads/$(OBJDIR)/prmon.$(OBJ_SUFFIX) \ +# threads/$(OBJDIR)/prsem.$(OBJ_SUFFIX) \ threads/combined/$(OBJDIR)/prucpu.$(OBJ_SUFFIX) \ threads/combined/$(OBJDIR)/prucv.$(OBJ_SUFFIX) \ threads/combined/$(OBJDIR)/prulock.$(OBJ_SUFFIX) \ Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prinit.c ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prinit.c (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prinit.c Tue Apr 10 18:13:27 2007 @@ -762,6 +762,10 @@ } return once->status; } +PRBool _PR_Obsolete(const char *obsolete, const char *preferred) +{ + return PR_FALSE; +} /* _PR_Obsolete */ /* prinit.c */

1 0

[commit] r4912 - freeswitch/trunk/src
by Freeswitch SVN 10 Apr '07

10 Apr '07

Author: mikej Date: Tue Apr 10 17:18:33 2007 New Revision: 4912 Modified: freeswitch/trunk/src/switch_ivr.c Log: use the right data types. Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Apr 10 17:18:33 2007 @@ -83,7 +83,7 @@ static void *SWITCH_THREAD_FUNC unicast_thread_run(switch_thread_t *thread, void *obj) { switch_unicast_conninfo_t *conninfo = (switch_unicast_conninfo_t *) obj; - uint32_t len; + switch_size_t len; switch_channel_t *channel; if (!conninfo) { @@ -97,7 +97,7 @@ if (switch_socket_recv(conninfo->socket, conninfo->write_frame.data, &len) != SWITCH_STATUS_SUCCESS || len == 0) { break; } - conninfo->write_frame.datalen = len; + conninfo->write_frame.datalen = (uint32_t)len; conninfo->write_frame.samples = conninfo->write_frame.datalen / 2; switch_core_session_write_frame(conninfo->session, &conninfo->write_frame, -1, conninfo->stream_id); }

1 0

[commit] r4911 - freeswitch/trunk/libs/xmlrpc-c/src
by Freeswitch SVN 10 Apr '07

10 Apr '07

Author: mikej Date: Tue Apr 10 17:15:20 2007 New Revision: 4911 Modified: freeswitch/trunk/libs/xmlrpc-c/src/Makefile Log: fix make clean Modified: freeswitch/trunk/libs/xmlrpc-c/src/Makefile ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/src/Makefile (original) +++ freeswitch/trunk/libs/xmlrpc-c/src/Makefile Tue Apr 10 17:15:20 2007 @@ -10,9 +10,11 @@ default: all SUBDIRS = +CPPCLEAN = ifeq ($(ENABLE_CPLUSPLUS),yes) SUBDIRS += cpp + CPPCLEAN += cpp/clean endif WININET_TRANSPORT_DIR = $(SRCDIR)/lib/wininet_transport @@ -131,7 +133,7 @@ .PHONY: clean clean-local distclean clean: clean-common clean-local -clean-local: cpp/clean +clean-local: $(CPPCLEAN) distclean: clean distclean-common

1 0