- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r5265 - freeswitch/trunk/src/include
by Freeswitch SVN 05 Jun '07

05 Jun '07

Author: anthm Date: Tue Jun 5 12:21:30 2007 New Revision: 5265 Modified: freeswitch/trunk/src/include/switch_utils.h Log: add util Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Tue Jun 5 12:21:30 2007 @@ -177,6 +177,15 @@ #define switch_set_string(_dst, _src) switch_copy_string(_dst, _src, sizeof(_dst)) +static __inline__ void switch_clean_string(char *s) +{ char *p; + + for (p = s; p && *p; p++) { uint8_t x = (uint8_t) *p; if (x < 32 || x > 127) { *p = ' '; } + } +} + + + /*! \brief Free a pointer and set it to NULL unless it already is NULL \param it the pointer

1 0

[commit] r5264 - freeswitch/branches/greenlizard
by Freeswitch SVN 05 Jun '07

05 Jun '07

Author: greenlizard Date: Tue Jun 5 12:10:57 2007 New Revision: 5264 Modified: freeswitch/branches/greenlizard/configure.in Log: merge in changes from trunk 5202 to 5240. accidentally forgot to commit this file in previous two commits. Modified: freeswitch/branches/greenlizard/configure.in ============================================================================== --- freeswitch/branches/greenlizard/configure.in (original) +++ freeswitch/branches/greenlizard/configure.in Tue Jun 5 12:10:57 2007 @@ -139,6 +139,9 @@ *-solaris2*) APR_ADDTO(SWITCH_AM_CFLAGS, -DPATH_MAX=2048) ;; + *bsd*) + APR_ADDTO(SWITCH_AM_CFLAGS, -I/usr/local/include) + ;; esac APR_REMOVEFROM(SWITCH_AM_CXXFLAGS, -std=c99)

1 0

[commit] r5263 - in freeswitch/branches/greenlizard/libs: iax/src js/nsprpub/pr/src/io js/nsprpub/pr/src/misc js/nsprpub/pr/src/pthreads libedit libedit/src
by Freeswitch SVN 05 Jun '07

05 Jun '07

