- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4090 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 30 Jan '07

30 Jan '07

Author: anthm Date: Mon Jan 29 19:43:14 2007 New Revision: 4090 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: conf tweaks the series 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 Mon Jan 29 19:43:14 2007 @@ -283,7 +283,15 @@ uint32_t timeout, char *flags, char *cid_name, - char *cid_num); + char *cid_num, + switch_call_cause_t *cause); +static switch_status_t conference_outcall_bg(conference_obj_t *conference, + switch_core_session_t *session, + char *bridgeto, + uint32_t timeout, + char *flags, + char *cid_name, + char *cid_num); static void conference_function(switch_core_session_t *session, char *data); static void launch_conference_thread(conference_obj_t *conference); static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, void *obj); @@ -1222,8 +1230,9 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "dial argc %u 1 '%s' 2 '%s' 3 '%s' 4 '%s'\n", argc, argv[0], argv[1], argv[2], argv[3]); if (argc >= 4) { + switch_call_cause_t *cause; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "executing conference outcall\n"); - conference_outcall(member->conference, NULL, argv[0], atoi(argv[1]), NULL, argv[3], argv[2]); + conference_outcall(member->conference, NULL, argv[0], atoi(argv[1]), NULL, argv[3], argv[2], &cause); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "conference outcall not executed\n"); } @@ -2919,7 +2928,26 @@ assert(stream != NULL); if (argc > 2) { - conference_outcall(conference, NULL, argv[2], 60, NULL, argv[4], argv[3]); + switch_call_cause_t cause; + conference_outcall(conference, NULL, argv[2], 60, NULL, argv[4], argv[3], &cause); + stream->write_function(stream, "Call Requested: result: [%s]\n", switch_channel_cause2str(cause)); + } else { + ret_status = SWITCH_STATUS_GENERR; + } + + return ret_status; +} + + +static switch_status_t conf_api_sub_bgdial(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) +{ + switch_status_t ret_status = SWITCH_STATUS_SUCCESS; + + assert(conference != NULL); + assert(stream != NULL); + + if (argc > 2) { + conference_outcall_bg(conference, NULL, argv[2], 60, NULL, argv[4], argv[3]); stream->write_function(stream, "OK\n"); } else { ret_status = SWITCH_STATUS_GENERR; @@ -3100,6 +3128,7 @@ {"lock", &conf_api_sub_lock, CONF_API_SUB_ARGS_SPLIT, "<confname> lock"}, {"unlock", &conf_api_sub_unlock, CONF_API_SUB_ARGS_SPLIT, "<confname> unlock"}, {"dial", &conf_api_sub_dial, CONF_API_SUB_ARGS_SPLIT, "<confname> dial <endpoint_module_name>/<destination> <callerid number> <callerid name>"}, + {"bgdial", &conf_api_sub_bgdial, CONF_API_SUB_ARGS_SPLIT, "<confname> bgdial <endpoint_module_name>/<destination> <callerid number> <callerid name>"}, {"transfer", &conf_api_sub_transfer, CONF_API_SUB_ARGS_SPLIT, "<confname> transfer <conference_name> <member id> [...<member id>]"}, {"record", &conf_api_sub_record, CONF_API_SUB_ARGS_SPLIT, "<confname> record <filename>"}, {"norecord", &conf_api_sub_norecord, CONF_API_SUB_ARGS_SPLIT, "<confname> norecord <[filename|all]>"}, @@ -3260,13 +3289,11 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n"); goto done; } - switch_mutex_lock(conference->mutex); if (argc >= 2) { conf_api_dispatch(conference, stream, argc, argv, (const char *)buf, 1); } else { stream->write_function(stream, "Conference command, not specified.\nTry 'help'\n"); } - switch_mutex_unlock(conference->mutex); switch_thread_rwlock_unlock(conference->rwlock); } else { @@ -3317,6 +3344,7 @@ /*.on_hold */ NULL, }; + /* generate an outbound call from the conference */ static switch_status_t conference_outcall(conference_obj_t *conference, switch_core_session_t *session, @@ -3324,14 +3352,16 @@ uint32_t timeout, char *flags, char *cid_name, - char *cid_num) + char *cid_num, + switch_call_cause_t *cause) { switch_core_session_t *peer_session; switch_channel_t *peer_channel; switch_status_t status = SWITCH_STATUS_SUCCESS; switch_channel_t *caller_channel = NULL; char appdata[512]; - switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; + + *cause = SWITCH_CAUSE_NORMAL_CLEARING; if (switch_thread_rwlock_tryrdlock(conference->rwlock) != SWITCH_STATUS_SUCCESS) { @@ -3355,7 +3385,7 @@ /* establish an outbound call leg */ if (switch_ivr_originate(session, &peer_session, - &cause, + cause, bridgeto, timeout, &audio_bridge_peer_state_handlers, @@ -3363,9 +3393,9 @@ cid_num, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot create outgoing channel, cause: %s\n", - switch_channel_cause2str(cause)); + switch_channel_cause2str(*cause)); if (caller_channel) { - switch_channel_hangup(caller_channel, cause); + switch_channel_hangup(caller_channel, *cause); } goto done; } @@ -3420,6 +3450,82 @@ return status; } +struct bg_call { + conference_obj_t *conference; + switch_core_session_t *session; + char *bridgeto; + uint32_t timeout; + char *flags; + char *cid_name; + char *cid_num; +}; + +static void *SWITCH_THREAD_FUNC conference_outcall_run(switch_thread_t *thread, void *obj) +{ + struct bg_call *call = (struct bg_call *) obj; + + if (call) { + switch_call_cause_t cause; + + conference_outcall(call->conference, call->session, call->bridgeto, call->timeout, call->flags, call->cid_name, call->cid_num, &cause); + switch_event_t *event; + + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", call->conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "bgdial-result"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Result", switch_channel_cause2str(cause)); + switch_event_fire(&event); + } + switch_safe_free(call->bridgeto); + switch_safe_free(call->flags); + switch_safe_free(call->cid_name); + switch_safe_free(call->cid_num); + switch_safe_free(call); + } + + return NULL; +} + +static switch_status_t conference_outcall_bg(conference_obj_t *conference, + switch_core_session_t *session, + char *bridgeto, + uint32_t timeout, + char *flags, + char *cid_name, + char *cid_num) +{ + struct bg_call *call = NULL; + + if ((call = malloc(sizeof(*call)))) { + switch_thread_t *thread; + switch_threadattr_t *thd_attr = NULL; + + memset(call, 0, sizeof(*call)); + call->conference = conference; + call->session = session; + call->timeout = timeout; + + if (bridgeto) { + call->bridgeto = strdup(bridgeto); + } + if (flags) { + call->flags = strdup(flags); + } + if (cid_name) { + call->cid_name = strdup(cid_name); + } + if (cid_num) { + call->cid_num = strdup(cid_num); + } + + switch_threadattr_create(&thd_attr, conference->pool); + switch_threadattr_detach_set(thd_attr, 1); + switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); + switch_thread_create(&thread, thd_attr, conference_outcall_run, call, conference->pool); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Lanuching BG Thread for outcall\n"); + } +} + /* Play a file */ static switch_status_t conference_local_play_file(conference_obj_t *conference, switch_core_session_t *session, char *path, uint32_t leadin, char *buf, switch_size_t len) @@ -3682,7 +3788,8 @@ /* if we're using "bridge:" make an outbound call and bridge it in */ if (!switch_strlen_zero(bridgeto) && strcasecmp(bridgeto, "none")) { - if (conference_outcall(conference, session, bridgeto, 60, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) { + switch_call_cause_t cause; + if (conference_outcall(conference, session, bridgeto, 60, NULL, NULL, NULL, &cause) != SWITCH_STATUS_SUCCESS) { goto done; } } else {

1 0

[commit] r4087 - in freeswitch/trunk: libs/libdingaling/src src/mod/endpoints/mod_dingaling
by Freeswitch SVN 29 Jan '07

29 Jan '07

Author: anthm Date: Mon Jan 29 17:22:29 2007 New Revision: 4087 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/libs/libdingaling/src/libdingaling.h freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: fix dingaling reject Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Mon Jan 29 17:22:29 2007 @@ -366,6 +366,8 @@ } } else if (!strcasecmp(type, "transport-accept")) { dl_signal = LDL_SIGNAL_TRANSPORT_ACCEPT; + } else if (!strcasecmp(type, "reject")) { + dl_signal = LDL_SIGNAL_REJECT; } else if (!strcasecmp(type, "transport-info")) { char *tid = iks_find_attrib(xml, "id"); dl_signal = LDL_SIGNAL_CANDIDATES; Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.h ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.h (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.h Mon Jan 29 17:22:29 2007 @@ -142,7 +142,8 @@ LDL_SIGNAL_LOGIN_SUCCESS, LDL_SIGNAL_LOGIN_FAILURE, LDL_SIGNAL_CONNECTED, - LDL_SIGNAL_TRANSPORT_ACCEPT + LDL_SIGNAL_TRANSPORT_ACCEPT, + LDL_SIGNAL_REJECT } ldl_signal_t; typedef enum { 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 Mon Jan 29 17:22:29 2007 @@ -1616,10 +1616,10 @@ switch_channel_set_flag(channel, CF_OUTBOUND); switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); - + switch_stun_random_string(sess_id, 10, "0123456789"); - tech_pvt->us = switch_core_session_strdup(session, user); - tech_pvt->them = switch_core_session_strdup(session, full_id); + tech_pvt->us = switch_core_session_strdup(*new_session, user); + tech_pvt->them = switch_core_session_strdup(*new_session, full_id); ldl_session_create(&dlsession, mdl_profile->handle, sess_id, full_id, user, LDL_FLAG_OUTBOUND); tech_pvt->profile = mdl_profile; ldl_session_set_private(dlsession, *new_session); @@ -2685,11 +2685,18 @@ } } break; + case LDL_SIGNAL_REJECT: + if (channel) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "reject %s\n", switch_channel_get_name(channel)); + terminate_session(&session, __LINE__, SWITCH_CAUSE_CALL_REJECTED); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "End Call (Rejected)\n"); + goto done; + } + break; case LDL_SIGNAL_ERROR: case LDL_SIGNAL_TERMINATE: if (channel) { - switch_channel_state_t state = switch_channel_get_state(channel); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "hungup %s %u %d\n", switch_channel_get_name(channel), state, CS_INIT); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "hungup %s %u %d\n", switch_channel_get_name(channel)); terminate_session(&session, __LINE__, SWITCH_CAUSE_NORMAL_CLEARING); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "End Call\n"); goto done;

