diff --git a/bootstrap.sh b/bootstrap.sh index 17c52f386d..e0992e079b 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -389,18 +389,19 @@ bootstrap_fs() { bootstrap_libs_pre() { case "$1" in - ldns) - # This file shouldn't even be in the tree as it's autogenerated - # during bootstrap, but some people report it breaks the build - # if it's not there. Let's prevent it from getting accidentally - # updated. - (cd $BASEDIR/libs/ldns && cp -a install-sh install-sh~) ;; + *) return 0;; esac } bootstrap_libs_post() { case "$1" in - ldns) (cd $BASEDIR/libs/ldns && mv install-sh~ install-sh) ;; + ldns) + cd $BASEDIR/libs/ldns + if test ! -x install-sh; then + ex automake --add-missing --copy + ex rm -rf autom4te*.cache + fi + ;; esac } diff --git a/configure.in b/configure.in index 3df878551d..4228883fd3 100644 --- a/configure.in +++ b/configure.in @@ -398,11 +398,13 @@ AC_ARG_ENABLE(timerfd-wrapper, AM_CONDITIONAL([ENABLE_TIMERFD_WRAPPER],[test "x$enable_timer_fd_wrapper" != "xno"]) -AC_CHECK_LIB(z, inflateReset, have_libz=yes, have_libz=no) +AC_CHECK_LIB(z, inflateReset, have_libz=yes, AC_MSG_ERROR([no usable zlib; please install zlib devel package or equivalent])) if test "x$have_libz" = "xyes" ; then APR_ADDTO(SWITCH_AM_LDFLAGS, -lz) fi +AC_CHECK_LIB(jpeg, jpeg_std_error,, AC_MSG_ERROR([no usable libjpeg; please install libjpeg devel package or equivalent])) + AC_CHECK_LIB(resolv, res_init, have_libresolv=yes, have_libresolv=no) if test "x$have_libresolv" = "xyes" ; then APR_ADDTO(SWITCH_AM_LDFLAGS, -lresolv) diff --git a/libs/.gitignore b/libs/.gitignore index e0fed1112a..e39b1f4bf1 100644 --- a/libs/.gitignore +++ b/libs/.gitignore @@ -887,7 +887,6 @@ missing !/ldns/drill/install-sh !/ldns/examples/config.h.in !/ldns/examples/configure -!/ldns/install-sh !/ldns/ldns/config.h.in !/libdingaling/config.guess !/libdingaling/config.sub diff --git a/libs/esl/fs_cli.c b/libs/esl/fs_cli.c index 875b359ec3..408c946d29 100644 --- a/libs/esl/fs_cli.c +++ b/libs/esl/fs_cli.c @@ -57,6 +57,7 @@ typedef struct { const char *console_fnkeys[12]; char loglevel[128]; int quiet; + int batch_mode; char prompt_color[12]; char input_text_color[12]; char output_text_color[12]; @@ -108,6 +109,7 @@ static void sleep_s(int secs) { _sleep_ns(secs, 0); } static int process_command(esl_handle_t *handle, const char *cmd); static void clear_cli(void) { + if (global_profile->batch_mode) return; putchar('\r'); printf("\033[%dC", bare_prompt_str_len); printf("\033[K"); @@ -401,7 +403,9 @@ static BOOL console_readConsole(HANDLE conIn, char *buf, int len, int *pRed, int { DWORD recordIndex, bufferIndex, toRead, red; PINPUT_RECORD pInput; - GetNumberOfConsoleInputEvents(conIn, &toRead); + if (GetNumberOfConsoleInputEvents(conIn, &toRead) == 0) { + return(FALSE); + } if (len < (int)toRead) { toRead = len; } @@ -548,6 +552,7 @@ static const char *usage_str = " -r, --retry Retry connection on failure\n" " -R, --reconnect Reconnect if disconnected\n" " -d, --debug=level Debug Level (0 - 7)\n" + " -b, --batchmode Batch mode\n" " -t, --timeout Timeout for API commands (in miliseconds)\n\n"; static int usage(char *name){ @@ -597,6 +602,7 @@ static int write_char(int c) { #ifdef WIN32 static void clear_line(void) { + if (global_profile->batch_mode) return; putchar('\r'); printf("\033[K"); fflush(stdout); @@ -605,6 +611,7 @@ static void clear_line(void) #else static void clear_line(void) { + if (global_profile->batch_mode) return; if (!(write_char('\r'))) goto done; if (!(write_str("\033[K"))) goto done; done: @@ -617,6 +624,7 @@ static void redisplay(void) #ifndef WIN32 const LineInfo *lf = el_line(el); const char *c = lf->buffer; + if (global_profile->batch_mode) return; if (!(write_str(prompt_str))) goto done; while (c < lf->lastchar && *c) { if (!(write_char(*c))) goto done; @@ -642,7 +650,9 @@ static int output_printf(const char *fmt, ...) int r; va_start(ap, fmt); #ifndef WIN32 - printf("%s", output_text_color); + if (!(global_profile->batch_mode)) { + printf("%s", output_text_color); + } #endif r = vprintf(fmt, ap); va_end(ap); @@ -680,15 +690,23 @@ static void *msg_thread_run(esl_thread_t *me, void *obj) #ifndef WIN32 if (aok) { if (feature_level) clear_line(); - printf("%s%s", colors[level], handle->last_event->body); - if (!feature_level) printf("%s", ESL_SEQ_DEFAULT_COLOR); + if(!(global_profile->batch_mode)) { + printf("%s%s", colors[level], handle->last_event->body); + if (!feature_level) printf("%s", ESL_SEQ_DEFAULT_COLOR); + } else { + printf("%s", handle->last_event->body); + } if (feature_level) redisplay(); } #else if (aok) { - SetConsoleTextAttribute(hStdout, colors[level]); + if(!(global_profile->batch_mode)) { + SetConsoleTextAttribute(hStdout, colors[level]); + } WriteFile(hStdout, handle->last_event->body, len, &outbytes, NULL); - SetConsoleTextAttribute(hStdout, wOldColorAttrs); + if(!(global_profile->batch_mode)) { + SetConsoleTextAttribute(hStdout, wOldColorAttrs); + } } #endif } @@ -831,20 +849,27 @@ static int get_profile(const char *name, cli_profile_t **profile) return -1; } -#ifndef HAVE_EDITLINE static char command_buf[CMD_BUFLEN+1] = ""; static const char *basic_gets(int *cnt) { -#ifndef _MSC_VER int x = 0; +#ifdef _MSC_VER + int read, key; + char keys[CMD_BUFLEN]; + HANDLE stdinHandle; + if (global_profile->batch_mode) { +#endif printf("%s", prompt_str); + if (global_profile->batch_mode) fflush(stdout); memset(&command_buf, 0, sizeof(command_buf)); for (x = 0; x < (sizeof(command_buf) - 1); x++) { int c = getchar(); if (c < 0) { - int y = read(fileno(stdin), command_buf, sizeof(command_buf) - 1); - command_buf[y - 1] = '\0'; + if (fgets(command_buf, sizeof(command_buf) - 1, stdin) != command_buf) { + break; + } + command_buf[strlen(command_buf)-1] = '\0'; /* remove endline */ break; } command_buf[x] = (char) c; @@ -854,27 +879,28 @@ static const char *basic_gets(int *cnt) } } *cnt = x; -#else - int read, key; - char keys[CMD_BUFLEN]; - HANDLE stdinHandle = GetStdHandle(STD_INPUT_HANDLE); - console_bufferInput (0, 0, prompt_str, PROMPT_OP); - printf("%s", prompt_str); - *cnt = 0; - memset(&command_buf, 0, sizeof(command_buf)); - while (!*cnt) { - if (console_readConsole(stdinHandle, keys, (int)sizeof(keys), &read, &key)) { - *cnt = console_bufferInput(keys, read, command_buf, key); - if (!strcmp(command_buf, "Empty")) { - command_buf[0] = 0; +#ifdef _MSC_VER + } else { + stdinHandle = GetStdHandle(STD_INPUT_HANDLE); + console_bufferInput (0, 0, prompt_str, PROMPT_OP); + printf("%s", prompt_str); + if (global_profile->batch_mode) fflush(stdout); + *cnt = 0; + memset(&command_buf, 0, sizeof(command_buf)); + while (!*cnt) { + if (console_readConsole(stdinHandle, keys, (int)sizeof(keys), &read, &key)) { + *cnt = console_bufferInput(keys, read, command_buf, key); + if (global_profile->batch_mode) fflush(stdout); + if (!strcmp(command_buf, "Empty")) { + command_buf[0] = 0; + } } + sleep_ms(20); } - sleep_ms(20); } #endif return command_buf; } -#endif static const char *banner = " _____ ____ ____ _ ___ \n" @@ -1077,6 +1103,8 @@ static void read_config(const char *dft_cfile, const char *cfile) { if (pt > 0) { profiles[pcount-1].port = (esl_port_t)pt; } + } else if (!strcasecmp(var, "batchmode")) { + profiles[pcount-1].batch_mode = esl_true(val); } else if (!strcasecmp(var, "debug")) { int dt = atoi(val); if (dt > -1 && dt < 8){ @@ -1110,6 +1138,7 @@ static void clear_el_buffer(void) { #ifdef HAVE_EDITLINE const LineInfo *lf = el_line(el); int len = (int)(lf->lastchar - lf->buffer); + if (global_profile->batch_mode) return; el_deletestr(el, len); memset((char*)lf->buffer, 0, len); #endif @@ -1144,6 +1173,7 @@ int main(int argc, char *argv[]) {"execute", 1, 0, 'x'}, {"loglevel", 1, 0, 'l'}, {"quiet", 0, 0, 'q'}, + {"batchmode", 0, 0, 'b'}, {"retry", 0, 0, 'r'}, {"interrupt", 0, 0, 'i'}, {"reconnect", 0, 0, 'R'}, @@ -1164,6 +1194,7 @@ int main(int argc, char *argv[]) char argv_command[1024] = ""; char argv_loglevel[128] = ""; int argv_quiet = 0; + int argv_batch = 0; int loops = 2, reconnect = 0, timeout = 0; @@ -1195,7 +1226,7 @@ int main(int argc, char *argv[]) esl_global_set_default_logger(6); /* default debug level to 6 (info) */ for(;;) { int option_index = 0; - opt = getopt_long(argc, argv, "H:U:P:S:u:p:d:x:l:t:qrRhi?", options, &option_index); + opt = getopt_long(argc, argv, "H:U:P:S:u:p:d:x:l:t:qrRhib?", options, &option_index); if (opt == -1) break; switch (opt) { case 'H': @@ -1238,6 +1269,9 @@ int main(int argc, char *argv[]) case 'q': argv_quiet = 1; break; + case 'b': + argv_batch = 1; + break; case 'i': allow_ctl_c = 1; break; @@ -1288,6 +1322,10 @@ int main(int argc, char *argv[]) if (argv_pass) { esl_set_string(profile->pass, temp_pass); } + if (argv_batch || profile->batch_mode) { + profile->batch_mode = 1; + feature_level=0; + } if (*argv_loglevel) { esl_set_string(profile->loglevel, argv_loglevel); profile->quiet = 0; @@ -1428,15 +1466,22 @@ int main(int argc, char *argv[]) snprintf(cmd_str, sizeof(cmd_str), "log %s\n\n", profile->loglevel); esl_send_recv(&handle, cmd_str); } + if (global_profile->batch_mode) { + setvbuf(stdout, (char*)NULL, _IONBF, 0); + } print_banner(stdout); esl_log(ESL_LOG_INFO, "FS CLI Ready.\nenter /help for a list of commands.\n"); output_printf("%s\n", handle.last_sr_reply); while (running > 0) { int r; #ifdef HAVE_EDITLINE - line = el_gets(el, &count); -#else + if (!(global_profile->batch_mode)) { + line = el_gets(el, &count); + } else { +#endif line = basic_gets(&count); +#ifdef HAVE_EDITLINE + } #endif if (count > 1 && !esl_strlen_zero(line)) { char *p, *cmd = strdup(line); diff --git a/libs/ldns/install-sh b/libs/ldns/install-sh deleted file mode 100755 index a9244eb078..0000000000 --- a/libs/ldns/install-sh +++ /dev/null @@ -1,527 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2011-01-19.21; # UTC - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# 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 -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. - -nl=' -' -IFS=" "" $nl" - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi - -# Put in absolute file names if you don't have them in your path; -# or use environment vars. - -chgrpprog=${CHGRPPROG-chgrp} -chmodprog=${CHMODPROG-chmod} -chownprog=${CHOWNPROG-chown} -cmpprog=${CMPPROG-cmp} -cpprog=${CPPROG-cp} -mkdirprog=${MKDIRPROG-mkdir} -mvprog=${MVPROG-mv} -rmprog=${RMPROG-rm} -stripprog=${STRIPPROG-strip} - -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - -posix_mkdir= - -# Desired mode of installed file. -mode=0755 - -chgrpcmd= -chmodcmd=$chmodprog -chowncmd= -mvcmd=$mvprog -rmcmd="$rmprog -f" -stripcmd= - -src= -dst= -dir_arg= -dst_arg= - -copy_on_change=false -no_target_directory= - -usage="\ -Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: - --help display this help and exit. - --version display version info and exit. - - -c (ignored) - -C install only if different (preserve the last data modification time) - -d create directories instead of installing files. - -g GROUP $chgrpprog installed files to GROUP. - -m MODE $chmodprog installed files to MODE. - -o USER $chownprog installed files to USER. - -s $stripprog installed files. - -t DIRECTORY install into DIRECTORY. - -T report an error if DSTFILE is a directory. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG - RMPROG STRIPPROG -" - -while test $# -ne 0; do - case $1 in - -c) ;; - - -C) copy_on_change=true;; - - -d) dir_arg=true;; - - -g) chgrpcmd="$chgrpprog $2" - shift;; - - --help) echo "$usage"; exit $?;; - - -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; - - -o) chowncmd="$chownprog $2" - shift;; - - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 - # Protect names problematic for `test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; - - -T) no_target_directory=true;; - - --version) echo "$0 $scriptversion"; exit $?;; - - --) shift - break;; - - -*) echo "$0: invalid option: $1" >&2 - exit 1;; - - *) break;; - esac - shift -done - -if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then - # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dst_arg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dst_arg" - shift # fnord - fi - shift # arg - dst_arg=$arg - # Protect names problematic for `test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - done -fi - -if test $# -eq 0; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call `install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -if test -z "$dir_arg"; then - do_exit='(exit $ret); exit $ret' - trap "ret=129; $do_exit" 1 - trap "ret=130; $do_exit" 2 - trap "ret=141; $do_exit" 13 - trap "ret=143; $do_exit" 15 - - # Set umask so as not to create temps with too-generous modes. - # However, 'strip' requires both read and write access to temps. - case $mode in - # Optimize common cases. - *644) cp_umask=133;; - *755) cp_umask=22;; - - *[0-7]) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw='% 200' - fi - cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; - *) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw=,u+rw - fi - cp_umask=$mode$u_plus_rw;; - esac -fi - -for src -do - # Protect names problematic for `test' and other utilities. - case $src in - -* | [=\(\)!]) src=./$src;; - esac - - if test -n "$dir_arg"; then - dst=$src - dstdir=$dst - test -d "$dstdir" - dstdir_status=$? - else - - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dst_arg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - dst=$dst_arg - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 - fi - dstdir=$dst - dst=$dstdir/`basename "$src"` - dstdir_status=0 - else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - - test -d "$dstdir" - dstdir_status=$? - fi - fi - - obsolete_mkdir_used=false - - if test $dstdir_status != 0; then - case $posix_mkdir in - '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; - esac - - if - $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" - ) - then : - else - - # The umask is ridiculous, or mkdir does not conform to POSIX, - # or it failed possibly due to a race condition. Create the - # directory the slow way, step by step, checking for races as we go. - - case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; - esac - - eval "$initialize_posix_glob" - - oIFS=$IFS - IFS=/ - $posix_glob set -f - set fnord $dstdir - shift - $posix_glob set +f - IFS=$oIFS - - prefixes= - - for d - do - test X"$d" = X && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ - done - - if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true - fi - fi - fi - - if test -n "$dir_arg"; then - { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && - { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || - test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 - else - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - - # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && - { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && - { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # If -C, don't bother to copy if it wouldn't change the file. - if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && - set X $old && old=:$2:$4:$5:$6 && - set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - - test "$old" = "$new" && - $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 - then - rm -f "$dsttmp" - else - # Rename the file to the real destination. - $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || - - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - fi || exit 1 - - trap '' 0 - fi -done - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/libs/libzrtp/projects/gnu/bootstrap.sh b/libs/libzrtp/projects/gnu/bootstrap.sh index abc867ebf8..df9bb21e30 100755 --- a/libs/libzrtp/projects/gnu/bootstrap.sh +++ b/libs/libzrtp/projects/gnu/bootstrap.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh reconf () { aclocal diff --git a/src/mod/applications/mod_avmd/mod_avmd.c b/src/mod/applications/mod_avmd/mod_avmd.c index d0c9f6e419..58683b4587 100644 --- a/src/mod/applications/mod_avmd/mod_avmd.c +++ b/src/mod/applications/mod_avmd/mod_avmd.c @@ -59,13 +59,17 @@ #define TO_HZ(r, f) (((r) * (f)) / (2.0 * M_PI)) /*! Minimum beep frequency in Hertz */ #define MIN_FREQUENCY (300.0) +#define MIN_FREQUENCY_R(r) ((2.0 * M_PI * MIN_FREQUENCY) / (r)) /*! Maximum beep frequency in Hertz */ -#define MAX_FREQUENCY (1500.0) +#define MAX_FREQUENCY (2500.0) +#define MAX_FREQUENCY_R(r) ((2.0 * M_PI * MAX_FREQUENCY) / (r)) +/* decrease this value to eliminate false positives */ +#define VARIANCE_THRESHOLD (0.001) #include "amplitude.h" #include "buffer.h" #include "desa2.h" -#include "goertzel.h" +//#include "goertzel.h" #include "psi.h" #include "sma_buf.h" #include "options.h" @@ -111,7 +115,9 @@ typedef struct { uint32_t rate; circ_buffer_t b; sma_buffer_t sma_b; + sma_buffer_t sqa_b; size_t pos; + double f; /* freq_table_t ft; */ avmd_state_t state; } avmd_session_t; @@ -134,6 +140,7 @@ static void init_avmd_session_data(avmd_session_t *avmd_session, switch_core_se avmd_session->session = fs_session; avmd_session->pos = 0; + avmd_session->f = 0.0; avmd_session->state.last_beep = 0; avmd_session->state.beep_state = BEEP_NOTDETECTED; @@ -142,6 +149,12 @@ static void init_avmd_session_data(avmd_session_t *avmd_session, switch_core_se BEEP_LEN(avmd_session->rate) / SINE_LEN(avmd_session->rate), fs_session ); + + INIT_SMA_BUFFER( + &avmd_session->sqa_b, + BEEP_LEN(avmd_session->rate) / SINE_LEN(avmd_session->rate), + fs_session + ); } @@ -474,17 +487,18 @@ static void avmd_process(avmd_session_t *session, switch_frame_t *frame) circ_buffer_t *b; size_t pos; double f; - double a; - double error = 0.0; - double success = 0.0; - double amp = 0.0; - double s_rate; + double v; +// double error = 0.0; +// double success = 0.0; +// double amp = 0.0; +// double s_rate; // double e_rate; - double avg_a; +// double avg_a; double sine_len; uint32_t sine_len_i; - int valid; - + uint32_t beep_len_i; +// int valid; + b = &session->b; /*! If beep has already been detected skip the CPU heavy stuff */ @@ -495,56 +509,38 @@ static void avmd_process(avmd_session_t *session, switch_frame_t *frame) /*! Precompute values used heavily in the inner loop */ sine_len_i = SINE_LEN(session->rate); sine_len = (double)sine_len_i; - + beep_len_i = BEEP_LEN(session->rate); channel = switch_core_session_get_channel(session->session); /*! Insert frame of 16 bit samples into buffer */ INSERT_INT16_FRAME(b, (int16_t *)(frame->data), frame->samples); + //switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session->session), SWITCH_LOG_INFO, "<<< AVMD sine_len_i=%d >>>\n", sine_len_i); + /*! INNER LOOP -- OPTIMIZATION TARGET */ - for(pos = GET_BACKLOG_POS(b); pos != (GET_CURRENT_POS(b) - P); pos++){ + for(pos = session->pos; pos < (GET_CURRENT_POS(b) - P); pos++){ + if ((pos % sine_len_i) == 0) { + /*! Get a desa2 frequency estimate every sine len */ + f = desa2(b, pos); - /*! Get a desa2 frequency estimate in Hertz */ - f = TO_HZ(session->rate, desa2(b, pos)); + if(f < MIN_FREQUENCY_R(session->rate) || f > MAX_FREQUENCY_R(session->rate)) { + v = 99999.0; + RESET_SMA_BUFFER(&session->sma_b); + RESET_SMA_BUFFER(&session->sqa_b); + } else { + APPEND_SMA_VAL(&session->sma_b, f); + APPEND_SMA_VAL(&session->sqa_b, f * f); + + /* calculate variance */ + v = session->sqa_b.sma - (session->sma_b.sma * session->sma_b.sma); - /*! Don't caculate amplitude if frequency is not within range */ - if(f < MIN_FREQUENCY || f > MAX_FREQUENCY) { - a = 0.0; - error += 1.0; - } else { - a = amplitude(b, pos, f); - success += 1.0; - if(!ISNAN(a)){ - amp += a; - } - } - - /*! Every once in a while we evaluate the desa2 and amplitude results */ - if(((pos + 1) % sine_len_i) == 0){ - s_rate = success / (error + success); -// e_rate = error / (error + success); - avg_a = amp / sine_len; + switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session->session), SWITCH_LOG_INFO, "<<< AVMD v=%f f=%f %fHz sma=%f sqa=%f >>>\n", v, f, TO_HZ(session->rate, f), session->sma_b.sma, session->sqa_b.sma); + } - /*! Results out of these ranges are considered invalid */ - valid = 0; - if( s_rate > 0.60 && avg_a > 0.50) valid = 1; - else if(s_rate > 0.65 && avg_a > 0.45) valid = 1; - else if(s_rate > 0.70 && avg_a > 0.40) valid = 1; - else if(s_rate > 0.80 && avg_a > 0.30) valid = 1; - else if(s_rate > 0.95 && avg_a > 0.05) valid = 1; - else if(s_rate >= 0.99 && avg_a > 0.04) valid = 1; - else if(s_rate == 1.00 && avg_a > 0.02) valid = 1; + /*! If variance is less than threshold then we have detection */ + if(v < VARIANCE_THRESHOLD){ - if(valid) { - APPEND_SMA_VAL(&session->sma_b, s_rate * avg_a); - } - else { - APPEND_SMA_VAL(&session->sma_b, 0.0 ); - } - - /*! If sma is higher then 0 we have some kind of detection (increase this value to eliminate false positives ex: 0.01) */ - if(session->sma_b.sma > 0.00){ /*! Throw an event to FreeSWITCH */ status = switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, AVMD_EVENT_BEEP); if(status != SWITCH_STATUS_SUCCESS) { @@ -565,16 +561,18 @@ static void avmd_process(avmd_session_t *session, switch_frame_t *frame) switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session->session), SWITCH_LOG_INFO, "<<< AVMD - Beep Detected >>>\n"); switch_channel_set_variable(channel, "avmd_detect", "TRUE"); RESET_SMA_BUFFER(&session->sma_b); + RESET_SMA_BUFFER(&session->sqa_b); session->state.beep_state = BEEP_DETECTED; return; } - amp = 0.0; - success = 0.0; - error = 0.0; + //amp = 0.0; + //success = 0.0; + //error = 0.0; } } + session->pos = pos; } /* For Emacs: diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index e92971ab80..30c08e9944 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -83,7 +83,7 @@ static int EC = 0; /* the maximum value for the IIR score [keeps loud & longwinded people from getting overweighted] */ #define SCORE_MAX_IIR 25000 /* the minimum score for which you can be considered to be loud enough to now have the floor */ -#define SCORE_IIR_SPEAKING_MAX 3000 +#define SCORE_IIR_SPEAKING_MAX 300 /* the threshold below which you cede the floor to someone loud (see above value). */ #define SCORE_IIR_SPEAKING_MIN 100 diff --git a/src/mod/applications/mod_httapi/mod_httapi.c b/src/mod/applications/mod_httapi/mod_httapi.c index 2c93cf02bd..3db9c3fb04 100644 --- a/src/mod/applications/mod_httapi/mod_httapi.c +++ b/src/mod/applications/mod_httapi/mod_httapi.c @@ -1324,7 +1324,7 @@ static void cleanup_attachments(client_t *client) for (hp = client->params->headers; hp; hp = hp->next) { if (!strncasecmp(hp->name, "attach_file:", 12)) { - if (switch_file_exists(hp->value, client->pool)) { + if (switch_file_exists(hp->value, client->pool) == SWITCH_STATUS_SUCCESS) { printf("DELETE %s\n", hp->value); unlink(hp->value); } diff --git a/src/mod/applications/mod_voicemail/mod_voicemail.c b/src/mod/applications/mod_voicemail/mod_voicemail.c index 55a25c1f2d..968a9d57f7 100644 --- a/src/mod/applications/mod_voicemail/mod_voicemail.c +++ b/src/mod/applications/mod_voicemail/mod_voicemail.c @@ -2583,8 +2583,6 @@ static switch_status_t deliver_vm(vm_profile_t *profile, switch_status_t ret = SWITCH_STATUS_SUCCESS; char *convert_cmd = profile->convert_cmd; char *convert_ext = profile->convert_ext; - int del_file = 0; - if (!params) { switch_event_create(&local_event, SWITCH_EVENT_REQUEST_PARAMS); @@ -2901,10 +2899,6 @@ static switch_status_t deliver_vm(vm_profile_t *profile, switch_safe_free(headers); } } - - if (!insert_db) { - del_file = 1; - } } if (session) { @@ -2926,7 +2920,7 @@ static switch_status_t deliver_vm(vm_profile_t *profile, failed: - if (del_file && file_path && switch_file_exists(file_path, pool)) { + if (!insert_db && file_path && switch_file_exists(file_path, pool) == SWITCH_STATUS_SUCCESS) { if (unlink(file_path) != 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to delete file [%s]\n", file_path); } diff --git a/src/mod/endpoints/mod_alsa/mod_alsa.c b/src/mod/endpoints/mod_alsa/mod_alsa.c index 40c1362f3d..cadd560de4 100644 --- a/src/mod/endpoints/mod_alsa/mod_alsa.c +++ b/src/mod/endpoints/mod_alsa/mod_alsa.c @@ -748,14 +748,6 @@ static switch_io_routines_t channel_io_routines = { /*.receive_message */ channel_receive_message }; -static switch_endpoint_interface_t channel_endpoint_interface = { - /*.interface_name */ "alsa", - /*.io_routines */ &channel_io_routines, - /*.event_handlers */ &channel_event_handlers, - /*.private */ NULL, - /*.next */ NULL -}; - /* Make sure when you have 2 sessions in the same scope that you pass the appropriate one to the routines that allocate memory or you will have 1 channel with memory allocated from another channel's pool! @@ -766,7 +758,7 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi switch_call_cause_t *cancel_cause) { - if ((*new_session = switch_core_session_request(&channel_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, flags, pool)) != 0) { + if ((*new_session = switch_core_session_request(alsa_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, flags, pool)) != 0) { private_t *tech_pvt; switch_channel_t *channel; switch_caller_profile_t *caller_profile; @@ -956,6 +948,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_alsa_shutdown) } switch_core_hash_destroy(&globals.call_hash); + switch_event_free_subclass(MY_EVENT_RINGING); switch_safe_free(globals.dialplan); switch_safe_free(globals.cid_name); switch_safe_free(globals.cid_num); @@ -1437,7 +1430,7 @@ static switch_status_t place_call(char **argv, int argc, switch_stream_handle_t } dest = argv[0]; - if ((session = switch_core_session_request(&channel_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, SOF_NONE, NULL)) != 0) { + if ((session = switch_core_session_request(alsa_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, SOF_NONE, NULL)) != 0) { private_t *tech_pvt; switch_channel_t *channel; char *dialplan = globals.dialplan; diff --git a/src/mod/endpoints/mod_skypopen/install/install.pl b/src/mod/endpoints/mod_skypopen/install/install.pl index f4c04f3aef..20de07e2eb 100755 --- a/src/mod/endpoints/mod_skypopen/install/install.pl +++ b/src/mod/endpoints/mod_skypopen/install/install.pl @@ -1,8 +1,8 @@ #!/usr/bin/perl my $myname ; -my $skype_download_url = "http://mirrors.kernel.org/archlinux/community/os/i686/skype-oss-2.0.0.72-2-i686.pkg.tar.gz"; -my $skype_download_pkg = "skype-oss-2.0.0.72-2-i686.pkg.tar.gz"; +my $skype_download_url = "http://mirrors.kernel.org/archlinux/community/os/i686/skype-oss-2.0.0.72-3-i686.pkg.tar.xz"; +my $skype_download_pkg = "skype-oss-2.0.0.72-3-i686.pkg.tar.xz"; my $skype_binary_dir = "/usr/bin"; my $skype_download_dir = "/tmp/skype_download"; my $skype_share_dir = "/usr/share/skype"; @@ -203,7 +203,7 @@ printf("\n"); system("mkdir -p $skype_download_dir"); system("cd $skype_download_dir ; wget -c $skype_download_url"); -system("cd $skype_download_dir ; tar -xzf $skype_download_pkg"); +system("cd $skype_download_dir ; tar -xJf $skype_download_pkg"); system("mkdir -p $skype_binary_dir"); system("cd $skype_download_dir/usr/bin ; cp skype $skype_binary_dir/"); diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c index 6a6e8294ed..212455d3a8 100644 --- a/src/mod/endpoints/mod_sofia/sofia.c +++ b/src/mod/endpoints/mod_sofia/sofia.c @@ -2630,9 +2630,8 @@ static void parse_gateways(sofia_profile_t *profile, switch_xml_t gateways_tag) gateway->register_url = switch_core_sprintf(gateway->pool, "sip:%s", proxy); } - gateway->register_from = switch_core_sprintf(gateway->pool, "", - from_user, !zstr(from_domain) ? from_domain : proxy, register_transport); - + gateway->register_from = switch_core_sprintf(gateway->pool, "", + from_user, !zstr(from_domain) ? from_domain : proxy); if (ping_freq) { if (ping_freq >= 5) { @@ -2640,10 +2639,8 @@ static void parse_gateways(sofia_profile_t *profile, switch_xml_t gateways_tag) gateway->ping_max = ping_max; gateway->ping_min = ping_min; gateway->ping = switch_epoch_time_now(NULL) + ping_freq; - gateway->options_to_uri = switch_core_sprintf(gateway->pool, "", - !zstr(from_domain) ? from_domain : proxy, register_transport); - //gateway->options_from_uri = switch_core_sprintf(gateway->pool, "", - // profile->extrtpip ? profile->extrtpip : profile->sipip, register_transport); + gateway->options_to_uri = switch_core_sprintf(gateway->pool, "", + !zstr(from_domain) ? from_domain : proxy); gateway->options_from_uri = gateway->options_to_uri; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ERROR: invalid ping!\n"); diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c index e64f430af7..bdcbd3288f 100644 --- a/src/mod/endpoints/mod_sofia/sofia_presence.c +++ b/src/mod/endpoints/mod_sofia/sofia_presence.c @@ -3901,7 +3901,7 @@ void sofia_presence_handle_sip_i_publish(nua_t *nua, sofia_profile_t *profile, n event_type = sip_header_as_string(nh->nh_home, (void *) sip->sip_event); - if (count < 2) { + if (count != 1) { if ((sql = switch_mprintf("delete from sip_presence where sip_user='%q' and sip_host='%q' " " and profile_name='%q' and hostname='%q'", from_user, from_host, profile->name, mod_sofia_globals.hostname))) { diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c index f3223723e9..9a25903987 100644 --- a/src/switch_ivr_originate.c +++ b/src/switch_ivr_originate.c @@ -1931,6 +1931,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess ok = 1; } else if (!strcasecmp((char *) hi->name, "group_confirm_file")) { ok = 1; + } else if (!strcasecmp((char *) hi->name, "group_confirm_read_timeout")) { + ok = 1; } else if (!strcasecmp((char *) hi->name, "group_confirm_cancel_timeout")) { ok = 1; } else if (!strcasecmp((char *) hi->name, "forked_dial")) {