January 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r11467 - freeswitch/trunk/conf/dialplan
by FreeSWITCH SVN 23 Jan '09

23 Jan '09

Author: brian Date: Fri Jan 23 14:33:25 2009 New Revision: 11467 Log: fix unloop bug Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/dialplan/public.xml Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Jan 23 14:33:25 2009 @@ -15,7 +15,7 @@ <context name="default"> <extension name="unloop"> - <condition field="$${unroll_loops}" expression="^true$"/> + <condition field="${unroll_loops}" expression="^true$"/> <condition field="${sip_looped_call}" expression="^true$"> <action application="deflect" data="${destination_number}"/> </condition> Modified: freeswitch/trunk/conf/dialplan/public.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/public.xml (original) +++ freeswitch/trunk/conf/dialplan/public.xml Fri Jan 23 14:33:25 2009 @@ -14,7 +14,7 @@ <context name="public"> <extension name="unloop"> - <condition field="$${unroll_loops}" expression="^true$"/> + <condition field="${unroll_loops}" expression="^true$"/> <condition field="${sip_looped_call}" expression="^true$"> <action application="deflect" data="${destination_number}"/> </condition>

1 0

[commit] r11466 - in freeswitch/trunk/src: . include mod/applications/mod_fifo
by FreeSWITCH SVN 23 Jan '09

23 Jan '09