1 0

[commit] r4086 - freeswitch/trunk/src
by Freeswitch SVN 29 Jan '07

29 Jan '07

Author: anthm Date: Mon Jan 29 15:11:26 2007 New Revision: 4086 Modified: freeswitch/trunk/src/switch_core.c Log: make send_dtmf parse w and W for 500 and 1000 ms pause Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Jan 29 15:11:26 2007 @@ -2469,13 +2469,35 @@ switch_status_t status = SWITCH_STATUS_FALSE; if (session->endpoint_interface->io_routines->send_dtmf) { - if ((status = session->endpoint_interface->io_routines->send_dtmf(session, dtmf)) == SWITCH_STATUS_SUCCESS) { - for (ptr = session->event_hooks.send_dtmf; ptr; ptr = ptr->next) { - if ((status = ptr->send_dtmf(session, dtmf)) != SWITCH_STATUS_SUCCESS) { - break; - } - } - } + if (strchr(dtmf, 'w') || strchr(dtmf, 'W')) { + char *d; + for (d = dtmf; d && *d; d++) { + char digit[2] = ""; + + if (*d == 'w') { + switch_yield(500000); + continue; + } else if (*d == 'W') { + switch_yield(1000000); + continue; + } + + digit[0] = *d; + if ((status = session->endpoint_interface->io_routines->send_dtmf(session, digit)) != SWITCH_STATUS_SUCCESS) { + return status; + } + } + } else { + status = session->endpoint_interface->io_routines->send_dtmf(session, dtmf); + } + + if (status == SWITCH_STATUS_SUCCESS) { + for (ptr = session->event_hooks.send_dtmf; ptr; ptr = ptr->next) { + if ((status = ptr->send_dtmf(session, dtmf)) != SWITCH_STATUS_SUCCESS) { + break; + } + } + } } return status;

