February 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4257 - in freeswitch/trunk/src: . include mod/languages/mod_spidermonkey
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: anthm Date: Wed Feb 14 10:19:01 2007 New Revision: 4257 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_ivr.c Log: add new xml call detail function to the core and a way to use it from javascript Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Wed Feb 14 10:19:01 2007 @@ -53,6 +53,15 @@ /*! + \brief Generate an XML CDR report. + \param session the session to get the data from. + \param xml_cdr pointer to the xml_record + \return SWITCH_STATUS_SUCCESS if successful + \note on success the xml object must be freed +*/ +SWITCH_DECLARE(switch_status_t) switch_ivr_generate_xml_cdr(switch_core_session_t *session, switch_xml_t *xml_cdr); + +/*! \brief Parse command from an event \param session the session to send the message to \param event the event to send Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Wed Feb 14 10:19:01 2007 @@ -1340,6 +1340,27 @@ return JS_TRUE; } + +static JSBool session_cdr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + struct js_session *jss = JS_GetPrivate(cx, obj); + switch_xml_t cdr; + + /*Always a pessimist... sheesh!*/ + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + + if (switch_ivr_generate_xml_cdr(jss->session, &cdr) == SWITCH_STATUS_SUCCESS) { + char *xml_text; + if ((xml_text = switch_xml_toxml(cdr))) { + *rval = STRING_TO_JSVAL (JS_NewStringCopyZ(cx, xml_text)); + } + switch_safe_free(xml_text); + switch_xml_free(cdr); + } + + return JS_TRUE; +} + static JSBool session_ready(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { struct js_session *jss = JS_GetPrivate(cx, obj); @@ -1716,6 +1737,7 @@ {"getVariable", session_get_variable, 1}, {"getDigits", session_get_digits, 1}, {"answer", session_answer, 0}, + {"generateXmlCdr", session_cdr, 0}, {"ready", session_ready, 0}, {"waitForAnswer", session_wait_for_answer, 0}, {"waitForMedia", session_wait_for_media, 0}, Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Wed Feb 14 10:19:01 2007 @@ -4833,6 +4833,217 @@ } +static int set_profile_data(switch_xml_t xml, switch_caller_profile_t *caller_profile, int off) +{ + switch_xml_t param; + + if (!(param = switch_xml_add_child_d(xml, "username", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->username); + + if (!(param = switch_xml_add_child_d(xml, "dialplan", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->dialplan); + + if (!(param = switch_xml_add_child_d(xml, "caller_id_name", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->caller_id_name); + + if (!(param = switch_xml_add_child_d(xml, "ani", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->ani); + + if (!(param = switch_xml_add_child_d(xml, "aniii", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->aniii); + + if (!(param = switch_xml_add_child_d(xml, "caller_id_number", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->caller_id_number); + + if (!(param = switch_xml_add_child_d(xml, "network_addr", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->network_addr); + + if (!(param = switch_xml_add_child_d(xml, "rdnis", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->rdnis); + + if (!(param = switch_xml_add_child_d(xml, "destination_number", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->destination_number); + + if (!(param = switch_xml_add_child_d(xml, "uuid", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->uuid); + + if (!(param = switch_xml_add_child_d(xml, "source", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->source); + + if (!(param = switch_xml_add_child_d(xml, "context", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->context); + + if (!(param = switch_xml_add_child_d(xml, "chan_name", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->chan_name); + + return 0; +} + +SWITCH_DECLARE(switch_status_t) switch_ivr_generate_xml_cdr(switch_core_session_t *session, switch_xml_t *xml_cdr) +{ + switch_channel_t *channel; + switch_caller_profile_t *caller_profile; + switch_hash_index_t *hi; + void *vval; + const void *vvar; + switch_xml_t variable, + variables, + cdr, + x_caller_profile, + x_caller_extension, + x_times, + x_application, + x_callflow; + char tmp[512]; + int cdr_off = 0, v_off = 0; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + if (!(cdr = switch_xml_new("cdr"))) { + return SWITCH_STATUS_SUCCESS; + } + + if (!(variables = switch_xml_add_child_d(cdr, "variables", cdr_off++))) { + goto error; + } + + for (hi = switch_channel_variable_first(channel, switch_core_session_get_pool(session)); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, &vvar, NULL, &vval); + if (vvar && vval) { + if ((variable = switch_xml_add_child_d(variables, (char *) vvar, v_off++))) { + char *data; + char *value = (char *) vval; + switch_size_t dlen = strlen(value) * 3; + + if ((data = switch_core_session_alloc(session, dlen))) { + switch_url_encode(value, data, dlen); + switch_xml_set_txt_d(variable, data); + } + } + } + } + + caller_profile = switch_channel_get_caller_profile(channel); + + while (caller_profile) { + int cf_off = 0; + + if (!(x_callflow = switch_xml_add_child_d(cdr, "callflow", cdr_off++))) { + goto error; + } + + if (caller_profile->caller_extension) { + switch_caller_application_t *ap; + + if (!(x_caller_extension = switch_xml_add_child_d(x_callflow, "extension", cf_off++))) { + goto error; + } + switch_xml_set_attr_d(x_caller_extension, "name", caller_profile->caller_extension->extension_name); + switch_xml_set_attr_d(x_caller_extension, "number", caller_profile->caller_extension->extension_number); + if (caller_profile->caller_extension->current_application) { + switch_xml_set_attr_d(x_caller_extension, "current_app", caller_profile->caller_extension->current_application->application_name); + } + + for(ap = caller_profile->caller_extension->applications; ap; ap = ap->next) { + if (!(x_application = switch_xml_add_child_d(x_callflow, "application", cf_off++))) { + goto error; + } + switch_xml_set_attr_d(x_application, "app_name", ap->application_name); + switch_xml_set_attr_d(x_application, "app_data", ap->application_data); + } + } + + if (!(x_caller_profile = switch_xml_add_child_d(x_callflow, "caller_profile", cf_off++))) { + goto error; + } + set_profile_data(x_caller_profile, caller_profile, 0); + + if (caller_profile->originator_caller_profile) { + if (!(x_caller_profile = switch_xml_add_child_d(x_callflow, "originator_caller_profile", cf_off++))) { + goto error; + } + set_profile_data(x_caller_profile, caller_profile->originator_caller_profile, 0); + } + + if (caller_profile->originatee_caller_profile) { + if (!(x_caller_profile = switch_xml_add_child_d(x_callflow, "originatee_caller_profile", cf_off++))) { + goto error; + } + set_profile_data(x_caller_profile, caller_profile->originatee_caller_profile, 0); + } + + + if (caller_profile->times) { + if (!(x_times = switch_xml_add_child_d(x_callflow, "created_time", cf_off++))) { + goto error; + } + snprintf(tmp, sizeof(tmp), "%"APR_TIME_T_FMT, caller_profile->times->created); + switch_xml_set_txt_d(x_times, tmp); + + if (!(x_times = switch_xml_add_child_d(x_callflow, "answered_time", cf_off++))) { + goto error; + } + snprintf(tmp, sizeof(tmp), "%"APR_TIME_T_FMT, caller_profile->times->answered); + switch_xml_set_txt_d(x_times, tmp); + + if (!(x_times = switch_xml_add_child_d(x_callflow, "hangup_time", cf_off++))) { + goto error; + } + snprintf(tmp, sizeof(tmp), "%"APR_TIME_T_FMT, caller_profile->times->hungup); + switch_xml_set_txt_d(x_times, tmp); + + if (!(x_times = switch_xml_add_child_d(x_callflow, "transfer_time", cf_off++))) { + goto error; + } + snprintf(tmp, sizeof(tmp), "%"APR_TIME_T_FMT, caller_profile->times->transferred); + switch_xml_set_txt_d(x_times, tmp); + } + + caller_profile = caller_profile->next; + } + + *xml_cdr = cdr; + + return SWITCH_STATUS_SUCCESS; + + error: + + if (cdr) { + switch_xml_free(cdr); + } + + return SWITCH_STATUS_FALSE; +} + + + /* For Emacs: * Local Variables: * mode:c

1 0

[commit] r4256 - freeswitch/trunk/src/include
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: anthm Date: Wed Feb 14 10:08:49 2007 New Revision: 4256 Modified: freeswitch/trunk/src/include/switch_console.h Log: s.data is void * Modified: freeswitch/trunk/src/include/switch_console.h ============================================================================== --- freeswitch/trunk/src/include/switch_console.h (original) +++ freeswitch/trunk/src/include/switch_console.h Wed Feb 14 10:08:49 2007 @@ -43,7 +43,7 @@ SWITCH_BEGIN_EXTERN_C #define SWITCH_CMD_CHUNK_LEN 1024 -#define SWITCH_STANDARD_STREAM(s) if ((s.data = (char *)malloc(SWITCH_CMD_CHUNK_LEN))) { \ +#define SWITCH_STANDARD_STREAM(s) if ((s.data = malloc(SWITCH_CMD_CHUNK_LEN))) { \ memset(s.data, 0, SWITCH_CMD_CHUNK_LEN); \ s.end = s.data;\ s.data_size = SWITCH_CMD_CHUNK_LEN;\

1 0

[commit] r4255 - freeswitch/trunk/conf
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: mikej Date: Tue Feb 13 23:30:14 2007 New Revision: 4255 Modified: freeswitch/trunk/conf/modules.conf.xml Log: add mod_say_en to load by default. Modified: freeswitch/trunk/conf/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/modules.conf.xml (original) +++ freeswitch/trunk/conf/modules.conf.xml Tue Feb 13 23:30:14 2007 @@ -64,5 +64,8 @@    + +  + <load module="mod_say_en"/> </modules> </configuration>

1 0

[commit] r4254 - in freeswitch/trunk/src: . mod/applications/mod_conference mod/endpoints/mod_dingaling mod/endpoints/mod_sofia mod/event_handlers/mod_event_socket
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: mikej Date: Tue Feb 13 22:45:10 2007 New Revision: 4254 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/switch_ivr.c Log: potential format string exploits (warning: format not a string literal and no format arguments) Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Tue Feb 13 22:45:10 2007 @@ -2466,7 +2466,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "dtmf-member"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Digits", dtmf); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Digits", "%s", dtmf); switch_event_fire(&event); } Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue Feb 13 22:45:10 2007 @@ -628,7 +628,7 @@ va_start(ap, fmt); vsnprintf(data, sizeof(data), fmt, ap); - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_DEBUG, data); + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_DEBUG, "%s", data); va_end(ap); } @@ -2427,7 +2427,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "to", "%s", to); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "subject", "%s", subject); if (msg) { - switch_event_add_body(event, msg); + switch_event_add_body(event, "%s", msg); } if (switch_core_session_queue_event(tech_pvt->session, &event) != SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "delivery-failure", "true"); 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 Tue Feb 13 22:45:10 2007 @@ -2659,7 +2659,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "to", "%s", to_addr); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "subject", "SIMPLE MESSAGE"); if (msg) { - switch_event_add_body(event, msg); + switch_event_add_body(event, "%s", msg); } if (switch_core_session_queue_event(tech_pvt->session, &event) != SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "delivery-failure", "true"); Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Tue Feb 13 22:45:10 2007 @@ -550,7 +550,7 @@ if (switch_event_create(&event, SWITCH_EVENT_BACKGROUND_JOB) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Job-UUID", "%s", acs->uuid_str); - switch_event_add_body(event, reply); + switch_event_add_body(event, "%s", reply); switch_event_fire(&event); } } else { @@ -650,7 +650,7 @@ } } - snprintf(reply, reply_len, val); + snprintf(reply, reply_len, "%s", val); goto done; } else if (!strncasecmp(cmd, "myevents", 8)) { listener->event_list[SWITCH_EVENT_CHANNEL_CREATE] = 1; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Feb 13 22:45:10 2007 @@ -807,7 +807,7 @@ if (switch_event_create(&event, SWITCH_EVENT_DETECTED_SPEECH) == SWITCH_STATUS_SUCCESS) { if (status == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Speech-Type", "detected-speech"); - switch_event_add_body(event, xmlstr); + switch_event_add_body(event, "%s", xmlstr); } else { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Speech-Type", "begin-speaking"); } @@ -2518,7 +2518,7 @@ for (hi = switch_channel_variable_first(caller_channel, switch_core_session_get_pool(session)); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, &vvar, NULL, &vval); if (vvar && vval) { - switch_event_add_header(var_event, SWITCH_STACK_BOTTOM, (void *)vvar, vval); + switch_event_add_header(var_event, SWITCH_STACK_BOTTOM, (void *)vvar, "%s", (char *)vval); } }

1 0

[commit] r4253 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: mikej Date: Tue Feb 13 22:32:13 2007 New Revision: 4253 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: potential format string exploit Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Feb 13 22:32:13 2007 @@ -225,7 +225,7 @@ if (argc > 0) { char *body = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); - switch_event_add_body(eo->event, body); + switch_event_add_body(eo->event, "%s", body); *rval = BOOLEAN_TO_JSVAL( JS_TRUE ); return JS_TRUE; }

1 0

[commit] r4252 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: mikej Date: Tue Feb 13 22:24:20 2007 New Revision: 4252 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: cleanups: duplicate declarations, shadowed global names, extra paramaters, and constifications. 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 Tue Feb 13 22:24:20 2007 @@ -424,8 +424,6 @@ static void launch_profile_thread(sofia_profile_t *profile); -static switch_status_t config_sofia(int reload); - static switch_status_t chat_send(char *proto, char *from, char *to, char *subject, char *body, char *hint); /* BODY OF THE MODULE */ @@ -438,14 +436,13 @@ } auth_res_t; -static char *get_url_from_contact(char *buf, uint8_t dup) +static char *get_url_from_contact(char *buf, uint8_t to_dup) { char *url = NULL, *e; - if ((url = strchr(buf, '<')) && (e = strchr(url, '>'))) { url++; - if (dup) { + if (to_dup) { url = strdup(url); e = strchr(url, '>'); } @@ -459,8 +456,8 @@ static auth_res_t parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, char *regstr, char *np, size_t nplen) { - int index; - char *cur; + int indexnum; + const char *cur; su_md5_t ctx; char uridigest[2 * SU_MD5_DIGEST_SIZE + 1]; char bigdigest[2 * SU_MD5_DIGEST_SIZE + 1]; @@ -471,7 +468,7 @@ nonce = uri = qop = cnonce = nc = response = NULL; if (authorization->au_params) { - for(index = 0; (cur=(char*)authorization->au_params[index]); index++) { + for(indexnum = 0; (cur=authorization->au_params[indexnum]); indexnum++) { char *var, *val, *p, *work; var = val = work = NULL; if ((work = strdup(cur))) { @@ -1325,7 +1322,7 @@ deactivate_rtp(tech_pvt); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel %s hanging up, cause: %s\n", - switch_channel_get_name(channel), switch_channel_cause2str(cause), sip_cause); + switch_channel_get_name(channel), switch_channel_cause2str(cause)); if (tech_pvt->hash_key) { switch_core_hash_delete(tech_pvt->profile->chat_hash, tech_pvt->hash_key); @@ -4573,7 +4570,7 @@ char const *realm = NULL; char *p = NULL, *duprealm = NULL, *qrealm = NULL; char const *scheme = NULL; - int index; + int indexnum; char *cur; char authentication[256] = ""; int ss_state; @@ -4597,7 +4594,7 @@ } scheme = (char const *) authenticate->au_scheme; if (authenticate->au_params) { - for(index = 0; (cur=(char*)authenticate->au_params[index]); index++) { + for(indexnum = 0; (cur=(char*)authenticate->au_params[indexnum]); indexnum++) { if ((realm = strstr(cur, "realm="))) { realm += 6; break;

1 0

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

14 Feb '07

Author: mikej Date: Tue Feb 13 22:22:43 2007 New Revision: 4251 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_event.h freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_event.c Log: constification for switch_core_hash_find and switch_event_create_subclass Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Tue Feb 13 22:22:43 2007 @@ -886,7 +886,7 @@ \param key the key to retrieve \return a pointer to the data held in the key */ -SWITCH_DECLARE(void *) switch_core_hash_find(switch_hash_t *hash, char *key); +SWITCH_DECLARE(void *) switch_core_hash_find(switch_hash_t *hash, const char *key); ///\} ///\defgroup timer Timer Functions Modified: freeswitch/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/trunk/src/include/switch_event.h (original) +++ freeswitch/trunk/src/include/switch_event.h Tue Feb 13 22:22:43 2007 @@ -139,7 +139,7 @@ \param subclass_name the subclass name for custom event (only valid when event_id is SWITCH_EVENT_CUSTOM) \return SWITCH_STATUS_SUCCESS on success */ -SWITCH_DECLARE(switch_status_t) switch_event_create_subclass(switch_event_t **event, switch_event_types_t event_id, char *subclass_name); +SWITCH_DECLARE(switch_status_t) switch_event_create_subclass(switch_event_t **event, switch_event_types_t event_id, const char *subclass_name); /*! \brief Set the priority of an event Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Feb 13 22:22:43 2007 @@ -3504,7 +3504,7 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(void *) switch_core_hash_find(switch_hash_t *hash, char *key) +SWITCH_DECLARE(void *) switch_core_hash_find(switch_hash_t *hash, const char *key) { return apr_hash_get(hash, key, APR_HASH_KEY_STRING); } Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Feb 13 22:22:43 2007 @@ -423,7 +423,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_create_subclass(switch_event_t **event, switch_event_types_t event_id, - char *subclass_name) + const char *subclass_name) { if (event_id != SWITCH_EVENT_CUSTOM && subclass_name) {

1 0

[commit] r4250 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: mikej Date: Tue Feb 13 21:56:31 2007 New Revision: 4250 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: eliminate shadowing of function level variables (functionally equivalent but redundant in this case) 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 Tue Feb 13 21:56:31 2007 @@ -2047,15 +2047,6 @@ nua_respond(tech_pvt->nh, SIP_180_RINGING, SIPTAG_CONTACT_STR(tech_pvt->profile->url), TAG_END()); break; case SWITCH_MESSAGE_INDICATE_PROGRESS: { - struct private_object *tech_pvt; - switch_channel_t *channel = NULL; - - channel = switch_core_session_get_channel(session); - assert(channel != NULL); - - tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); - if (!switch_test_flag(tech_pvt, TFLAG_ANS)) { switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Asked to send early media by %s\n", msg->from);

1 0

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

14 Feb '07

Author: mikej Date: Tue Feb 13 21:53:23 2007 New Revision: 4249 Modified: freeswitch/trunk/src/include/switch_console.h freeswitch/trunk/src/include/switch_event.h freeswitch/trunk/src/include/switch_log.h freeswitch/trunk/src/switch_console.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_log.c Log: constify the fmt string on all printf like functions Modified: freeswitch/trunk/src/include/switch_console.h ============================================================================== --- freeswitch/trunk/src/include/switch_console.h (original) +++ freeswitch/trunk/src/include/switch_console.h Tue Feb 13 21:53:23 2007 @@ -67,7 +67,7 @@ /*! \brief A method akin to printf for dealing with api streams */ -SWITCH_DECLARE(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, char *fmt, ...) PRINTF_FUNCTION(2,3); +SWITCH_DECLARE(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, const char *fmt, ...) PRINTF_FUNCTION(2,3); SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/trunk/src/include/switch_event.h (original) +++ freeswitch/trunk/src/include/switch_event.h Tue Feb 13 21:53:23 2007 @@ -172,7 +172,7 @@ \param fmt the value of the header (varargs see standard sprintf family) \return SWITCH_STATUS_SUCCESS if the header was added */ -SWITCH_DECLARE(switch_status_t) switch_event_add_header(switch_event_t *event, switch_stack_t stack, char *header_name, char *fmt, ...) PRINTF_FUNCTION(4,5); +SWITCH_DECLARE(switch_status_t) switch_event_add_header(switch_event_t *event, switch_stack_t stack, const char *header_name, const char *fmt, ...) PRINTF_FUNCTION(4,5); /*! \brief Destroy an event @@ -251,7 +251,7 @@ \return the xml object if the operation was successful \note the body supplied by this function will supersede an existing body the event may have */ -SWITCH_DECLARE(switch_xml_t) switch_event_xmlize(switch_event_t *event, char *fmt, ...) PRINTF_FUNCTION(2,3); +SWITCH_DECLARE(switch_xml_t) switch_event_xmlize(switch_event_t *event, const char *fmt, ...) PRINTF_FUNCTION(2,3); /*! \brief Determine if the event system has been initilized @@ -266,7 +266,7 @@ \return SWITCH_STATUS_SUCCESS if the body was added to the event \note the body parameter can be shadowed by the switch_event_reserve_subclass_detailed function */ -SWITCH_DECLARE(switch_status_t) switch_event_add_body(switch_event_t *event, char *fmt, ...) PRINTF_FUNCTION(2,3); +SWITCH_DECLARE(switch_status_t) switch_event_add_body(switch_event_t *event, const char *fmt, ...) PRINTF_FUNCTION(2,3); /*! Modified: freeswitch/trunk/src/include/switch_log.h ============================================================================== --- freeswitch/trunk/src/include/switch_log.h (original) +++ freeswitch/trunk/src/include/switch_log.h Tue Feb 13 21:53:23 2007 @@ -94,7 +94,7 @@ \param ... variable args \note there are channel macros to supply the first 4 parameters */ -SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char *file, const char *func, int line, switch_log_level_t level, char *fmt, ...) PRINTF_FUNCTION(6,7); +SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char *file, const char *func, int line, switch_log_level_t level, const char *fmt, ...) PRINTF_FUNCTION(6,7); /*! \brief Shut down the logging engine Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Tue Feb 13 21:53:23 2007 @@ -35,7 +35,7 @@ #define CMD_BUFLEN 1024; -SWITCH_DECLARE(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, char *fmt, ...) +SWITCH_DECLARE(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, const char *fmt, ...) { va_list ap; char *buf = handle->data; Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Feb 13 21:53:23 2007 @@ -474,8 +474,8 @@ return NULL; } -SWITCH_DECLARE(switch_status_t) switch_event_add_header(switch_event_t *event, switch_stack_t stack, char *header_name, - char *fmt, ...) +SWITCH_DECLARE(switch_status_t) switch_event_add_header(switch_event_t *event, switch_stack_t stack, const char *header_name, + const char *fmt, ...) { int ret = 0; char data[2048]; @@ -516,7 +516,7 @@ } -SWITCH_DECLARE(switch_status_t) switch_event_add_body(switch_event_t *event, char *fmt, ...) +SWITCH_DECLARE(switch_status_t) switch_event_add_body(switch_event_t *event, const char *fmt, ...) { int ret = 0; char *data; @@ -729,7 +729,7 @@ return header; } -SWITCH_DECLARE(switch_xml_t) switch_event_xmlize(switch_event_t *event, char *fmt, ...) +SWITCH_DECLARE(switch_xml_t) switch_event_xmlize(switch_event_t *event, const char *fmt, ...) { switch_event_header_t *hp; char *data = NULL, *body = NULL; Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Tue Feb 13 21:53:23 2007 @@ -162,7 +162,7 @@ return NULL; } -SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char *file, const char *func, int line, switch_log_level_t level, char *fmt, ...) +SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char *file, const char *func, int line, switch_log_level_t level, const char *fmt, ...) { char *data = NULL; char *new_fmt = NULL;

1 0

[commit] r4248 - freeswitch/trunk/src/include
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: anthm Date: Tue Feb 13 20:01:58 2007 New Revision: 4248 Modified: freeswitch/trunk/src/include/switch_xml.h Log: add nil thing to xml func Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Tue Feb 13 20:01:58 2007 @@ -265,7 +265,7 @@ ///\param value the attribute value ///\return an xml node or NULL #define switch_xml_set_attr_d(xml, name, value) \ - switch_xml_set_attr(switch_xml_set_flag(xml, SWITCH_XML_DUP), strdup(name), strdup(value)) + switch_xml_set_attr(switch_xml_set_flag(xml, SWITCH_XML_DUP), strdup(name), strdup(switch_str_nil(value))) ///\brief sets a flag for the given tag and returns the tag ///\param xml the xml node

1 0