January 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r11478 - freeswitch/trunk/src/mod/applications/mod_easyroute
by FreeSWITCH SVN 24 Jan '09

24 Jan '09

Author: silik0n Date: Fri Jan 23 19:14:10 2009 New Revision: 11478 Log: fix build error when --enable-core-odbc-support not used at configure time Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c (original) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Fri Jan 23 19:14:10 2009 @@ -197,8 +197,8 @@ static switch_status_t route_lookup(char *dn, easyroute_results_t *results, int noat, char *seperator) { -#ifdef SWITCH_HAVE_ODBC switch_status_t sstatus = SWITCH_STATUS_SUCCESS; +#ifdef SWITCH_HAVE_ODBC char *sql = NULL; route_callback_t pdata;

1 0

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

24 Jan '09

Author: andrew Date: Fri Jan 23 19:04:59 2009 New Revision: 11477 Log: Initial support to spawn a process (module/function) outbound on a specified node. Also fix some bugs. Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c 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/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 Fri Jan 23 19:04:59 2009 @@ -123,29 +123,29 @@ /* 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) +int ei_spawn(struct ei_cnode_s *ec, int sockfd, erlang_ref *ref, 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_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]); + if (argc < 0) { + 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); @@ -156,12 +156,11 @@ 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); - +#ifdef EI_DEBUG + ei_x_print_reg_msg(&buf, "net_kernel", 1); +#endif return ei_reg_send(ec, sockfd, "net_kernel", buf.buff, buf.index); + } @@ -196,6 +195,69 @@ } +void ei_x_print_reg_msg(ei_x_buff *buf, char *dest, int send) +{ + char *mbuf = NULL; + int i = 1; + + ei_s_print_term(&mbuf, buf->buff, &i); + + if (send) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending %s to %s\n", mbuf, dest); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Received %s from %s\n", mbuf, dest); + } + free(mbuf); +} + + +void ei_x_print_msg(ei_x_buff *buf, erlang_pid *pid, int send) +{ + char *pbuf = NULL; + int i = 0; + ei_x_buff pidbuf; + + ei_x_new(&pidbuf); + ei_x_encode_pid(&pidbuf, pid); + + ei_s_print_term(&pbuf, pidbuf.buff, &i); + + ei_x_print_reg_msg(buf, pbuf, send); + free(pbuf); +} + + +int ei_sendto(ei_cnode *ec, int fd, struct erlang_process *process, ei_x_buff *buf) +{ + int ret; + if (process->type == ERLANG_PID) { + ret = ei_send(fd, &process->pid, buf->buff, buf->index); +#ifdef EI_DEBUG + ei_x_print_msg(buf, &process->pid, 1); +#endif + } else if (process->type == ERLANG_REG_PROCESS) { + ret = ei_reg_send(ec, fd, process->reg_name, buf->buff, buf->index); +#ifdef EI_DEBUG + ei_x_print_reg_msg(buf, process->reg_name, 1); +#endif + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid process type!\n"); + /* wuh-oh */ + ret = -1; + } + + return ret; +} + + +/* convert an erlang reference to some kind of hashed string so we can store it as a hash key */ +void ei_hash_ref(erlang_ref *ref, char *output) +{ + /* very lazy */ + sprintf(output, "%d.%d.%d@%s", ref->n[0], ref->n[1], ref->n[2], ref->node); +} + + switch_status_t initialise_ei(struct ei_cnode_s *ec) { switch_status_t rv; 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 Fri Jan 23 19:04:59 2009 @@ -107,6 +107,9 @@ switch_mutex_lock(acs->listener->sock_mutex); ei_send(acs->listener->sockfd, &acs->pid, ebuf.buff, ebuf.index); switch_mutex_unlock(acs->listener->sock_mutex); +#ifdef EI_DEBUG + ei_x_print_msg(&ebuf, &acs->pid, 1); +#endif ei_x_free(&ebuf); } @@ -132,6 +135,9 @@ switch_mutex_lock(acs->listener->sock_mutex); ei_send(acs->listener->sockfd, &acs->pid, rbuf.buff, rbuf.index); switch_mutex_unlock(acs->listener->sock_mutex); +#ifdef EI_DEBUG + ei_x_print_msg(&rbuf, &acs->pid, 1); +#endif ei_x_free(&rbuf); } @@ -492,8 +498,6 @@ binding->process.pid = msg->from; binding->listener = listener; - switch_core_hash_init(&listener->fetch_reply_hash, listener->pool); - switch_mutex_lock(globals.listener_mutex); for (ptr = bindings.head; ptr && ptr->next; ptr = ptr->next); @@ -532,7 +536,7 @@ switch_core_session_t *session; if (!switch_strlen_zero(uuid_str) && (session = switch_core_session_locate(uuid_str))) { /* create a new session list element and attach it to this listener */ - if (attach_call_to_listener(listener,reg_name,session)) { + if (attach_call_to_registered_process(listener, reg_name, session)) { ei_x_encode_atom(rbuf, "ok"); } else { ei_x_encode_tuple_header(rbuf, 2); @@ -660,9 +664,48 @@ return ret; } + +static switch_status_t handle_ref_tuple(listener_t *listener, erlang_msg *msg, ei_x_buff *buf, ei_x_buff *rbuf) +{ + erlang_ref ref; + erlang_pid *pid2, *pid = switch_core_alloc(listener->pool, sizeof(erlang_pid)); + char hash[100]; + int arity; + + ei_decode_tuple_header(buf->buff, &buf->index, &arity); + + if (ei_decode_ref(buf->buff, &buf->index, &ref)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid reference\n"); + return SWITCH_STATUS_FALSE; + } + + if (ei_decode_pid(buf->buff, &buf->index, pid)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid pid in a reference/pid tuple\n"); + return SWITCH_STATUS_FALSE; + } + + ei_hash_ref(&ref, hash); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hashed ref to %s\n", hash); + + if ((pid2 = (erlang_pid *) switch_core_hash_find(listener->spawn_pid_hash, hash))) { + if (pid2 == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found unfilled slot for %s\n", hash); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found filled slot for %s\n", hash); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No slot for %s\n", hash); + switch_core_hash_insert(listener->spawn_pid_hash, hash, pid); + } + + return SWITCH_STATUS_SUCCESS; +} + + int handle_msg(listener_t *listener, erlang_msg *msg, ei_x_buff *buf, ei_x_buff *rbuf) { - int type, size, version; + int type, type2, size, version, arity, tmpindex; switch_status_t ret = SWITCH_STATUS_SUCCESS; buf->index = 0; @@ -672,7 +715,27 @@ switch(type) { case ERL_SMALL_TUPLE_EXT : case ERL_LARGE_TUPLE_EXT : - ret = handle_msg_tuple(listener,msg,buf,rbuf); + tmpindex = buf->index; + ei_decode_tuple_header(buf->buff, &tmpindex, &arity); + ei_get_type(buf->buff, &tmpindex, &type2, &size); + + switch(type2) { + case ERL_ATOM_EXT: + ret = handle_msg_tuple(listener,msg,buf,rbuf); + break; + case ERL_REFERENCE_EXT : + case ERL_NEW_REFERENCE_EXT : + handle_ref_tuple(listener, msg, buf, rbuf); + return 0; + default : + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "WEEEEEEEE %d\n", type); + /* some other kind of erlang term */ + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_atom(rbuf, "error"); + ei_x_encode_atom(rbuf, "undef"); + break; + } + break; case ERL_ATOM_EXT : @@ -687,17 +750,23 @@ break; } - if (SWITCH_STATUS_FALSE==ret) + if (SWITCH_STATUS_FALSE==ret) { return 0; - else { + } else if (rbuf->index > 1) { switch_mutex_lock(listener->sock_mutex); ei_send(listener->sockfd, &msg->from, rbuf->buff, rbuf->index); switch_mutex_unlock(listener->sock_mutex); +#ifdef EI_DEBUG + ei_x_print_msg(rbuf, &msg->from, 1); +#endif if (SWITCH_STATUS_SUCCESS==ret) return 0; else /* SWITCH_STATUS_TERM */ return 1; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Empty reply, supressing\n"); + return 0; } } 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 Fri Jan 23 19:04:59 2009 @@ -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->process.pid, buf.buff, buf.index); + ei_sendto(ptr->listener->ec, ptr->listener->sockfd, &ptr->process, &buf); switch_mutex_unlock(ptr->listener->sock_mutex); int i = 0; @@ -418,16 +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 (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); - } + result = ei_sendto(listener->ec, listener->sockfd, &process, &lbuf); + + switch_mutex_unlock(listener->sock_mutex); if (result) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to send call event\n"); } - switch_mutex_unlock(listener->sock_mutex); ei_x_free(&lbuf); return SWITCH_STATUS_SUCCESS; @@ -467,11 +464,7 @@ ei_encode_switch_event(&ebuf, pevent); switch_mutex_lock(listener->sock_mutex); - 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); - } + ei_sendto(listener->ec, listener->sockfd, &sp->process, &ebuf); switch_mutex_unlock(listener->sock_mutex); /* event is a hangup, so this session can be removed */ @@ -484,8 +477,11 @@ else listener->session_list = sp->next; + + switch_channel_clear_flag(switch_core_session_get_channel(sp->session), CF_CONTROLLED); /* this allows the application threads to exit */ - switch_clear_flag_locked(sp, LFLAG_SESSION_ALIVE); + switch_clear_flag_locked(sp, LFLAG_SESSION_ALIVE); + switch_core_session_rwunlock(sp->session); /* TODO if this listener was created outbound, and the last session has been detached @@ -546,11 +542,7 @@ ei_x_encode_empty_list(&lbuf); switch_mutex_lock(listener->sock_mutex); - 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); - } + ei_sendto(listener->ec, listener->sockfd, &listener->log_process, &lbuf); switch_mutex_unlock(listener->sock_mutex); ei_x_free(&lbuf); @@ -576,11 +568,7 @@ ei_encode_switch_event(&ebuf, pevent); switch_mutex_lock(listener->sock_mutex); - 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); - } + ei_sendto(listener->ec, listener->sockfd, &listener->log_process, &ebuf); switch_mutex_unlock(listener->sock_mutex); ei_x_free(&ebuf); @@ -592,8 +580,6 @@ 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; @@ -614,20 +600,27 @@ case ERL_MSG : switch(msg.msgtype) { case ERL_SEND : - /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "erl_send\n");*/ - /*i = 1;*/ +#ifdef EI_DEBUG + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "erl_send\n"); + + ei_x_print_msg(&buf, &msg.from, 0); /*ei_s_print_term(&pbuf, buf.buff, &i);*/ /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "erl_send was message %s\n", pbuf);*/ +#endif 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 to %s\n", msg.toname);*/ +#ifdef EI_DEBUG + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "erl_reg_send to %s\n", msg.toname); + + ei_x_print_reg_msg(&buf, msg.toname, 0); /*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);*/ +#endif if (handle_msg(listener, &msg, &buf, &rbuf)) { return; @@ -695,6 +688,9 @@ ei_x_encode_atom(&rbuf, "acldeny"); ei_send(listener->sockfd, &msg.from, rbuf.buff, rbuf.index); +#ifdef EI_DEBUG + ei_x_print_msg(&rbuf, &msg.from, 1); +#endif ei_x_free(&rbuf); } @@ -718,6 +714,9 @@ prefs.threads++; switch_mutex_unlock(globals.listener_mutex); + switch_core_hash_init(&listener->fetch_reply_hash, listener->pool); + switch_core_hash_init(&listener->spawn_pid_hash, listener->pool); + switch_assert(listener != NULL); if (check_inbound_acl(listener)) { @@ -896,7 +895,7 @@ return listener; } -session_elem_t* attach_call_to_listener(listener_t* listener, char* reg_name, switch_core_session_t *session) +session_elem_t* attach_call_to_registered_process(listener_t* listener, char* reg_name, switch_core_session_t *session) { /* create a session list element */ session_elem_t* session_element=NULL; @@ -922,32 +921,92 @@ return session_element; } +session_elem_t* attach_call_to_spawned_process(listener_t* listener, char *module, char *function, switch_core_session_t *session) +{ + /* create a session list element */ + session_elem_t* session_element=NULL; + if (!(session_element = switch_core_alloc(switch_core_session_get_pool(session), sizeof(*session_element)))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to allocate session element\n"); + } + else { + if (SWITCH_STATUS_SUCCESS != switch_core_session_read_lock(session)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to get session read lock\n"); + } + else { + char *argv[1], hash[100]; + int i = 0; + session_element->session = session; + erlang_pid *pid; + erlang_ref ref; + + ei_spawn(listener->ec, listener->sockfd, &ref, module, function, 0, argv); + ei_hash_ref(&ref, hash); + + while (!(pid = (erlang_pid *) switch_core_hash_find(listener->spawn_pid_hash, hash))) { + if (i > 50) { /* half a second timeout */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "timed out!\n"); + return NULL; + } + i++; + switch_yield(10000); /* 10ms */ + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got pid!\n"); + + session_element->process.type = ERLANG_PID; + memcpy(&session_element->process.pid, pid, sizeof(erlang_pid)); + 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)); + switch_mutex_init(&session_element->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); + /* attach the session to the listener */ + add_session_elem_to_listener(listener,session_element); + } + } + return session_element; +} + + /* Module Hooks */ /* Entry point for outbound mode */ SWITCH_STANDARD_APP(erlang_outbound_function) { - char *reg_name, *node; + char *reg_name = NULL, *node, *module = NULL, *function = NULL; listener_t *listener; - int argc = 0; - char *argv[80] = { 0 }; - char *mydata; + int argc = 0, argc2=0; + char *argv[80] = { 0 }, *argv2[80] = { 0 }; + char *mydata, *myarg; switch_bool_t new_session = SWITCH_FALSE; session_elem_t* session_element=NULL; /* process app arguments */ if (data && (mydata = switch_core_session_strdup(session, data))) { argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); - } + } /* XXX else? */ if (argc < 2) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error - need registered name and node!\n"); return; } - reg_name = argv[0]; - if (switch_strlen_zero(reg_name)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing registered name!\n"); + if (switch_strlen_zero(argv[0])) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing registered name or module:function!\n"); return; } + + if ((myarg = switch_core_session_strdup(session, argv[0]))) { + argc2 = switch_separate_string(myarg, ':', argv2, (sizeof(argv2) / sizeof(argv2[0]))); + } + + if (argc2 == 2) { + /* mod:fun style */ + module = argv2[0]; + function = argv2[1]; + } else { + /* registered name style */ + reg_name = argv[0]; + } + + node = argv[1]; if (switch_strlen_zero(node)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing node name!\n"); @@ -967,17 +1026,27 @@ else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Using existing listener for session\n"); } - if (listener && - (session_element=attach_call_to_listener(listener,reg_name,session)) != NULL) { - - if (new_session) - launch_listener_thread(listener); - switch_ivr_park(session, NULL); - /* keep app thread running for lifetime of session */ - if (switch_channel_get_state(switch_core_session_get_channel(session)) >= CS_HANGUP) { - while (switch_test_flag(session_element, LFLAG_SESSION_ALIVE)) { - switch_yield(100000); + if (listener) { + if (module && function) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Creating new spawned session for listener\n"); + session_element=attach_call_to_spawned_process(listener, module, function, session); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Creating new registered session for listener\n"); + session_element=attach_call_to_registered_process(listener, reg_name, session); + } + + if (session_element) { + + if (new_session) + launch_listener_thread(listener); + switch_ivr_park(session, NULL); + + /* keep app thread running for lifetime of session */ + if (switch_channel_get_state(switch_core_session_get_channel(session)) >= CS_HANGUP) { + while (switch_test_flag(session_element, LFLAG_SESSION_ALIVE)) { + switch_yield(100000); + } } } } 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 Fri Jan 23 19:04:59 2009 @@ -32,6 +32,7 @@ * */ +#define EI_DEBUG typedef enum { LFLAG_OUTBOUND_INIT = (1 << 0), /* Erlang peer has been notified of this session */ @@ -93,6 +94,7 @@ uint8_t event_list[SWITCH_EVENT_ALL + 1]; switch_hash_t *event_hash; switch_hash_t *fetch_reply_hash; + switch_hash_t *spawn_pid_hash; switch_thread_rwlock_t *rwlock; switch_mutex_t *session_mutex; session_elem_t *session_list; @@ -186,13 +188,18 @@ 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); +int ei_spawn(struct ei_cnode_s *ec, int sockfd, erlang_ref *ref, char *module, char *function, int argc, char **argv); void ei_init_ref(struct ei_cnode_s *ec, erlang_ref *ref); +void ei_x_print_reg_msg(ei_x_buff *buf, char *dest, int send); +void ei_x_print_msg(ei_x_buff *buf, erlang_pid *pid, int send); +int ei_sendto(ei_cnode *ec, int fd, struct erlang_process *process, ei_x_buff *buf); +void ei_hash_ref(erlang_ref *ref, char *output); 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") /* mod_erlang_event.c */ -session_elem_t* attach_call_to_listener(listener_t* listener, char* reg_name, switch_core_session_t *session); +session_elem_t* attach_call_to_registered_process(listener_t* listener, char* reg_name, switch_core_session_t *session); +session_elem_t* attach_call_to_spawned_process(listener_t* listener, char *module, char *function, switch_core_session_t *session); /* For Emacs: * Local Variables:

1 0

[commit] r11476 - freeswitch/trunk/libs/portaudio/test
by FreeSWITCH SVN 24 Jan '09

24 Jan '09

Author: anthm Date: Fri Jan 23 18:42:11 2009 New Revision: 11476 Log: doh Modified: freeswitch/trunk/libs/portaudio/test/patest1.c freeswitch/trunk/libs/portaudio/test/patest_sine.c freeswitch/trunk/libs/portaudio/test/patest_sine8.c freeswitch/trunk/libs/portaudio/test/patest_sine_formats.c Modified: freeswitch/trunk/libs/portaudio/test/patest1.c ============================================================================== --- freeswitch/trunk/libs/portaudio/test/patest1.c (original) +++ freeswitch/trunk/libs/portaudio/test/patest1.c Fri Jan 23 18:42:11 2009 @@ -49,7 +49,7 @@ #define M_PI (3.14159265) #endif -#define SAMPLE_RATE (8000) +#define SAMPLE_RATE (44100) typedef struct { Modified: freeswitch/trunk/libs/portaudio/test/patest_sine.c ============================================================================== --- freeswitch/trunk/libs/portaudio/test/patest_sine.c (original) +++ freeswitch/trunk/libs/portaudio/test/patest_sine.c Fri Jan 23 18:42:11 2009 @@ -45,9 +45,9 @@ #include <math.h> #include "portaudio.h" -#define NUM_SECONDS (1) -#define SAMPLE_RATE (8000) -#define FRAMES_PER_BUFFER (160) +#define NUM_SECONDS (5) +#define SAMPLE_RATE (44100) +#define FRAMES_PER_BUFFER (64) #ifndef M_PI #define M_PI (3.14159265) Modified: freeswitch/trunk/libs/portaudio/test/patest_sine8.c ============================================================================== --- freeswitch/trunk/libs/portaudio/test/patest_sine8.c (original) +++ freeswitch/trunk/libs/portaudio/test/patest_sine8.c Fri Jan 23 18:42:11 2009 @@ -45,15 +45,15 @@ #include <math.h> #include "portaudio.h" -#define NUM_SECONDS (1) +#define NUM_SECONDS (8) #define SAMPLE_RATE (44100) #define TABLE_SIZE (200) #define TEST_UNSIGNED (0) #if TEST_UNSIGNED -#define TEST_FORMAT paUInt16 +#define TEST_FORMAT paUInt8 #else -#define TEST_FORMAT paInt16 +#define TEST_FORMAT paInt8 #endif #ifndef M_PI Modified: freeswitch/trunk/libs/portaudio/test/patest_sine_formats.c ============================================================================== --- freeswitch/trunk/libs/portaudio/test/patest_sine_formats.c (original) +++ freeswitch/trunk/libs/portaudio/test/patest_sine_formats.c Fri Jan 23 18:42:11 2009 @@ -43,11 +43,10 @@ #include <stdio.h> #include <math.h> #include "portaudio.h" -#include <fcntl.h> -#define NUM_SECONDS (20) -#define SAMPLE_RATE (8000) -#define FRAMES_PER_BUFFER (80) +#define NUM_SECONDS (10) +#define SAMPLE_RATE (44100) +#define FRAMES_PER_BUFFER (512) #define LEFT_FREQ (SAMPLE_RATE/256.0) /* So we hit 1.0 */ #define RIGHT_FREQ (500.0) #define AMPLITUDE (1.0) @@ -92,8 +91,6 @@ #endif -static int fd = 0; - typedef struct { double left_phase; @@ -123,26 +120,14 @@ { framesToCalc = data->framesToGo; data->framesToGo = 0; - //finished = 1; + finished = 1; } else { framesToCalc = framesPerBuffer; data->framesToGo -= framesPerBuffer; } - - - if (!fd) { - fd = open("/root/sr8k.raw", O_RDONLY, 0); - } - - printf("WTF %d\n", framesToCalc); - i = read(fd, outputBuffer, framesToCalc * 2); - - if (!i) finished = 1; - - /* for( i=0; i<framesToCalc; i++ ) { data->left_phase += (LEFT_FREQ / SAMPLE_RATE); @@ -153,16 +138,12 @@ if( data->right_phase > 1.0) data->right_phase -= 1.0; *out++ = DOUBLE_TO_SAMPLE( AMPLITUDE * sin( (data->right_phase * M_PI * 2. ))); } - */ - /* zero remainder of final buffer */ -#if 0 for( ; i<(int)framesPerBuffer; i++ ) { *out++ = SAMPLE_ZERO; /* left */ *out++ = SAMPLE_ZERO; /* right */ } -#endif return finished; } /*******************************************************************/ @@ -184,7 +165,7 @@ outputParameters.device = Pa_GetDefaultOutputDevice(); /* Default output device. */ - outputParameters.channelCount = 1; /* Stereo output */ + outputParameters.channelCount = 2; /* Stereo output */ outputParameters.sampleFormat = TEST_FORMAT; /* Selected above. */ outputParameters.suggestedLatency = Pa_GetDeviceInfo(outputParameters.device)->defaultLowOutputLatency; outputParameters.hostApiSpecificStreamInfo = NULL;

1 0

[commit] r11475 - in freeswitch/trunk: libs/portaudio/test src
by FreeSWITCH SVN 24 Jan '09

24 Jan '09

Author: anthm Date: Fri Jan 23 18:39:37 2009 New Revision: 11475 Log: evil line of code strikes again\! Modified: freeswitch/trunk/libs/portaudio/test/patest1.c freeswitch/trunk/libs/portaudio/test/patest_sine.c freeswitch/trunk/libs/portaudio/test/patest_sine8.c freeswitch/trunk/libs/portaudio/test/patest_sine_formats.c freeswitch/trunk/src/switch_core_io.c Modified: freeswitch/trunk/libs/portaudio/test/patest1.c ============================================================================== --- freeswitch/trunk/libs/portaudio/test/patest1.c (original) +++ freeswitch/trunk/libs/portaudio/test/patest1.c Fri Jan 23 18:39:37 2009 @@ -49,7 +49,7 @@ #define M_PI (3.14159265) #endif -#define SAMPLE_RATE (44100) +#define SAMPLE_RATE (8000) typedef struct { Modified: freeswitch/trunk/libs/portaudio/test/patest_sine.c ============================================================================== --- freeswitch/trunk/libs/portaudio/test/patest_sine.c (original) +++ freeswitch/trunk/libs/portaudio/test/patest_sine.c Fri Jan 23 18:39:37 2009 @@ -45,9 +45,9 @@ #include <math.h> #include "portaudio.h" -#define NUM_SECONDS (5) -#define SAMPLE_RATE (44100) -#define FRAMES_PER_BUFFER (64) +#define NUM_SECONDS (1) +#define SAMPLE_RATE (8000) +#define FRAMES_PER_BUFFER (160) #ifndef M_PI #define M_PI (3.14159265) Modified: freeswitch/trunk/libs/portaudio/test/patest_sine8.c ============================================================================== --- freeswitch/trunk/libs/portaudio/test/patest_sine8.c (original) +++ freeswitch/trunk/libs/portaudio/test/patest_sine8.c Fri Jan 23 18:39:37 2009 @@ -45,15 +45,15 @@ #include <math.h> #include "portaudio.h" -#define NUM_SECONDS (8) +#define NUM_SECONDS (1) #define SAMPLE_RATE (44100) #define TABLE_SIZE (200) #define TEST_UNSIGNED (0) #if TEST_UNSIGNED -#define TEST_FORMAT paUInt8 +#define TEST_FORMAT paUInt16 #else -#define TEST_FORMAT paInt8 +#define TEST_FORMAT paInt16 #endif #ifndef M_PI Modified: freeswitch/trunk/libs/portaudio/test/patest_sine_formats.c ============================================================================== --- freeswitch/trunk/libs/portaudio/test/patest_sine_formats.c (original) +++ freeswitch/trunk/libs/portaudio/test/patest_sine_formats.c Fri Jan 23 18:39:37 2009 @@ -43,10 +43,11 @@ #include <stdio.h> #include <math.h> #include "portaudio.h" +#include <fcntl.h> -#define NUM_SECONDS (10) -#define SAMPLE_RATE (44100) -#define FRAMES_PER_BUFFER (512) +#define NUM_SECONDS (20) +#define SAMPLE_RATE (8000) +#define FRAMES_PER_BUFFER (80) #define LEFT_FREQ (SAMPLE_RATE/256.0) /* So we hit 1.0 */ #define RIGHT_FREQ (500.0) #define AMPLITUDE (1.0) @@ -91,6 +92,8 @@ #endif +static int fd = 0; + typedef struct { double left_phase; @@ -120,14 +123,26 @@ { framesToCalc = data->framesToGo; data->framesToGo = 0; - finished = 1; + //finished = 1; } else { framesToCalc = framesPerBuffer; data->framesToGo -= framesPerBuffer; } + + + if (!fd) { + fd = open("/root/sr8k.raw", O_RDONLY, 0); + } + + printf("WTF %d\n", framesToCalc); + i = read(fd, outputBuffer, framesToCalc * 2); + + if (!i) finished = 1; + + /* for( i=0; i<framesToCalc; i++ ) { data->left_phase += (LEFT_FREQ / SAMPLE_RATE); @@ -138,12 +153,16 @@ if( data->right_phase > 1.0) data->right_phase -= 1.0; *out++ = DOUBLE_TO_SAMPLE( AMPLITUDE * sin( (data->right_phase * M_PI * 2. ))); } + */ + /* zero remainder of final buffer */ +#if 0 for( ; i<(int)framesPerBuffer; i++ ) { *out++ = SAMPLE_ZERO; /* left */ *out++ = SAMPLE_ZERO; /* right */ } +#endif return finished; } /*******************************************************************/ @@ -165,7 +184,7 @@ outputParameters.device = Pa_GetDefaultOutputDevice(); /* Default output device. */ - outputParameters.channelCount = 2; /* Stereo output */ + outputParameters.channelCount = 1; /* Stereo output */ outputParameters.sampleFormat = TEST_FORMAT; /* Selected above. */ outputParameters.suggestedLatency = Pa_GetDeviceInfo(outputParameters.device)->defaultLowOutputLatency; outputParameters.hostApiSpecificStreamInfo = NULL; Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Fri Jan 23 18:39:37 2009 @@ -616,7 +616,8 @@ if ((session->write_codec && frame->codec && session->write_codec->implementation != frame->codec->implementation)) { - if (session->write_impl.microseconds_per_packet != frame->codec->implementation->microseconds_per_packet) { + if (session->write_impl.codec_id == frame->codec->implementation->codec_id || + session->write_impl.microseconds_per_packet != frame->codec->implementation->microseconds_per_packet) { ptime_mismatch = TRUE; if (switch_test_flag(frame->codec, SWITCH_CODEC_FLAG_PASSTHROUGH) || switch_test_flag(session->read_codec, SWITCH_CODEC_FLAG_PASSTHROUGH)) { status = perform_write(session, frame, flags, stream_id);

1 0

[commit] r11473 - freeswitch/trunk/scripts/contrib/Phil/pylons
by FreeSWITCH SVN 23 Jan '09

23 Jan '09

Author: Phil Date: Fri Jan 23 17:08:59 2009 New Revision: 11473 Log: pylons controllers for FS Added: freeswitch/trunk/scripts/contrib/Phil/pylons/freeswitchcdr.py freeswitch/trunk/scripts/contrib/Phil/pylons/freeswitchdialplan.py freeswitch/trunk/scripts/contrib/Phil/pylons/freeswitchdirectory.py Added: freeswitch/trunk/scripts/contrib/Phil/pylons/freeswitchcdr.py ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/Phil/pylons/freeswitchcdr.py Fri Jan 23 17:08:59 2009 @@ -0,0 +1,60 @@ +import logging + +from freeswitch.lib.base import * + + +import xml +from xml.sax.handler import ContentHandler + + +log = logging.getLogger(__name__) + + +class FreeswitchcdrController(BaseController): + + + # simple method to display the uuid of a call that got terminated + def cdr(self): + + next = 0 + uuid = [] + + try: + cdr = request.POST.getone('cdr') + # needs to be casted to a string as the unicode string can't be parsed correctly by the sax parser + cdr = str(cdr) + + cdrHandler = CDR_XML_Handler() + xml.sax.parseString(cdr, cdrHandler) + uuid = cdrHandler.uuid + print uuid + + + except KeyError, e: + print e + return + + + + +class CDR_XML_Handler(ContentHandler): + + def __init__(self): + self.uuid = [] + self.uuidString = "" + self.isUuidElement = 0 + + def startElement(self, name, attrs): + + if name == 'uuid': + self.isUuidElement = 1 + uuidString = "" + + def characters(self, ch): + if self.isUuidElement == 1: + self.uuidString += ch + + def endElement(self, name): + if name == 'uuid': + self.isUuidElement= 0 + self.uuid.append(self.uuidString) Added: freeswitch/trunk/scripts/contrib/Phil/pylons/freeswitchdialplan.py ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/Phil/pylons/freeswitchdialplan.py Fri Jan 23 17:08:59 2009 @@ -0,0 +1,154 @@ +import logging + +from freeswitch.lib.base import * + + + +log = logging.getLogger(__name__) + +class FreeswitchdialplanController(BaseController): + + + + + # needs to be checked what's the best return string when an error occures + error = '''<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'''\ + '''<document type="freeswitch/xml">\n'''\ + '''<section name="dialplan" description="RE Dial Plan For FreeSwitch">\n'''\ + '''</section>\n'''\ + '''</document>''' + + + + # the name forward is a bit confusing as it is actually a FS bridge + # the next two methods allow you to forward a single call to n number of outbound calls + def forwardCreate(self, number, gateway, forwardString): + if forwardString != '': + forwardString = forwardString + ',' + + return forwardString + '''sofia/gateway/%s/%s''' % (gateway, number) + + + + def forwardFinishCreate(self, didNumber, forwardString): + return '''<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'''\ + '''<document type="freeswitch/xml">\n'''\ + '''<section name="dialplan" description="RE Dial Plan For FreeSwitch">\n'''\ + '''<context name="public">\n'''\ + '''<extension name="extension%s">\n'''\ + '''<condition field="destination_number" expression="^(%s)$">\n'''\ + '''<action application="bridge" data="%s"/>\n'''\ + '''</condition>\n'''\ + '''</extension>\n'''\ + '''</context>\n'''\ + '''</section>\n'''\ + '''</document>\n''' % (didNumber, didNumber, forwardString) + + + # bridge one inbound call with a single outbound call + def bridge(self, didNumber, outboundNumber, gateway): + + return '''<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'''\ + '''<document type="freeswitch/xml">\n'''\ + '''<section name="dialplan" description="RE Dial Plan For FreeSwitch">\n'''\ + '''<context name="public">\n'''\ + '''<extension name="extension%s">\n'''\ + '''<condition field="destination_number" expression="^(%s)$">\n'''\ + '''<action application="bridge" data="sofia/gateway/%s/%s"/>\n'''\ + '''</condition>\n'''\ + '''</extension>\n'''\ + '''</context>\n'''\ + '''</section>\n'''\ + '''</document>\n''' % (didNumber, didNumber, gateway, outboundNumber) + + + + def voicemail(self, didNumber, mailbox_id): + + return '''<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'''\ + '''<document type="freeswitch/xml">\n'''\ + '''<section name="dialplan" description="RE Dial Plan For FreeSwitch">\n'''\ + '''<context name="public">\n'''\ + '''<extension name="voicemail%s">\n'''\ + '''<condition field="destination_number" expression="^(%s)$">\n'''\ + '''<action application="voicemail" data="default $${domain} %s"/>\n'''\ + '''</condition>\n'''\ + '''</extension>\n'''\ + '''</context>\n'''\ + '''</section>\n'''\ + '''</document>''' % (didNumber, didNumber, mailbox_id) + + def checkVoicemail(self, didNumber, mailbox_id): + + return '''<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'''\ + '''<document type="freeswitch/xml">\n'''\ + '''<section name="dialplan" description="RE Dial Plan For FreeSwitch">\n'''\ + '''<context name="public">\n'''\ + '''<extension name="voicemail%s">\n'''\ + '''<condition field="destination_number" expression="^(%s)$">\n'''\ + '''<action application="voicemail" data="check default $${domain} %s"/>\n'''\ + '''</condition>\n'''\ + '''</extension>\n'''\ + '''</context>\n'''\ + '''</section>\n'''\ + '''</document>''' % (didNumber, didNumber, mailbox_id) + + + # if you hungup the call before it has been answered a busy is issued + def busy(self, didNumber): + return '''<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'''\ + '''<document type="freeswitch/xml">\n'''\ + '''<section name="dialplan" description="RE Dial Plan For FreeSwitch">\n'''\ + '''<context name="public">\n'''\ + '''<extension name="extension%s">\n'''\ + '''<condition field="destination_number" expression="^(%s)$">\n'''\ + '''<action application="hungup" data=""/>\n'''\ + '''</condition>\n'''\ + '''</extension>\n'''\ + '''</context>\n'''\ + '''</section>\n'''\ + '''</document>\n''' % (destinationNumber, didNumber) + + + + + def dialplan(self): + + action = "voicemail" + + # replace with your sofia gateway + gateway = 'sipgate2' + + # replace with phone numbers + forwards = ['the did number extension - gateway', 'the number to forward to'] + + # that is the username of the mailbox + mailbox_id = 'test' + + + didNumber = str(request.POST.getone('Caller-Destination-Number')) + + + # ------------------------------------------------------------ Forward ------------------------------------------------------- + # if the action is forward, we forward to all numbers in forwards + if action == "forward": + + forwardString = '' + for f in forwards: + forwardString = self.forwardCreate(f, gateway, forwardString) + + return self.forwardFinishCreate(didNumber, forwardString) + + + + elif action == "checkVoicemail": + + return self.checkVoicemail(didNumber, mailbox_id) + + + + elif action == "voicemail": + + return self.voicemail(didNumber, mailbox_id) + + Added: freeswitch/trunk/scripts/contrib/Phil/pylons/freeswitchdirectory.py ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/Phil/pylons/freeswitchdirectory.py Fri Jan 23 17:08:59 2009 @@ -0,0 +1,67 @@ +import logging + +from freeswitch.lib.base import * + + + + +log = logging.getLogger(__name__) + +class FreeswitchdirectoryController(BaseController): + + bootReply = '''<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'''\ + '''<document type="freeswitch/xml">\n'''\ + '''<section name="directory" description="arbitrary stuff here">\n'''\ + '''</section>\n'''\ + '''</document>''' + + error = '''<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'''\ + '''<document type="freeswitch/xml">\n'''\ + '''<section name="dialplan" description="RE Dial Plan For FreeSwitch">\n'''\ + '''</section>\n'''\ + '''</document>''' + + def user(self, didNumber, domain, mailbox_id): + test = '''<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'''\ + '''<document type="freeswitch/xml">\n'''\ + '''<section name="directory" description="arbitrary stuff here">\n'''\ + '''<domain name="%s">\n'''\ + '''<groups>\n'''\ + '''<group name="default">\n'''\ + '''<users>\n'''\ + '''<user id="%s" mailbox="%s">\n'''\ + '''<params>\n'''\ + '''<param name="password" value="1234"/>\n'''\ + '''<param name="vm-password" value="0000"/>\n'''\ + '''</params>\n'''\ + '''<variables>\n'''\ + '''<variable name="accountcode" value="%s"/>\n'''\ + '''<variable name="user_context" value="default"/>\n'''\ + '''<variable name="vm_extension" value="%s"/>\n'''\ + '''<variable name="max_calls" value="1"/>\n'''\ + '''<variable name="fail_over" value="415"/>\n'''\ + '''<variable name="cringback" value="us-ring"/>\n'''\ + '''</variables>\n'''\ + '''</user>\n'''\ + '''</users>\n'''\ + '''</group>\n'''\ + '''</groups>\n'''\ + '''</domain>\n'''\ + '''</section>\n'''\ + '''</document>''' % (domain, mailbox_id, mailbox_id, mailbox_id, mailbox_id) + + return test + + + # a very simple reply that creates a user for the voicemail. + def directory(self): + + try: + return self.user(request.POST.getone('mailbox'), request.POST.getone('domain'), request.POST.getone('user')) + + except KeyError, e: + pass + + return self.bootReply + +

1 0

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

23 Jan '09

Author: mikej Date: Fri Jan 23 16:09:17 2009 New Revision: 11472 Log: mod_portaudio: default dual-streams to off Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Fri Jan 23 16:09:17 2009 @@ -845,6 +845,8 @@ return SWITCH_STATUS_TERM; } + globals.dual_streams = 0; + globals.indev = globals.outdev = globals.ringdev = -1; globals.sample_rate = 8000; @@ -919,10 +921,6 @@ globals.codec_ms = 20; } - if (!globals.dual_streams) { - globals.dual_streams = 0; - } - if (!globals.ring_interval) { globals.ring_interval = 5; }