1 0

[commit] r4085 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 29 Jan '07

29 Jan '07

Author: mikej Date: Mon Jan 29 15:06:23 2007 New Revision: 4085 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: add queue_dtmf application, takes one param, a string of dtmf that will be queued to send from the channel. You could use this in the dialplan before a bridge to queue up dtmf to be sent to the other channel for example if you need to dial digits after answer for an fxo ata device. Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Mon Jan 29 15:06:23 2007 @@ -71,6 +71,16 @@ switch_channel_ringback(channel); } +static void queue_dtmf_function(switch_core_session_t *session, char *data) +{ + switch_channel_t *channel; + if (!switch_strlen_zero(data)) { + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + switch_channel_queue_dtmf(channel, data); + } +} + static void transfer_function(switch_core_session_t *session, char *data) { int argc; @@ -469,13 +479,22 @@ /*.next */ &dptools_api_interface }; +static const switch_application_interface_t queuedtmf_application_interface = { + /*.interface_name */ "queue_dtmf", + /*.application_function */ queue_dtmf_function, + /* long_desc */ "Queue dtmf to be sent from a session", + /* short_desc */ "Queue dtmf to be sent", + /* syntax */ "<dtmf_data>", + /*.next */ NULL +}; + static const switch_application_interface_t redirect_application_interface = { /*.interface_name */ "redirect", /*.application_function */ redirect_function, /* long_desc */ "Send a redirect message to a session.", /* short_desc */ "Send session redirect", /* syntax */ "<redirect_data>", - /*.next */ NULL + /*.next */ &queuedtmf_application_interface }; static const switch_application_interface_t ivr_application_interface = {

1 0

[commit] r4084 - freeswitch/trunk/src
by Freeswitch SVN 29 Jan '07

29 Jan '07

Author: anthm Date: Mon Jan 29 13:31:35 2007 New Revision: 4084 Modified: freeswitch/trunk/src/switch_loadable_module.c Log: more tweaks Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Mon Jan 29 13:31:35 2007 @@ -711,11 +711,23 @@ void *val; switch_codec_interface_t *codec_interface; int i = 0; + const switch_codec_implementation_t *imp; for (hi = switch_hash_first(pool, loadable_modules.codec_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); codec_interface = (switch_codec_interface_t *) val; + /* Look for a 20ms implementation because it's the safest choice */ + for (imp = codec_interface->implementations; imp; imp = imp->next) { + if (imp->microseconds_per_frame / 1000 == 20) { + array[i++] = imp; + goto found; + } + } + /* oh well we will use what we have */ array[i++] = codec_interface->implementations; + + found: + if (i > arraylen) { break; }

1 0

[commit] r4083 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 29 Jan '07

29 Jan '07

Author: anthm Date: Mon Jan 29 13:05:22 2007 New Revision: 4083 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix conference parse bug 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 Mon Jan 29 13:05:22 2007 @@ -3145,7 +3145,6 @@ } } - if (all) { conference_member_itterator(conference, stream, conf_api_sub_commands[i].pfnapicmd, argv[argn+2]); } else if (last) { @@ -3170,19 +3169,17 @@ } switch_mutex_unlock(conference->member_mutex); - } else { + } else if (id) { conf_api_member_cmd_t pfn = (conf_api_member_cmd_t)conf_api_sub_commands[i].pfnapicmd; conference_member_t *member = conference_member_get(conference, id); - + if (member != NULL) { pfn(conference_member_get(conference, id), stream, argv[argn+2]); } else { - if (id == 0) { - stream->write_function(stream, conf_api_sub_commands[i].psyntax); - } else { - stream->write_function(stream, "Non-Existant ID %u\n", id); - } + stream->write_function(stream, "Non-Existant ID %u\n", id); } + } else { + stream->write_function(stream, conf_api_sub_commands[i].psyntax); } } break;

