- Freeswitch-svn - FreeSWITCH Mailing Lists

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

05 Mar '07

Author: mikej Date: Mon Mar 5 01:56:13 2007 New Revision: 4449 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: constification Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Mar 5 01:56:13 2007 @@ -3211,8 +3211,8 @@ const char *from_host = NULL; char contact_str[1024] = ""; char buf[512]; - char *passwd = NULL; - char *a1_hash = NULL; + const char *passwd = NULL; + const char *a1_hash = NULL; uint8_t stale = 0, ret = 0, forbidden = 0; auth_res_t auth_res; long exptime = 60; @@ -3329,10 +3329,8 @@ for (param = switch_xml_child(xparams, "param"); param; param = param->next) { - char *var = (char *) switch_xml_attr_soft(param, "name"); - char *val = (char *) switch_xml_attr_soft(param, "value"); - - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "param [%s]=[%s]\n", var, val); + const char *var = switch_xml_attr_soft(param, "name"); + const char *val = switch_xml_attr_soft(param, "value"); if (!strcasecmp(var, "password")) { passwd = val;

1 0

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

05 Mar '07

Author: mikej Date: Mon Mar 5 01:04:37 2007 New Revision: 4448 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: add a bit more null handling in mod_sofia. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Mar 5 01:04:37 2007 @@ -456,7 +456,7 @@ } -static auth_res_t parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, char *regstr, char *np, size_t nplen) +static auth_res_t parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, const char *regstr, char *np, size_t nplen) { int indexnum; const char *cur; @@ -643,12 +643,17 @@ } -static char *find_reg_url(sofia_profile_t *profile, char *user, char *host, char *val, switch_size_t len) +static char *find_reg_url(sofia_profile_t *profile, const char *user, const char *host, char *val, switch_size_t len) { char *errmsg; struct callback_t cbt = {0}; switch_core_db_t *db; + if (!user) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Called with null user!\n"); + return NULL; + } + if (!(db = switch_core_db_open_file(profile->dbname))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB %s\n", profile->dbname); return NULL; @@ -2594,20 +2599,21 @@ char hash_key[256] = ""; char buf[512]; - if (!sip || tech_pvt->hash_key) { + if (tech_pvt->hash_key || !sip || !sip->sip_from || + !sip->sip_from->a_url || + !sip->sip_from->a_url->url_user || + !sip->sip_from->a_url->url_host) { return; } - if (find_reg_url(tech_pvt->profile, (char *) sip->sip_from->a_url->url_user, (char *) sip->sip_from->a_url->url_host, buf, sizeof(buf))) { - tech_pvt->chat_from = sip_header_as_string(tech_pvt->home, (void *)sip->sip_to); + if (find_reg_url(tech_pvt->profile, sip->sip_from->a_url->url_user, sip->sip_from->a_url->url_host, buf, sizeof(buf))) { + tech_pvt->chat_from = sip_header_as_string(tech_pvt->home, (const sip_header_t *)sip->sip_to); tech_pvt->chat_to = switch_core_session_strdup(tech_pvt->session, buf); set_hash_key(hash_key, sizeof(hash_key), sip); } else { return; } - - tech_pvt->hash_key = switch_core_session_strdup(tech_pvt->session, hash_key); switch_core_hash_insert(tech_pvt->profile->chat_hash, tech_pvt->hash_key, tech_pvt); @@ -3193,16 +3199,16 @@ char *key, uint32_t keylen) { - sip_from_t const *from = sip->sip_from; - sip_expires_t const *expires = sip->sip_expires; - sip_authorization_t const *authorization = sip->sip_authorization; - sip_contact_t const *contact = sip->sip_contact; + sip_from_t const *from = NULL; + sip_expires_t const *expires = NULL; + sip_authorization_t const *authorization = NULL; + sip_contact_t const *contact = NULL; switch_xml_t domain, xml, user, param, xparams; char params[1024] = ""; char *sql; switch_event_t *s_event; - char *from_user = (char *) from->a_url->url_user; - char *from_host = (char *) from->a_url->url_host; + const char *from_user = NULL; + const char *from_host = NULL; char contact_str[1024] = ""; char buf[512]; char *passwd = NULL; @@ -3214,8 +3220,27 @@ const char *rpid = "unknown"; const char *display = "\"user\""; - if (contact && contact->m_url) { - char *port = (char *) contact->m_url->url_port; + /* all callers must confirm that sip, sip->sip_request and sip->sip_contact are not NULL */ + assert(sip != NULL && sip->sip_contact != NULL && sip->sip_request != NULL); + + expires = sip->sip_expires; + authorization = sip->sip_authorization; + contact = sip->sip_contact; + from = sip->sip_from; + + if (from) { + from_user = from->a_url->url_user; + from_host = from->a_url->url_host; + } + + if (!from_user || !from_host) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can not do authorization without a complete from header\n"); + nua_respond(nh, SIP_500_INTERNAL_SERVER_ERROR, TAG_END()); + return 1; + } + + if (contact->m_url) { + const char *port = contact->m_url->url_port; display = contact->m_display; if (switch_strlen_zero(display)) { @@ -3242,7 +3267,7 @@ if (expires) { exptime = expires->ex_delta; - } else if (contact && contact->m_expires) { + } else if (contact->m_expires) { exptime = atol(contact->m_expires); } @@ -3257,7 +3282,7 @@ } if (authorization) { - if ((auth_res = parse_auth(profile, authorization, (char *)sip->sip_request->rq_method_name, key, keylen)) == AUTH_STALE) { + if ((auth_res = parse_auth(profile, authorization, sip->sip_request->rq_method_name, key, keylen)) == AUTH_STALE) { stale = 1; } @@ -4358,12 +4383,13 @@ const char *context; char network_ip[80]; - if (!sip) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received an invite callback with no packet!\n"); + if (!sip || !sip->sip_request || !sip->sip_request->rq_method_name) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received an invalid packet!\n"); nua_respond(nh, SIP_500_INTERNAL_SERVER_ERROR, TAG_END()); return; } + if (!(sip->sip_contact && sip->sip_contact->m_url)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "NO CONTACT!\n"); nua_respond(nh, 400, "Missing Contact Header", TAG_END()); @@ -4426,7 +4452,7 @@ } } - if (sip->sip_request && sip->sip_request->rq_url) { + if (sip->sip_request->rq_url) { const char * req_uri = url_set_chanvars(session, sip->sip_request->rq_url, sip_req); if (profile->pflags & PFLAG_FULL_ID) { destination_number = req_uri; @@ -4540,6 +4566,19 @@ tagi_t tags[]) { char key[128] = ""; + + if (!sip || !sip->sip_request || !sip->sip_request->rq_method_name) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received an invalid packet!\n"); + nua_respond(nh, SIP_500_INTERNAL_SERVER_ERROR, TAG_END()); + return; + } + + if (!(sip->sip_contact && sip->sip_contact->m_url)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "NO CONTACT!\n"); + nua_respond(nh, 400, "Missing Contact Header", TAG_END()); + return; + } + handle_register(nua, profile, nh, sip, REG_REGISTER, key, sizeof(key)); }