1 0

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

23 Jan '09

Author: brian Date: Fri Jan 23 15:40:54 2009 New Revision: 11471 Log: lets default to zero Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Fri Jan 23 15:40:54 2009 @@ -919,6 +919,10 @@ globals.codec_ms = 20; } + if (!globals.dual_streams) { + globals.dual_streams = 0; + } + if (!globals.ring_interval) { globals.ring_interval = 5; }

1 0

[commit] r11470 - in freeswitch/trunk: conf/autoload_configs src/mod/endpoints/mod_portaudio
by FreeSWITCH SVN 23 Jan '09

23 Jan '09

Author: brian Date: Fri Jan 23 15:34:43 2009 New Revision: 11470 Log: make this param optional in the config on all platforms but solaris since it doesn't like it anyway Modified: freeswitch/trunk/conf/autoload_configs/portaudio.conf.xml freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Modified: freeswitch/trunk/conf/autoload_configs/portaudio.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/portaudio.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/portaudio.conf.xml Fri Jan 23 15:34:43 2009 @@ -15,6 +15,8 @@    +  +   <param name="hold-file" value="$${hold_music}"/> Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Fri Jan 23 15:34:43 2009 @@ -782,8 +782,6 @@ /* dual streams makes portaudio on solaris choke */ #if defined(sun) || defined(__sun) globals.dual_streams = 0; -#else - globals.dual_streams = 1; #endif if ((status = load_config()) != SWITCH_STATUS_SUCCESS) { @@ -863,6 +861,12 @@ set_global_ring_file(val); } else if (!strcmp(var, "hold-file")) { set_global_hold_file(val); + } else if (!strcmp(var, "dual-streams")) { + if (switch_true(val)) { + globals.dual_streams = 1; + } else { + globals.dual_streams = 0; + } } else if (!strcmp(var, "timer-name")) { set_global_timer_name(val); } else if (!strcmp(var, "sample-rate")) {