1 0

[commit] r4082 - freeswitch/trunk/conf
by Freeswitch SVN 29 Jan '07

29 Jan '07

Author: mikej Date: Mon Jan 29 12:53:07 2007 New Revision: 4082 Modified: freeswitch/trunk/conf/ivr.conf.xml Log: fix typo double >, fix via e-mail from Bret McDanel. Modified: freeswitch/trunk/conf/ivr.conf.xml ============================================================================== --- freeswitch/trunk/conf/ivr.conf.xml (original) +++ freeswitch/trunk/conf/ivr.conf.xml Mon Jan 29 12:53:07 2007 @@ -11,7 +11,7 @@ <entry action="menu-play-sound" digits="4" param="/soundfiles/4.wav"/> <entry action="menu-back" digits="5"/> <entry action="menu-call-transfer" digits="7" param="888"/> - <entry action="menu-sub" digits="8" param="menu8"/>> + <entry action="menu-sub" digits="8" param="menu8"/> </menu> <menu name="menu8" greet-long="/soundfiles/greet-long.wav"

1 0

[commit] r4081 - in freeswitch/trunk/src: . include
by Freeswitch SVN 29 Jan '07

29 Jan '07

Author: mikej Date: Mon Jan 29 11:58:37 2007 New Revision: 4081 Modified: freeswitch/trunk/src/include/switch_xml.h freeswitch/trunk/src/switch_xml.c Log: merge changes from ezXML 0.8.6 - fixed a bug in ezxml_add_child() that can occur when adding tags out of order - for consistency, ezxml_set_attr() now returns the tag given - added ezxml_move() and supporting functions ezxml_cut() and ezxml_insert() - fixed a bug where parsing an empty file could cause a segfault Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Mon Jan 29 11:58:37 2007 @@ -256,9 +256,10 @@ ///\param xml the xml node ///\param name the attribute name ///\param value the attribute value -SWITCH_DECLARE(void) switch_xml_set_attr(switch_xml_t xml, const char *name, const char *value); +///\return the tag given +SWITCH_DECLARE(switch_xml_t) switch_xml_set_attr(switch_xml_t xml, const char *name, const char *value); -///\ Wrapper for switch_xml_set_attr() that strdup()s name/value. Value cannot be NULL +///\brief Wrapper for switch_xml_set_attr() that strdup()s name/value. Value cannot be NULL ///\param xml the xml node ///\param name the attribute name ///\param value the attribute value @@ -272,10 +273,19 @@ ///\return an xml node or NULL SWITCH_DECLARE(switch_xml_t) switch_xml_set_flag(switch_xml_t xml, switch_xml_flag_t flag); +///\brief removes a tag along with its subtags without freeing its memory +///\param xml the xml node +SWITCH_DECLARE(switch_xml_t) switch_xml_cut(switch_xml_t xml); + +///\brief inserts an existing tag into an ezxml structure +SWITCH_DECLARE(switch_xml_t) switch_xml_insert(switch_xml_t xml, switch_xml_t dest, switch_size_t off); + +///\brief Moves an existing tag to become a subtag of dest at the given offset from +///\ the start of dest's character content. Returns the moved tag. +#define switch_xml_move(xml, dest, off) switch_xml_insert(switch_xml_cut(xml), dest, off) ///\brief removes a tag along with all its subtags -///\param xml the xml node -SWITCH_DECLARE(void) switch_xml_remove(switch_xml_t xml); +#define switch_xml_remove(xml) switch_xml_free(switch_xml_cut(xml)) ///\brief open the Core xml root ///\param reload if it's is already open close it and open it again as soon as permissable (blocking) Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Mon Jan 29 11:58:37 2007 @@ -28,10 +28,10 @@ * * switch_xml.c -- XML PARSER * - * Derived from EZXML http://ezxml.sourceforge.net + * Derived from switch_xml http://switch_xml.sourceforge.net * Original Copyright * - * Copyright 2004, 2005 Aaron Voisine <aaron(a)voisine.org> + * Copyright 2004, 2006 Aaron Voisine <aaron(a)voisine.org> * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the @@ -696,7 +696,7 @@ if (switch_xml_close_tag(root, d, s)) return &root->xml; if (isspace((int)(*s = q))) s += strspn(s, SWITCH_XML_WS); } - else if (! strncmp(s, "!--", 3)) { // comment + else if (! strncmp(s, "!--", 3)) { // xml comment if (! (s = strstr(s + 3, "--")) || (*(s += 2) != '>' && *s) || (! *s && e != '>')) return switch_xml_err(root, d, "unclosed <!--"); } @@ -1286,8 +1286,8 @@ } } -// converts an switch_xml structure back to xml, returning it as a string that must -// be freed +// 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_xml_t p = (xml) ? xml->parent : NULL, o = (xml) ? xml->ordered : NULL; @@ -1410,51 +1410,64 @@ return &root->xml; } -// Adds a child tag. off is the offset of the child tag relative to the start -// of the parent tag's character content. returns the child tag -switch_xml_t switch_xml_add_child(switch_xml_t xml, const char *name, switch_size_t off) +// inserts an existing tag into an switch_xml structure +SWITCH_DECLARE(switch_xml_t) switch_xml_insert(switch_xml_t xml, switch_xml_t dest, switch_size_t off) { - switch_xml_t cur, head, child; + switch_xml_t cur, prev, head; - if (! xml) return NULL; - child = (switch_xml_t)memset(malloc(sizeof(struct switch_xml)), '\0', - sizeof(struct switch_xml)); - child->name = (char *)name; - child->attr = SWITCH_XML_NIL; - child->off = off; - child->parent = xml; - child->txt = ""; + xml->next = xml->sibling = xml->ordered = NULL; + xml->off = off; + xml->parent = dest; - if ((head = xml->child)) { // already have sub tags + if ((head = dest->child)) { // already have sub tags if (head->off <= off) { // not first subtag for (cur = head; cur->ordered && cur->ordered->off <= off; cur = cur->ordered); - child->ordered = cur->ordered; - cur->ordered = child; + xml->ordered = cur->ordered; + cur->ordered = xml; } else { // first subtag - child->ordered = head; - xml->child = child; + xml->ordered = head; + dest->child = xml; } - for (cur = head; cur->sibling && strcmp(cur->name, name); - cur = cur->sibling); // find tag type - if (! strcmp(cur->name, name) && cur->off <= off) { //not first of type + for (cur = head, prev = NULL; cur && strcmp(cur->name, xml->name); + prev = cur, cur = cur->sibling); // find tag type + if (cur && cur->off <= off) { // not first of type while (cur->next && cur->next->off <= off) cur = cur->next; - child->next = cur->next; - cur->next = child; + xml->next = cur->next; + cur->next = xml; } else { // first tag of this type - if (cur->off > off) child->next = cur; // not only tag of this type - for (cur = head; cur->sibling && cur->sibling->off <= off; - cur = cur->sibling); - child->sibling = cur->sibling; - cur->sibling = child; + if (prev && cur) prev->sibling = cur->sibling; // remove old first + xml->next = cur; // old first tag is now next + for (cur = head, prev = NULL; cur && cur->off <= off; + prev = cur, cur = cur->sibling); // new sibling insert point + xml->sibling = cur; + if (prev) prev->sibling = xml; } } - else xml->child = child; // only sub tag - - return child; + else dest->child = xml; // only sub tag + + return xml; +} + +// Adds a child tag. off is the offset of the child tag relative to the start +// of the parent tag's character content. Returns the child tag +switch_xml_t switch_xml_add_child(switch_xml_t xml, const char *name, switch_size_t off) +{ + switch_xml_t child; + + if (! xml) return NULL; + child = (switch_xml_t)memset(malloc(sizeof(struct switch_xml)), '\0', + sizeof(struct switch_xml)); + child->name = (char *)name; + child->attr = SWITCH_XML_NIL; + child->off = off; + child->parent = xml; + child->txt = ""; + + return switch_xml_insert(child, xml, off); } // sets the character content for the given tag and returns the tag @@ -1468,15 +1481,15 @@ } // Sets the given tag attribute or adds a new attribute if not found. A value -// of NULL will remove the specified attribute. -SWITCH_DECLARE(void) switch_xml_set_attr(switch_xml_t xml, const char *name, const char *value) +// of NULL will remove the specified attribute. Returns the tag given +SWITCH_DECLARE(switch_xml_t) switch_xml_set_attr(switch_xml_t xml, const char *name, const char *value) { int l = 0, c; - if (! xml) return; + if (! xml) return NULL; while (xml->attr[l] && strcmp(xml->attr[l], name)) l += 2; if (! xml->attr[l]) { // not found, add as new attribute - if (! value) return; // nothing to do + if (! value) return xml; // nothing to do if (xml->attr == SWITCH_XML_NIL) { // first attribute xml->attr = malloc(4 * sizeof(char *)); xml->attr[1] = strdup(""); // empty list of malloced names/vals @@ -1506,6 +1519,8 @@ (c / 2) - (l / 2)); // fix list of which name/vals are malloced } xml->flags &= ~SWITCH_XML_DUP; // clear strdup() flag + + return xml; } // sets a flag for the given tag and returns the tag @@ -1515,12 +1530,12 @@ return xml; } -// removes a tag along with all its subtags -SWITCH_DECLARE(void) switch_xml_remove(switch_xml_t xml) +// removes a tag along with its subtags without freeing its memory +SWITCH_DECLARE(switch_xml_t) switch_xml_cut(switch_xml_t xml) { switch_xml_t cur; - if (! xml) return; // nothing to do + if (! xml) return NULL; // nothing to do if (xml->next) xml->next->sibling = xml->sibling; // patch sibling list if (xml->parent) { // not root tag @@ -1545,8 +1560,8 @@ if (cur->next) cur->next = cur->next->next; // patch next list } } - xml->ordered = NULL; // prevent switch_xml_free() from clobbering ordered list - switch_xml_free(xml); + xml->ordered = xml->sibling = xml->next = NULL; // prevent switch_xml_free() from clobbering ordered list + return xml; } /* For Emacs:

