- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r5827 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 06 Oct '07

06 Oct '07

Author: anthm Date: Sat Oct 6 19:44:39 2007 New Revision: 5827 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: smal fix Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Sat Oct 6 19:44:39 2007 @@ -42,10 +42,10 @@ SWITCH_STANDARD_API(status_function) { uint8_t html = 0; - switch_core_time_duration_t duration; + switch_core_time_duration_t duration = {0}; char *http = NULL; - int sps, last_sps; - + int sps = 0, last_sps = 0; + if (session) { return SWITCH_STATUS_FALSE; }

1 0

[commit] r5826 - freeswitch/trunk/build
by Freeswitch SVN 06 Oct '07

06 Oct '07

Author: mikej Date: Sat Oct 6 19:21:00 2007 New Revision: 5826 Modified: freeswitch/trunk/build/modules.conf.in Log: shouldn't be default Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Sat Oct 6 19:21:00 2007 @@ -46,7 +46,7 @@ languages/mod_spidermonkey languages/mod_spidermonkey_teletone languages/mod_spidermonkey_core_db -languages/mod_spidermonkey_odbc +#languages/mod_spidermonkey_odbc #languages/mod_spidermonkey_etpan xml_int/mod_xml_rpc #xml_int/mod_xml_curl

1 0

[commit] r5825 - freeswitch/trunk/src/mod/xml_int/mod_xml_cdr
by Freeswitch SVN 06 Oct '07

06 Oct '07

Author: anthm Date: Fri Oct 5 21:38:37 2007 New Revision: 5825 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Log: update Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Fri Oct 5 21:38:37 2007 @@ -256,7 +256,7 @@ if (!strcasecmp(val, "base64")) { globals.encode = 2; } else { - globals.encode = switch_true(val); + globals.encode = switch_true(val) ? 1 : 0; } } else if (!strcasecmp(var, "retries")) { globals.retries = (uint32_t) atoi(val);

1 0

[commit] r5824 - in freeswitch/trunk/src: . include mod/xml_int/mod_xml_cdr
by Freeswitch SVN 06 Oct '07

06 Oct '07

Author: anthm Date: Fri Oct 5 21:05:55 2007 New Revision: 5824 Modified: freeswitch/trunk/src/include/switch_xml.h freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c freeswitch/trunk/src/switch_xml.c Log: add headers Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Fri Oct 5 21:05:55 2007 @@ -191,6 +191,7 @@ ///\param xml the xml node ///\return the xml text string SWITCH_DECLARE(char *) switch_xml_toxml(switch_xml_t xml); +SWITCH_DECLARE(char *) switch_xml_toxml_buf(switch_xml_t xml, char *buf, switch_size_t buflen, switch_size_t offset); ///\brief returns a NULL terminated array of processing instructions for the given ///\ target Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Fri Oct 5 21:05:55 2007 @@ -75,7 +75,6 @@ switch_status_t status = SWITCH_STATUS_FALSE; if (switch_ivr_generate_xml_cdr(session, &cdr) == SWITCH_STATUS_SUCCESS) { - /* build the XML */ if (!(xml_text = switch_xml_toxml(cdr))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); @@ -108,6 +107,7 @@ /* try to post it to the web server */ if (!switch_strlen_zero(globals.url)) { + struct curl_slist *headers = NULL; curl_handle = curl_easy_init(); if (globals.encode) { @@ -117,13 +117,17 @@ assert(xml_text_escaped); memset(xml_text_escaped, 0, sizeof(xml_text_escaped)); if (globals.encode == 1) { + headers = curl_slist_append(headers, "Content-Type: application/x-www-form-urlencoded"); switch_url_encode(xml_text, xml_text_escaped, need_bytes - 1); } else { + headers = curl_slist_append(headers, "Content-Type: application/x-www-form-base64-encoded"); switch_b64_encode((unsigned char *)xml_text, need_bytes / 3, (unsigned char *)xml_text_escaped, need_bytes); } switch_safe_free(xml_text); xml_text = xml_text_escaped; - } + } else { + headers = curl_slist_append(headers, "Content-Type: application/x-www-form-plaintext"); + } if (!(curl_xml_text = switch_mprintf("cdr=%s", xml_text))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); @@ -135,12 +139,13 @@ curl_easy_setopt(curl_handle, CURLOPT_USERPWD, globals.cred); } - curl_easy_setopt(curl_handle, CURLOPT_POST, 1); + curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, headers); + curl_easy_setopt(curl_handle, CURLOPT_POST, 1); curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, curl_xml_text); curl_easy_setopt(curl_handle, CURLOPT_URL, globals.url); curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-xml/1.0"); curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, httpCallBack); - + if (globals.ignore_cacert_check) { curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, FALSE); } @@ -164,6 +169,7 @@ } curl_easy_cleanup(curl_handle); + curl_slist_free_all(headers); curl_handle = NULL; /* if we are here the web post failed for some reason */ Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Fri Oct 5 21:05:55 2007 @@ -1509,21 +1509,29 @@ } } +SWITCH_DECLARE(char *) switch_xml_toxml(switch_xml_t xml) +{ + char *s; + s = malloc(SWITCH_XML_BUFSIZE); + return switch_xml_toxml_buf(xml, s, SWITCH_XML_BUFSIZE, 0); +} + // converts an switch_xml structure back to xml, returning a string of xml date that // must be freed -SWITCH_DECLARE(char *) switch_xml_toxml(switch_xml_t xml) +SWITCH_DECLARE(char *) switch_xml_toxml_buf(switch_xml_t xml, char *buf, switch_size_t buflen, switch_size_t offset) { switch_xml_t p = (xml) ? xml->parent : NULL, o = (xml) ? xml->ordered : NULL; switch_xml_root_t root = (switch_xml_root_t) xml; - switch_size_t len = 0, max = SWITCH_XML_BUFSIZE; + switch_size_t len = 0, max = buflen; char *s, *t, *n, *r; int i, j, k; uint32_t count = 0; - s = malloc(max); + s = buf; assert(s != NULL); memset(s, 0, max); - len = sprintf(s, "<?xml version=\"1.0\"?>\n"); + len += offset; + len += sprintf(s + len, "<?xml version=\"1.0\"?>\n"); if (!xml || !xml->name) {

1 0

[commit] r5823 - in freeswitch/trunk: conf src src/include src/mod/endpoints/mod_sofia src/mod/xml_int/mod_xml_cdr
by Freeswitch SVN 06 Oct '07

06 Oct '07

Author: anthm Date: Fri Oct 5 20:30:04 2007 New Revision: 5823 Modified: freeswitch/trunk/conf/xml_cdr.conf.xml freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c freeswitch/trunk/src/switch_utils.c Log: make encoding optional none, base64 or url encoding Modified: freeswitch/trunk/conf/xml_cdr.conf.xml ============================================================================== --- freeswitch/trunk/conf/xml_cdr.conf.xml (original) +++ freeswitch/trunk/conf/xml_cdr.conf.xml Fri Oct 5 20:30:04 2007 @@ -15,7 +15,10 @@   <param name="log-dir" value=""/> - + +  +  +    Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Fri Oct 5 20:30:04 2007 @@ -55,6 +55,8 @@ #define switch_is_file_path(file) ((*file == '/') || strstr(file, SWITCH_URL_SEPARATOR)) #endif +SWITCH_DECLARE(switch_status_t) switch_b64_encode(unsigned char *in, switch_size_t ilen, unsigned char *out, switch_size_t olen); + static inline switch_bool_t switch_is_digit_string(const char *s) { while(s && *s) { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Oct 5 20:30:04 2007 @@ -341,6 +341,7 @@ nua_set_params(profile->nua, NUTAG_APPL_METHOD("OPTIONS"), NUTAG_APPL_METHOD("NOTIFY"), + NUTAG_APPL_METHOD("INFO"), //NUTAG_EARLY_MEDIA(1), NUTAG_AUTOANSWER(0), NUTAG_AUTOALERT(0), Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Fri Oct 5 20:30:04 2007 @@ -43,6 +43,7 @@ uint32_t retries; uint32_t shutdown; uint32_t ignore_cacert_check; + int encode; } globals; SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load); @@ -81,9 +82,6 @@ goto error; } - /* do we log to the disk no matter what? */ - /* all previous functionality is retained */ - if (!(logdir = switch_channel_get_variable(channel, "xml_cdr_base"))) { logdir = globals.log_dir; } @@ -111,15 +109,23 @@ /* try to post it to the web server */ if (!switch_strlen_zero(globals.url)) { curl_handle = curl_easy_init(); - - xml_text_escaped = curl_easy_escape(curl_handle, (const char*) xml_text, (int)strlen(xml_text)); - - if (switch_strlen_zero(xml_text_escaped)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); - goto error; - } - - if (!(curl_xml_text = switch_mprintf("cdr=%s", xml_text_escaped))) { + + if (globals.encode) { + switch_size_t need_bytes = strlen(xml_text) * 3; + + xml_text_escaped = malloc(need_bytes); + assert(xml_text_escaped); + memset(xml_text_escaped, 0, sizeof(xml_text_escaped)); + if (globals.encode == 1) { + switch_url_encode(xml_text, xml_text_escaped, need_bytes - 1); + } else { + switch_b64_encode((unsigned char *)xml_text, need_bytes / 3, (unsigned char *)xml_text_escaped, need_bytes); + } + switch_safe_free(xml_text); + xml_text = xml_text_escaped; + } + + if (!(curl_xml_text = switch_mprintf("cdr=%s", xml_text))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); goto error; } @@ -193,9 +199,8 @@ curl_easy_cleanup(curl_handle); } switch_safe_free(curl_xml_text); - switch_safe_free(xml_text_escaped); - switch_safe_free(path); switch_safe_free(xml_text); + switch_safe_free(path); switch_xml_free(cdr); return status; @@ -241,6 +246,12 @@ globals.url = strdup(val); } else if (!strcasecmp(var, "delay")) { globals.delay = (uint32_t) atoi(val); + } else if (!strcasecmp(var, "encode")) { + if (!strcasecmp(val, "base64")) { + globals.encode = 2; + } else { + globals.encode = switch_true(val); + } } else if (!strcasecmp(var, "retries")) { globals.retries = (uint32_t) atoi(val); } else if (!strcasecmp(var, "log-dir")) { @@ -286,7 +297,9 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "retries set but delay 0 setting to 5000ms\n"); globals.delay = 5000; } - + + globals.retries++; + switch_xml_free(xml); return status; } Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Fri Oct 5 20:30:04 2007 @@ -34,6 +34,40 @@ #include <arpa/inet.h> #endif +static const char switch_b64_table[65] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; +#define B64BUFFLEN 1024 +SWITCH_DECLARE(switch_status_t) switch_b64_encode(unsigned char *in, switch_size_t ilen, unsigned char *out, switch_size_t olen) +{ + int y = 0, bytes = 0; + size_t x = 0; + unsigned int b = 0,l = 0; + + for(x = 0; x < ilen; x++) { + b = (b<<8) + in[x]; + l += 8; + while (l >= 6) { + out[bytes++] = switch_b64_table[(b>>(l-=6))%64]; + if(++y != 72) { + continue; + } + //out[bytes++] = '\n'; + y=0; + } + } + + if (l > 0) { + out[bytes++] = switch_b64_table[((b%16)<<(6-l))%64]; + } + if (l != 0) { + while (l < 6) { + out[bytes++] = '=', l += 2; + } + } + + return SWITCH_STATUS_SUCCESS; +} + + SWITCH_DECLARE(switch_status_t) switch_find_local_ip(char *buf, int len, int family) { switch_status_t status = SWITCH_STATUS_FALSE;

1 0

[commit] r5822 - in freeswitch/trunk: conf src
by Freeswitch SVN 05 Oct '07

05 Oct '07

Author: anthm Date: Fri Oct 5 14:59:18 2007 New Revision: 5822 Modified: freeswitch/trunk/conf/switch.conf.xml freeswitch/trunk/src/switch_core.c Log: add loglevel param to switch.conf Modified: freeswitch/trunk/conf/switch.conf.xml ============================================================================== --- freeswitch/trunk/conf/switch.conf.xml (original) +++ freeswitch/trunk/conf/switch.conf.xml Fri Oct 5 14:59:18 2007 @@ -4,6 +4,8 @@ <param name="max-sessions" value="1000"/>  <param name="sessions-per-second" value="30"/> +  + <param name="loglevel" value="debug"/>  <param name="crash-protection" value="false"/>  Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri Oct 5 14:59:18 2007 @@ -443,6 +443,16 @@ if (switch_true(val)) { switch_set_flag((&runtime), SCF_CRASH_PROT); } + } else if (!strcasecmp(var, "loglevel")) { + int level; + if (*val > 47 && *val < 58) { + level = atoi(val); + } else { + level = switch_log_str2level(val); + } + + switch_core_session_ctl(SCSC_LOGLEVEL, &level); + } else if (!strcasecmp(var, "sessions-per-second")) { switch_core_sessions_per_second(atoi(val)); } else if (!strcasecmp(var, "max-sessions")) {

1 0

[commit] r5821 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Oct '07

05 Oct '07

Author: anthm Date: Fri Oct 5 14:05:51 2007 New Revision: 5821 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Oct 5 14:05:51 2007 @@ -55,11 +55,13 @@ if (session) { channel = switch_core_session_get_channel(session); assert(channel != NULL); - switch_channel_answer(channel); - switch_channel_set_variable(channel, "auto_answer_destination", switch_channel_get_variable(channel, "destination_number")); - switch_ivr_session_transfer(session, "auto_answer", NULL , NULL); - nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END()); - return; + if (!switch_channel_test_flag(channel, CF_OUTBOUND)) { + switch_channel_answer(channel); + switch_channel_set_variable(channel, "auto_answer_destination", switch_channel_get_variable(channel, "destination_number")); + switch_ivr_session_transfer(session, "auto_answer", NULL , NULL); + nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END()); + return; + } } } }