1 0

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

23 Jan '09

Author: brian Date: Fri Jan 23 15:27:24 2009 New Revision: 11469 Log: remove rate option from call desc. Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Fri Jan 23 15:27:24 2009 @@ -1777,7 +1777,7 @@ "pa help\n" "pa dump\n" "pa rescan\n" - "pa call <dest> [<dialplan> <cid_name> <cid_num> <rate>]\n" + "pa call <dest> [<dialplan> <cid_name> <cid_num>]\n" "pa answer [<call_id>]\n" "pa hangup [<call_id>]\n" "pa list\n"

1 0

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

23 Jan '09

Author: anthm Date: Fri Jan 23 14:33:30 2009 New Revision: 11468 Log: allow <params> tag in gateways as well as <variables> with direction inbound/outbound (default both) and call counter 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/mod/endpoints/mod_sofia/sofia_reg.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 Fri Jan 23 14:33:30 2009 @@ -1503,22 +1503,25 @@ switch_assert(gp->state < REG_STATE_LAST); stream->write_function(stream, "%s\n", line); - stream->write_function(stream, "Name \t\t%s\n", switch_str_nil(gp->name)); - stream->write_function(stream, "Scheme \t\t%s\n", switch_str_nil(gp->register_scheme)); - stream->write_function(stream, "Realm \t\t%s\n", switch_str_nil(gp->register_realm)); - stream->write_function(stream, "Username\t\t%s\n", switch_str_nil(gp->register_username)); - stream->write_function(stream, "Password\t\t%s\n", switch_strlen_zero(gp->register_password) ? "no" : "yes"); - stream->write_function(stream, "From \t\t%s\n", switch_str_nil(gp->register_from)); - stream->write_function(stream, "Contact \t\t%s\n", switch_str_nil(gp->register_contact)); - stream->write_function(stream, "To \t\t%s\n", switch_str_nil(gp->register_to)); - stream->write_function(stream, "Proxy \t\t%s\n", switch_str_nil(gp->register_proxy)); - stream->write_function(stream, "Context \t\t%s\n", switch_str_nil(gp->register_context)); - stream->write_function(stream, "Expires \t\t%s\n", switch_str_nil(gp->expires_str)); - stream->write_function(stream, "Freq \t\t%d\n", gp->freq); - stream->write_function(stream, "Ping \t\t%d\n", gp->ping); - stream->write_function(stream, "PingFreq\t\t%d\n", gp->ping_freq); - stream->write_function(stream, "State \t\t%s\n", sofia_state_names[gp->state]); - stream->write_function(stream, "Status \t\t%s%s\n", status_names[gp->status], gp->pinging ? " (ping)" : ""); + stream->write_function(stream, "Name \t%s\n", switch_str_nil(gp->name)); + stream->write_function(stream, "Scheme \t%s\n", switch_str_nil(gp->register_scheme)); + stream->write_function(stream, "Realm \t%s\n", switch_str_nil(gp->register_realm)); + stream->write_function(stream, "Username\t%s\n", switch_str_nil(gp->register_username)); + stream->write_function(stream, "Password\t%s\n", switch_strlen_zero(gp->register_password) ? "no" : "yes"); + stream->write_function(stream, "From \t%s\n", switch_str_nil(gp->register_from)); + stream->write_function(stream, "Contact \t%s\n", switch_str_nil(gp->register_contact)); + stream->write_function(stream, "Exten \t%s\n", switch_str_nil(gp->extension)); + stream->write_function(stream, "To \t%s\n", switch_str_nil(gp->register_to)); + stream->write_function(stream, "Proxy \t%s\n", switch_str_nil(gp->register_proxy)); + stream->write_function(stream, "Context \t%s\n", switch_str_nil(gp->register_context)); + stream->write_function(stream, "Expires \t%s\n", switch_str_nil(gp->expires_str)); + stream->write_function(stream, "Freq \t%d\n", gp->freq); + stream->write_function(stream, "Ping \t%d\n", gp->ping); + stream->write_function(stream, "PingFreq\t%d\n", gp->ping_freq); + stream->write_function(stream, "State \t%s\n", sofia_state_names[gp->state]); + stream->write_function(stream, "Status \t%s%s\n", status_names[gp->status], gp->pinging ? " (ping)" : ""); + stream->write_function(stream, "CallsIN \t%d\n", gp->ib_calls); + stream->write_function(stream, "CallsOUT\t%d\n", gp->ob_calls); stream->write_function(stream, "%s\n", line); sofia_reg_release_gateway(gp); } else { @@ -1531,51 +1534,51 @@ if ((argv[1]) && (profile = sofia_glue_find_profile(argv[1]))) { if (!argv[2] || strcasecmp(argv[2], "reg")) { stream->write_function(stream, "%s\n", line); - stream->write_function(stream, "Name \t\t%s\n", switch_str_nil(argv[1])); - stream->write_function(stream, "Domain Name \t\t%s\n", profile->domain_name ? profile->domain_name : "N/A"); + stream->write_function(stream, "Name \t%s\n", switch_str_nil(argv[1])); + stream->write_function(stream, "Domain Name \t%s\n", profile->domain_name ? profile->domain_name : "N/A"); if (strcasecmp(argv[1], profile->name)) { - stream->write_function(stream, "Alias Of \t\t%s\n", switch_str_nil(profile->name)); + stream->write_function(stream, "Alias Of \t%s\n", switch_str_nil(profile->name)); } - stream->write_function(stream, "DBName \t\t%s\n", switch_str_nil(profile->dbname)); - stream->write_function(stream, "Pres Hosts \t\t%s\n", switch_str_nil(profile->presence_hosts)); - stream->write_function(stream, "Dialplan \t\t%s\n", switch_str_nil(profile->dialplan)); - stream->write_function(stream, "Context \t\t%s\n", switch_str_nil(profile->context)); - stream->write_function(stream, "Challenge Realm\t\t%s\n", + stream->write_function(stream, "DBName \t%s\n", switch_str_nil(profile->dbname)); + stream->write_function(stream, "Pres Hosts \t%s\n", switch_str_nil(profile->presence_hosts)); + stream->write_function(stream, "Dialplan \t%s\n", switch_str_nil(profile->dialplan)); + stream->write_function(stream, "Context \t%s\n", switch_str_nil(profile->context)); + stream->write_function(stream, "Challenge Realm \t%s\n", switch_strlen_zero(profile->challenge_realm) ? "auto_to" : profile->challenge_realm); - stream->write_function(stream, "RTP-IP \t\t%s\n", switch_str_nil(profile->rtpip)); + stream->write_function(stream, "RTP-IP \t%s\n", switch_str_nil(profile->rtpip)); if (profile->extrtpip) { - stream->write_function(stream, "Ext-RTP-IP \t\t%s\n", profile->extrtpip); + stream->write_function(stream, "Ext-RTP-IP \t%s\n", profile->extrtpip); } - stream->write_function(stream, "SIP-IP \t\t%s\n", switch_str_nil(profile->sipip)); + stream->write_function(stream, "SIP-IP \t%s\n", switch_str_nil(profile->sipip)); if (profile->extsipip) { - stream->write_function(stream, "Ext-SIP-IP \t\t%s\n", profile->extsipip); + stream->write_function(stream, "Ext-SIP-IP \t%s\n", profile->extsipip); } - stream->write_function(stream, "URL \t\t%s\n", switch_str_nil(profile->url)); - stream->write_function(stream, "BIND-URL \t\t%s\n", switch_str_nil(profile->bindurl)); + stream->write_function(stream, "URL \t%s\n", switch_str_nil(profile->url)); + stream->write_function(stream, "BIND-URL \t%s\n", switch_str_nil(profile->bindurl)); if (sofia_test_pflag(profile, PFLAG_TLS)) { - stream->write_function(stream, "TLS-URL \t\t%s\n", switch_str_nil(profile->tls_url)); - stream->write_function(stream, "TLS-BIND-URL \t%s\n", switch_str_nil(profile->tls_bindurl)); + stream->write_function(stream, "TLS-URL \t%s\n", switch_str_nil(profile->tls_url)); + stream->write_function(stream, "TLS-BIND-URL \t%s\n", switch_str_nil(profile->tls_bindurl)); } - stream->write_function(stream, "HOLD-MUSIC \t\t%s\n", switch_strlen_zero(profile->hold_music) ? "N/A" : profile->hold_music); - stream->write_function(stream, "CODECS \t\t%s\n", switch_str_nil(profile->codec_string)); - stream->write_function(stream, "TEL-EVENT \t\t%d\n", profile->te); + stream->write_function(stream, "HOLD-MUSIC \t%s\n", switch_strlen_zero(profile->hold_music) ? "N/A" : profile->hold_music); + stream->write_function(stream, "CODECS \t%s\n", switch_str_nil(profile->codec_string)); + stream->write_function(stream, "TEL-EVENT \t%d\n", profile->te); if (profile->dtmf_type == DTMF_2833) { - stream->write_function(stream, "DTMF-MODE \t\trfc2833\n"); + stream->write_function(stream, "DTMF-MODE \trfc2833\n"); } else if (profile->dtmf_type == DTMF_INFO) { - stream->write_function(stream, "DTMF-MODE \t\tinfo\n"); + stream->write_function(stream, "DTMF-MODE \tinfo\n"); } else { - stream->write_function(stream, "DTMF-MODE \t\tnone\n"); + stream->write_function(stream, "DTMF-MODE \tnone\n"); } - stream->write_function(stream, "CNG \t\t%d\n", profile->cng_pt); - stream->write_function(stream, "SESSION-TO \t\t%d\n", profile->session_timeout); - stream->write_function(stream, "MAX-DIALOG \t\t%d\n", profile->max_proceeding); - stream->write_function(stream, "NOMEDIA \t\t%s\n", switch_test_flag(profile, TFLAG_INB_NOMEDIA) ? "true" : "false"); - stream->write_function(stream, "LATE-NEG \t\t%s\n", switch_test_flag(profile, TFLAG_LATE_NEGOTIATION) ? "true" : "false"); - stream->write_function(stream, "PROXY-MEDIA \t\t%s\n", switch_test_flag(profile, TFLAG_PROXY_MEDIA) ? "true" : "false"); - stream->write_function(stream, "AGGRESSIVENAT \t\t%s\n", sofia_test_pflag(profile, PFLAG_AGGRESSIVE_NAT_DETECTION) ? "true" : "false"); - stream->write_function(stream, "STUN_ENABLED \t\t%s\n", sofia_test_pflag(profile, PFLAG_STUN_ENABLED) ? "true" : "false"); - stream->write_function(stream, "STUN_AUTO_DISABLE \t%s\n", sofia_test_pflag(profile, PFLAG_STUN_AUTO_DISABLE) ? "true" : "false"); + stream->write_function(stream, "CNG \t%d\n", profile->cng_pt); + stream->write_function(stream, "SESSION-TO \t%d\n", profile->session_timeout); + stream->write_function(stream, "MAX-DIALOG \t%d\n", profile->max_proceeding); + stream->write_function(stream, "NOMEDIA \t%s\n", switch_test_flag(profile, TFLAG_INB_NOMEDIA) ? "true" : "false"); + stream->write_function(stream, "LATE-NEG \t%s\n", switch_test_flag(profile, TFLAG_LATE_NEGOTIATION) ? "true" : "false"); + stream->write_function(stream, "PROXY-MEDIA \t%s\n", switch_test_flag(profile, TFLAG_PROXY_MEDIA) ? "true" : "false"); + stream->write_function(stream, "AGGRESSIVENAT \t%s\n", sofia_test_pflag(profile, PFLAG_AGGRESSIVE_NAT_DETECTION) ? "true" : "false"); + stream->write_function(stream, "STUN_ENABLED \t%s\n", sofia_test_pflag(profile, PFLAG_STUN_ENABLED) ? "true" : "false"); + stream->write_function(stream, "STUN_AUTO_DISABLE\t%s\n", sofia_test_pflag(profile, PFLAG_STUN_AUTO_DISABLE) ? "true" : "false"); } stream->write_function(stream, "\nRegistrations:\n%s\n", line); @@ -1695,6 +1698,7 @@ stream->write_function(stream, "<Password>%s</Password>\n", switch_strlen_zero(gp->register_password) ? "no" : "yes"); stream->write_function(stream, "<From>%s</From>\n", switch_amp_encode(switch_str_nil(gp->register_from),xmlbuf,buflen)); stream->write_function(stream, "<Contact>%s</Contact>\n", switch_amp_encode(switch_str_nil(gp->register_contact),xmlbuf,buflen)); + stream->write_function(stream, "<Exten>%s</Exten>\n", switch_amp_encode(switch_str_nil(gp->extension),xmlbuf,buflen)); stream->write_function(stream, "<To>%s</To>\n", switch_str_nil(gp->register_to)); stream->write_function(stream, "<Proxy>%s</Proxy>\n", switch_str_nil(gp->register_proxy)); stream->write_function(stream, "<Context>%s</Context>\n", switch_str_nil(gp->register_context)); @@ -1704,6 +1708,8 @@ stream->write_function(stream, "<PingFreq>%d</PingFreq>\n", gp->ping_freq); stream->write_function(stream, "<State>%s</State>\n", sofia_state_names[gp->state]); stream->write_function(stream, "<Status>%s%s</Status>\n", status_names[gp->status], gp->pinging ? " (ping)" : ""); + stream->write_function(stream, "<CallsIN>%d</CallsIN>\n", gp->ib_calls); + stream->write_function(stream, "<CallsOUT>%d</CallsOUT>\n", gp->ob_calls); stream->write_function(stream, "</Gateway>\n"); sofia_reg_release_gateway(gp); } else { @@ -2424,10 +2430,12 @@ } else { tech_pvt->invite_contact = switch_core_session_strdup(nsession, gateway_ptr->register_contact); } + + gateway_ptr->ob_calls++; - if (gateway_ptr->vars) { + if (gateway_ptr->ob_vars) { switch_event_header_t *hp; - for(hp = gateway_ptr->vars->headers; hp; hp = hp->next) { + for(hp = gateway_ptr->ob_vars->headers; hp; hp = hp->next) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s setting variable [%s]=[%s]\n", switch_channel_get_name(nchannel), hp->name, hp->value); switch_channel_set_variable(nchannel, hp->name, hp->value); 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 Fri Jan 23 14:33:30 2009 @@ -315,6 +315,7 @@ char *register_password; char *register_from; char *register_contact; + char *extension; char *register_to; char *register_proxy; char *register_sticky_proxy; @@ -334,7 +335,10 @@ reg_state_t state; switch_memory_pool_t *pool; int deleted; - switch_event_t *vars; + switch_event_t *ib_vars; + switch_event_t *ob_vars; + uint32_t ib_calls; + uint32_t ob_calls; char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; int failures; struct sofia_gateway *next; 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 14:33:30 2009 @@ -953,7 +953,7 @@ static void parse_gateways(sofia_profile_t *profile, switch_xml_t gateways_tag) { - switch_xml_t gateway_tag, param, gw_subs_tag; + switch_xml_t gateway_tag, param = NULL, x_params, gw_subs_tag; sofia_gateway_t *gp; for (gateway_tag = switch_xml_child(gateways_tag, "gateway"); gateway_tag; gateway_tag = gateway_tag->next) { @@ -1001,8 +1001,55 @@ gateway->next = NULL; gateway->ping = 0; gateway->ping_freq = 0; + + + if ((x_params = switch_xml_child(gateway_tag, "variables"))) { + param = switch_xml_child(x_params, "variable"); + } else { + param = switch_xml_child(gateway_tag, "variable"); + } + + + for (; param; param = param->next) { + const char *var = switch_xml_attr(param, "name"); + const char *val = switch_xml_attr(param, "value"); + const char *direction = switch_xml_attr(param, "direction"); + int in = 0, out = 0; + + if (var && val) { + if (direction) { + if (!strcasecmp(direction, "inbound")) { + in = 1; + } else if (!strcasecmp(direction, "outbound")) { + out = 1; + } + } else { + in = out = 1; + } + + if (in) { + if (!gateway->ib_vars) { + switch_event_create(&gateway->ib_vars, SWITCH_EVENT_GENERAL); + } + switch_event_add_header_string(gateway->ib_vars, SWITCH_STACK_BOTTOM, var, val); + } + + if (out) { + if (!gateway->ob_vars) { + switch_event_create(&gateway->ob_vars, SWITCH_EVENT_GENERAL); + } + switch_event_add_header_string(gateway->ob_vars, SWITCH_STACK_BOTTOM, var, val); + } + } + } - for (param = switch_xml_child(gateway_tag, "param"); param; param = param->next) { + if ((x_params = switch_xml_child(gateway_tag, "params"))) { + param = switch_xml_child(x_params, "param"); + } else { + param = switch_xml_child(gateway_tag, "param"); + } + + for (; param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); char *val = (char *) switch_xml_attr_soft(param, "value"); @@ -1144,12 +1191,13 @@ gateway->register_from = switch_core_sprintf(gateway->pool, "<sip:%s@%s;transport=%s>", from_user, from_domain, register_transport); sipip = profile->extsipip ? profile->extsipip : profile->sipip; - format = strchr(sipip, ':') ? "<sip:%s@[%s]:%d%s>" : "<sip:%s@%s:%d%s>"; - gateway->register_contact = switch_core_sprintf(gateway->pool, format, extension, + format = strchr(sipip, ':') ? "<sip:gw+%s@[%s]:%d%s>" : "<sip:gw+%s@%s:%d%s>"; + gateway->extension = switch_core_strdup(gateway->pool, extension); + gateway->register_contact = switch_core_sprintf(gateway->pool, format, gateway->name, sipip, - sofia_glue_transport_has_tls(gateway->register_transport) ? profile->tls_sip_port : profile-> - sip_port, params); - + sofia_glue_transport_has_tls(gateway->register_transport) ? + profile->tls_sip_port : profile->sip_port, params); + if (!strncasecmp(proxy, "sip:", 4)) { gateway->register_proxy = switch_core_strdup(gateway->pool, proxy); gateway->register_to = switch_core_sprintf(gateway->pool, "sip:%s@%s", username, proxy + 4); @@ -4024,6 +4072,7 @@ check_decode(destination_number, session); } + if (sip->sip_to && sip->sip_to->a_url) { const char *host, *user; int port; @@ -4174,20 +4223,6 @@ switch_channel_set_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE, max_forwards); } - if (sip->sip_request->rq_url) { - sofia_gateway_t *gateway; - char *from_key; - char *user = (char *) sip->sip_request->rq_url->url_user; - check_decode(user, session); - from_key = switch_core_session_sprintf(session, "sip:%s@%s", user, sip->sip_request->rq_url->url_host); - - if ((gateway = sofia_reg_find_gateway(from_key))) { - context = gateway->register_context; - switch_channel_set_variable(channel, "sip_gateway", gateway->name); - sofia_reg_release_gateway(gateway); - } - } - if (!context) { context = switch_channel_get_variable(channel, "user_context"); } @@ -4220,6 +4255,35 @@ free(tmp); } + + if (strstr(destination_number, "gw+")) { + const char *gw_name = destination_number + 3; + sofia_gateway_t *gateway; + if (gw_name && (gateway = sofia_reg_find_gateway(gw_name))) { + context = switch_core_session_strdup(session, gateway->register_context); + switch_channel_set_variable(channel, "sip_gateway", gateway->name); + + if (gateway->extension) { + destination_number = switch_core_session_strdup(session, gateway->extension); + } + + gateway->ib_calls++; + + if (gateway->ib_vars) { + switch_event_header_t *hp; + for(hp = gateway->ib_vars->headers; hp; hp = hp->next) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s setting variable [%s]=[%s]\n", + switch_channel_get_name(channel), hp->name, hp->value); + switch_channel_set_variable(channel, hp->name, hp->value); + } + } + + sofia_reg_release_gateway(gateway); + } + } + + + check_decode(displayname, session); tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), from_user, Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Fri Jan 23 14:33:30 2009 @@ -194,8 +194,11 @@ switch_core_hash_delete(mod_sofia_globals.gateway_hash, gateway_ptr->register_from); switch_core_hash_delete(mod_sofia_globals.gateway_hash, gateway_ptr->register_contact); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Deleted gateway %s\n", gateway_ptr->name); - if (gateway_ptr->vars) { - switch_event_destroy(&gateway_ptr->vars); + if (gateway_ptr->ob_vars) { + switch_event_destroy(&gateway_ptr->ob_vars); + } + if (gateway_ptr->ib_vars) { + switch_event_destroy(&gateway_ptr->ib_vars); } } else { last = gateway_ptr;

1 0