June 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13907 - freeswitch/trunk/conf/jingle_profiles
by FreeSWITCH SVN 23 Jun '09

23 Jun '09

Author: brian Date: Tue Jun 23 09:19:03 2009 New Revision: 13907 Log: clean up configs and put wan.auto in by default commented out Removed: freeswitch/trunk/conf/jingle_profiles/client.noload freeswitch/trunk/conf/jingle_profiles/server.noload Modified: freeswitch/trunk/conf/jingle_profiles/client.xml freeswitch/trunk/conf/jingle_profiles/server.xml Modified: freeswitch/trunk/conf/jingle_profiles/client.xml ============================================================================== --- freeswitch/trunk/conf/jingle_profiles/client.xml (original) +++ freeswitch/trunk/conf/jingle_profiles/client.xml Tue Jun 23 09:19:03 2009 @@ -26,6 +26,6 @@  <param name="vad" value="both"/>  -  +  </x-profile> </include> Modified: freeswitch/trunk/conf/jingle_profiles/server.xml ============================================================================== --- freeswitch/trunk/conf/jingle_profiles/server.xml (original) +++ freeswitch/trunk/conf/jingle_profiles/server.xml Tue Jun 23 09:19:03 2009 @@ -16,6 +16,6 @@    -  +  </x-profile> </include>

1 0

[commit] r13906 - freeswitch/trunk/patches
by FreeSWITCH SVN 23 Jun '09

23 Jun '09

Author: anthm Date: Tue Jun 23 08:57:02 2009 New Revision: 13906 Log: patch Added: freeswitch/trunk/patches/MODAPP-293.diff Added: freeswitch/trunk/patches/MODAPP-293.diff ============================================================================== --- (empty file) +++ freeswitch/trunk/patches/MODAPP-293.diff Tue Jun 23 08:57:02 2009 @@ -0,0 +1,26 @@ +Index: libs/xmlrpc-c/lib/abyss/src/socket_unix.c +=================================================================== +--- libs/xmlrpc-c/lib/abyss/src/socket_unix.c (revision 13903) ++++ libs/xmlrpc-c/lib/abyss/src/socket_unix.c (working copy) +@@ -227,20 +227,8 @@ + struct socketUnix * const socketUnixP = channelP->implP; + + int rc; +- fd_set rfds, efds; +- struct timeval tv = { 10, 0 }; +- +- FD_ZERO(&rfds); +- FD_ZERO(&efds); +- FD_SET(socketUnixP->fd, &rfds); +- FD_SET(socketUnixP->fd, &efds); ++ rc = recv(socketUnixP->fd, buffer, bufferSize, 0); + +- if ((rc = select(socketUnixP->fd + 1, &rfds, NULL, &efds, &tv)) > 0) { +- rc = recv(socketUnixP->fd, buffer, bufferSize, 0); +- } else { +- rc = -1; +- } +- + if (rc < 0) { + *failedP = TRUE; + if (ChannelTraceIsActive)

1 0

[commit] r13905 - freeswitch/trunk/src
by FreeSWITCH SVN 23 Jun '09

23 Jun '09

Author: anthm Date: Tue Jun 23 08:40:29 2009 New Revision: 13905 Log: add wan.auto acl Modified: freeswitch/trunk/src/switch_core.c Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Jun 23 08:40:29 2009 @@ -901,6 +901,14 @@ switch_network_list_add_cidr(rfc_list, "192.168.0.0/16", SWITCH_TRUE); switch_core_hash_insert(IP_LIST.hash, tmp_name, rfc_list); + tmp_name = "wan.auto"; + switch_network_list_create(&rfc_list, tmp_name, SWITCH_TRUE, IP_LIST.pool); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Created ip list %s default (allow)\n", tmp_name); + switch_network_list_add_cidr(rfc_list, "10.0.0.0/8", SWITCH_FALSE); + switch_network_list_add_cidr(rfc_list, "172.16.0.0/12", SWITCH_FALSE); + switch_network_list_add_cidr(rfc_list, "192.168.0.0/16", SWITCH_FALSE); + switch_core_hash_insert(IP_LIST.hash, tmp_name, rfc_list); + tmp_name = "nat.auto"; switch_network_list_create(&rfc_list, tmp_name, SWITCH_FALSE, IP_LIST.pool); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Created ip list %s default (deny)\n", tmp_name);

1 0

[commit] r13904 - freeswitch/trunk/src
by FreeSWITCH SVN 23 Jun '09

23 Jun '09