Author: greenlizard Date: Tue Jun 5 12:03:00 2007 New Revision: 5263 Modified: freeswitch/branches/greenlizard/libs/iax/src/iax.c freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/io/prfdcach.c freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/io/prlog.c freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/misc/prinit.c freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/pthreads/ptthread.c freeswitch/branches/greenlizard/libs/libedit/Makefile.am freeswitch/branches/greenlizard/libs/libedit/src/el.c freeswitch/branches/greenlizard/libs/libedit/src/sig.c freeswitch/branches/greenlizard/libs/libedit/src/sig.h freeswitch/branches/greenlizard/libs/libedit/src/term.c freeswitch/branches/greenlizard/libs/libedit/src/unvis.c freeswitch/branches/greenlizard/libs/libedit/src/vi.c freeswitch/branches/greenlizard/libs/libedit/src/vis.c Log: merge in changes from trunk 5202 to 5240. accidentally forgot to commit the libs directory on last commit. Modified: freeswitch/branches/greenlizard/libs/iax/src/iax.c ============================================================================== --- freeswitch/branches/greenlizard/libs/iax/src/iax.c (original) +++ freeswitch/branches/greenlizard/libs/iax/src/iax.c Tue Jun 5 12:03:00 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; */ Modified: freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/io/prfdcach.c ============================================================================== --- freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/io/prfdcach.c (original) +++ freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/io/prfdcach.c Tue Jun 5 12:03:00 2007 @@ -259,8 +259,8 @@ ** be overridden at runtime using environment variables ** or a super-wiz-bang API. */ - //const char *low = PR_GetEnv("NSPR_FD_CACHE_SIZE_LOW"); - //const char *high = PR_GetEnv("NSPR_FD_CACHE_SIZE_HIGH"); + /* const char *low = PR_GetEnv("NSPR_FD_CACHE_SIZE_LOW"); */ + /* const char *high = PR_GetEnv("NSPR_FD_CACHE_SIZE_HIGH"); */ /* ** _low is allowed to be zero, _high is not. @@ -274,8 +274,8 @@ _pr_fd_cache.limit_high = 0; #endif /* defined(DEBUG) */ - //if (NULL != low) _pr_fd_cache.limit_low = atoi(low); - //if (NULL != high) _pr_fd_cache.limit_high = atoi(high); + /*if (NULL != low) _pr_fd_cache.limit_low = atoi(low);*/ + /*if (NULL != high) _pr_fd_cache.limit_high = atoi(high);*/ if (_pr_fd_cache.limit_high < _pr_fd_cache.limit_low) _pr_fd_cache.limit_high = _pr_fd_cache.limit_low; Modified: freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/io/prlog.c ============================================================================== --- freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/io/prlog.c (original) +++ freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/io/prlog.c Tue Jun 5 12:03:00 2007 @@ -208,7 +208,7 @@ _pr_logLock = PR_NewLock(); -// ev = PR_GetEnv("NSPR_LOG_MODULES"); + /* ev = PR_GetEnv("NSPR_LOG_MODULES"); */ if (ev && ev[0]) { char module[64]; /* Security-Critical: If you change this * size, you must also change the sscanf @@ -255,7 +255,7 @@ } PR_SetLogBuffering(isSync ? bufSize : 0); - //ev = PR_GetEnv("NSPR_LOG_FILE"); + /* ev = PR_GetEnv("NSPR_LOG_FILE"); */ if (ev && ev[0]) { if (!PR_SetLogFile(ev)) { #ifdef XP_PC @@ -318,7 +318,7 @@ { char *ev = NULL; - //ev = PR_GetEnv("NSPR_LOG_MODULES"); + /* ev = PR_GetEnv("NSPR_LOG_MODULES"); */ if (ev && ev[0]) { char module[64]; /* Security-Critical: If you change this * size, you must also change the sscanf Modified: freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/misc/prinit.c ============================================================================== --- freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/misc/prinit.c (original) +++ freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/misc/prinit.c Tue Jun 5 12:03:00 2007 @@ -202,7 +202,6 @@ _PR_InitSegs(); _PR_InitStacks(); _PR_InitTPD(); - //_PR_InitEnv(); _PR_InitLayerCache(); _PR_InitClock(); @@ -234,22 +233,10 @@ _PR_InitMem(); #endif - //_PR_InitCMon(); _PR_InitIO(); - //_PR_InitNet(); _PR_InitLog(); - //_PR_InitLinker(); _PR_InitCallOnce(); - //_PR_InitDtoa(); _PR_InitMW(); - //_PR_InitRWLocks(); - - //nspr_InitializePRErrorTable(); - -#if !defined(_PR_INET6) || defined(_PR_INET6_PROBE) - //_pr_init_ipv6(); -#endif - _PR_MD_FINAL_INIT(); } @@ -420,9 +407,7 @@ #endif _PR_CleanupMW(); - //_PR_CleanupDtoa(); _PR_CleanupCallOnce(); - //_PR_ShutdownLinker(); /* Release the primordial thread's private data, etc. */ _PR_CleanupThread(me); @@ -452,7 +437,6 @@ * Ideally, for each _PR_InitXXX(), there should be a corresponding * _PR_XXXCleanup() that we can call here. */ - //_PR_CleanupNet(); _PR_CleanupIO(); #ifdef WINNT _PR_CleanupCPUs(); @@ -461,7 +445,6 @@ PR_DestroyLock(_pr_sleeplock); _pr_sleeplock = NULL; _PR_CleanupLayerCache(); - //_PR_CleanupEnv(); _PR_CleanupStacks(); _PR_CleanupBeforeExit(); _pr_initialized = PR_FALSE; Modified: freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/pthreads/ptthread.c ============================================================================== --- freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/pthreads/ptthread.c (original) +++ freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/pthreads/ptthread.c Tue Jun 5 12:03:00 2007 @@ -938,9 +938,7 @@ PR_Unlock(pt_book.ml); _PR_CleanupMW(); - //_PR_CleanupDtoa(); _PR_CleanupCallOnce(); - //_PR_ShutdownLinker(); _PR_LogCleanup(); _PR_CleanupNet(); /* Close all the fd's before calling _PR_CleanupIO */ @@ -963,7 +961,6 @@ PR_DestroyLock(_pr_sleeplock); _pr_sleeplock = NULL; _PR_CleanupLayerCache(); - //_PR_CleanupEnv(); #ifdef _PR_ZONE_ALLOCATOR _PR_DestroyZones(); #endif Modified: freeswitch/branches/greenlizard/libs/libedit/Makefile.am ============================================================================== --- freeswitch/branches/greenlizard/libs/libedit/Makefile.am (original) +++ freeswitch/branches/greenlizard/libs/libedit/Makefile.am Tue Jun 5 12:03:00 2007 @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = src examples doc +SUBDIRS = src ## GENERATED BY SCRIPT - DO NOT EDIT BELOW Modified: freeswitch/branches/greenlizard/libs/libedit/src/el.c ============================================================================== --- freeswitch/branches/greenlizard/libs/libedit/src/el.c (original) +++ freeswitch/branches/greenlizard/libs/libedit/src/el.c Tue Jun 5 12:03:00 2007 @@ -522,7 +522,9 @@ sigset_t oset, nset; (void) sigemptyset(&nset); +#ifdef SIGWINCH (void) sigaddset(&nset, SIGWINCH); +#endif (void) sigprocmask(SIG_BLOCK, &nset, &oset); /* get the correct window size */ Modified: freeswitch/branches/greenlizard/libs/libedit/src/sig.c ============================================================================== --- freeswitch/branches/greenlizard/libs/libedit/src/sig.c (original) +++ freeswitch/branches/greenlizard/libs/libedit/src/sig.c Tue Jun 5 12:03:00 2007 @@ -83,9 +83,11 @@ term__flush(); break; +#ifdef SIGWINCH case SIGWINCH: el_resize(sel); break; +#endif default: tty_cookedmode(sel); Modified: freeswitch/branches/greenlizard/libs/libedit/src/sig.h ============================================================================== --- freeswitch/branches/greenlizard/libs/libedit/src/sig.h (original) +++ freeswitch/branches/greenlizard/libs/libedit/src/sig.h Tue Jun 5 12:03:00 2007 @@ -48,6 +48,7 @@ * Define here all the signals we are going to handle * The _DO macro is used to iterate in the source code */ +#ifdef SIGWINCH #define ALLSIGS \ _DO(SIGINT) \ _DO(SIGTSTP) \ @@ -57,6 +58,16 @@ _DO(SIGTERM) \ _DO(SIGCONT) \ _DO(SIGWINCH) +#else +#define ALLSIGS \ + _DO(SIGINT) \ + _DO(SIGTSTP) \ + _DO(SIGSTOP) \ + _DO(SIGQUIT) \ + _DO(SIGHUP) \ + _DO(SIGTERM) \ + _DO(SIGCONT) +#endif typedef void (*el_signalhandler_t)(int); typedef el_signalhandler_t *el_signal_t; Modified: freeswitch/branches/greenlizard/libs/libedit/src/term.c ============================================================================== --- freeswitch/branches/greenlizard/libs/libedit/src/term.c (original) +++ freeswitch/branches/greenlizard/libs/libedit/src/term.c Tue Jun 5 12:03:00 2007 @@ -905,7 +905,9 @@ int lins, cols; (void) sigemptyset(&nset); +#ifdef SIGWINCH (void) sigaddset(&nset, SIGWINCH); +#endif (void) sigprocmask(SIG_BLOCK, &nset, &oset); area = buf; Modified: freeswitch/branches/greenlizard/libs/libedit/src/unvis.c ============================================================================== --- freeswitch/branches/greenlizard/libs/libedit/src/unvis.c (original) +++ freeswitch/branches/greenlizard/libs/libedit/src/unvis.c Tue Jun 5 12:03:00 2007 @@ -63,7 +63,7 @@ #define S_HEX1 7 /* hex digit */ #define S_HEX2 8 /* hex digit 2 */ -#define isoctal(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7') +#define isoctal(c) (((unsigned char)(c)) >= '0' && ((unsigned char)(c)) <= '7') #define xtod(c) (isdigit(c) ? (c - '0') : ((tolower(c) - 'a') + 10)) /* Modified: freeswitch/branches/greenlizard/libs/libedit/src/vi.c ============================================================================== --- freeswitch/branches/greenlizard/libs/libedit/src/vi.c (original) +++ freeswitch/branches/greenlizard/libs/libedit/src/vi.c Tue Jun 5 12:03:00 2007 @@ -915,14 +915,14 @@ * NB: posix implies that we should enter insert mode, however * this is against historical precedent... */ -#ifdef __weak_reference +#if defined(__weak_reference) && !defined(__FreeBSD__) extern char *get_alias_text(const char *) __weak_reference(get_alias_text); #endif protected el_action_t /*ARGSUSED*/ vi_alias(EditLine *el, int c) { -#ifdef __weak_reference +#if defined(__weak_reference) && !defined(__FreeBSD__) char alias_name[3]; char *alias_text; Modified: freeswitch/branches/greenlizard/libs/libedit/src/vis.c ============================================================================== --- freeswitch/branches/greenlizard/libs/libedit/src/vis.c (original) +++ freeswitch/branches/greenlizard/libs/libedit/src/vis.c Tue Jun 5 12:03:00 2007 @@ -106,7 +106,7 @@ #undef BELL #define BELL '\a' -#define isoctal(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7') +#define isoctal(c) (((unsigned char)(c)) >= '0' && ((unsigned char)(c)) <= '7') #define iswhite(c) (c == ' ' || c == '\t' || c == '\n') #define issafe(c) (c == '\b' || c == BELL || c == '\r') #define xtoa(c) "0123456789abcdef"[c] @@ -208,8 +208,8 @@ } \ if (isextra || ((c & 0177) == ' ') || (flag & VIS_OCTAL)) { \ *dst++ = '\\'; \ - *dst++ = (u_char)(((u_int32_t)(u_char)c >> 6) & 03) + '0'; \ - *dst++ = (u_char)(((u_int32_t)(u_char)c >> 3) & 07) + '0'; \ + *dst++ = (unsigned char)(((u_int32_t)(unsigned char)c >> 6) & 03) + '0'; \ + *dst++ = (unsigned char)(((u_int32_t)(unsigned char)c >> 3) & 07) + '0'; \ *dst++ = (c & 07) + '0'; \ } else { \ if ((flag & VIS_NOSLASH) == 0) *dst++ = '\\'; \