1 0

[commit] r4447 - in freeswitch/trunk/src: . include mod/xml_int/mod_xml_curl
by Freeswitch SVN 05 Mar '07

05 Mar '07

Author: mikej Date: Mon Mar 5 00:49:52 2007 New Revision: 4447 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/include/switch_xml.h freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c freeswitch/trunk/src/switch_xml.c Log: constify some xml functions Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Mar 5 00:49:52 2007 @@ -1029,11 +1029,11 @@ typedef switch_status_t (*switch_module_shutdown_t) (void); typedef struct switch_xml *switch_xml_t; typedef struct switch_core_time_duration switch_core_time_duration_t; -typedef switch_xml_t (*switch_xml_search_function_t)(char *section, - char *tag_name, - char *key_name, - char *key_value, - char *params, +typedef switch_xml_t (*switch_xml_search_function_t)(const char *section, + const char *tag_name, + const char *key_name, + const char *key_value, + const char *params, void *user_data); /* things we don't deserve to know about */ Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Mon Mar 5 00:49:52 2007 @@ -316,20 +316,20 @@ ///\param node a pointer to the requested node ///\param params optional URL formatted params to pass to external gateways ///\return SWITCH_STATUS_SUCCESS if successful root and node will be assigned -SWITCH_DECLARE(switch_status_t) switch_xml_locate(char *section, - char *tag_name, - char *key_name, - char *key_value, +SWITCH_DECLARE(switch_status_t) switch_xml_locate(const char *section, + const char *tag_name, + const char *key_name, + const char *key_value, switch_xml_t *root, switch_xml_t *node, - char *params); + const char *params); ///\brief open a config in the core registry ///\param file_path the name of the config section e.g. modules.conf ///\param node a pointer to point to the node if it is found ///\param params optional URL formatted params to pass to external gateways ///\return the root xml node associated with the current request or NULL -SWITCH_DECLARE(switch_xml_t) switch_xml_open_cfg(char *file_path, switch_xml_t *node, char *params); +SWITCH_DECLARE(switch_xml_t) switch_xml_open_cfg(const char *file_path, switch_xml_t *node, const char *params); ///\brief bind a search function to an external gateway ///\param function the search function to bind @@ -342,7 +342,7 @@ ///\brief parse a string for a list of sections ///\param str a | delimited list of section names ///\return the section mask -SWITCH_DECLARE(switch_xml_section_t) switch_xml_parse_section_string(char *str); +SWITCH_DECLARE(switch_xml_section_t) switch_xml_parse_section_string(const char *str); SWITCH_END_EXTERN_C Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Mon Mar 5 00:49:52 2007 @@ -56,11 +56,11 @@ } -static switch_xml_t xml_url_fetch(char *section, - char *tag_name, - char *key_name, - char *key_value, - char *params, +static switch_xml_t xml_url_fetch(const char *section, + const char *tag_name, + const char *key_name, + const char *key_value, + const char *params, void *user_data) { char filename[512] = ""; Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Mon Mar 5 00:49:52 2007 @@ -112,7 +112,7 @@ { NULL, 0} }; -SWITCH_DECLARE(switch_xml_section_t) switch_xml_parse_section_string(char *str) +SWITCH_DECLARE(switch_xml_section_t) switch_xml_parse_section_string(const char *str) { size_t x; char buf[1024] = ""; @@ -950,12 +950,12 @@ int fd = -1, write_fd = -1; switch_xml_t xml = NULL; char *new_file = NULL; - char *abs; + const char *abs; if ((abs = strrchr(file, '/')) || (abs = strrchr(file, '\\'))) { abs++; } else { - abs = (char *)file; + abs = file; } if (!(new_file = switch_mprintf("%s%s%s.fsxml", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, abs))) { @@ -991,13 +991,13 @@ } -SWITCH_DECLARE(switch_status_t) switch_xml_locate(char *section, - char *tag_name, - char *key_name, - char *key_value, +SWITCH_DECLARE(switch_status_t) switch_xml_locate(const char *section, + const char *tag_name, + const char *key_name, + const char *key_value, switch_xml_t *root, switch_xml_t *node, - char *params) + const char *params) { switch_xml_t conf = NULL; switch_xml_t tag = NULL; @@ -1154,7 +1154,7 @@ return SWITCH_STATUS_FALSE; } -SWITCH_DECLARE(switch_xml_t) switch_xml_open_cfg(char *file_path, switch_xml_t *node, char *params) +SWITCH_DECLARE(switch_xml_t) switch_xml_open_cfg(const char *file_path, switch_xml_t *node, const char *params) { switch_xml_t xml = NULL, cfg = NULL;

1 0

[commit] r4446 - freeswitch/trunk/src/mod/loggers/mod_console
by Freeswitch SVN 04 Mar '07

04 Mar '07

Author: mikej Date: Sun Mar 4 17:19:39 2007 New Revision: 4446 Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Log: add color support to console in windows. Note, I don't like the colors I chose, if someone comes up with better ones, I'd be happy for the patch. Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Sun Mar 4 17:19:39 2007 @@ -34,8 +34,24 @@ static const char modname[] = "mod_console"; static const uint8_t STATIC_LEVELS[] = {0, 1, 2, 3, 4, 5, 6, 7, 8}; static int COLORIZE = 0; +#ifdef WIN32 +static HANDLE hStdout; +static WORD wOldColorAttrs; +static CONSOLE_SCREEN_BUFFER_INFO csbiInfo; +static WORD COLORS[] = + { FOREGROUND_RED | FOREGROUND_INTENSITY, + FOREGROUND_RED | FOREGROUND_INTENSITY, + FOREGROUND_RED | FOREGROUND_INTENSITY, + FOREGROUND_RED | FOREGROUND_INTENSITY, + FOREGROUND_BLUE | FOREGROUND_INTENSITY, + FOREGROUND_BLUE | FOREGROUND_INTENSITY, + FOREGROUND_GREEN | FOREGROUND_INTENSITY, + FOREGROUND_GREEN | FOREGROUND_INTENSITY, + FOREGROUND_GREEN | FOREGROUND_INTENSITY }; +#else static const char *COLORS[] = { SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FMAGEN, SWITCH_SEQ_FCYAN, SWITCH_SEQ_FGREEN, SWITCH_SEQ_FYELLOW, "" }; +#endif static switch_loadable_module_interface_t console_module_interface = { /*.module_name */ modname, @@ -109,7 +125,16 @@ char *val = (char *) switch_xml_attr_soft(param, "value"); if (!strcasecmp(var, "colorize") && switch_true(val)) { +#ifdef WIN32 + hStdout = GetStdHandle(STD_OUTPUT_HANDLE); + if (switch_core_get_console() == stdout && hStdout != INVALID_HANDLE_VALUE + && GetConsoleScreenBufferInfo(hStdout, &csbiInfo)) { + wOldColorAttrs = csbiInfo.wAttributes; + COLORIZE = 1; + } +#else COLORIZE = 1; +#endif } } } @@ -143,7 +168,13 @@ if (!log_hash || (((all_level > - 1) || lookup) && level >= node->level)) { if (COLORIZE) { +#ifdef WIN32 + SetConsoleTextAttribute(hStdout, COLORS[node->level]); + WriteFile(hStdout, node->data, (DWORD)strlen(node->data), NULL, NULL); + SetConsoleTextAttribute(hStdout, wOldColorAttrs); +#else fprintf(handle, "%s%s%s", COLORS[node->level], node->data, SWITCH_SEQ_DEFAULT_COLOR); +#endif } else { fprintf(handle, "%s", node->data); }

1 0

[commit] r4445 - freeswitch/trunk/src
by Freeswitch SVN 04 Mar '07

04 Mar '07

Author: brian Date: Sat Mar 3 20:53:49 2007 New Revision: 4445 Modified: freeswitch/trunk/src/switch_utils.c Log: update comments Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Sat Mar 3 20:53:49 2007 @@ -376,8 +376,9 @@ if ((r = apr_socket_recvfrom(from, sock, flags, buf, len)) == APR_SUCCESS) { from->port = ntohs(from->sa.sin.sin_port); - //from->ipaddr_ptr = &(from->sa.sin.sin_addr); - //from->ipaddr_ptr = inet_ntoa(from->sa.sin.sin_addr); + /* from->ipaddr_ptr = &(from->sa.sin.sin_addr); + * from->ipaddr_ptr = inet_ntoa(from->sa.sin.sin_addr); + */ } return r; @@ -647,7 +648,7 @@ #ifdef WIN32 -//this forces certain symbols to not be optimized out of the dll +/* this forces certain symbols to not be optimized out of the dll */ void include_me(void) { apr_socket_shutdown(NULL, 0);

1 0

[commit] r4444 - freeswitch/trunk/src
by Freeswitch SVN 04 Mar '07

04 Mar '07

Author: brian Date: Sat Mar 3 20:52:52 2007 New Revision: 4444 Modified: freeswitch/trunk/src/switch_loadable_module.c freeswitch/trunk/src/switch_resample.c freeswitch/trunk/src/switch_rtp.c Log: update comments Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Sat Mar 3 20:52:52 2007 @@ -909,7 +909,7 @@ } else { status = SWITCH_STATUS_FALSE; stream->write_function(stream, "INVALID COMMAND [%s]", cmd); - //snprintf(retbuf, len, "INVALID COMMAND [%s]", cmd); + /* snprintf(retbuf, len, "INVALID COMMAND [%s]", cmd); */ } if (stream->event) { Modified: freeswitch/trunk/src/switch_resample.c ============================================================================== --- freeswitch/trunk/src/switch_resample.c (original) +++ freeswitch/trunk/src/switch_resample.c Sat Mar 3 20:52:52 2007 @@ -88,7 +88,7 @@ int lastFlag = (last && (srcBlock == srclen - srcpos)); o = resample_process(resampler->resampler, resampler->factor, &src[srcpos], srcBlock, lastFlag, &srcused, &dst[out], dstlen - out); - //printf("resampling %d/%d (%d) %d %f\n", srcpos, srclen, MIN(dstlen-out, dstlen), srcused, factor); + /* printf("resampling %d/%d (%d) %d %f\n", srcpos, srclen, MIN(dstlen-out, dstlen), srcused, factor); */ srcpos += srcused; if (o >= 0) { @@ -169,7 +169,7 @@ for (i = 0; i < len; i++) { f[i] = (float) (s[i]) / NORMFACT; - //f[i] = (float) s[i]; + /* f[i] = (float) s[i]; */ } return len; } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sat Mar 3 20:52:52 2007 @@ -228,7 +228,7 @@ } } while (switch_stun_packet_next_attribute(attr)); - //printf("[%s] [%s] [%s]\n", rtp_session->user_ice, username, !strcmp(rtp_session->user_ice, username) ? "yes" : "no"); + /* printf("[%s] [%s] [%s]\n", rtp_session->user_ice, username, !strcmp(rtp_session->user_ice, username) ? "yes" : "no"); */ if ((packet->header.type == SWITCH_STUN_BINDING_REQUEST) && !strcmp(rtp_session->user_ice, username)) { uint8_t buf[512]; switch_stun_packet_t *rpacket; @@ -239,7 +239,7 @@ memset(buf, 0, sizeof(buf)); rpacket = switch_stun_packet_build_header(SWITCH_STUN_BINDING_RESPONSE, packet->header.id, buf); switch_stun_packet_attribute_add_username(rpacket, username, 32); - //switch_sockaddr_ip_get(&remote_ip, rtp_session->from_addr); + /* switch_sockaddr_ip_get(&remote_ip, rtp_session->from_addr); */ remote_ip = switch_get_addr(ipbuf, sizeof(ipbuf), rtp_session->from_addr); @@ -427,8 +427,9 @@ return SWITCH_STATUS_FALSE; } - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "set master key/salt to %s/", octet_string_hex_string(key, 16)); - //switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "%s\n", octet_string_hex_string(key+16, 14)); + /* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "set master key/salt to %s/", octet_string_hex_string(key, 16)); + * switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "%s\n", octet_string_hex_string(key+16, 14)); + */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Activating Secure RTP!\n"); } @@ -678,7 +679,7 @@ duration = rtp_session->dtmf_data.out_digit_sofar; } - //ts = rtp_session->dtmf_data.timestamp_dtmf += samples; + /* ts = rtp_session->dtmf_data.timestamp_dtmf += samples; */ rtp_session->dtmf_data.out_digit_packet[2] = (unsigned char) (duration >> 8); rtp_session->dtmf_data.out_digit_packet[3] = (unsigned char) duration; @@ -719,8 +720,9 @@ rtp_session->dtmf_data.out_digit_packet[0] = (unsigned char)switch_char_to_rfc2833(rdigit->digit); rtp_session->dtmf_data.out_digit_packet[1] = 7; - //ts = rtp_session->dtmf_data.timestamp_dtmf += samples; - //rtp_session->dtmf_data.timestamp_dtmf++; + /* ts = rtp_session->dtmf_data.timestamp_dtmf += samples; + * rtp_session->dtmf_data.timestamp_dtmf++; + */ rtp_session->dtmf_data.timestamp_dtmf = rtp_session->last_write_ts; rtp_session->dtmf_data.out_digit_seq = rtp_session->last_write_seq; @@ -1131,7 +1133,7 @@ if (rtp_session->vad_data.scan_freq && rtp_session->vad_data.next_scan <= now) { rtp_session->vad_data.bg_count = rtp_session->vad_data.bg_level = 0; rtp_session->vad_data.next_scan = now + rtp_session->vad_data.scan_freq; - //printf("RESCAN\n"); + /* printf("RESCAN\n"); */ } if (switch_core_codec_decode(&rtp_session->vad_data.vad_codec, @@ -1162,8 +1164,9 @@ rtp_session->vad_data.bg_level += score; if (++rtp_session->vad_data.bg_count == rtp_session->vad_data.bg_len) { rtp_session->vad_data.bg_level /= rtp_session->vad_data.bg_len; - //rtp_session->vad_data.bg_level += (rtp_session->vad_data.bg_level / 3); - //printf("AVG %u\n", rtp_session->vad_data.bg_level); + /* rtp_session->vad_data.bg_level += (rtp_session->vad_data.bg_level / 3); + * printf("AVG %u\n", rtp_session->vad_data.bg_level); + */ } send = 1; } else { @@ -1215,8 +1218,9 @@ if (switch_test_flag(&rtp_session->vad_data, SWITCH_VAD_FLAG_CNG) && ++rtp_session->vad_data.cng_count >= rtp_session->vad_data.cng_freq) { rtp_session->send_msg.header.pt = SWITCH_RTP_CNG_PAYLOAD; memset(rtp_session->send_msg.body, 255, SWITCH_RTP_CNG_PAYLOAD); - //rtp_session->send_msg.header.ts = htonl(rtp_session->vad_data.ts); - //rtp_session->vad_data.ts++; + /* rtp_session->send_msg.header.ts = htonl(rtp_session->vad_data.ts); + * rtp_session->vad_data.ts++; + */ bytes = SWITCH_RTP_CNG_PAYLOAD; send = 1; rtp_session->vad_data.cng_count = 0;

1 0

[commit] r4443 - freeswitch/trunk/src
by Freeswitch SVN 04 Mar '07

04 Mar '07

Author: brian Date: Sat Mar 3 20:50:52 2007 New Revision: 4443 Modified: freeswitch/trunk/src/switch_event.c Log: fix more comments Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Sat Mar 3 20:50:52 2007 @@ -41,8 +41,8 @@ static switch_mutex_t *EVENT_QUEUE_HAVEMORE_MUTEX = NULL; static switch_thread_cond_t *EVENT_QUEUE_CONDITIONAL = NULL; static switch_memory_pool_t *RUNTIME_POOL = NULL; -//static switch_memory_pool_t *APOOL = NULL; -//static switch_memory_pool_t *BPOOL = NULL; +/* static switch_memory_pool_t *APOOL = NULL; */ +/* static switch_memory_pool_t *BPOOL = NULL; */ static switch_memory_pool_t *THRUNTIME_POOL = NULL; static switch_queue_t *EVENT_QUEUE[3] = {0,0,0}; static int POOL_COUNT_MAX = SWITCH_CORE_QUEUE_LEN; @@ -209,34 +209,36 @@ if (!any) { - //lock on havemore so we are the only ones poking at it while we check it - //see if we saw anything in the queues or have a check again flag + /* lock on havemore so we are the only ones poking at it while we check it + * see if we saw anything in the queues or have a check again flag + */ switch_mutex_lock(EVENT_QUEUE_HAVEMORE_MUTEX); if(!EVENT_QUEUE_HAVEMORE) { - //See if we need to quit + /* See if we need to quit */ if (THREAD_RUNNING != 1) { - //give up our lock + /* give up our lock */ switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); - //Game over + /* game over */ break; } - //give up our lock + /* give up our lock */ switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); - //wait until someone tells us we have something to do + /* wait until someone tells us we have something to do */ switch_thread_cond_wait(EVENT_QUEUE_CONDITIONAL, EVENT_QUEUE_MUTEX); } else { - //Caught a race, one of the queues was updated after we looked at it - //reset our flag + /* Caught a race, one of the queues was updated after we looked at it + * reset our flag + */ EVENT_QUEUE_HAVEMORE = 0; - //Give up our lock + /* give up our lock */ switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); } - //go grab some events + /* go grab some events */ continue; } @@ -348,24 +350,27 @@ if (THREAD_RUNNING > 0) { THREAD_RUNNING = -1; - //Lock on havemore to make sure he event thread, if currently running - // doesn't check the HAVEMORE flag before we set it + /* lock on havemore to make sure he event thread, if currently running + * doesn't check the HAVEMORE flag before we set it + */ switch_mutex_lock(EVENT_QUEUE_HAVEMORE_MUTEX); - //See if the event thread is sitting + /* see if the event thread is sitting */ if(switch_mutex_trylock(EVENT_QUEUE_MUTEX) == SWITCH_STATUS_SUCCESS) { - //we don't need havemore anymore, the thread was sitting already + /* we don't need havemore anymore, the thread was sitting already */ switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); - //wake up the event thread + /* wake up the event thread */ switch_thread_cond_signal(EVENT_QUEUE_CONDITIONAL); - //give up our lock + /* give up our lock */ switch_mutex_unlock(EVENT_QUEUE_MUTEX); - } else { // it wasn't waiting which means we might have updated a queue it already looked at - //set a flag so it knows to read the queues again + } else { + /* it wasn't waiting which means we might have updated a queue it already looked at + * set a flag so it knows to read the queues again + */ EVENT_QUEUE_HAVEMORE = 1; - //variable updated, give up the mutex + /* variable updated, give up the mutex */ switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); } @@ -401,7 +406,7 @@ return SWITCH_STATUS_MEMERR; } */ - //THRUNTIME_POOL = APOOL; + /* THRUNTIME_POOL = APOOL; */ switch_queue_create(&EVENT_QUEUE[0], POOL_COUNT_MAX + 10, THRUNTIME_POOL); switch_queue_create(&EVENT_QUEUE[1], POOL_COUNT_MAX + 10, THRUNTIME_POOL); switch_queue_create(&EVENT_QUEUE[2], POOL_COUNT_MAX + 10, THRUNTIME_POOL); @@ -627,7 +632,7 @@ return SWITCH_STATUS_MEMERR; } - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "hit serialze!.\n"); + /* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "hit serialze!.\n"); */ for (hp = event->headers; hp; hp = hp->next) { /* * grab enough memory to store 3x the string (url encode takes one char and turns it into %XX) @@ -641,7 +646,7 @@ if(encode_len < new_len) { char* tmp; - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Allocing %d was %d.\n", ((strlen(hp->value) * 3) + 1), encode_len); + /* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Allocing %d was %d.\n", ((strlen(hp->value) * 3) + 1), encode_len); */ /* we can use realloc for initial alloc as well, if encode_buf is zero it treats it as a malloc */ /* keep track of the size of our allocation */ @@ -834,24 +839,27 @@ switch_queue_push(EVENT_QUEUE[(*event)->priority], *event); - //Lock on havemore to make sure he event thread, if currently running - // doesn't check the HAVEMORE flag before we set it + /* lock on havemore to make sure he event thread, if currently running + * doesn't check the HAVEMORE flag before we set it + */ switch_mutex_lock(EVENT_QUEUE_HAVEMORE_MUTEX); - //See if the event thread is sitting + /* see if the event thread is sitting */ if(switch_mutex_trylock(EVENT_QUEUE_MUTEX) == SWITCH_STATUS_SUCCESS) { - //we don't need havemore anymore, the thread was sitting already + /* we don't need havemore anymore, the thread was sitting already */ switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); - //wake up the event thread + /* wake up the event thread */ switch_thread_cond_signal(EVENT_QUEUE_CONDITIONAL); - //give up our lock + /* give up our lock */ switch_mutex_unlock(EVENT_QUEUE_MUTEX); - } else { // it wasn't waiting which means we might have updated a queue it already looked at - //set a flag so it knows to read the queues again + } else { + /* it wasn't waiting which means we might have updated a queue it already looked at + * set a flag so it knows to read the queues again + */ EVENT_QUEUE_HAVEMORE = 1; - //variable updated, give up the mutex + /* variable updated, give up the mutex */ switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); }

1 0

[commit] r4442 - freeswitch/trunk/src
by Freeswitch SVN 04 Mar '07

04 Mar '07

Author: brian Date: Sat Mar 3 20:47:08 2007 New Revision: 4442 Modified: freeswitch/trunk/src/switch_core.c Log: fix comments Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Sat Mar 3 20:47:08 2007 @@ -40,7 +40,7 @@ #include <sys/mman.h> #endif -//#define DEBUG_ALLOC +/* #define DEBUG_ALLOC */ #define DO_EVENTS #ifdef CRASH_PROT @@ -3684,7 +3684,7 @@ #ifdef DEBUG_ALLOC switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Allocate %d\n", memory); - //assert(memory < 600000); + /* assert(memory < 600000); */ #endif if ((ptr = apr_palloc(pool, memory)) != 0) { @@ -4615,7 +4615,7 @@ if (runtime.memory_pool) { apr_pool_destroy(runtime.memory_pool); - //apr_terminate(); + /* apr_terminate(); */ } return SWITCH_STATUS_SUCCESS;

1 0

[commit] r4441 - freeswitch/trunk/src
by Freeswitch SVN 04 Mar '07

04 Mar '07

Author: brian Date: Sat Mar 3 20:46:33 2007 New Revision: 4441 Modified: freeswitch/trunk/src/switch_config.c Log: fix comments Modified: freeswitch/trunk/src/switch_config.c ============================================================================== --- freeswitch/trunk/src/switch_config.c (original) +++ freeswitch/trunk/src/switch_config.c Sat Mar 3 20:46:33 2007 @@ -174,7 +174,7 @@ if ((*val = strchr(*var, '=')) == 0) { ret = -1; - //log_printf(0, server.log, "Invalid syntax on %s: line %d\n", cfg->path, cfg->lineno); + /* log_printf(0, server.log, "Invalid syntax on %s: line %d\n", cfg->path, cfg->lineno); */ continue; } else { p = *val - 1;

1 0

[commit] r4440 - freeswitch/trunk/src
by Freeswitch SVN 04 Mar '07

04 Mar '07

Author: brian Date: Sat Mar 3 20:46:08 2007 New Revision: 4440 Modified: freeswitch/trunk/src/switch_channel.c Log: fix comments Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sat Mar 3 20:46:08 2007 @@ -667,9 +667,9 @@ state_names[last_state], state_names[state]); - //we won't tolerate an invalid state change so we can make sure we are as robust as a nice cup of dark coffee! + /* we won't tolerate an invalid state change so we can make sure we are as robust as a nice cup of dark coffee! */ if (channel->state < CS_HANGUP) { - // not cool lets crash this bad boy and figure out wtf is going on + /* not cool lets crash this bad boy and figure out wtf is going on */ assert(0); } }

1 0