Author: anthm Date: Tue Jun 23 08:40:07 2009 New Revision: 13904 Log: set sound path in say app Modified: freeswitch/trunk/src/switch_ivr.c Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Jun 23 08:40:07 2009 @@ -2009,7 +2009,33 @@ const char *say_method, switch_input_args_t *args) { switch_say_interface_t *si; + switch_channel_t *channel; switch_status_t status = SWITCH_STATUS_SUCCESS; + const char *save_path = NULL, *chan_lang = NULL, *lang = NULL; + + switch_assert(session); + channel = switch_core_session_get_channel(session); + switch_assert(channel); + + lang = switch_channel_get_variable(channel, "language"); + + if (!lang) { + chan_lang = switch_channel_get_variable(channel, "default_language"); + if (!chan_lang) { + chan_lang = "en"; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No language specified - Using [%s]\n", chan_lang); + } else { + chan_lang = lang; + } + + save_path = switch_channel_get_variable(channel, "sound_prefix"); + + switch_channel_set_variable_printf(channel, "sound_prefix", "%s%ssounds%s%s", + SWITCH_GLOBAL_dirs.base_dir, + SWITCH_PATH_SEPARATOR, + SWITCH_PATH_SEPARATOR, + chan_lang); if ((si = switch_loadable_module_get_say_interface(module_name))) { /* should go back and proto all the say mods to const.... */ @@ -2019,6 +2045,8 @@ status = SWITCH_STATUS_FALSE; } + switch_channel_set_variable(channel, "sound_prefix", save_path); + return status; }

1 0

[commit] r13903 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 23 Jun '09

23 Jun '09

Author: andrew Date: Mon Jun 22 22:26:27 2009 New Revision: 13903 Log: Add a commented out pre-shared key to the sample event_multicast.conf.xml file Modified: freeswitch/trunk/conf/autoload_configs/event_multicast.conf.xml Modified: freeswitch/trunk/conf/autoload_configs/event_multicast.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/event_multicast.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/event_multicast.conf.xml Mon Jun 22 22:26:27 2009 @@ -4,6 +4,10 @@ <param name="port" value="4242"/> <param name="bindings" value="all"/> <param name="ttl" value="1"/> +  +  +  +  </settings> </configuration>

1 0

[commit] r13902 - in freeswitch/trunk/src/mod/event_handlers: mod_erlang_event mod_event_multicast
by FreeSWITCH SVN 23 Jun '09

23 Jun '09

Author: andrew Date: Mon Jun 22 20:02:19 2009 New Revision: 13902 Log: bzero -> memset (so mike won't yell at me) Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c 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 Mon Jun 22 20:02:19 2009 @@ -1075,7 +1075,7 @@ session_elem_t* session_element = malloc(sizeof(*session_element)); switch_channel_t *channel = switch_core_session_get_channel(session); - bzero(session_element, sizeof(*session_element)); + memset(session_element, 0, sizeof(*session_element)); memcpy(session_element->uuid_str, switch_core_session_get_uuid(session), SWITCH_UUID_FORMATTED_LENGTH); Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Mon Jun 22 20:02:19 2009 @@ -496,7 +496,7 @@ tmp = malloc(len); - bzero(tmp, len); + memset(tmp, 0, len); switch_copy_string(uuid_str, packet, SWITCH_UUID_FORMATTED_LENGTH); packet += SWITCH_UUID_FORMATTED_LENGTH;

1 0

[commit] r13901 - freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
by FreeSWITCH SVN 23 Jun '09

23 Jun '09

Author: andrew Date: Mon Jun 22 19:59:03 2009 New Revision: 13901 Log: Add initial support for multicast peer up/down state tracking Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Mon Jun 22 19:59:03 2009 @@ -63,14 +63,22 @@ uint8_t ttl; char *psk; switch_mutex_t *mutex; + switch_hash_t *peer_hash; } globals; +struct peer_status { + switch_bool_t active; + int lastseen; +}; + SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_address, globals.address); SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_bindings, globals.bindings); #ifdef HAVE_OPENSSL SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_psk, globals.psk); #endif #define MULTICAST_EVENT "multicast::event" +#define MULTICAST_PEERUP "multicast::peerup" +#define MULTICAST_PEERDOWN "multicast::peerdown" static switch_status_t load_config(void) { switch_status_t status = SWITCH_STATUS_SUCCESS; @@ -169,6 +177,42 @@ } if (event->subclass_name && !strcmp(event->subclass_name, MULTICAST_EVENT)) { + char * event_name; + if ((event_name = switch_event_get_header(event, "orig-event-name")) && !strcasecmp(event_name, "HEARTBEAT")) { + char *sender = switch_event_get_header(event, "orig-multicast-sender"); + struct peer_status *p; + int now = switch_epoch_time_now(NULL); + + if (!(p = switch_core_hash_find(globals.peer_hash, sender))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Host %s not already in hash\n", sender); + p = switch_core_alloc(module_pool, sizeof(struct peer_status)); + p->active = SWITCH_FALSE; + p->lastseen = 0; + /*} else {*/ + /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Host %s last seen %d seconds ago\n", sender, now - p->lastseen);*/ + } + + if (!p->active) { + switch_event_t *local_event; + if (switch_event_create_subclass(&local_event, SWITCH_EVENT_CUSTOM, MULTICAST_PEERUP) == SWITCH_STATUS_SUCCESS) { + char lastseen[21]; + switch_event_add_header_string(local_event, SWITCH_STACK_BOTTOM, "Peer", sender); + if (p->lastseen) { + switch_snprintf(lastseen, sizeof(lastseen), "%d", p->lastseen); + } else { + switch_snprintf(lastseen, sizeof(lastseen), "%s", "Never"); + } + switch_event_add_header_string(local_event, SWITCH_STACK_BOTTOM, "Lastseen", lastseen); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Peer %s has come up; last seen: %s\n", sender, lastseen); + + switch_event_fire(&local_event); + } + } + p->active = SWITCH_TRUE; + p->lastseen = now; + + switch_core_hash_insert(globals.peer_hash, sender, p); + } /* ignore our own events to avoid ping pong */ return; } @@ -187,6 +231,36 @@ switch_mutex_unlock(globals.mutex); } + if (event->event_id == SWITCH_EVENT_HEARTBEAT) { + switch_hash_index_t *cur; + switch_ssize_t keylen; + const void *key; + void *value; + int now = switch_epoch_time_now(NULL); + struct peer_status *last; + char *host; + + for (cur = switch_hash_first(NULL, globals.peer_hash); cur; cur = switch_hash_next(cur)) { + switch_hash_this(cur, &key, &keylen, &value); + host = (char*) key; + last = (struct peer_status*) value; + if (last->active && (now - (last->lastseen)) > 60) { + switch_event_t *local_event; + + last->active = SWITCH_FALSE; + if (switch_event_create_subclass(&local_event, SWITCH_EVENT_CUSTOM, MULTICAST_PEERDOWN) == SWITCH_STATUS_SUCCESS) { + char lastseen[21]; + switch_event_add_header_string(local_event, SWITCH_STACK_BOTTOM, "Peer", host); + switch_snprintf(lastseen, sizeof(lastseen), "%d", last->lastseen); + switch_event_add_header_string(local_event, SWITCH_STACK_BOTTOM, "Lastseen", lastseen); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Peer %s has gone down; last seen: %s\n", host, lastseen); + + switch_event_fire(&local_event); + } + } + } + } + switch_mutex_lock(globals.mutex); if (globals.event_list[(uint8_t) SWITCH_EVENT_ALL]) { send = 1; @@ -271,6 +345,7 @@ module_pool = pool; switch_core_hash_init(&globals.event_hash, module_pool); + switch_core_hash_init(&globals.peer_hash, module_pool); gethostname(globals.hostname, sizeof(globals.hostname)); globals.host_hash = switch_hashfunc_default(globals.hostname, &hlen); @@ -319,7 +394,17 @@ *module_interface = switch_loadable_module_create_module_interface(pool, modname); if (switch_event_reserve_subclass(MULTICAST_EVENT) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", MULTICAST_EVENT); + return SWITCH_STATUS_GENERR; + } + + if (switch_event_reserve_subclass(MULTICAST_PEERUP) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", MULTICAST_PEERUP); + return SWITCH_STATUS_GENERR; + } + + if (switch_event_reserve_subclass(MULTICAST_PEERDOWN) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", MULTICAST_PEERDOWN); return SWITCH_STATUS_GENERR; }

1 0

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

22 Jun '09

Author: andrew Date: Mon Jun 22 18:38:23 2009 New Revision: 13900 Log: Unify outbound session cleanup code, possibly fixes MODEVENT-47 Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c 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 Mon Jun 22 18:38:23 2009 @@ -304,6 +304,7 @@ return l; } + static void add_session_elem_to_listener(listener_t *listener, session_elem_t *session_element) { switch_mutex_lock(listener->session_mutex); @@ -312,6 +313,7 @@ switch_mutex_unlock(listener->session_mutex); } + static void remove_session_elem_from_listener(listener_t *listener, session_elem_t *session_element) { session_elem_t *s, *last = NULL; @@ -320,10 +322,9 @@ if (!session_element) return; - switch_mutex_lock(listener->session_mutex); for(s = listener->session_list; s; s = s->next) { if (s == session_element) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Removing session element\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Removing session element for %s\n", session_element->uuid_str); if (last) { last->next = s->next; } else { @@ -335,10 +336,17 @@ } /* this allows the application threads to exit */ switch_clear_flag_locked(s, LFLAG_SESSION_ALIVE); + switch_safe_free(s); break; } last = s; } +} + + +static void remove_session_elem_from_listener_locked(listener_t *listener, session_elem_t *session_element) { + switch_mutex_lock(listener->session_mutex); + remove_session_elem_from_listener(listener, session_element); switch_mutex_unlock(listener->session_mutex); } @@ -557,14 +565,7 @@ if (pevent->event_id == SWITCH_EVENT_CHANNEL_DESTROY) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Destroy event for attached session for %s\n", sp->uuid_str); - /* remove session from list */ - if (last) - last->next = sp->next; - else - listener->session_list = sp->next; - /* this allows the application threads to exit */ - switch_clear_flag_locked(sp, LFLAG_SESSION_ALIVE); removed = sp; ei_x_new_with_version(&ebuf); @@ -583,7 +584,7 @@ } sp = sp->next; if (removed) { - switch_safe_free(removed) + remove_session_elem_from_listener(listener, removed); } else { last = sp; } @@ -682,7 +683,7 @@ s->uuid_str); /* TODO - if a spawned process that was handling an outbound call fails.. what do we do with the call? */ } - remove_session_elem_from_listener(listener, s); + remove_session_elem_from_listener_locked(listener, s); } if (listener->log_process.type == ERLANG_PID && !ei_compare_pids(&listener->log_process.pid, pid)) { @@ -1107,7 +1108,7 @@ { /* create a session list element */ session_elem_t* session_element = session_elem_create(listener, session); - + session_element->process.type = ERLANG_PID; memcpy(&session_element->process.pid, pid, sizeof(erlang_pid)); switch_set_flag(session_element, LFLAG_SESSION_ALIVE); @@ -1167,7 +1168,7 @@ while (!(p = switch_core_hash_find(listener->spawn_pid_hash, hash)) || p == &globals.WAITING) { if (i > 50) { /* half a second timeout */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Timed out when waiting for outbound pid\n"); - remove_session_elem_from_listener(listener,session_element); + remove_session_elem_from_listener_locked(listener,session_element); switch_core_hash_insert(listener->spawn_pid_hash, hash, &globals.TIMEOUT); /* TODO lock this? */ return NULL; }

1 0

[commit] r13899 - freeswitch/trunk/build
by FreeSWITCH SVN 22 Jun '09

22 Jun '09

Author: intralanman Date: Mon Jun 22 17:34:00 2009 New Revision: 13899 Log: long lost module Modified: freeswitch/trunk/build/modules.conf.in Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Mon Jun 22 17:34:00 2009 @@ -64,6 +64,7 @@ formats/mod_file_string #languages/mod_python languages/mod_spidermonkey +languages/mod_spidermonkey_curl languages/mod_spidermonkey_teletone languages/mod_spidermonkey_core_db languages/mod_spidermonkey_socket

1 0

[commit] r13898 - freeswitch/trunk/build
by FreeSWITCH SVN 22 Jun '09

22 Jun '09

Author: intralanman Date: Mon Jun 22 14:40:30 2009 New Revision: 13898 Log: [temporary] bsd-friendly hack Modified: freeswitch/trunk/build/buildopal.sh Modified: freeswitch/trunk/build/buildopal.sh ============================================================================== --- freeswitch/trunk/build/buildopal.sh (original) +++ freeswitch/trunk/build/buildopal.sh Mon Jun 22 14:40:30 2009 @@ -1,17 +1,20 @@ #!/bin/sh +uname -a | grep -qi bsd && MAKE=gmake || MAKE=make FS_DIR=`pwd` + cd /root svn co https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/ptlib/trunk ptlib cd ptlib ./configure --prefix=/usr -make -make install +${MAKE} +${MAKE} install + cd .. svn co https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/opal/branches/v3_6 opal cd opal export PKG_CONFIG_PATH=/usr/lib/pkgconfig ./configure --prefix=/usr -make -make install +${MAKE} +${MAKE} install cd ${FS_DIR} -make mod_opal-install +${MAKE} mod_opal-install

1 0