1 0

[commit] r5262 - freeswitch/trunk/scripts/socket/socket2me
by Freeswitch SVN 05 Jun '07

05 Jun '07

Author: anthm Date: Tue Jun 5 11:47:25 2007 New Revision: 5262 Modified: freeswitch/trunk/scripts/socket/socket2me/socket2me.c Log: leave me alone now Modified: freeswitch/trunk/scripts/socket/socket2me/socket2me.c ============================================================================== --- freeswitch/trunk/scripts/socket/socket2me/socket2me.c (original) +++ freeswitch/trunk/scripts/socket/socket2me/socket2me.c Tue Jun 5 11:47:25 2007 @@ -248,7 +248,7 @@ addr.sin_family = AF_INET; addr.sin_addr.s_addr = htonl(INADDR_ANY); - addr.sin_addr.s_addr = inet_addr(remote_ip); + /*addr.sin_addr.s_addr = inet_addr(remote_ip);*/ addr.sin_port = htons(remote_port); sendaddr.sin_family = AF_INET;

1 0

[commit] r5261 - freeswitch/trunk/src/mod/applications/mod_esf
by Freeswitch SVN 05 Jun '07

05 Jun '07

Author: mikej Date: Tue Jun 5 11:40:56 2007 New Revision: 5261 Modified: freeswitch/trunk/src/mod/applications/mod_esf/ (props changed) Log: svn:ignore props