1 0

[commit] r5820 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Oct '07

05 Oct '07

Author: anthm Date: Fri Oct 5 14:00:33 2007 New Revision: 5820 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: up Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Oct 5 14:00:33 2007 @@ -1097,7 +1097,7 @@ } - if (channel && (status == 180 || status == 183)) { + if (channel && (status == 180 || status == 183) && switch_channel_test_flag(channel, CF_OUTBOUND)) { char *val; if ((val = switch_channel_get_variable(channel, "sip_auto_answer")) && switch_true(val)) { nua_notify(nh, NUTAG_NEWSUB(1), NUTAG_SUBSTATE(nua_substate_active), SIPTAG_EVENT_STR("talk"), TAG_END());

1 0

[commit] r5819 - freeswitch/trunk/src
by Freeswitch SVN 05 Oct '07

05 Oct '07

Author: anthm Date: Fri Oct 5 13:42:21 2007 New Revision: 5819 Modified: freeswitch/trunk/src/switch_channel.c Log: now support 3pcc (forgot this) Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Fri Oct 5 13:42:21 2007 @@ -645,6 +645,7 @@ case CS_HIBERNATE: switch (state) { case CS_LOOPBACK: + case CS_INIT: case CS_RING: case CS_EXECUTE: case CS_TRANSMIT:

1 0

[commit] r5818 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Oct '07

05 Oct '07

Author: anthm Date: Fri Oct 5 13:33:13 2007 New Revision: 5818 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add auto_answer goodies Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Oct 5 13:33:13 2007 @@ -42,12 +42,30 @@ char const *phrase, nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private, sip_t const *sip, tagi_t tags[]); -void sofia_handle_sip_i_notify(int status, - char const *phrase, - nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private, sip_t const *sip, tagi_t tags[]) +void sofia_handle_sip_i_notify(switch_core_session_t *session, int status, + char const *phrase, + nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private, sip_t const *sip, tagi_t tags[]) { - nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua),TAG_END()); - //nua_handle_destroy(nh); + switch_channel_t *channel = NULL; + + if (sip && sip->sip_event) { + char *type = (char *)sip->sip_event->o_type; + + if (!strcasecmp(type, "talk")) { + if (session) { + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + switch_channel_answer(channel); + switch_channel_set_variable(channel, "auto_answer_destination", switch_channel_get_variable(channel, "destination_number")); + switch_ivr_session_transfer(session, "auto_answer", NULL , NULL); + nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END()); + return; + } + } + } + + nua_respond(nh, 481, "Subscription Does Not Exist", NUTAG_WITH_THIS(nua), TAG_END()); + } @@ -166,7 +184,7 @@ case nua_r_set_params: break; case nua_i_notify: - sofia_handle_sip_i_notify(status, phrase, nua, profile, nh, sofia_private, sip, tags); + sofia_handle_sip_i_notify(session, status, phrase, nua, profile, nh, sofia_private, sip, tags); break; case nua_r_register: sofia_reg_handle_sip_r_register(status, phrase, nua, profile, nh, sofia_private, sip, tags);

1 0