- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r5222 - freeswitch/trunk/src
by Freeswitch SVN 26 May '07

26 May '07

Author: anthm Date: Sat May 26 15:03:16 2007 New Revision: 5222 Modified: freeswitch/trunk/src/switch_rtp.c Log: update 2833 *stab* Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sat May 26 15:03:16 2007 @@ -752,13 +752,13 @@ rtp_session->dtmf_data.out_digit_packet[3] = (unsigned char) duration; - rtp_session->dtmf_data.out_digit_seq++; - if (loops != 1) { - rtp_session->dtmf_data.timestamp_dtmf += samples; - } + rtp_session->dtmf_data.timestamp_dtmf += samples; + for (x = 0; x < loops; x++) { + rtp_session->dtmf_data.out_digit_seq++; + switch_rtp_write_manual(rtp_session, rtp_session->dtmf_data.out_digit_packet, 4, @@ -770,6 +770,7 @@ loops == 1 ? "middle" : "end", rtp_session->dtmf_data.out_digit, rtp_session->dtmf_data.timestamp_dtmf, rtp_session->dtmf_data.out_digit_sofar, duration, rtp_session->dtmf_data.out_digit_seq); + } if (loops == 1) { @@ -804,7 +805,7 @@ for (x = 0; x < 3; x++) { - //rtp_session->dtmf_data.out_digit_seq++; + rtp_session->dtmf_data.out_digit_seq++; switch_rtp_write_manual(rtp_session, rtp_session->dtmf_data.out_digit_packet, 4,

1 0

[commit] r5221 - in freeswitch/trunk/src: . include
by Freeswitch SVN 26 May '07

26 May '07

Author: anthm Date: Fri May 25 23:27:02 2007 New Revision: 5221 Modified: freeswitch/trunk/src/include/switch.h freeswitch/trunk/src/switch_buffer.c freeswitch/trunk/src/switch_ivr_play_say.c Log: small fixes Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Fri May 25 23:27:02 2007 @@ -52,8 +52,10 @@ #define FREESWITCH_ITAD "543" #define __EXTENSIONS__ 1 #ifndef MACOSX +#ifndef _XOPEN_SOURCE #define _XOPEN_SOURCE 600 #endif +#endif #include <stdlib.h> #include <stdio.h> #include <stdarg.h> Modified: freeswitch/trunk/src/switch_buffer.c ============================================================================== --- freeswitch/trunk/src/switch_buffer.c (original) +++ freeswitch/trunk/src/switch_buffer.c Fri May 25 23:27:02 2007 @@ -260,6 +260,7 @@ assert(buffer->data != NULL); buffer->used = 0; + buffer->actually_used = 0; buffer->head = buffer->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 Fri May 25 23:27:02 2007 @@ -830,7 +830,6 @@ status = SWITCH_STATUS_SUCCESS; continue; } else if (status != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Bad Write\n"); done = 1; break; } @@ -851,6 +850,7 @@ switch_yield(10000); } status = switch_core_session_read_frame(session, &read_frame, -1, 0); + if (!SWITCH_READ_ACCEPTABLE(status)) { break; } @@ -1042,7 +1042,6 @@ write_frame.timestamp = timer->samplecount; } if (switch_core_session_write_frame(session, &write_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Bad Write\n"); done = 1; break; } @@ -1124,7 +1123,6 @@ write_frame.timestamp = timer->samplecount; } if (switch_core_session_write_frame(session, &write_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Bad Write\n"); done = 1; break; } @@ -1145,7 +1143,6 @@ write_frame.timestamp = timer->samplecount; } if (switch_core_session_write_frame(session, &write_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Bad Write\n"); done = 1; break; }

1 0

[commit] r5220 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 25 May '07

25 May '07

Author: anthm Date: Fri May 25 17:36:22 2007 New Revision: 5220 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Fri May 25 17:36:22 2007 @@ -27,7 +27,7 @@ $(GETLIB) $(WANPIPE_HOST) $(WANPIPE_FILE) $(WANPIPE_KO): $(WANPIPE_DIR) - cd $(WANPIPE_DIR) && $(MAKE) + cd $(WANPIPE_DIR) && $(MAKE) && $(MAKE) install @$(TOUCH_TARGET) $(WANPIPE_INSTALLED_KO): $(WANPIPE_KO)

1 0

[commit] r5219 - freeswitch/trunk/src
by Freeswitch SVN 25 May '07

25 May '07

Author: anthm Date: Fri May 25 16:39:13 2007 New Revision: 5219 Modified: freeswitch/trunk/src/switch_log.c Log: WTF Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Fri May 25 16:39:13 2007 @@ -114,8 +114,9 @@ static void *SWITCH_THREAD_FUNC log_thread(switch_thread_t * thread, void *obj) { - /* To Be or Not To Be */ - assert(obj == NULL || obj != NULL); + if (!obj) { + obj = NULL; + } THREAD_RUNNING = 1; while (THREAD_RUNNING == 1) {

1 0

[commit] r5218 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 25 May '07

25 May '07

Author: anthm Date: Fri May 25 15:46:51 2007 New Revision: 5218 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Fri May 25 15:46:51 2007 @@ -3,8 +3,8 @@ LIBPRI=libpri-1.2.4 LIBPRI_FILE=$(LIBPRI).tar.gz LIBPRI_DIR=$(BASE)/libs/$(LIBPRI) -WANPIPE=wanpipe-3.1.0.p18 -WANPIPE_HOST=ftp://ftp.sangoma.com/linux/custom/3.1 +WANPIPE=wanpipe-3.1.0 +WANPIPE_HOST=ftp://ftp.sangoma.com/linux/current_wanpipe/ WANPIPE_FILE=$(WANPIPE).tgz WANPIPE_DIR=$(BASE)/libs/$(WANPIPE) WANPIPE_INCLUDE=$(WANPIPE_DIR)/patches/kdrivers/include

1 0

[commit] r5217 - freeswitch/trunk/src
by Freeswitch SVN 25 May '07

25 May '07

Author: anthm Date: Fri May 25 12:15:02 2007 New Revision: 5217 Modified: freeswitch/trunk/src/switch_rtp.c Log: possible fix for FSCORE-30 (part 2) Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri May 25 12:15:02 2007 @@ -751,14 +751,14 @@ rtp_session->dtmf_data.out_digit_packet[2] = (unsigned char) (duration >> 8); rtp_session->dtmf_data.out_digit_packet[3] = (unsigned char) duration; + + rtp_session->dtmf_data.out_digit_seq++; + if (loops != 1) { - rtp_session->dtmf_data.out_digit_seq++; + rtp_session->dtmf_data.timestamp_dtmf += samples; } for (x = 0; x < loops; x++) { - if (loops == 1) { - rtp_session->dtmf_data.out_digit_seq++; - } switch_rtp_write_manual(rtp_session, rtp_session->dtmf_data.out_digit_packet, 4, @@ -818,7 +818,7 @@ rtp_session->dtmf_data.out_digit, rtp_session->dtmf_data.timestamp_dtmf, rtp_session->dtmf_data.out_digit_sofar, 0, rtp_session->dtmf_data.out_digit_seq); } - + rtp_session->dtmf_data.timestamp_dtmf += samples; free(rdigit); } }

1 0

[commit] r5216 - freeswitch/trunk/libs/iax/src
by Freeswitch SVN 25 May '07

25 May '07

Author: mikej Date: Fri May 25 12:14:31 2007 New Revision: 5216 Modified: freeswitch/trunk/libs/iax/src/iax.c Log: dos2unix Modified: freeswitch/trunk/libs/iax/src/iax.c ============================================================================== --- freeswitch/trunk/libs/iax/src/iax.c (original) +++ freeswitch/trunk/libs/iax/src/iax.c Fri May 25 12:14:31 2007 @@ -140,7 +140,7 @@ /* Max timeouts */ static int maxretries = 10; -/* configurable jitterbuffer options */ +/* configurable jitterbuffer options */ static long jb_target_extra = -1; static int do_shutdown = 0; @@ -948,11 +948,11 @@ return do_shutdown++; } -void iax_set_jb_target_extra( long value ) -{ - /* store in jb_target_extra, a static global */ - jb_target_extra = value ; -} +void iax_set_jb_target_extra( long value ) +{ + /* store in jb_target_extra, a static global */ + jb_target_extra = value ; +} int iax_init(char *ip, int preferredportno) { @@ -979,33 +979,33 @@ return -1; } - if (preferredportno == 0) preferredportno = IAX_DEFAULT_PORTNO; - if (preferredportno < 0) preferredportno = 0; - - sin.sin_family = AF_INET; - sin.sin_addr.s_addr = 0; - sin.sin_port = htons((short)preferredportno); - if (bind(netfd, (struct sockaddr *) &sin, sizeof(sin)) < 0) - { -#if defined(WIN32) || defined(_WIN32_WCE) - if (WSAGetLastError() == WSAEADDRINUSE) -#else - if (errno == EADDRINUSE) -#endif - { - /*the port is already in use, so bind to a free port chosen by the IP stack*/ - DEBU(G "Unable to bind to preferred port - port is in use. Trying to bind to a free one"); - sin.sin_port = htons((short)0); - if (bind(netfd, (struct sockaddr *) &sin, sizeof(sin)) < 0) - { - IAXERROR "Unable to bind UDP socket\n"); - return -1; - } - } else - { - IAXERROR "Unable to bind UDP socket\n"); - return -1; - } + if (preferredportno == 0) preferredportno = IAX_DEFAULT_PORTNO; + if (preferredportno < 0) preferredportno = 0; + + sin.sin_family = AF_INET; + sin.sin_addr.s_addr = 0; + sin.sin_port = htons((short)preferredportno); + if (bind(netfd, (struct sockaddr *) &sin, sizeof(sin)) < 0) + { +#if defined(WIN32) || defined(_WIN32_WCE) + if (WSAGetLastError() == WSAEADDRINUSE) +#else + if (errno == EADDRINUSE) +#endif + { + /*the port is already in use, so bind to a free port chosen by the IP stack*/ + DEBU(G "Unable to bind to preferred port - port is in use. Trying to bind to a free one"); + sin.sin_port = htons((short)0); + if (bind(netfd, (struct sockaddr *) &sin, sizeof(sin)) < 0) + { + IAXERROR "Unable to bind UDP socket\n"); + return -1; + } + } else + { + IAXERROR "Unable to bind UDP socket\n"); + return -1; + } } sinlen = sizeof(sin); if (getsockname(netfd, (struct sockaddr *) &sin, &sinlen) < 0) { @@ -1587,12 +1587,12 @@ iax_send_pong(event->session, event->ts); iax_event_free(event); break; - case IAX_EVENT_POKE: - event->etype = IAX_EVENT_PONG; - iax_send_pong(event->session, event->ts); - iax_destroy(event->session); - iax_event_free(event); - break; + case IAX_EVENT_POKE: + event->etype = IAX_EVENT_PONG; + iax_send_pong(event->session, event->ts); + iax_destroy(event->session); + iax_event_free(event); + break; default: return event; } @@ -2702,9 +2702,9 @@ e->ts = ts; e = schedule_delivery(e, ts, updatehistory); break; - case IAX_COMMAND_POKE: - e->etype = IAX_EVENT_POKE; - e->ts = ts; + case IAX_COMMAND_POKE: + e->etype = IAX_EVENT_POKE; + e->ts = ts; break; case IAX_COMMAND_PING: /* PINGS and PONGS don't get scheduled; */

1 0

[commit] r5215 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 25 May '07

25 May '07

Author: mikej Date: Fri May 25 12:14:12 2007 New Revision: 5215 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: Process P- headers into channel variables too. 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 May 25 12:14:12 2007 @@ -1924,7 +1924,7 @@ } } else if (!strncasecmp(un->un_name, "Remote-Party-ID", 15)) { process_rpid(un, tech_pvt); - } else if (!strncasecmp(un->un_name, "X-", 2)) { + } else if (!strncasecmp(un->un_name, "X-", 2) || !strncasecmp(un->un_name, "P-", 2)) { if (!switch_strlen_zero(un->un_value)) { char *new_name; if ((new_name = switch_mprintf("%s%s", SOFIA_SIP_HEADER_PREFIX, un->un_name))) {

1 0

[commit] r5214 - freeswitch/trunk/src
by Freeswitch SVN 25 May '07

25 May '07

Author: anthm Date: Fri May 25 11:31:47 2007 New Revision: 5214 Modified: freeswitch/trunk/src/switch_rtp.c Log: possible fix for FSCORE-30 Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri May 25 11:31:47 2007 @@ -751,9 +751,14 @@ rtp_session->dtmf_data.out_digit_packet[2] = (unsigned char) (duration >> 8); rtp_session->dtmf_data.out_digit_packet[3] = (unsigned char) duration; + if (loops != 1) { + rtp_session->dtmf_data.out_digit_seq++; + } for (x = 0; x < loops; x++) { - rtp_session->dtmf_data.out_digit_seq++; + if (loops == 1) { + rtp_session->dtmf_data.out_digit_seq++; + } switch_rtp_write_manual(rtp_session, rtp_session->dtmf_data.out_digit_packet, 4, @@ -769,6 +774,8 @@ if (loops == 1) { rtp_session->last_write_seq = 0; + } else { + rtp_session->dtmf_data.out_digit_seq = 0; } } @@ -1409,7 +1416,7 @@ } - if (rtp_session->last_write_seq >0 && rtp_session->last_write_seq <= rtp_session->dtmf_data.out_digit_seq) { + if (rtp_session->last_write_seq > 0 && rtp_session->last_write_seq <= rtp_session->dtmf_data.out_digit_seq) { send = 0; }

1 0

[commit] r5213 - freeswitch/trunk/src
by Freeswitch SVN 24 May '07

24 May '07

Author: anthm Date: Thu May 24 11:30:31 2007 New Revision: 5213 Modified: freeswitch/trunk/src/switch_loadable_module.c Log: fix unload Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Thu May 24 11:30:31 2007 @@ -785,7 +785,6 @@ SWITCH_DECLARE(switch_status_t) switch_loadable_module_unload_module(char *dir, char *fname, const char **err) { - switch_size_t len = 0; char *path = NULL; char *file = NULL; switch_loadable_module_t *module = NULL; @@ -808,17 +807,9 @@ path = strdup(file); } else { if (strchr(file, '.')) { - len = strlen(dir); - len += strlen(file); - len += 4; - path = (char *) switch_core_alloc(loadable_modules.pool, len); - snprintf(path, len, "%s%s%s", dir, SWITCH_PATH_SEPARATOR, file); + path = switch_mprintf("%s%s%s", dir, SWITCH_PATH_SEPARATOR, file); } else { - len = strlen(dir); - len += strlen(file); - len += 8; - path = (char *) malloc(len); - snprintf(path, len, "%s%s%s%s", dir, SWITCH_PATH_SEPARATOR, file, ext); + path = switch_mprintf("%s%s%s%s", dir, SWITCH_PATH_SEPARATOR, file, ext); } } @@ -833,6 +824,7 @@ do_shutdown(module); } } else { + *err = "No such module!"; status = SWITCH_STATUS_FALSE; } switch_mutex_unlock(loadable_modules.mutex);

1 0