1 0

[commit] r5260 - in freeswitch/trunk: scripts/socket/socket2me src/include
by Freeswitch SVN 05 Jun '07

05 Jun '07

Author: anthm Date: Tue Jun 5 11:39:56 2007 New Revision: 5260 Modified: freeswitch/trunk/scripts/socket/socket2me/socket2me.c freeswitch/trunk/src/include/switch_utils.h Log: small fix and new macro Modified: freeswitch/trunk/scripts/socket/socket2me/socket2me.c ============================================================================== --- freeswitch/trunk/scripts/socket/socket2me/socket2me.c (original) +++ freeswitch/trunk/scripts/socket/socket2me/socket2me.c Tue Jun 5 11:39:56 2007 @@ -248,7 +248,7 @@ addr.sin_family = AF_INET; addr.sin_addr.s_addr = htonl(INADDR_ANY); - sendaddr.sin_addr.s_addr = inet_addr(remote_ip); + addr.sin_addr.s_addr = inet_addr(remote_ip); addr.sin_port = htons(remote_port); sendaddr.sin_family = AF_INET; Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Tue Jun 5 11:39:56 2007 @@ -175,6 +175,7 @@ */ #define switch_copy_flags(dest, src, flags) (dest)->flags &= ~(flags); (dest)->flags |= ((src)->flags & (flags)) +#define switch_set_string(_dst, _src) switch_copy_string(_dst, _src, sizeof(_dst)) /*! \brief Free a pointer and set it to NULL unless it already is NULL