1 0

[commit] r4080 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 Jan '07

29 Jan '07

Author: anthm Date: Mon Jan 29 11:54:42 2007 New Revision: 4080 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: add tag to sipfrag notify packets re: pekka's advice 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 Jan 29 11:54:42 2007 @@ -2338,6 +2338,8 @@ mimp = near_match; } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Substituting codec %s@%ums\n", + mimp->iananame, mimp->microseconds_per_frame / 1000 ); match = 1; } @@ -3711,6 +3713,7 @@ if (switch_channel_test_flag(channel_a, CF_NOMEDIA)) { nua_notify(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), + NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 403 Forbidden"), SIPTAG_EVENT_STR(etmp), TAG_END()); @@ -3772,6 +3775,7 @@ switch_set_flag_locked(tech_pvt, TFLAG_BYE); switch_set_flag_locked(b_tech_pvt, TFLAG_BYE); nua_notify(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), + NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 200 OK"), SIPTAG_EVENT_STR(etmp), TAG_END()); @@ -3812,6 +3816,7 @@ } switch_set_flag_locked(tech_pvt, TFLAG_BYE); nua_notify(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), + NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 200 OK"), SIPTAG_EVENT_STR(etmp), TAG_END()); @@ -3855,6 +3860,7 @@ NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel! [%s]\n", exten); nua_notify(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), + NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 403 Forbidden"), SIPTAG_EVENT_STR(etmp), TAG_END()); @@ -3867,6 +3873,7 @@ switch_channel_set_variable(channel_a, "endpoint_disposition", "ATTENDED_TRANSFER"); switch_set_flag_locked(tech_pvt, TFLAG_BYE); nua_notify(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), + NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 200 OK"), SIPTAG_EVENT_STR(etmp), TAG_END()); @@ -3878,6 +3885,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Transfer! [%s]\n", br_a); switch_channel_set_variable(channel_a, "endpoint_disposition", "ATTENDED_TRANSFER_ERROR"); nua_notify(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), + NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 403 Forbidden"), SIPTAG_EVENT_STR(etmp), TAG_END()); @@ -3911,6 +3919,7 @@ /* nua_notify(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), + NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 200 OK"), SIPTAG_EVENT_STR(etmp), TAG_END()); @@ -3927,6 +3936,7 @@ /* nua_notify(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), + NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 200 OK"), SIPTAG_EVENT_STR(etmp), TAG_END());

