June 2006 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r1158 - in freeswitch/trunk: . conf src src/include src/mod/loggers/mod_syslog
by mikej＠freeswitch.org 07 Jun '06

07 Jun '06

Author: mikej Date: Fri Apr 14 12:45:31 2006 New Revision: 1158 Added: freeswitch/trunk/src/mod/loggers/mod_syslog/ - copied from r1155, /freeswitch/branches/james/src/mod/loggers/mod_syslog/ freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c - copied unchanged from r1155, /freeswitch/branches/james/src/mod/loggers/mod_syslog/mod_syslog.c Modified: freeswitch/trunk/AUTHORS freeswitch/trunk/conf/freeswitch.conf freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/switch_utils.c Log: Addition of mod_syslog for *nix. Thanks to James Martelletti. Modified: freeswitch/trunk/AUTHORS ============================================================================== --- freeswitch/trunk/AUTHORS (original) +++ freeswitch/trunk/AUTHORS Fri Apr 14 12:45:31 2006 @@ -20,6 +20,7 @@ Brian K. West - For countless hours of work on BSD and Mac support, finding countless bugs, and moral support. Michal "cypromis" Bielicki (michal.bielicki AT halo2.pl) - Solaris porting, and autotools enhancements. + James Martelletti <james(a)nerdc0re.com> - All around cool guy (mod_syslog) A big THANK YOU goes to: Modified: freeswitch/trunk/conf/freeswitch.conf ============================================================================== --- freeswitch/trunk/conf/freeswitch.conf (original) +++ freeswitch/trunk/conf/freeswitch.conf Fri Apr 14 12:45:31 2006 @@ -18,6 +18,7 @@ ; Loggers (I'd load these first) load => mod_console +load => mod_syslog ; Event Handlers ;load => mod_event_multicast @@ -67,6 +68,23 @@ ; ASR /TTS ;load => mod_cepstral +;---- SYSLOG +;-------------------------------------------------------------------------------- +; emerg - system is unusable +; alert - action must be taken immediately +; crit - critical conditions +; err - error conditions +; warning - warning conditions +; notice - normal, but significant, condition +; info - informational message +; debug - debug-level message +; +[+syslog.conf] +[settings] +ident => freeswitch +facility => user +format => ${time} - ${message} +level => debug,info,warning-alert ;---- IAX PROTOCOL Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Fri Apr 14 12:45:31 2006 @@ -174,6 +174,8 @@ */ SWITCH_DECLARE(char *) switch_cut_path(char *in); +SWITCH_DECLARE(char *) switch_string_replace(const char *string, const char *search, const char *replace); +SWITCH_DECLARE(switch_status) switch_string_match(const char *string, size_t string_len, const char *search, size_t search_len); #ifdef __cplusplus } Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Fri Apr 14 12:45:31 2006 @@ -30,6 +30,9 @@ * */ #include <switch.h> +#include <stdio.h> +#include <string.h> +#include <stdlib.h> SWITCH_DECLARE(char *) switch_priority_name(switch_priority_t priority) { @@ -141,6 +144,52 @@ return SWITCH_STATUS_SUCCESS; } +SWITCH_DECLARE(switch_status) switch_string_match(const char *string, size_t string_len, const char *search, size_t search_len) +{ + size_t i; + + for (i = 0; (i < search_len) && (i < string_len); i++) { + if (string[i] != search[i]) { + return SWITCH_STATUS_FALSE; + } + } + + if (i == search_len) { + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; +} + +SWITCH_DECLARE(char *) switch_string_replace(const char *string, const char *search, const char *replace) +{ + size_t string_len = strlen(string); + size_t search_len = strlen(search); + size_t replace_len = strlen(replace); + size_t i, n; + size_t dest_len = 0; + char *dest; + + dest = (char *)malloc(sizeof(char)); + + for (i = 0; i < string_len; i++) { + if (switch_string_match(string + i, string_len - i, search, search_len) == SWITCH_STATUS_SUCCESS) { + for (n = 0; n < replace_len; n++) { + dest[dest_len] = replace[n]; + dest_len++; + dest = (char *)realloc(dest, sizeof(char)*(dest_len+1)); + } + i += search_len-1; + } else { + dest[dest_len] = string[i]; + dest_len++; + dest = (char *)realloc(dest, sizeof(char)*(dest_len+1)); + } + } + + dest[dest_len] = 0; + return dest; +} SWITCH_DECLARE(int) switch_socket_waitfor(switch_pollfd_t *poll, int ms) {

1 0

[commit] r1158 - in freeswitch/trunk: . conf src src/include src/mod/loggers/mod_syslog
by mikej＠freeswitch.org 07 Jun '06

07 Jun '06

Author: mikej Date: Fri Apr 14 12:45:31 2006 New Revision: 1158 Added: freeswitch/trunk/src/mod/loggers/mod_syslog/ - copied from r1155, /freeswitch/branches/james/src/mod/loggers/mod_syslog/ freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c - copied unchanged from r1155, /freeswitch/branches/james/src/mod/loggers/mod_syslog/mod_syslog.c Modified: freeswitch/trunk/AUTHORS freeswitch/trunk/conf/freeswitch.conf freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/switch_utils.c Log: Addition of mod_syslog for *nix. Thanks to James Martelletti. Modified: freeswitch/trunk/AUTHORS ============================================================================== --- freeswitch/trunk/AUTHORS (original) +++ freeswitch/trunk/AUTHORS Fri Apr 14 12:45:31 2006 @@ -20,6 +20,7 @@ Brian K. West - For countless hours of work on BSD and Mac support, finding countless bugs, and moral support. Michal "cypromis" Bielicki (michal.bielicki AT halo2.pl) - Solaris porting, and autotools enhancements. + James Martelletti <james(a)nerdc0re.com> - All around cool guy (mod_syslog) A big THANK YOU goes to: Modified: freeswitch/trunk/conf/freeswitch.conf ============================================================================== --- freeswitch/trunk/conf/freeswitch.conf (original) +++ freeswitch/trunk/conf/freeswitch.conf Fri Apr 14 12:45:31 2006 @@ -18,6 +18,7 @@ ; Loggers (I'd load these first) load => mod_console +load => mod_syslog ; Event Handlers ;load => mod_event_multicast @@ -67,6 +68,23 @@ ; ASR /TTS ;load => mod_cepstral +;---- SYSLOG +;-------------------------------------------------------------------------------- +; emerg - system is unusable +; alert - action must be taken immediately +; crit - critical conditions +; err - error conditions +; warning - warning conditions +; notice - normal, but significant, condition +; info - informational message +; debug - debug-level message +; +[+syslog.conf] +[settings] +ident => freeswitch +facility => user +format => ${time} - ${message} +level => debug,info,warning-alert ;---- IAX PROTOCOL Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Fri Apr 14 12:45:31 2006 @@ -174,6 +174,8 @@ */ SWITCH_DECLARE(char *) switch_cut_path(char *in); +SWITCH_DECLARE(char *) switch_string_replace(const char *string, const char *search, const char *replace); +SWITCH_DECLARE(switch_status) switch_string_match(const char *string, size_t string_len, const char *search, size_t search_len); #ifdef __cplusplus } Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Fri Apr 14 12:45:31 2006 @@ -30,6 +30,9 @@ * */ #include <switch.h> +#include <stdio.h> +#include <string.h> +#include <stdlib.h> SWITCH_DECLARE(char *) switch_priority_name(switch_priority_t priority) { @@ -141,6 +144,52 @@ return SWITCH_STATUS_SUCCESS; } +SWITCH_DECLARE(switch_status) switch_string_match(const char *string, size_t string_len, const char *search, size_t search_len) +{ + size_t i; + + for (i = 0; (i < search_len) && (i < string_len); i++) { + if (string[i] != search[i]) { + return SWITCH_STATUS_FALSE; + } + } + + if (i == search_len) { + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; +} + +SWITCH_DECLARE(char *) switch_string_replace(const char *string, const char *search, const char *replace) +{ + size_t string_len = strlen(string); + size_t search_len = strlen(search); + size_t replace_len = strlen(replace); + size_t i, n; + size_t dest_len = 0; + char *dest; + + dest = (char *)malloc(sizeof(char)); + + for (i = 0; i < string_len; i++) { + if (switch_string_match(string + i, string_len - i, search, search_len) == SWITCH_STATUS_SUCCESS) { + for (n = 0; n < replace_len; n++) { + dest[dest_len] = replace[n]; + dest_len++; + dest = (char *)realloc(dest, sizeof(char)*(dest_len+1)); + } + i += search_len-1; + } else { + dest[dest_len] = string[i]; + dest_len++; + dest = (char *)realloc(dest, sizeof(char)*(dest_len+1)); + } + } + + dest[dest_len] = 0; + return dest; +} SWITCH_DECLARE(int) switch_socket_waitfor(switch_pollfd_t *poll, int ms) {

1 0

[commit] r1157 - in freeswitch/trunk/src: . include
by anthm＠freeswitch.org 07 Jun '06

07 Jun '06

Author: anthm Date: Fri Apr 14 12:43:49 2006 New Revision: 1157 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_core.c Log: backend for session to session event trading Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Fri Apr 14 12:43:49 2006 @@ -78,7 +78,6 @@ void *pointer_reply; /*! optional arbitrary pointer reply's size */ switch_size_t pointer_reply_size; - }; /*! \brief A generic object to pass as a thread's session object to allow mutiple arguements and a pool */ @@ -290,6 +289,14 @@ SWITCH_DECLARE (switch_status) switch_core_session_message_send(char *uuid_str, switch_core_session_message *message); /*! + \brief Queue an event on another session using its uuid + \param uuid_str the unique id of the session you want to send a message to + \param event the event to send + \return the status returned by the message handler +*/ +SWITCH_DECLARE(switch_status) switch_core_session_event_send(char *uuid_str, switch_event *event); + +/*! \brief Retrieve private user data from a session \param session the session to retrieve from \return a pointer to the private data @@ -378,6 +385,14 @@ \return the status returned by the message handler */ SWITCH_DECLARE(switch_status) switch_core_session_receive_message(switch_core_session *session, switch_core_session_message *message); + +/*! + \brief Queue an event on a given session + \param session the session to queue the message on + \param event the event to queue + \return the status returned by the message handler +*/ +SWITCH_DECLARE(switch_status) switch_core_session_queue_event(switch_core_session *session, switch_event *event); /*! \brief Read a frame from a session Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Fri Apr 14 12:43:49 2006 @@ -83,6 +83,13 @@ struct switch_io_event_hook_receive_message *next; }; +/*! \brief Node in which to store custom receive message callback hooks */ +struct switch_io_event_hook_queue_event { + /*! the answer channel callback hook*/ + switch_queue_event_hook queue_event; + struct switch_io_event_hook_queue_event *next; +}; + /*! \brief Node in which to store custom read frame channel callback hooks */ struct switch_io_event_hook_read_frame { /*! the read frame channel callback hook*/ @@ -133,6 +140,8 @@ struct switch_io_event_hook_answer_channel *answer_channel; /*! a list of receive message hooks */ struct switch_io_event_hook_receive_message *receive_message; + /*! a list of queue message hooks */ + struct switch_io_event_hook_queue_event *queue_event; /*! a list of read frame hooks */ struct switch_io_event_hook_read_frame *read_frame; /*! a list of write frame hooks */ @@ -167,6 +176,8 @@ switch_status (*send_dtmf)(switch_core_session *, char *); /*! receive a message from another session*/ switch_status (*receive_message)(switch_core_session *, switch_core_session_message *); + /*! queue a message for another session*/ + switch_status (*queue_event)(switch_core_session *, switch_event *); }; /*! \brief Abstraction of an module endpoint interface Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Fri Apr 14 12:43:49 2006 @@ -528,6 +528,7 @@ typedef struct switch_io_event_hook_outgoing_channel switch_io_event_hook_outgoing_channel; typedef struct switch_io_event_hook_answer_channel switch_io_event_hook_answer_channel; typedef struct switch_io_event_hook_receive_message switch_io_event_hook_receive_message; +typedef struct switch_io_event_hook_queue_event switch_io_event_hook_queue_event; typedef struct switch_io_event_hook_read_frame switch_io_event_hook_read_frame; typedef struct switch_io_event_hook_write_frame switch_io_event_hook_write_frame; typedef struct switch_io_event_hook_kill_channel switch_io_event_hook_kill_channel; @@ -550,6 +551,7 @@ typedef switch_status (*switch_outgoing_channel_hook)(switch_core_session *, switch_caller_profile *, switch_core_session *); typedef switch_status (*switch_answer_channel_hook)(switch_core_session *); typedef switch_status (*switch_receive_message_hook)(switch_core_session *, switch_core_session_message *); +typedef switch_status (*switch_queue_event_hook)(switch_core_session *, switch_event *); typedef switch_status (*switch_read_frame_hook)(switch_core_session *, switch_frame **, int, switch_io_flag, int); typedef switch_status (*switch_write_frame_hook)(switch_core_session *, switch_frame *, int, switch_io_flag, int); typedef switch_status (*switch_kill_channel_hook)(switch_core_session *, int); Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri Apr 14 12:43:49 2006 @@ -34,6 +34,8 @@ #include <switch.h> //#define DEBUG_ALLOC +#define SWITCH_EVENT_QUEUE_LEN 256 + struct switch_core_session { uint32_t id; char name[80]; @@ -70,6 +72,7 @@ char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; void *private_info; + switch_queue_t *event_queue; }; SWITCH_DECLARE_DATA switch_directories SWITCH_GLOBAL_dirs; @@ -236,6 +239,19 @@ return SWITCH_STATUS_FALSE; } +SWITCH_DECLARE(switch_status) switch_core_session_event_send(char *uuid_str, switch_event *event) +{ + switch_core_session *session = NULL; + + if ((session = switch_core_hash_find(runtime.session_table, uuid_str)) != 0) { + if (switch_channel_get_state(session->channel) < CS_HANGUP) { + return switch_core_session_queue_event(session, event); + } + } + + return SWITCH_STATUS_FALSE; +} + SWITCH_DECLARE(char *) switch_core_session_get_uuid(switch_core_session *session) { return session->uuid_str; @@ -922,6 +938,35 @@ } } } + + return status; +} + +SWITCH_DECLARE(switch_status) switch_core_session_queue_event(switch_core_session *session, switch_event *event) + +{ + struct switch_io_event_hook_queue_event *ptr; + switch_status status = SWITCH_STATUS_FALSE, istatus = SWITCH_STATUS_FALSE;; + + assert(session != NULL); + if (session->endpoint_interface->io_routines->queue_event) { + status = session->endpoint_interface->io_routines->queue_event(session, event); + + if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { + for (ptr = session->event_hooks.queue_event; ptr; ptr = ptr->next) { + if ((istatus = ptr->queue_event(session, event)) != SWITCH_STATUS_SUCCESS) { + break; + } + } + } + + if (status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK) { + if (!session->event_queue) { + switch_queue_create(&session->event_queue, SWITCH_EVENT_QUEUE_LEN, session->pool); + } + switch_queue_push(session->event_queue, event); + } + } return status; }

1 0

[commit] r1156 - freeswitch/trunk/src/mod/loggers/mod_console
by brian＠freeswitch.org 07 Jun '06

07 Jun '06

Author: brian Date: Fri Apr 14 11:59:22 2006 New Revision: 1156 Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Log: console tweak Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Fri Apr 14 11:59:22 2006 @@ -73,6 +73,7 @@ name = switch_core_strdup(module_pool, var); switch_core_hash_insert(name_hash, name, name); } + del_mapping(name); switch_core_hash_insert(log_hash, name, (void *) &STATIC_LEVELS[(uint8_t)switch_log_str2level(val)]); } @@ -108,9 +109,7 @@ uint8_t *lookup = NULL; switch_log_level level = SWITCH_LOG_DEBUG; - if (all_level > -1) { - level = (switch_log_level) all_level; - } else if (log_hash) { + if (log_hash) { lookup = switch_core_hash_find(log_hash, node->file); if (!lookup) { @@ -120,8 +119,10 @@ if (lookup) { level = (switch_log_level) *lookup; - } - + } else if (all_level > -1) { + level = (switch_log_level) all_level; + } + if (!log_hash || (((all_level > - 1) || lookup) && level >= node->level)) { fprintf(handle, node->data); }

1 0

[commit] r1154 - freeswitch/trunk/libs/libdingaling/src
by mikej＠freeswitch.org 07 Jun '06

07 Jun '06

Author: mikej Date: Fri Apr 14 10:13:28 2006 New Revision: 1154 Modified: freeswitch/trunk/libs/libdingaling/src/dingaling.def Log: add new function ldl_global_set_logger Modified: freeswitch/trunk/libs/libdingaling/src/dingaling.def ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/dingaling.def (original) +++ freeswitch/trunk/libs/libdingaling/src/dingaling.def Fri Apr 14 10:13:28 2006 @@ -22,3 +22,4 @@ ldl_handle_ready ldl_session_get_id ldl_session_set_ip +ldl_global_set_logger

1 0

[commit] r123 - freeswitch/trunk/w32/vsnet
by mikej＠freeswitch.org 07 Jun '06

07 Jun '06

Author: mikej Date: Tue Dec 13 13:17:12 2005 New Revision: 123 Modified: freeswitch/trunk/w32/vsnet/GetLibs.vbs Log: take iax dowloading out of win32 GetLibs.vbs script. Modified: freeswitch/trunk/w32/vsnet/GetLibs.vbs ============================================================================== --- freeswitch/trunk/w32/vsnet/GetLibs.vbs (original) +++ freeswitch/trunk/w32/vsnet/GetLibs.vbs Tue Dec 13 13:17:12 2005 @@ -254,10 +254,6 @@ End Sub Sub BuildLibs_ModIaxChan(BuildDebug, BuildRelease) - If Not FSO.FolderExists(LibDestDir & "iax") Then - WgetUnTarGz "http://www.sofaswitch.org/mikej/iax-0.2.3.tar.gz", LibDestDir - RenameFolder LibDestDir & "iax-0.2.3", "iax" - End If If FSO.FolderExists(LibDestDir & "iax") Then If BuildDebug Then If Not FSO.FileExists(LibDestDir & "iax\Debug\libiax2.lib") Then

1 0

[commit] r1150 - in freeswitch/trunk: src/mod/endpoints/mod_dingaling w32/vsnet
by mikej＠freeswitch.org 07 Jun '06

07 Jun '06

Author: mikej Date: Fri Apr 14 01:53:59 2006 New Revision: 1150 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/w32/vsnet/GetLibs.vbs Log: win32 tweaks Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Fri Apr 14 01:53:59 2006 @@ -123,7 +123,7 @@ uint8_t codec_num; switch_time_t last_cand; char *stun_ip; - uint32_t stun_port; + uint16_t stun_port; }; struct rfc2833_digit { Modified: freeswitch/trunk/w32/vsnet/GetLibs.vbs ============================================================================== --- freeswitch/trunk/w32/vsnet/GetLibs.vbs (original) +++ freeswitch/trunk/w32/vsnet/GetLibs.vbs Fri Apr 14 01:53:59 2006 @@ -178,6 +178,7 @@ If BuildModDingaling Then BuildLibs_iksemel BuildDebug, BuildRelease + BuildLibs_libdingaling BuildDebug, BuildRelease End If If BuildModIaxChan Then

1 0