1 0

[commit] r5259 - freeswitch/branches/anthonyl/log2file-branch/conf
by Freeswitch SVN 05 Jun '07

05 Jun '07

Author: anthonyl Date: Mon Jun 4 23:05:14 2007 New Revision: 5259 Modified: freeswitch/branches/anthonyl/log2file-branch/conf/log2file.conf.xml Log: adding contents to log2file.conf.xml Modified: freeswitch/branches/anthonyl/log2file-branch/conf/log2file.conf.xml ============================================================================== --- freeswitch/branches/anthonyl/log2file-branch/conf/log2file.conf.xml (original) +++ freeswitch/branches/anthonyl/log2file-branch/conf/log2file.conf.xml Mon Jun 4 23:05:14 2007 @@ -0,0 +1,14 @@ +<configuration name="log2file.conf" description="File Logging"> + <settings> +  + <param name="logfile" value="/var/log/freeswitch.log"/> +  + <param name="rollover" value="12000"/> +  + <param name="level" value="debug,info,warning-alert"/> +  +  + <param name="format" value="${time} ${type} ${file} ${func} ${message}"/> +</settings> +</configuration> +

1 0

[commit] r5258 - freeswitch/branches/anthonyl/log2file-branch/conf
by Freeswitch SVN 05 Jun '07

05 Jun '07

Author: anthonyl Date: Mon Jun 4 20:05:16 2007 New Revision: 5258 Added: freeswitch/branches/anthonyl/log2file-branch/conf/log2file.conf.xml Log: adding a sample log2file.conf.xml Added: freeswitch/branches/anthonyl/log2file-branch/conf/log2file.conf.xml ==============================================================================

1 0

[commit] r5257 - in freeswitch/trunk/src: . include mod/applications/mod_dptools
by Freeswitch SVN 04 Jun '07

04 Jun '07

