- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12846 - freeswitch/trunk/src
by FreeSWITCH SVN 30 Mar '09

30 Mar '09

Author: anthm Date: Mon Mar 30 16:12:06 2009 New Revision: 12846 Log: change blocking rtp to psuedo-blocking to avoid endlessly blocking reads and refactor jitter buffer Modified: freeswitch/trunk/src/switch_apr.c freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Mon Mar 30 16:12:06 2009 @@ -791,7 +791,13 @@ SWITCH_DECLARE(switch_status_t) switch_poll(switch_pollfd_t *aprset, int32_t numsock, int32_t *nsds, switch_interval_time_t timeout) { - return apr_poll((apr_pollfd_t *)aprset, numsock, nsds, timeout); + apr_status_t st = apr_poll((apr_pollfd_t *)aprset, numsock, nsds, timeout); + + if (st == APR_TIMEUP) { + st = SWITCH_STATUS_TIMEOUT; + } + + return st; } SWITCH_DECLARE(switch_status_t) switch_socket_create_pollfd(switch_pollfd_t **poll, switch_socket_t *sock, int16_t flags, switch_memory_pool_t *pool) Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Mar 30 16:12:06 2009 @@ -129,7 +129,9 @@ * used. */ switch_socket_t *sock_input, *sock_output; - + switch_pollfd_t *read_pollfd; + switch_pollfd_t *jb_pollfd; + switch_sockaddr_t *local_addr; rtp_msg_t send_msg; @@ -188,7 +190,6 @@ switch_timer_t timer; uint8_t ready; uint8_t cn; - switch_time_t last_time; stfu_instance_t *jb; uint32_t max_missed_packets; uint32_t missed_count; @@ -598,6 +599,8 @@ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER) || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK)) { switch_socket_opt_set(rtp_session->sock_input, SWITCH_SO_NONBLOCK, TRUE); switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_NOBLOCK); + } else { + switch_socket_create_pollfd(&rtp_session->read_pollfd, rtp_session->sock_input, SWITCH_POLLIN | SWITCH_POLLERR, rtp_session->pool); } status = SWITCH_STATUS_SUCCESS; @@ -1013,7 +1016,14 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_activate_jitter_buffer(switch_rtp_t *rtp_session, uint32_t queue_frames) { + if (rtp_session->read_pollfd) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't use jitterbuffer without a timer.\n"); + return SWITCH_STATUS_FALSE; + } + rtp_session->jb = stfu_n_init(queue_frames); + switch_socket_create_pollfd(&rtp_session->jb_pollfd, rtp_session->sock_input, SWITCH_POLLIN | SWITCH_POLLERR, rtp_session->pool); + return SWITCH_STATUS_SUCCESS; } @@ -1364,11 +1374,15 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_type, switch_frame_flag_t *flags, switch_io_flag_t io_flags) { switch_size_t bytes = 0; - switch_status_t status; + switch_status_t status = SWITCH_STATUS_SUCCESS, poll_status = SWITCH_STATUS_SUCCESS; int check = 0; stfu_frame_t *jb_frame; int ret = -1; int sleep_mss = 1000; + int poll_sec = 5; + int poll_loop = 0; + int fdr = 0; + int from_jb = 0; if (!switch_rtp_ready(rtp_session)) { return -1; @@ -1376,8 +1390,6 @@ if (rtp_session->timer.interval) { sleep_mss = rtp_session->timer.interval * 1000; - } else { - rtp_session->last_time = switch_time_now(); } READ_INC(rtp_session); @@ -1386,13 +1398,54 @@ int do_cng = 0; if (rtp_session->timer.interval) { - switch_core_timer_next(&rtp_session->timer); + int do_sleep = 1; + if (rtp_session->jb) { + if (switch_poll(rtp_session->jb_pollfd, 1, &fdr, 1) == SWITCH_STATUS_SUCCESS) { + do_sleep = 0; + } + } + if (do_sleep) { + switch_core_timer_next(&rtp_session->timer); + } } recvfrom: - bytes = sizeof(rtp_msg_t); - status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock_input, 0, (void *) &rtp_session->recv_msg, &bytes); + if (rtp_session->jb) { + if ((jb_frame = stfu_n_read_a_frame(rtp_session->jb))) { + memcpy(rtp_session->recv_msg.body, jb_frame->data, jb_frame->dlen); + if (jb_frame->plc) { + *flags |= SFF_PLC; + } + bytes = jb_frame->dlen + rtp_header_len; + rtp_session->recv_msg.header.ts = htonl(jb_frame->ts); + rtp_session->recv_msg.header.pt = rtp_session->payload; + from_jb = 1; + goto post_read; + } + } + + + if (rtp_session->read_pollfd) { + poll_status = switch_poll(rtp_session->read_pollfd, 1, &fdr, poll_sec * 1000000); + } + + + if (poll_status == SWITCH_STATUS_SUCCESS) { + bytes = sizeof(rtp_msg_t); + status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock_input, 0, (void *) &rtp_session->recv_msg, &bytes); + } else { + if (!SWITCH_STATUS_IS_BREAK(poll_status) && poll_status != SWITCH_STATUS_TIMEOUT) { + ret = -1; + goto end; + } + + poll_loop = 1; + rtp_session->missed_count += (poll_sec * 1000 ) / (rtp_session->ms_per_packet / 1000); + bytes = 0; + } + + post_read: if (bytes < 0) { ret = (int) bytes; @@ -1427,6 +1480,10 @@ continue; } + if (!bytes && poll_loop) { + goto recvfrom; + } + if (bytes && rtp_session->recv_msg.header.m && rtp_session->recv_msg.header.pt != rtp_session->te) { rtp_flush_read_buffer(rtp_session); } @@ -1517,26 +1574,16 @@ goto end; } - if (rtp_session->jb && ((bytes && rtp_session->recv_msg.header.pt == rtp_session->payload) || check)) { + if (rtp_session->jb && !from_jb && ((bytes && rtp_session->recv_msg.header.pt == rtp_session->payload) || check)) { if (bytes) { + if (rtp_session->recv_msg.header.m) { stfu_n_reset(rtp_session->jb); } - stfu_n_eat(rtp_session->jb, ntohl(rtp_session->recv_msg.header.ts), rtp_session->recv_msg.body, bytes - rtp_header_len); + stfu_n_eat(rtp_session->jb, ntohl(rtp_session->recv_msg.header.ts), rtp_session->recv_msg.body, bytes - rtp_header_len); bytes = 0; - } - - if ((jb_frame = stfu_n_read_a_frame(rtp_session->jb))) { - memcpy(rtp_session->recv_msg.body, jb_frame->data, jb_frame->dlen); - if (jb_frame->plc) { - *flags |= SFF_PLC; - } - bytes = jb_frame->dlen + rtp_header_len; - rtp_session->recv_msg.header.ts = htonl(jb_frame->ts); - rtp_session->recv_msg.header.pt = rtp_session->payload; - } else { - goto timer_check; + goto recvfrom; } }

1 0

[commit] r12845 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 30 Mar '09

30 Mar '09

Author: andrew Date: Mon Mar 30 16:10:01 2009 New Revision: 12845 Log: Fixed registered process outbound mode (reported by rcpacheco) 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 Mar 30 16:10:01 2009 @@ -417,8 +417,10 @@ ei_get_type(rep->buff, &rep->index, &type, &size); - if (type != ERL_STRING_EXT && type != ERL_BINARY_EXT) /* XXX no unicode or character codes > 255 */ + if (type != ERL_STRING_EXT && type != ERL_BINARY_EXT) { /* XXX no unicode or character codes > 255 */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "XML fetch response contained non ASCII characters? (was type %d of size %d)\n", type, size); return NULL; + } if (!(xmlstr = malloc(size + 1))) { @@ -778,7 +780,7 @@ check_log_queue(listener); check_event_queue(listener); - if (SWITCH_STATUS_SUCCESS != check_attached_sessions(listener)) { + if (check_attached_sessions(listener) != SWITCH_STATUS_SUCCESS) { return; } } @@ -1038,6 +1040,7 @@ if (!(session_element = switch_core_session_alloc(session, sizeof(*session_element)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to allocate session element\n"); } else { + memcpy(session_element->uuid_str, switch_core_session_get_uuid(session), SWITCH_UUID_FORMATTED_LENGTH); session_element->process.type = ERLANG_REG_PROCESS; session_element->process.reg_name = switch_core_strdup(switch_core_session_get_pool(session),reg_name); switch_set_flag(session_element, LFLAG_SESSION_ALIVE);

1 0

[commit] r12844 - freeswitch/trunk/src
by FreeSWITCH SVN 30 Mar '09

30 Mar '09

Author: anthm Date: Mon Mar 30 16:09:49 2009 New Revision: 12844 Log: add warnings Modified: freeswitch/trunk/src/switch_event.c Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Mar 30 16:09:49 2009 @@ -1100,7 +1100,8 @@ SWITCH_DECLARE(switch_status_t) switch_event_fire_detailed(const char *file, const char *func, int line, switch_event_t **event, void *user_data) { - + int index; + switch_assert(BLOCK != NULL); switch_assert(RUNTIME_POOL != NULL); switch_assert(EVENT_QUEUE_MUTEX != NULL); @@ -1116,8 +1117,22 @@ (*event)->event_user_data = user_data; } + for (;;) { + for (index = (*event)->priority; index < 3; index++) { + if (switch_queue_trypush(EVENT_QUEUE[index], *event) == SWITCH_STATUS_SUCCESS) { + if (index != (*event)->priority) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "queued event at a lower priority!\n"); + } + goto end; + } + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Event queue is full!\n"); + switch_yield(100000); + } + + end: - switch_queue_push(EVENT_QUEUE[(*event)->priority], *event); *event = NULL; return SWITCH_STATUS_SUCCESS;

1 0

[commit] r12843 - freeswitch/trunk
by FreeSWITCH SVN 30 Mar '09

30 Mar '09

Author: mikej Date: Mon Mar 30 13:24:16 2009 New Revision: 12843 Log: add build of fs_ivrd Modified: freeswitch/trunk/Makefile.am Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Mon Mar 30 13:24:16 2009 @@ -165,12 +165,15 @@ CLEANFILES = src/include/switch_version.h src/include/switch_swigable_cpp.h BUILT_SOURCES = src/include/switch_version.h src/include/switch_swigable_cpp.h -bin_PROGRAMS = freeswitch fs_cli +bin_PROGRAMS = freeswitch fs_cli fs_ivrd +fs_ivrd_SOURCES = libs/esl/src/esl.c libs/esl/src/esl_config.c libs/esl/src/esl_event.c libs/esl/src/esl_threadmutex.c libs/esl/ivrd.c fs_cli_SOURCES = libs/esl/src/esl.c libs/esl/src/esl_config.c libs/esl/src/esl_event.c libs/esl/src/esl_threadmutex.c libs/esl/fs_cli.c freeswitch_SOURCES = src/switch.c nodist_freeswitch_SOURCES = src/include/switch_version.h fs_cli_CFLAGS = $(AM_CFLAGS) -Ilibs/esl/src/include fs_cli_LDFLAGS = $(AM_LDFLAGS) -lpthread $(ESL_LDFLAGS) +fs_ivrd_CFLAGS = $(AM_CFLAGS) -Ilibs/esl/src/include +fs_ivrd_LDFLAGS = $(AM_LDFLAGS) -lpthread $(ESL_LDFLAGS) freeswitch_CFLAGS = $(AM_CFLAGS) $(CORE_CFLAGS) freeswitch_LDFLAGS = $(AM_LDFLAGS) -rpath $(libdir) freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la

1 0

[commit] r12842 - freeswitch/trunk/src
by FreeSWITCH SVN 30 Mar '09

30 Mar '09

Author: mrene Date: Mon Mar 30 12:48:25 2009 New Revision: 12842 Log: Fix Solaris build Modified: freeswitch/trunk/src/switch_xml_config.c Modified: freeswitch/trunk/src/switch_xml_config.c ============================================================================== --- freeswitch/trunk/src/switch_xml_config.c (original) +++ freeswitch/trunk/src/switch_xml_config.c Mon Mar 30 12:48:25 2009 @@ -336,7 +336,7 @@ case SWITCH_CONFIG_FLAGARRAY: { int8_t *dest = (int8_t*)item->ptr; - int8_t index = (int8_t)(intptr_t)item->data; + unsigned int index = (unsigned int)(intptr_t)item->data; int8_t newval = value ? !!switch_true(value) : (int8_t)((intptr_t)item->defaultvalue); if (dest[index] != newval) { changed = SWITCH_TRUE;

1 0

[commit] r12841 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 30 Mar '09

30 Mar '09

Author: mikej Date: Mon Mar 30 12:20:46 2009 New Revision: 12841 Log: fix mwi Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Mon Mar 30 12:20:46 2009 @@ -285,6 +285,7 @@ char *pname = NULL; const char *call_id; const char *sub_call_id; + int for_everyone = 0; switch_assert(event != NULL); @@ -301,6 +302,11 @@ call_id = switch_event_get_header(event, "call-id"); sub_call_id = switch_event_get_header(event, "sub-call-id"); + if (!call_id && !sub_call_id) { + for_everyone = 1; + } + + dup_account = strdup(account); switch_assert(dup_account != NULL); sofia_glue_get_user_host(dup_account, &user, &host); @@ -346,34 +352,45 @@ sql = NULL; - if (sub_call_id) { + if (for_everyone) { sql = switch_mprintf("select proto,sip_user,sip_host,sub_to_user,sub_to_host,event,contact,call_id,full_from," "full_via,expires,user_agent,accept,profile_name" ",'%q','%q' from sip_subscriptions where event='message-summary' " - "and sub_to_user='%q' and (sub_to_host='%q' or presence_hosts like '%%%q%%' and call_id='%q')", - stream.data, host, user, host, host, sub_call_id); - } else if (!call_id) { + "and sub_to_user='%q' and (sub_to_host='%q' or presence_hosts like '%%%q%%')", + stream.data, host, user, host, host); + } else if (sub_call_id) { sql = switch_mprintf("select proto,sip_user,sip_host,sub_to_user,sub_to_host,event,contact,call_id,full_from," "full_via,expires,user_agent,accept,profile_name" ",'%q','%q' from sip_subscriptions where event='message-summary' " - "and sub_to_user='%q' and (sub_to_host='%q' or presence_hosts like '%%%q%%')", - stream.data, host, user, host, host); + "and sub_to_user='%q' and (sub_to_host='%q' or presence_hosts like '%%%q%%' and call_id='%q')", + stream.data, host, user, host, host, sub_call_id); } + if (sql) { sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, sofia_presence_mwi_callback, &h); - switch_safe_free(sql); + free(sql); + sql = NULL; + + } + if (for_everyone) { + sql = switch_mprintf("select sip_user,sip_host,contact,profile_name,'%q' " + "from sip_registrations where sip_user='%q' and sip_host='%q'", + stream.data, user, host); } else if (call_id) { sql = switch_mprintf("select sip_user,sip_host,contact,profile_name,'%q' " "from sip_registrations where sip_user='%q' and sip_host='%q' and call_id='%q'", stream.data, user, host, call_id); + } + + if (sql) { switch_assert(sql != NULL); sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, sofia_presence_mwi_callback2, &h); + free(sql); + sql = NULL; } - - switch_safe_free(sql); switch_safe_free(stream.data); switch_safe_free(dup_account);

1 0

[commit] r12840 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 30 Mar '09

30 Mar '09

Author: anthm Date: Mon Mar 30 11:48:44 2009 New Revision: 12840 Log: add read_terminator_used var Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_ivr_play_say.c Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Mar 30 11:48:44 2009 @@ -110,6 +110,7 @@ #define SWITCH_PATH_SEPARATOR "/" #endif #define SWITCH_URL_SEPARATOR "://" +#define SWITCH_READ_TERMINATOR_USED_VARIABLE "read_terminator_used" #define SWITCH_SEND_SILENCE_WHEN_IDLE_VARIABLE "send_silence_when_idle" #define SWITCH_CURRENT_APPLICATION_VARIABLE "current_application" #define SWITCH_CURRENT_APPLICATION_DATA_VARIABLE "current_application_data" Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Mon Mar 30 11:48:44 2009 @@ -1446,8 +1446,8 @@ switch_channel_t *channel; switch_input_args_t args = { 0 }; switch_status_t status = SWITCH_STATUS_SUCCESS; - char terminator; size_t len = 0; + char tb[2] = ""; switch_assert(session); @@ -1488,7 +1488,12 @@ if ((min_digits && len < min_digits) || len < max_digits) { args.buf = digit_buffer + len; args.buflen = (uint32_t) (digit_buffer_length - len); - status = switch_ivr_collect_digits_count(session, digit_buffer, digit_buffer_length, max_digits, valid_terminators, &terminator, timeout, 0, 0); + status = switch_ivr_collect_digits_count(session, digit_buffer, digit_buffer_length, max_digits, valid_terminators, &tb[0], timeout, 0, 0); + } + + + if (tb[0]) { + switch_channel_set_variable(channel, SWITCH_READ_TERMINATOR_USED_VARIABLE, tb); } len = strlen(digit_buffer);

1 0

[commit] r12839 - freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms
by FreeSWITCH SVN 30 Mar '09

30 Mar '09

Author: jtregunna Date: Mon Mar 30 10:07:38 2009 New Revision: 12839 Log: Updated do_config() to strdup() three variables, and shutdown func to release that memory again. Modified: freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/mod_fastsms.c Modified: freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/mod_fastsms.c ============================================================================== --- freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/mod_fastsms.c (original) +++ freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/mod_fastsms.c Mon Mar 30 10:07:38 2009 @@ -29,9 +29,9 @@ if ((settings = switch_xml_child(cfg, "settings"))) { auth = switch_xml_child(settings, "auth"); - companyid = (char*)switch_xml_attr_soft(auth, "companyid"); - userid = (char*)switch_xml_attr_soft(auth, "userid"); - password = (char*)switch_xml_attr_soft(auth, "password"); + companyid = strdup(switch_xml_attr_soft(auth, "companyid")); + userid = strdup(switch_xml_attr_soft(auth, "userid")); + password = strdup(switch_xml_attr_soft(auth, "password")); } if (xml) @@ -129,6 +129,9 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_fastsms_shutdown) { curl_easy_cleanup(curl); + free(companyid); + free(userid); + free(password); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r12838 - freeswitch/trunk/conf/directory/default
by FreeSWITCH SVN 30 Mar '09

30 Mar '09

Author: mikej Date: Mon Mar 30 09:24:14 2009 New Revision: 12838 Log: FSCONFIG-5 Modified: freeswitch/trunk/conf/directory/default/1000.xml freeswitch/trunk/conf/directory/default/1001.xml freeswitch/trunk/conf/directory/default/1002.xml freeswitch/trunk/conf/directory/default/1003.xml freeswitch/trunk/conf/directory/default/1004.xml freeswitch/trunk/conf/directory/default/1005.xml freeswitch/trunk/conf/directory/default/1006.xml freeswitch/trunk/conf/directory/default/1007.xml freeswitch/trunk/conf/directory/default/1008.xml freeswitch/trunk/conf/directory/default/1009.xml freeswitch/trunk/conf/directory/default/1010.xml freeswitch/trunk/conf/directory/default/1011.xml freeswitch/trunk/conf/directory/default/1012.xml freeswitch/trunk/conf/directory/default/1013.xml freeswitch/trunk/conf/directory/default/1014.xml freeswitch/trunk/conf/directory/default/1015.xml freeswitch/trunk/conf/directory/default/1016.xml freeswitch/trunk/conf/directory/default/1017.xml freeswitch/trunk/conf/directory/default/1018.xml freeswitch/trunk/conf/directory/default/1019.xml freeswitch/trunk/conf/directory/default/brian.xml Modified: freeswitch/trunk/conf/directory/default/1000.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1000.xml (original) +++ freeswitch/trunk/conf/directory/default/1000.xml Mon Mar 30 09:24:14 2009 @@ -1,7 +1,7 @@ <include> <user id="1000" mailbox="1000"> <params> - <param name="password" value="${default_password}"/> + <param name="password" value="$${default_password}"/> <param name="vm-password" value="1000"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1001.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1001.xml (original) +++ freeswitch/trunk/conf/directory/default/1001.xml Mon Mar 30 09:24:14 2009 @@ -1,7 +1,7 @@ <include> <user id="1001" mailbox="1001"> <params> - <param name="password" value="${default_password}"/> + <param name="password" value="$${default_password}"/> <param name="vm-password" value="1001"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1002.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1002.xml (original) +++ freeswitch/trunk/conf/directory/default/1002.xml Mon Mar 30 09:24:14 2009 @@ -1,7 +1,7 @@ <include> <user id="1002" mailbox="1002"> <params> - <param name="password" value="${default_password}"/> + <param name="password" value="$${default_password}"/> <param name="vm-password" value="1002"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1003.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1003.xml (original) +++ freeswitch/trunk/conf/directory/default/1003.xml Mon Mar 30 09:24:14 2009 @@ -1,7 +1,7 @@ <include> <user id="1003" mailbox="1003"> <params> - <param name="password" value="${default_password}"/> + <param name="password" value="$${default_password}"/> <param name="vm-password" value="1003"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1004.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1004.xml (original) +++ freeswitch/trunk/conf/directory/default/1004.xml Mon Mar 30 09:24:14 2009 @@ -1,7 +1,7 @@ <include> <user id="1004" mailbox="1004"> <params> - <param name="password" value="${default_password}"/> + <param name="password" value="$${default_password}"/> <param name="vm-password" value="1004"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1005.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1005.xml (original) +++ freeswitch/trunk/conf/directory/default/1005.xml Mon Mar 30 09:24:14 2009 @@ -1,7 +1,7 @@ <include> <user id="1005" mailbox="1005"> <params> - <param name="password" value="${default_password}"/> + <param name="password" value="$${default_password}"/> <param name="vm-password" value="1005"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1006.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1006.xml (original) +++ freeswitch/trunk/conf/directory/default/1006.xml Mon Mar 30 09:24:14 2009 @@ -1,7 +1,7 @@ <include> <user id="1006" mailbox="1006"> <params> - <param name="password" value="${default_password}"/> + <param name="password" value="$${default_password}"/> <param name="vm-password" value="1006"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1007.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1007.xml (original) +++ freeswitch/trunk/conf/directory/default/1007.xml Mon Mar 30 09:24:14 2009 @@ -1,7 +1,7 @@ <include> <user id="1007" mailbox="1007"> <params> - <param name="password" value="${default_password}"/> + <param name="password" value="$${default_password}"/> <param name="vm-password" value="1007"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1008.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1008.xml (original) +++ freeswitch/trunk/conf/directory/default/1008.xml Mon Mar 30 09:24:14 2009 @@ -1,7 +1,7 @@ <include> <user id="1008" mailbox="1008"> <params> - <param name="password" value="${default_password}"/> + <param name="password" value="$${default_password}"/> <param name="vm-password" value="1008"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1009.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1009.xml (original) +++ freeswitch/trunk/conf/directory/default/1009.xml Mon Mar 30 09:24:14 2009 @@ -1,7 +1,7 @@ <include> <user id="1009" mailbox="1009"> <params> - <param name="password" value="${default_password}"/> + <param name="password" value="$${default_password}"/> <param name="vm-password" value="1009"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1010.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1010.xml (original) +++ freeswitch/trunk/conf/directory/default/1010.xml Mon Mar 30 09:24:14 2009 @@ -1,7 +1,7 @@ <include> <user id="1010" mailbox="1010"> <params> - <param name="password" value="${default_password}"/> + <param name="password" value="$${default_password}"/> <param name="vm-password" value="1010"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1011.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1011.xml (original) +++ freeswitch/trunk/conf/directory/default/1011.xml Mon Mar 30 09:24:14 2009 @@ -1,7 +1,7 @@ <include> <user id="1011" mailbox="1011"> <params> - <param name="password" value="${default_password}"/> + <param name="password" value="$${default_password}"/> <param name="vm-password" value="1011"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1012.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1012.xml (original) +++ freeswitch/trunk/conf/directory/default/1012.xml Mon Mar 30 09:24:14 2009 @@ -1,7 +1,7 @@ <include> <user id="1012" mailbox="1012"> <params> - <param name="password" value="${default_password}"/> + <param name="password" value="$${default_password}"/> <param name="vm-password" value="1012"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1013.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1013.xml (original) +++ freeswitch/trunk/conf/directory/default/1013.xml Mon Mar 30 09:24:14 2009 @@ -1,7 +1,7 @@ <include> <user id="1013" mailbox="1013"> <params> - <param name="password" value="${default_password}"/> + <param name="password" value="$${default_password}"/> <param name="vm-password" value="1013"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1014.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1014.xml (original) +++ freeswitch/trunk/conf/directory/default/1014.xml Mon Mar 30 09:24:14 2009 @@ -1,7 +1,7 @@ <include> <user id="1014" mailbox="1014"> <params> - <param name="password" value="${default_password}"/> + <param name="password" value="$${default_password}"/> <param name="vm-password" value="1014"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1015.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1015.xml (original) +++ freeswitch/trunk/conf/directory/default/1015.xml Mon Mar 30 09:24:14 2009 @@ -1,7 +1,7 @@ <include> <user id="1015" mailbox="1015"> <params> - <param name="password" value="${default_password}"/> + <param name="password" value="$${default_password}"/> <param name="vm-password" value="1015"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1016.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1016.xml (original) +++ freeswitch/trunk/conf/directory/default/1016.xml Mon Mar 30 09:24:14 2009 @@ -1,7 +1,7 @@ <include> <user id="1016" mailbox="1016"> <params> - <param name="password" value="${default_password}"/> + <param name="password" value="$${default_password}"/> <param name="vm-password" value="1016"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1017.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1017.xml (original) +++ freeswitch/trunk/conf/directory/default/1017.xml Mon Mar 30 09:24:14 2009 @@ -1,7 +1,7 @@ <include> <user id="1017" mailbox="1017"> <params> - <param name="password" value="${default_password}"/> + <param name="password" value="$${default_password}"/> <param name="vm-password" value="1017"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1018.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1018.xml (original) +++ freeswitch/trunk/conf/directory/default/1018.xml Mon Mar 30 09:24:14 2009 @@ -1,7 +1,7 @@ <include> <user id="1018" mailbox="1018"> <params> - <param name="password" value="${default_password}"/> + <param name="password" value="$${default_password}"/> <param name="vm-password" value="1018"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1019.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1019.xml (original) +++ freeswitch/trunk/conf/directory/default/1019.xml Mon Mar 30 09:24:14 2009 @@ -1,7 +1,7 @@ <include> <user id="1019" mailbox="1019"> <params> - <param name="password" value="${default_password}"/> + <param name="password" value="$${default_password}"/> <param name="vm-password" value="1019"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/brian.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/brian.xml (original) +++ freeswitch/trunk/conf/directory/default/brian.xml Mon Mar 30 09:24:14 2009 @@ -43,7 +43,7 @@ </gateways> <params>  - <param name="password" value="${default_password}"/> + <param name="password" value="$${default_password}"/> <param name="vm-password" value="9999"/>

1 0

[commit] r12837 - freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms
by FreeSWITCH SVN 30 Mar '09

30 Mar '09

Author: jtregunna Date: Mon Mar 30 08:23:03 2009 New Revision: 12837 Log: Added a module for the fastsms web service to scripts/contrib/jtregunna/mod_fastsms. README file is included with instructions, as well as a sample config file. Tested on FreeBSD 7.1 with r12817, however should work fine on Linux and Windows as well. Though, due to development limitations, no VCProj is included. Added: freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/ freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/COPYING freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/Makefile freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/README freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/fastsms.conf.xml freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/mod_fastsms.c Added: freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/COPYING ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/COPYING Mon Mar 30 08:23:03 2009 @@ -0,0 +1,20 @@ +Copyright (c) 2006-2008 Hampton Catlin + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file Added: freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/Makefile Mon Mar 30 08:23:03 2009 @@ -0,0 +1,3 @@ +BASE=../../../.. +WANT_CURL=yes +include $(BASE)/build/modmake.rules Added: freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/README ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/README Mon Mar 30 08:23:03 2009 @@ -0,0 +1,33 @@ +mod_fastsms +Copyright (c) 2009, Jeremy Tregunna, All Rights Reserved. + +What is it? + +mod_fastsms is a FreeSWITCH module that can be used to send Short Message Service (SMS) +text messages via the FastSMS web service. + +Configuration + +A template fastsms.conf.xml is included, you will need to edit the auth tag to put in +the information you get from the FastSMS service. + +As far as your dialplan goes, you can add something like this: + +<extension name="fastsms"> + <condition field="destination_number" expression="^1200$"> + <action application="fastsms" data="15145551212 Limit this bit of text to 160 characters. It's your message."/> + </condition> +</extension> + +You can optionally define an originator (who the message appears to come from), in your +directory, add this line: + <variable name="fastsms_originator" value="Mr. Bob's Server"/> + +and reloadxml. + +That's about it! Just copy the fastsms.conf.xml to your conf/autoload_configs and make +the changes appropriately, copy this directory to freeswitch/src/mod/applications/mod_fastsms +edit freeswitch/modules.conf and add a line "applications/mod_fastsms" then rebuild +FreeSWITCH. + +Should you encounter problems, either drop me a line at jeremy.tregunna(a)me.com. Added: freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/fastsms.conf.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/fastsms.conf.xml Mon Mar 30 08:23:03 2009 @@ -0,0 +1,5 @@ +<configuration name="fastsms.conf" description="fastsms"> + <settings> + <auth companyid="XXX" userid="YYY" password="ZZZ"/> + </settings> +</configuration> Added: freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/mod_fastsms.c ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/mod_fastsms.c Mon Mar 30 08:23:03 2009 @@ -0,0 +1,144 @@ +/* + * Interface to the FastSMS message service. + * Copyright (c) 2009, Jeremy Tregunna, All Rights Reserved. + * + * This library is free software; you can redistribute it and/or modify + * it under the terms of the MIT license. See COPYING for details. + */ +#include <switch.h> +#include <curl/curl.h> + +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_fastsms_shutdown); +SWITCH_MODULE_RUNTIME_FUNCTION(mod_fastsms_runtime); +SWITCH_MODULE_LOAD_FUNCTION(mod_fastsms_load); +SWITCH_MODULE_DEFINITION(mod_fastsms, mod_fastsms_load, mod_fastsms_shutdown, NULL); + +static char* companyid; +static char* userid; +static char* password; +static CURL* curl; + +static switch_status_t do_config(switch_bool_t reload) +{ + switch_xml_t cfg, xml, settings, auth; + + if (!(xml = switch_xml_open_cfg("fastsms.conf", &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not open fastsms.conf\n"); + return SWITCH_STATUS_FALSE; + } + + if ((settings = switch_xml_child(cfg, "settings"))) { + auth = switch_xml_child(settings, "auth"); + companyid = (char*)switch_xml_attr_soft(auth, "companyid"); + userid = (char*)switch_xml_attr_soft(auth, "userid"); + password = (char*)switch_xml_attr_soft(auth, "password"); + } + + if (xml) + switch_xml_free(xml); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t fastsms_send_msg(switch_core_session_t* session, const char* msisdn, const char* text, const char* originator) +{ + char* params; + int error; + long response = 0; + + if (originator) { + asprintf(&params, "CompanyId=%s&UserId=%s&Password=%s&Msisdn=%s&MessageText=%s&OasText=%s", companyid, + userid, password, msisdn, text, originator); + } else { + asprintf(&params, "CompanyId=%s&UserId=%s&Password=%s&Msisdn=%s&MessageText=%s", companyid, userid, + password, msisdn, text); + } + + curl_easy_setopt(curl, CURLOPT_URL, "https://secure.bayhamsystems.com/mfi/sendMessage"); + curl_easy_setopt(curl, CURLOPT_POSTFIELDS, params); + curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0); + if ((error = curl_easy_perform(curl)) != CURLE_OK) + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "FastSMS Error: %s\n", curl_easy_strerror(error)); + curl_easy_getinfo(curl, CURLINFO_HTTP_CODE, &response); + free(params); + + switch (response) { + case 200: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "SMS message sent.\n"); + return SWITCH_STATUS_SUCCESS; + break; + case 403: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: Forbidden.\n"); + break; + default: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FastSMS Error: Response code %ld\n", response); + break; + } + + return SWITCH_STATUS_FALSE; +} + +#define FASTSMS_DESC "FastSMS SMS Message Service" +#define FASTSMS_USAGE "<number> <text message>" + +SWITCH_STANDARD_APP(fastsms_function) +{ + switch_channel_t* channel = switch_core_session_get_channel(session); + char* msisdn = NULL; + char* text = NULL; + const char* originator = switch_channel_get_variable(channel, "fastsms_originator"); + + if (!switch_strlen_zero(data)) { + msisdn = switch_core_session_strdup(session, data); + text = strchr(msisdn, ' '); + if (text) + *text++ = '\0'; + fastsms_send_msg(session, msisdn, text, originator); + } +} + +SWITCH_STANDARD_API(fastsms_api_function) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Reloading FastSMS configuration file.\n"); + do_config(SWITCH_TRUE); + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MODULE_LOAD_FUNCTION(mod_fastsms_load) +{ + switch_status_t status; + switch_application_interface_t *app_interface; + switch_api_interface_t *api_interface; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "FastSMS module loaded.\n"); + + if ((status = do_config(SWITCH_FALSE)) != SWITCH_STATUS_SUCCESS) { + return status; + } + + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + curl = curl_easy_init(); + + SWITCH_ADD_API(api_interface, "fastsms_api", "fastsms_api", fastsms_api_function, "syntax"); + SWITCH_ADD_APP(app_interface, "fastsms", "fastsms", FASTSMS_DESC, fastsms_function, FASTSMS_USAGE, SAF_NONE); + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_fastsms_shutdown) +{ + curl_easy_cleanup(curl); + return SWITCH_STATUS_SUCCESS; +} + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 + */

1 0