Author: anthm Date: Fri Jan 23 12:44:25 2009 New Revision: 11466 Log: pause media bugs while not in a bridge while inside mod_fifo Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c freeswitch/trunk/src/switch_core_media_bug.c Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Fri Jan 23 12:44:25 2009 @@ -143,6 +143,10 @@ _In_ switch_media_bug_callback_t callback, _In_opt_ void *user_data, _In_ time_t stop_time, _In_ switch_media_bug_flag_t flags, _Out_ switch_media_bug_t **new_bug); + +SWITCH_DECLARE(void) switch_core_media_bug_pause(switch_core_session_t *session); +SWITCH_DECLARE(void) switch_core_media_bug_resume(switch_core_session_t *session); + /*! \brief Obtain private data from a media bug \param bug the bug to get the data from Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Fri Jan 23 12:44:25 2009 @@ -841,7 +841,7 @@ CF_INNER_BRIDGE, CF_REQ_MEDIA, CF_VERBOSE_EVENTS, - + CF_PAUSE_BUGS, /* WARNING: DO NOT ADD ANY FLAGS BELOW THIS LINE */ CF_FLAG_MAX } switch_channel_flag_t; Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Fri Jan 23 12:44:25 2009 @@ -767,6 +767,8 @@ check_string(moh); switch_assert(node); + switch_core_media_bug_pause(session); + if (!consumer) { switch_core_session_t *other_session; switch_channel_t *other_channel; @@ -926,7 +928,7 @@ if (!aborted && switch_channel_ready(channel)) { switch_channel_set_state(channel, CS_HIBERNATE); - return; + goto done; } else { ts = switch_timestamp_now(); switch_time_exp_lt(&tm, ts); @@ -956,7 +958,8 @@ switch_ivr_session_transfer(session, cd.orbit_exten, NULL, NULL); } - return; + goto done; + } else { /* consumer */ void *pop = NULL; switch_frame_t *read_frame; @@ -987,7 +990,7 @@ strat = STRAT_WAITING_LONGER; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid strategy\n"); - return; + goto done; } } @@ -996,7 +999,7 @@ do_wait = 0; } else if (strcasecmp(argv[2], "wait")) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE); - return; + goto done; } } @@ -1235,8 +1238,12 @@ switch_ivr_record_session(session, expanded, 0, NULL); } + switch_core_media_bug_resume(session); + switch_core_media_bug_resume(other_session); switch_ivr_multi_threaded_bridge(session, other_session, on_dtmf, other_session, session); - + switch_core_media_bug_pause(session); + switch_core_media_bug_pause(other_session); + if (record_template) { switch_ivr_stop_record_session(session, expanded); if (expanded != record_template) { @@ -1299,7 +1306,7 @@ if (!switch_strlen_zero(fifo_consumer_wrapup_key) && strcmp(buf, fifo_consumer_wrapup_key)) { while(switch_channel_ready(channel)) { char terminator = 0; - + if (fifo_consumer_wrapup_time) { wrapup_time_elapsed = (switch_timestamp_now() - wrapup_time_started) / 1000; if (wrapup_time_elapsed > fifo_consumer_wrapup_time) { @@ -1362,6 +1369,11 @@ } } } + + done: + + switch_core_media_bug_resume(session); + } struct xml_helper { Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Fri Jan 23 12:44:25 2009 @@ -46,6 +46,16 @@ } } +SWITCH_DECLARE(void) switch_core_media_bug_pause(switch_core_session_t *session) +{ + switch_channel_set_flag(session->channel, CF_PAUSE_BUGS); +} + +SWITCH_DECLARE(void) switch_core_media_bug_resume(switch_core_session_t *session) +{ + switch_channel_clear_flag(session->channel, CF_PAUSE_BUGS); +} + SWITCH_DECLARE(uint32_t) switch_core_media_bug_test_flag(switch_media_bug_t *bug, uint32_t flag) { return switch_test_flag(bug, flag);

1 0

[commit] r11463 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 23 Jan '09

23 Jan '09

Author: mikej Date: Fri Jan 23 10:22:50 2009 New Revision: 11463 Log: mod_sofia: fix segfault due to missing contact header in invite (MODENDP-177) Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Jan 23 10:22:50 2009 @@ -3769,6 +3769,12 @@ 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; + } + get_addr(network_ip, sizeof(network_ip), my_addrinfo->ai_addr, my_addrinfo->ai_addrlen); network_port = ntohs(((struct sockaddr_in *) msg_addrinfo(nua_current_request(nua))->ai_addr)->sin_port); @@ -3860,12 +3866,6 @@ is_auth++; } - 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; - } - if (sofia_endpoint_interface) { if (profile->pflags & PFLAG_CALLID_AS_UUID) { session = switch_core_session_request_uuid(sofia_endpoint_interface, NULL, sip->sip_call_id->i_id);

1 0

[commit] r11462 - freeswitch/trunk/src
by FreeSWITCH SVN 23 Jan '09

23 Jan '09

Author: mrene Date: Fri Jan 23 08:16:34 2009 New Revision: 11462 Log: FSCORE-279 Prevent media setup on failed originates Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri Jan 23 08:16:34 2009 @@ -2044,7 +2044,7 @@ switch_ivr_sleep(*bleg, 0, SWITCH_TRUE, NULL); } - if (oglobals.session) { + if (oglobals.session && status == SWITCH_STATUS_SUCCESS) { switch_ivr_sleep(oglobals.session, 0, SWITCH_TRUE, NULL); }

1 0

[commit] r11460 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 23 Jan '09

23 Jan '09

Author: andrew Date: Thu Jan 22 21:40:20 2009 New Revision: 11460 Log: Added some initial work to allow mod_erlang_event to spawn processes on other nodes Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c Thu Jan 22 21:40:20 2009 @@ -122,6 +122,80 @@ } +/* function to spawn a process on a remote node */ +int ei_spawn(struct ei_cnode_s *ec, int sockfd, char *module, char *function, int argc, char **argv) +{ + ei_x_buff buf; + ei_x_new_with_version(&buf); + erlang_ref ref; + int i; + + ei_x_encode_tuple_header(&buf, 3); + ei_x_encode_atom(&buf, "$gen_call"); + ei_x_encode_tuple_header(&buf, 2); + ei_x_encode_pid(&buf, ei_self(ec)); + /* TODO - use this reference to determine the response */ + ei_init_ref(ec, &ref); + ei_x_encode_ref(&buf, &ref); + ei_x_encode_tuple_header(&buf, 5); + ei_x_encode_atom(&buf, "spawn"); + ei_x_encode_atom(&buf, module); + ei_x_encode_atom(&buf, function); + + /* argument list */ + ei_x_encode_list_header(&buf, argc); + for(i = 0; i < argc && argv[i]; i++) { + ei_x_encode_atom(&buf, argv[i]); + } + + ei_x_encode_empty_list(&buf); + + /*if (i != argc - 1) {*/ + /* horked argument list */ + /*}*/ + + ei_x_encode_pid(&buf, ei_self(ec)); /* should really be a valid group leader */ + + char *pbuf = 0; + i = 1; + ei_s_print_term(&pbuf, buf.buff, &i); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "spawn returning %s\n", pbuf); + + return ei_reg_send(ec, sockfd, "net_kernel", buf.buff, buf.index); +} + + +/* stolen from erts/emulator/beam/erl_term.h */ +#define _REF_NUM_SIZE 18 +#define MAX_REFERENCE (1 << _REF_NUM_SIZE) + +/* function to fill in an erlang reference struct */ +void ei_init_ref(ei_cnode *ec, erlang_ref *ref) +{ + memset(ref, 0, sizeof(*ref)); /* zero out the struct */ + snprintf(ref->node, MAXATOMLEN, ec->thisnodename); + + switch_mutex_lock(globals.ref_mutex); + globals.reference0++; + if (globals.reference0 >= MAX_REFERENCE) { + globals.reference0 = 0; + globals.reference1++; + if (globals.reference1 == 0) { + globals.reference2++; + } + } + + ref->n[0] = globals.reference0; + ref->n[1] = globals.reference1; + ref->n[2] = globals.reference2; + + switch_mutex_unlock(globals.ref_mutex); + + ref->creation = 1; /* why is this 1 */ + ref->len = 3; /* why is this 3 */ +} + + switch_status_t initialise_ei(struct ei_cnode_s *ec) { switch_status_t rv; @@ -167,7 +241,6 @@ return SWITCH_STATUS_FALSE; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "ei initialized node at %s\n", thisnodename); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Thu Jan 22 21:40:20 2009 @@ -592,6 +592,8 @@ static void listener_main_loop(listener_t *listener) { int status = 1; + /*int i = 1;*/ + /*char *pbuf = 0;*/ while ((status >= 0 || erl_errno == ETIMEDOUT || erl_errno == EAGAIN) && !prefs.done) { erlang_msg msg; @@ -613,12 +615,20 @@ switch(msg.msgtype) { case ERL_SEND : /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "erl_send\n");*/ + /*i = 1;*/ + /*ei_s_print_term(&pbuf, buf.buff, &i);*/ + /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "erl_send was message %s\n", pbuf);*/ + if (handle_msg(listener, &msg, &buf, &rbuf)) { return; } break; case ERL_REG_SEND : - /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "erl_reg_send\n");*/ + /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "erl_reg_send to %s\n", msg.toname);*/ + /*i = 1;*/ + /*ei_s_print_term(&pbuf, buf.buff, &i);*/ + /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "erl_reg_send was message %s\n", pbuf);*/ + if (handle_msg(listener, &msg, &buf, &rbuf)) { return; } @@ -980,6 +990,12 @@ switch_application_interface_t *app_interface; switch_mutex_init(&globals.listener_mutex, SWITCH_MUTEX_NESTED, pool); + + /* intialize the unique reference stuff */ + switch_mutex_init(&globals.ref_mutex, SWITCH_MUTEX_NESTED, pool); + globals.reference0 = 0; + globals.reference1 = 0; + globals.reference2 = 0; if (switch_event_bind_removable(modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL, &globals.node) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); @@ -1099,7 +1115,7 @@ } } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connected and published erlang cnode\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connected and published erlang cnode at %s\n", ec.thisnodename); listen_list.ready = 1; Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h Thu Jan 22 21:40:20 2009 @@ -128,6 +128,10 @@ struct globals_struct { switch_mutex_t *listener_mutex; switch_event_node_t *node; + unsigned int reference0; + unsigned int reference1; + unsigned int reference2; + switch_mutex_t *ref_mutex; }; typedef struct globals_struct globals_t; @@ -182,6 +186,8 @@ void ei_link(listener_t *listener, erlang_pid *from, erlang_pid *to); void ei_encode_switch_event_headers(ei_x_buff *ebuf, switch_event_t *event); void ei_encode_switch_event_tag(ei_x_buff *ebuf, switch_event_t *event, char *tag); +int ei_spawn(struct ei_cnode_s *ec, int sockfd, char *module, char *function, int argc, char **argv); +void ei_init_ref(struct ei_cnode_s *ec, erlang_ref *ref); switch_status_t initialise_ei(struct ei_cnode_s *ec); #define ei_encode_switch_event(_b, _e) ei_encode_switch_event_tag(_b, _e, "event")