Author: mikej Date: Mon Jun 4 18:10:42 2007 New Revision: 5257 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr_async.c Log: merge patch from MODAPP-12, thanks Bret. Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Mon Jun 4 18:10:42 2007 @@ -25,7 +25,7 @@ * * Anthony Minessale II <anthmct(a)yahoo.com> * Neal Horman <neal at wanlink dot com> - * + * Bret McDanel <trixter AT 0xdecafbad dot com> * * switch_ivr.h -- IVR Library * @@ -208,11 +208,44 @@ */ SWITCH_DECLARE(switch_status_t) switch_ivr_stop_record_session(switch_core_session_t *session, char *file); +/*! + \brief Start looking for DTMF inband + \param session the session to start looking + \return SWITCH_STATUS_SUCCESS if all is well +*/ SWITCH_DECLARE(switch_status_t) switch_ivr_inband_dtmf_session(switch_core_session_t *session); + +/*! + \brief Stop looking for DTMF inband + \param session the session to stop looking + \return SWITCH_STATUS_SUCCESS if all is well +*/ SWITCH_DECLARE(switch_status_t) switch_ivr_stop_inband_dtmf_session(switch_core_session_t *session); + +/*! + \brief XXX DESCRIBE ME + \param session the session to act on + \return SWITCH_STATUS_SUCCESS if all is well - maybe more XXX FIXME +*/ SWITCH_DECLARE(void) switch_ivr_session_echo(switch_core_session_t *session); /*! + \brief Stop looking for FAX CNG + \param session the session to stop looking + \return SWITCH_STATUS_SUCCESS if all is well +*/ +SWITCH_DECLARE(switch_status_t) switch_ivr_stop_fax_detect_session(switch_core_session_t *session); + +/*! + \brief Start looking for FAX CNG + \param session the session to start looking + \return SWITCH_STATUS_SUCCESS if all is well +*/ +SWITCH_DECLARE(switch_status_t) switch_ivr_fax_detect_session(switch_core_session_t *session); + + + +/*! \brief play a file from the disk to the session \param session the session to play the file too \param fh file handle to use (NULL for builtin one) Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Jun 4 18:10:42 2007 @@ -24,6 +24,7 @@ * Contributor(s): * * Anthony Minessale II <anthmct(a)yahoo.com> + * Bret McDanel <trixter AT 0xdecafbad dot com> * * switch_types.h -- Data Types * @@ -832,6 +833,7 @@ SWITCH_EVENT_CODEC - Codec Change SWITCH_EVENT_BACKGROUND_JOB - Background Job SWITCH_EVENT_DETECTED_SPEECH - Detected Speech + SWITCH_EVENT_DETECTED_FAX - Detected Fax CNG Tone SWITCH_EVENT_PRIVATE_COMMAND - A private command event SWITCH_EVENT_HEARTBEAT - Machine is alive SWITCH_EVENT_TRAP - Error Trap @@ -881,6 +883,7 @@ SWITCH_EVENT_CODEC, SWITCH_EVENT_BACKGROUND_JOB, SWITCH_EVENT_DETECTED_SPEECH, + SWITCH_EVENT_DETECTED_FAX, SWITCH_EVENT_PRIVATE_COMMAND, SWITCH_EVENT_HEARTBEAT, SWITCH_EVENT_TRAP, Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Mon Jun 4 18:10:42 2007 @@ -27,6 +27,7 @@ * Ken Rice, Asteria Solutions Group, Inc <ken(a)asteriasgi.com> * Michael Murdock <mike at mmurdock dot org> * Neal Horman <neal at wanlink dot com> + * Bret McDanel <trixter AT 0xdecafbad dot com> * * mod_dptools.c -- Raw Audio File Streaming Application Module * @@ -651,25 +652,28 @@ static void dtm_session_function(switch_core_session_t *session, char *data) { - switch_channel_t *channel; - - channel = switch_core_session_get_channel(session); - assert(channel != NULL); - switch_ivr_inband_dtmf_session(session); } static void stop_dtmf_session_function(switch_core_session_t *session, char *data) { - switch_channel_t *channel; + switch_ivr_stop_inband_dtmf_session(session); +} - channel = switch_core_session_get_channel(session); - assert(channel != NULL); +static void fax_detect_session_function(switch_core_session_t *session, char *data) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Enabling fax detection\n"); + switch_ivr_fax_detect_session(session); +} - switch_ivr_stop_inband_dtmf_session(session); +static void stop_fax_detect_session_function(switch_core_session_t *session, char *data) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Disabling fax detection\n"); + switch_ivr_stop_fax_detect_session(session); } + static const switch_api_interface_t strepoch_api_interface = { /*.interface_name */ "strepoch", /*.desc */ "Convert a date string into epoch time", @@ -702,6 +706,27 @@ /*.next */ &dptools_api_interface }; + +static const switch_application_interface_t fax_detect_application_interface = { + /*.interface_name */ "fax_detect", + /*.application_function */ fax_detect_session_function, + /* long_desc */ "Detect fax send tone", + /* short_desc */ "Detect faxes", + /* syntax */ "", + /* flags */ SAF_NONE, + /*.next */ NULL +}; + +static const switch_application_interface_t stop_fax_detect_application_interface = { + /*.interface_name */ "stop_fax_detect", + /*.application_function */ stop_fax_detect_session_function, + /* long_desc */ "Stop detecting fax send tones", + /* short_desc */ "stop detecting faxes", + /* syntax */ "", + /* flags */ SAF_NONE, + /* next */ &fax_detect_application_interface +}; + static const switch_application_interface_t dtmf_application_interface = { /*.interface_name */ "start_dtmf", /*.application_function */ dtm_session_function, @@ -709,7 +734,7 @@ /* short_desc */ "Detect dtmf", /* syntax */ "", /* flags */ SAF_NONE, - NULL + /* next */ &stop_fax_detect_application_interface }; static const switch_application_interface_t stop_dtmf_application_interface = { @@ -717,7 +742,7 @@ /*.application_function */ stop_dtmf_session_function, /* long_desc */ "Stop detecting inband dtmf.", /* short_desc */ "stop inband dtmf.", - /* syntax */ "<path>", + /* syntax */ "", /* flags */ SAF_NONE, &dtmf_application_interface }; Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Mon Jun 4 18:10:42 2007 @@ -25,6 +25,7 @@ * * Anthony Minessale II <anthmct(a)yahoo.com> * Michael Jerris <mike(a)jerris.com> + * Bret McDanel <bret AT 0xdecafbad dot com> * * switch_ivr_async.c -- IVR Library (async operations) * @@ -324,6 +325,122 @@ return SWITCH_STATUS_SUCCESS; } + +typedef struct { + switch_core_session_t *session; + teletone_multi_tone_t mt; +} switch_fax_detect_t; + +static switch_bool_t fax_detect_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) +{ + switch_fax_detect_t *pvt = (switch_fax_detect_t *) user_data; + uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE]; + switch_frame_t frame = { 0 }; + // switch_channel_t *channel = switch_core_session_get_channel(pvt->session); + + // assert(channel != NULL); + frame.data = data; + frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE; + + switch (type) { + case SWITCH_ABC_TYPE_INIT: + break; + case SWITCH_ABC_TYPE_CLOSE: + break; + case SWITCH_ABC_TYPE_READ: + if (switch_core_media_bug_read(bug, &frame) == SWITCH_STATUS_SUCCESS) { + if(teletone_multi_tone_detect(&pvt->mt, frame.data, frame.samples)) { + switch_event_t *event; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FAX CNG DETECTED\n"); + + if (switch_event_create(&event, SWITCH_EVENT_DETECTED_FAX) == SWITCH_STATUS_SUCCESS) { + switch_event_t *dup; + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "fax", "detected"); + + if (switch_event_dup(&dup, event) == SWITCH_STATUS_SUCCESS) { + switch_event_fire(&dup); + } + + + if (switch_core_session_queue_event(pvt->session, &event) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Event queue failed!\n"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "delivery-failure", "true"); + switch_event_fire(&event); + } + } + } + } + break; + case SWITCH_ABC_TYPE_WRITE: + default: + break; + } + return SWITCH_TRUE; +} + +SWITCH_DECLARE(switch_status_t) switch_ivr_stop_fax_detect_session(switch_core_session_t *session) +{ + switch_media_bug_t *bug; + switch_channel_t *channel = switch_core_session_get_channel(session); + + assert(channel != NULL); + if ((bug = switch_channel_get_private(channel, "fax"))) { + switch_channel_set_private(channel, "fax", NULL); + switch_core_media_bug_remove(session, &bug); + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; + +} + +SWITCH_DECLARE(switch_status_t) switch_ivr_fax_detect_session(switch_core_session_t *session) +{ + switch_channel_t *channel; + switch_codec_t *read_codec; + switch_media_bug_t *bug; + switch_status_t status; + switch_fax_detect_t *pvt; + teletone_tone_map_t *map; + int i; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + + read_codec = switch_core_session_get_read_codec(session); + assert(read_codec != NULL); + + if (!(pvt = switch_core_session_alloc(session, sizeof(*pvt)))) { + return SWITCH_STATUS_MEMERR; + } + + if (!(map = switch_core_session_alloc(session, sizeof(*map)))) { + return SWITCH_STATUS_MEMERR; + } + + for(i=0;i<TELETONE_MAX_TONES;i++) { + map->freqs[i] = 1100.0; + } + pvt->mt.sample_rate = read_codec->implementation->samples_per_second; + pvt->session = session; + + teletone_multi_tone_init(&pvt->mt, map); + + switch_channel_answer(channel); + + if ((status = switch_core_media_bug_add(session, fax_detect_callback, pvt, 0, SMBF_READ_STREAM, &bug)) != SWITCH_STATUS_SUCCESS) { + return status; + } + + switch_channel_set_private(channel, "fax", bug); + + return SWITCH_STATUS_SUCCESS; +} + + struct speech_thread_handle { switch_core_session_t *session; switch_asr_handle_t *ah;