1 0

[commit] r4079 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 Jan '07

29 Jan '07

Author: anthm Date: Mon Jan 29 11:44:44 2007 New Revision: 4079 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: make sofia try harder to match the packet interval on codecs 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 Jan 29 11:44:44 2007 @@ -2290,8 +2290,8 @@ sdp_rtpmap_t *map; for (map = m->m_rtpmaps; map; map = map->rm_next) { - int32_t i, btn = 0; - const switch_codec_implementation_t *mimp = NULL, *better_than_nothing[10] = {0}; + int32_t i; + const switch_codec_implementation_t *mimp = NULL, *near_match = NULL; if (!strcasecmp(map->rm_encoding, "telephone-event")) { tech_pvt->te = (switch_payload_t)map->rm_pt; @@ -2308,8 +2308,8 @@ } if (match && (map->rm_rate == imp->samples_per_second)) { - if (ptime && ptime * 1000 != imp->microseconds_per_frame && btn < 10) { - better_than_nothing[btn++] = imp; + if (ptime && ptime * 1000 != imp->microseconds_per_frame) { + near_match = imp; continue; } mimp = imp; @@ -2319,9 +2319,26 @@ } } - if (!match && btn) { + if (!match && near_match) { + const switch_codec_implementation_t *search[1]; + char *prefs[1]; + char tmp[80]; + int num; + + snprintf(tmp, sizeof(tmp), "%s@%uk@%ui", + near_match->iananame, + near_match->samples_per_second, + ptime); + + num = switch_loadable_module_get_codecs_sorted(search, 1, prefs, 1); + + if (num) { + mimp = search[0]; + } else { + mimp = near_match; + } + match = 1; - mimp = better_than_nothing[0]; } if (mimp) {

1 0