1 0

[commit] r11455 - freeswitch/trunk/scripts/contrib/seven
by FreeSWITCH SVN 23 Jan '09

23 Jan '09

Author: seven Date: Thu Jan 22 19:19:15 2009 New Revision: 11455 Log: test new contrib dir Added: freeswitch/trunk/scripts/contrib/seven/README Added: freeswitch/trunk/scripts/contrib/seven/README ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/seven/README Thu Jan 22 19:19:15 2009 @@ -0,0 +1 @@ +Currently blank...

1 0

[commit] r11440 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 22 Jan '09

22 Jan '09

Author: brian Date: Thu Jan 22 17:53:59 2009 New Revision: 11440 Log: do not print this debug info unless the profile is in debug mode Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Thu Jan 22 17:53:59 2009 @@ -192,7 +192,9 @@ } if (!sofia_private || !sofia_private->gateway) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Gateway information missing Subscription Event: %s\n", sip->sip_event->o_type); + if (profile->debug) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Gateway information missing Subscription Event: %s\n", sip->sip_event->o_type); + } goto error; }

1 0

[commit] r11437 - freeswitch/trunk/src
by FreeSWITCH SVN 22 Jan '09

22 Jan '09

Author: anthm Date: Thu Jan 22 17:50:01 2009 New Revision: 11437 Log: add disposition to monitor_early_media Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Thu Jan 22 17:50:01 2009 @@ -248,11 +248,22 @@ if (app) { switch_channel_t *channel = switch_core_session_get_channel(session); if (!strcmp(app, "fail")) { + const char *bd = switch_channel_get_variable(channel, "monitor_fail_dispo"); + if (!bd) { + bd = "monitor_early_media_fail"; + } + switch_channel_set_variable(channel, "originate_disposition", bd); switch_channel_hangup(channel, data ? switch_channel_str2cause(data) : SWITCH_CAUSE_USER_BUSY); } else if (!strcmp(app, "ring")) { originate_global_t *oglobals = (originate_global_t *) switch_channel_get_private(channel, "_oglobals_"); + const char *bd = switch_channel_get_variable(channel, "monitor_ring_dispo"); + if (!bd) { + bd = "monitor_early_media_ring"; + } + switch_channel_set_variable(channel, "originate_disposition", bd); if (oglobals) { + switch_channel_set_private(channel, "_oglobals_", NULL); if (!oglobals->progress) {

1 0

[commit] r11429 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 22 Jan '09

22 Jan '09

Author: andrew Date: Thu Jan 22 17:07:37 2009 New Revision: 11429 Log: Some inital work on abstracting registered processes and pids Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c Thu Jan 22 17:07:37 2009 @@ -488,7 +488,8 @@ } else { binding->section = section; - binding->pid = msg->from; + binding->process.type = ERLANG_PID; + binding->process.pid = msg->from; binding->listener = listener; switch_core_hash_init(&listener->fetch_reply_hash, listener->pool); @@ -530,7 +531,7 @@ } else { switch_core_session_t *session; if (!switch_strlen_zero(uuid_str) && (session = switch_core_session_locate(uuid_str))) { - /* create a new sesion list element and attach it to this listener */ + /* create a new session list element and attach it to this listener */ if (attach_call_to_listener(listener,reg_name,session)) { ei_x_encode_atom(rbuf, "ok"); } else { @@ -606,13 +607,15 @@ ei_x_encode_atom(rbuf, "ok"); } else if (!strncmp(atom, "register_log_handler", MAXATOMLEN)) { ei_link(listener, ei_self(listener->ec), &msg->from); - listener->log_pid = msg->from; + listener->log_process.type = ERLANG_PID; + listener->log_process.pid = msg->from; listener->level = SWITCH_LOG_DEBUG; switch_set_flag(listener, LFLAG_LOG); ei_x_encode_atom(rbuf, "ok"); } else if (!strncmp(atom, "register_event_handler", MAXATOMLEN)) { ei_link(listener, ei_self(listener->ec), &msg->from); - listener->event_pid = msg->from; + listener->event_process.type = ERLANG_PID; + listener->event_process.pid = msg->from; if (!switch_test_flag(listener, LFLAG_EVENTS)) { switch_set_flag_locked(listener, LFLAG_EVENTS); } Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Thu Jan 22 17:07:37 2009 @@ -114,7 +114,7 @@ for (ptr = bindings.head; ptr; lst = ptr, ptr = ptr->next) { if ((listener && ptr->listener == listener) || - (pid && (&ptr->pid) && (!strcmp(pid->node, ptr->pid.node)) && pid->creation == ptr->pid.creation && pid->num == ptr->pid.num && pid->serial == ptr->pid.serial)) { + (pid && (&ptr->process.type == ERLANG_PID) && (!strcmp(pid->node, ptr->process.pid.node)) && pid->creation == ptr->process.pid.creation && pid->num == ptr->process.pid.num && pid->serial == ptr->process.pid.serial)) { if (bindings.head == ptr) { if (ptr->next) { bindings.head = ptr->next; @@ -327,7 +327,7 @@ return NULL; /* our pointer is trash */ } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "binding for %s in section %s with key %s and value %s requested from node %s\n", tag_name, sectionstr, key_name, key_value, ptr->pid.node); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "binding for %s in section %s with key %s and value %s requested from node %s\n", tag_name, sectionstr, key_name, key_value, ptr->process.pid.node); switch_uuid_get(&uuid); switch_uuid_format(uuid_str, &uuid); @@ -346,7 +346,7 @@ /*switch_core_hash_insert(ptr->reply_hash, uuid_str, );*/ switch_mutex_lock(ptr->listener->sock_mutex); - ei_send(ptr->listener->sockfd, &ptr->pid, buf.buff, buf.index); + ei_send(ptr->listener->sockfd, &ptr->process.pid, buf.buff, buf.index); switch_mutex_unlock(ptr->listener->sock_mutex); int i = 0; @@ -392,8 +392,9 @@ } -static switch_status_t notify_new_session(listener_t *listener, switch_core_session_t *session, char* reg_name) +static switch_status_t notify_new_session(listener_t *listener, switch_core_session_t *session, struct erlang_process process) { + int result; switch_event_t *call_event=NULL; switch_channel_t *channel=NULL; @@ -417,7 +418,13 @@ ei_encode_switch_event(&lbuf, call_event); switch_mutex_lock(listener->sock_mutex); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending initial call event\n"); - if (ei_reg_send(listener->ec,listener->sockfd, reg_name, lbuf.buff, lbuf.index)==ERL_ERROR) { + if (process.type == ERLANG_PID) { + result = ei_send(listener->sockfd, &process.pid, lbuf.buff, lbuf.index); + } else { + result = ei_reg_send(listener->ec, listener->sockfd, process.reg_name, lbuf.buff, lbuf.index); + } + + if (result) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to send call event\n"); } switch_mutex_unlock(listener->sock_mutex); @@ -441,7 +448,7 @@ last = NULL; while(sp) { if (!switch_test_flag(sp, LFLAG_OUTBOUND_INIT)) { - status = notify_new_session(listener, sp->session, sp->reg_name); + status = notify_new_session(listener, sp->session, sp->process); if (status != SWITCH_STATUS_SUCCESS) break; switch_set_flag(sp, LFLAG_OUTBOUND_INIT); @@ -460,7 +467,11 @@ ei_encode_switch_event(&ebuf, pevent); switch_mutex_lock(listener->sock_mutex); - ei_reg_send(listener->ec, listener->sockfd, sp->reg_name, ebuf.buff, ebuf.index); + if (sp->process.type == ERLANG_PID) { + ei_send(listener->sockfd, &sp->process.pid, ebuf.buff, ebuf.index); + } else { + ei_reg_send(listener->ec, listener->sockfd, sp->process.reg_name, ebuf.buff, ebuf.index); + } switch_mutex_unlock(listener->sock_mutex); /* event is a hangup, so this session can be removed */ @@ -535,7 +546,11 @@ ei_x_encode_empty_list(&lbuf); switch_mutex_lock(listener->sock_mutex); - ei_send(listener->sockfd, &listener->log_pid, lbuf.buff, lbuf.index); + if (listener->log_process.type == ERLANG_PID) { + ei_send(listener->sockfd, &listener->log_process.pid, lbuf.buff, lbuf.index); + } else { + ei_reg_send(listener->ec, listener->sockfd, listener->log_process.reg_name, lbuf.buff, lbuf.index); + } switch_mutex_unlock(listener->sock_mutex); ei_x_free(&lbuf); @@ -561,9 +576,13 @@ ei_encode_switch_event(&ebuf, pevent); switch_mutex_lock(listener->sock_mutex); - ei_send(listener->sockfd, &listener->event_pid, ebuf.buff, ebuf.index); + if (listener->log_process.type == ERLANG_PID) { + ei_send(listener->sockfd, &listener->log_process.pid, ebuf.buff, ebuf.index); + } else { + ei_reg_send(listener->ec, listener->sockfd, listener->log_process.reg_name, ebuf.buff, ebuf.index); + } switch_mutex_unlock(listener->sock_mutex); - + ei_x_free(&ebuf); switch_event_destroy(&pevent); } @@ -880,7 +899,8 @@ } else { session_element->session = session; - session_element->reg_name = switch_core_strdup(switch_core_session_get_pool(session),reg_name); + session_element->process.type = ERLANG_REG_PROCESS; + session_element->process.reg_name = switch_core_strdup(switch_core_session_get_pool(session),reg_name); switch_set_flag(session_element, LFLAG_SESSION_ALIVE); switch_clear_flag(session_element, LFLAG_OUTBOUND_INIT); switch_queue_create(&session_element->event_queue, SWITCH_CORE_QUEUE_LEN, switch_core_session_get_pool(session)); Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h Thu Jan 22 17:07:37 2009 @@ -38,12 +38,23 @@ LFLAG_SESSION_ALIVE } session_flag_t; +typedef enum { + ERLANG_PID = 0, + ERLANG_REG_PROCESS +} process_type; + +struct erlang_process { + process_type type; + char *reg_name; + erlang_pid pid; +}; + struct session_elem { switch_core_session_t *session; switch_mutex_t *flag_mutex; uint32_t flags; /* registered process name that will receive call notifications from this session */ - char* reg_name; + struct erlang_process process; switch_queue_t *event_queue; struct session_elem *next; }; @@ -68,8 +79,8 @@ struct listener { int sockfd; struct ei_cnode_s *ec; - erlang_pid log_pid; - erlang_pid event_pid; + struct erlang_process log_process; + struct erlang_process event_process; char *peer_nodename; switch_queue_t *event_queue; switch_queue_t *log_queue; @@ -99,8 +110,7 @@ struct erlang_binding { switch_xml_section_t section; - erlang_pid pid; - char *registered_process; /* TODO */ + struct erlang_process process; listener_t *listener; struct erlang_binding *next; };

1 0

[commit] r11428 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by FreeSWITCH SVN 22 Jan '09

22 Jan '09

Author: anthm Date: Thu Jan 22 17:07:31 2009 New Revision: 11428 Log: only auto-restart if the binded ip changes Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/switch_core.c 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 Thu Jan 22 17:07:31 2009 @@ -2756,6 +2756,48 @@ const char *cond = switch_event_get_header(event, "condition"); if (cond && !strcmp(cond, "network-address-change") && mod_sofia_globals.auto_restart) { + const char *old_ip4 = switch_event_get_header_nil(event, "network-address-previous-v4"); + const char *new_ip4 = switch_event_get_header_nil(event, "network-address-change-v4"); + const char *old_ip6 = switch_event_get_header_nil(event, "network-address-previous-v6"); + const char *new_ip6 = switch_event_get_header_nil(event, "network-address-change-v6"); + switch_hash_index_t *hi; + const void *var; + void *val; + sofia_profile_t *profile; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "IP change detected [%s]->[%s] [%s]->[%s]\n", old_ip4, new_ip4, old_ip6, new_ip6); + + switch_mutex_lock(mod_sofia_globals.hash_mutex); + if (mod_sofia_globals.profile_hash) { + for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { + int rb = 0; + switch_hash_this(hi, &var, NULL, &val); + if ((profile = (sofia_profile_t *) val) && profile->auto_restart) { + if (!strcmp(profile->sipip, old_ip4)) { + profile->sipip = switch_core_strdup(profile->pool, new_ip4); + rb++; + } + if (!strcmp(profile->rtpip, old_ip4)) { + profile->rtpip = switch_core_strdup(profile->pool, new_ip4); + rb++; + } + if (!strcmp(profile->sipip, old_ip6)) { + profile->sipip = switch_core_strdup(profile->pool, new_ip6); + rb++; + } + if (!strcmp(profile->rtpip, old_ip6)) { + profile->rtpip = switch_core_strdup(profile->pool, new_ip6); + rb++; + } + + if (rb) { + sofia_set_pflag_locked(profile, PFLAG_RESPAWN); + sofia_clear_pflag_locked(profile, PFLAG_RUNNING); + } + } + } + } + sofia_glue_restart_all_profiles(); } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Thu Jan 22 17:07:31 2009 @@ -384,6 +384,7 @@ char *presence_hosts; char *challenge_realm; sofia_dtmf_t dtmf_type; + int auto_restart; int sip_port; int tls_sip_port; int tls_version; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Thu Jan 22 17:07:31 2009 @@ -1279,6 +1279,8 @@ parse_rtp_bugs(profile, val); } else if (!strcasecmp(var, "user-agent-string")) { profile->user_agent = switch_core_strdup(profile->pool, val); + } else if (!strcasecmp(var, "auto-restart")) { + profile->auto_restart = switch_true(val); } else if (!strcasecmp(var, "dtmf-type")) { if (!strcasecmp(val, "rfc2833")) { profile->dtmf_type = DTMF_2833; @@ -1688,7 +1690,8 @@ profile->rport_level = 1; profile->pflags |= PFLAG_STUN_ENABLED; profile->pflags |= PFLAG_DISABLE_100REL; - + profile->auto_restart = 1; + for (param = switch_xml_child(settings, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); char *val = (char *) switch_xml_attr_soft(param, "value"); @@ -1711,6 +1714,8 @@ #endif } else if (!strcasecmp(var, "user-agent-string")) { profile->user_agent = switch_core_strdup(profile->pool, val); + } else if (!strcasecmp(var, "auto-restart")) { + profile->auto_restart = switch_true(val); } else if (!strcasecmp(var, "dtmf-type")) { if (!strcasecmp(val, "rfc2833")) { profile->dtmf_type = DTMF_2833; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Jan 22 17:07:31 2009 @@ -85,6 +85,8 @@ static void check_ip(void) { char guess_ip4[256] = ""; char guess_ip6[256] = ""; + char old_ip4[256] = ""; + char old_ip6[256] = ""; int ok4 = 1, ok6 = 1; switch_find_local_ip(guess_ip4, sizeof(guess_ip4), AF_INET); @@ -94,6 +96,7 @@ switch_set_string(main_ip4, guess_ip4); } else { if (!(ok4 = !strcmp(main_ip4, guess_ip4))) { + switch_set_string(old_ip4, main_ip4); switch_set_string(main_ip4, guess_ip4); switch_core_set_variable("local_ip_v4", guess_ip4); } @@ -103,6 +106,7 @@ switch_set_string(main_ip6, guess_ip6); } else { if (!(ok6 = !strcmp(main_ip6, guess_ip6))) { + switch_set_string(old_ip6, main_ip6); switch_set_string(main_ip6, guess_ip6); switch_core_set_variable("local_ip_v6", guess_ip6); } @@ -114,9 +118,11 @@ if (switch_event_create(&event, SWITCH_EVENT_TRAP) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "condition", "network-address-change"); if (!ok4) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "network-address-previous-v4", old_ip4); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "network-address-change-v4", main_ip4); } if (!ok6) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "network-address-previous-v6", old_ip6); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "network-address-change-v6", main_ip6); } switch_event_fire(&event);

1 0