1 0

[commit] r5256 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 04 Jun '07

04 Jun '07

Author: mikej Date: Mon Jun 4 13:12:43 2007 New Revision: 5256 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: add start_dtmf and stop_dtmf apps, inspired by trixter. Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Mon Jun 4 13:12:43 2007 @@ -649,6 +649,27 @@ } +static void dtm_session_function(switch_core_session_t *session, char *data) +{ + switch_channel_t *channel; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_ivr_inband_dtmf_session(session); +} + + +static void stop_dtmf_session_function(switch_core_session_t *session, char *data) +{ + switch_channel_t *channel; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_ivr_stop_inband_dtmf_session(session); +} + static const switch_api_interface_t strepoch_api_interface = { /*.interface_name */ "strepoch", /*.desc */ "Convert a date string into epoch time", @@ -681,6 +702,25 @@ /*.next */ &dptools_api_interface }; +static const switch_application_interface_t dtmf_application_interface = { + /*.interface_name */ "start_dtmf", + /*.application_function */ dtm_session_function, + /* long_desc */ "Detect inband dtmf on the session", + /* short_desc */ "Detect dtmf", + /* syntax */ "", + /* flags */ SAF_NONE, + NULL +}; + +static const switch_application_interface_t stop_dtmf_application_interface = { + /*.interface_name */ "stop_dtmf", + /*.application_function */ stop_dtmf_session_function, + /* long_desc */ "Stop detecting inband dtmf.", + /* short_desc */ "stop inband dtmf.", + /* syntax */ "<path>", + /* flags */ SAF_NONE, + &dtmf_application_interface +}; static const switch_application_interface_t exe_application_interface = { /*.interface_name */ "execute_extension", @@ -689,7 +729,7 @@ /*.short_desc */ "Execute an extension", /*.syntax */ "<extension> <dialplan> <context>", /* flags */ SAF_SUPPORT_NOMEDIA, - /*.next */ + /*.next */ &stop_dtmf_application_interface }; static const switch_application_interface_t sched_transfer_application_interface = {

1 0