- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7255 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 16 Jan '08

16 Jan '08

Author: brian Date: Wed Jan 16 16:29:03 2008 New Revision: 7255 Modified: freeswitch/trunk/conf/sip_profiles/default.xml Log: woops Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Wed Jan 16 16:29:03 2008 @@ -46,7 +46,7 @@   - <param name="tls" value="true"/> + <param name="tls" value="false"/>  <param name="tls-bind-params" value="transport=tls"/>

1 0

[commit] r7254 - in freeswitch/trunk: conf/dialplan conf/sip_profiles src/mod/endpoints/mod_sofia
by Freeswitch SVN 16 Jan '08

16 Jan '08

Author: anthm Date: Wed Jan 16 16:28:20 2008 New Revision: 7254 Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/sip_profiles/default.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: tweak to srtp to support polycoms Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Wed Jan 16 16:28:20 2008 @@ -52,7 +52,7 @@ <condition field="${call_debug}" expression="^true$" break="never"> <action application="info"/> </condition> - <condition field="${sip_has_crypto}" expression="^AES_CM_128_HMAC_SHA1_32$" break="never"> + <condition field="${sip_has_crypto}" expression="^(AES_CM_128_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_80)$" break="never"> <action application="set" data="sip_secure_media=true"/> </condition> <condition> @@ -236,6 +236,13 @@ </condition> </extension> + <extension name="echo"> + <condition field="destination_number" expression="^9996$"> + <action application="answer"/> + <action application="echo"/> + </condition> + </extension> + <extension name="milliwatt"> <condition field="destination_number" expression="^9997$"> <action application="answer"/> @@ -251,7 +258,7 @@ </extension> <extension name="hold_music"> - <condition field="${sip_has_crypto}" expression="^AES_CM_128_HMAC_SHA1_32$" break="never"> + <condition field="${sip_has_crypto}" expression="^(AES_CM_128_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_80)$" break="never"> <action application="answer"/> <action application="execute_extension" data="is_secure XML default"/> </condition> Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Wed Jan 16 16:28:20 2008 @@ -46,7 +46,7 @@   - <param name="tls" value="false"/> + <param name="tls" value="true"/>  <param name="tls-bind-params" value="transport=tls"/>  @@ -54,7 +54,7 @@  <param name="tls-cert-dir" value="$${base_dir}/conf/ssl"/>  - <param name="tls-version" value="sslv23"/> + <param name="tls-version" value="tlsv1"/>   Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Wed Jan 16 16:28:20 2008 @@ -345,6 +345,7 @@ char *gateway_name; char *local_crypto_key; char *remote_crypto_key; + int crypto_tag; unsigned char local_raw_key[SWITCH_RTP_MAX_CRYPTO_LEN]; unsigned char remote_raw_key[SWITCH_RTP_MAX_CRYPTO_LEN]; switch_rtp_crypto_key_type_t crypto_send_type; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Wed Jan 16 16:28:20 2008 @@ -1352,7 +1352,8 @@ if (tech_pvt->remote_crypto_key && switch_test_flag(tech_pvt, TFLAG_SECURE)) { sofia_glue_add_crypto(tech_pvt, tech_pvt->remote_crypto_key, SWITCH_RTP_CRYPTO_RECV); switch_rtp_add_crypto_key(tech_pvt->rtp_session, SWITCH_RTP_CRYPTO_SEND, 1, tech_pvt->crypto_type, tech_pvt->local_raw_key, SWITCH_RTP_KEY_LEN); - switch_rtp_add_crypto_key(tech_pvt->rtp_session, SWITCH_RTP_CRYPTO_RECV, 1, tech_pvt->crypto_type, tech_pvt->remote_raw_key, SWITCH_RTP_KEY_LEN); + switch_rtp_add_crypto_key(tech_pvt->rtp_session, SWITCH_RTP_CRYPTO_RECV, tech_pvt->crypto_tag, + tech_pvt->crypto_type, tech_pvt->remote_raw_key, SWITCH_RTP_KEY_LEN); switch_channel_set_variable(tech_pvt->channel, SOFIA_SECURE_MEDIA_CONFIRMED_VARIABLE, "true"); } @@ -1547,11 +1548,23 @@ ptime = atoi(a->a_value); } else if (!strcasecmp(a->a_name, "crypto") && a->a_value) { crypto = a->a_value; + int crypto_tag = atoi(crypto); + if (tech_pvt->remote_crypto_key) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Already have a key\n"); + if (crypto_tag && crypto_tag == tech_pvt->crypto_tag) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Existing key is still valid.\n"); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Change Remote key to [%s]\n", crypto); + tech_pvt->remote_crypto_key = switch_core_session_strdup(tech_pvt->session, crypto); + tech_pvt->crypto_tag = crypto_tag; + sofia_glue_add_crypto(tech_pvt, tech_pvt->remote_crypto_key, SWITCH_RTP_CRYPTO_RECV); + switch_rtp_add_crypto_key(tech_pvt->rtp_session, SWITCH_RTP_CRYPTO_RECV, tech_pvt->crypto_tag, + tech_pvt->crypto_type, tech_pvt->remote_raw_key, SWITCH_RTP_KEY_LEN); + } } else { tech_pvt->remote_crypto_key = switch_core_session_strdup(tech_pvt->session, crypto); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Remote Key [%s]\n", tech_pvt->remote_crypto_key); + tech_pvt->crypto_tag = crypto_tag; if (switch_strlen_zero(tech_pvt->local_crypto_key)) { if (switch_stristr(SWITCH_RTP_CRYPTO_KEY_32, crypto)) {

1 0

[commit] r7253 - freeswitch/trunk/docs
by Freeswitch SVN 16 Jan '08

16 Jan '08

Author: silik0n Date: Wed Jan 16 15:32:04 2008 New Revision: 7253 Modified: freeswitch/trunk/docs/AUTHORS Log: cleaning up Modified: freeswitch/trunk/docs/AUTHORS ============================================================================== --- freeswitch/trunk/docs/AUTHORS (original) +++ freeswitch/trunk/docs/AUTHORS Wed Jan 16 15:32:04 2008 @@ -19,7 +19,7 @@ Brian K. West - For countless hours of work on BSD and Mac support, finding countless bugs, and moral support. Xcode project files. Joshua Colp - For his help making mod_exosip possible (which we are now getting rid of but oh well), - and for just being a swell guy! (until he backstabbed us, c'est la vie) + and for just being a swell guy! Michal "cypromis" Bielicki (michal.bielicki AT voiceworks.pl) - Solaris porting, and autotools enhancements, debian, rpm and solaris packaging. James Martelletti <james(a)nerdc0re.com> - All around cool guy (mod_syslog) Johny Kadarisman <jkr888(a)gmail.com>

1 0

[commit] r7252 - freeswitch/trunk/docs
by Freeswitch SVN 16 Jan '08

16 Jan '08

Author: silik0n Date: Wed Jan 16 15:29:22 2008 New Revision: 7252 Modified: freeswitch/trunk/docs/AUTHORS Log: tweak Modified: freeswitch/trunk/docs/AUTHORS ============================================================================== --- freeswitch/trunk/docs/AUTHORS (original) +++ freeswitch/trunk/docs/AUTHORS Wed Jan 16 15:29:22 2008 @@ -27,7 +27,7 @@ Stefan Knoblich - Various patches and support. Thanks. Justin Unger - <justinunger at gmail dot com> Lots of help with patches and SIP testing. Thanks! Paul D. Tinsley - Various patches and support. <pdt at jackhammer.org> - Ken Rice - <krice AT suspicious.org> - xmlcdr, sofia improvements, load testing. + Ken Rice - <krice AT suspicious.org> - xmlcdr, sofia improvements, load testing, 1 liners here and there. Neal Horman <neal at wanlink dot com> - conference improvements, switch_ivr menu additions and other tweaks. Johny Kadarisman <jkr888 at gmail.com> - mod_python fixups. Michael Murdock <mike at mmurdock dot org> - testing, documentation, bug finding and usability enhancements.

1 0

[commit] r7251 - in freeswitch/trunk: docs src
by Freeswitch SVN 16 Jan '08

16 Jan '08

Author: brian Date: Wed Jan 16 15:18:09 2008 New Revision: 7251 Modified: freeswitch/trunk/docs/AUTHORS freeswitch/trunk/src/switch_utils.c Log: add patch from FSCORE-89 thank you Modified: freeswitch/trunk/docs/AUTHORS ============================================================================== --- freeswitch/trunk/docs/AUTHORS (original) +++ freeswitch/trunk/docs/AUTHORS Wed Jan 16 15:18:09 2008 @@ -34,7 +34,8 @@ Matt Klein <mklein(a)nmedia.net> Jonas Gauffin <jonas at gauffin dot org> - Bugfixes and additions in mod_spidermonkey_odbc Damjan Jovanovic <moctodliamgtavojtodnajmad backwards> - mod_java - + Juan Jose Comellas <juanjo(a)comellas.org> - Patch to switch_utils for arg parsing. + A big THANK YOU goes to: Justin Cassidy - Build related cleanups and automatic build setup. Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Wed Jan 16 15:18:09 2008 @@ -24,6 +24,7 @@ * Contributor(s): * * Anthony Minessale II <anthmct(a)yahoo.com> + * Juan Jose Comellas <juanjo(a)comellas.org> * * * switch_utils.c -- Compatability and Helper Code @@ -1004,62 +1005,182 @@ return data; } +/* Helper function used when separating strings to unescape a character. The + supported characters are: -SWITCH_DECLARE(unsigned int) switch_separate_string(char *buf, char delim, char **array, int arraylen) + \n linefeed + \r carriage return + \t tab + \s space + + Any other character is returned as it was received. */ +static char unescape_char(char escaped) { - int argc; - char *ptr; - int quot = 0; - char qc = '\''; - int x; + char unescaped; + + switch (escaped) { + case 'n': + unescaped = '\n'; + break; + case 'r': + unescaped = '\r'; + break; + case 't': + unescaped = '\t'; + break; + case 's': + unescaped = ' '; + break; + default: + unescaped = escaped; + } + return unescaped; +} - if (!buf || !array || !arraylen) { - return 0; +/* Helper function used when separating strings to remove quotes, leading / + trailing spaces, and to convert escaped characters. */ +static char *cleanup_separated_string(char *str) +{ + char *ptr; + char *dest; + char *start; + char *end = NULL; + int inside_quotes = 0; + + /* Skip initial whitespace */ + for (ptr = str; *ptr == ' '; ++ptr) { + } + + for (start = dest = ptr; *ptr; ++ptr) { + if (*ptr == '\\') { + ++ptr; + *dest++ = unescape_char(*ptr); + end = dest; + } else if (*ptr == '\'') { + inside_quotes = (1 - inside_quotes); + } else { + *dest++ = *ptr; + if (*ptr != ' ' || inside_quotes) { + end = dest; + } + } + } + if (end) { + *end = '\0'; } + return start; +} - memset(array, 0, arraylen * sizeof(*array)); +/* Separate a string using a delimiter that is not a space */ +static unsigned int separate_string_char_delim(char *buf, char delim, char **array, int arraylen) +{ + enum tokenizer_state { + START, + FIND_DELIM + } state = START; - ptr = buf; + unsigned int count = 0; + char *ptr = buf; + int inside_quotes = 0; + int i; + + while (*ptr && count < arraylen) { + switch (state) { + case START: + array[count++] = ptr; + state = FIND_DELIM; + break; - for (argc = 0; *ptr && (argc < arraylen - 1); argc++) { - array[argc] = ptr; - for (; *ptr; ptr++) { - if (*ptr == qc) { - if (quot) { - quot--; - } else { - quot++; + case FIND_DELIM: + /* escaped characters are copied verbatim to the destination string */ + if (*ptr == '\\') { + ++ptr; + } else if (*ptr == '\'') { + inside_quotes = (1 - inside_quotes); + } else if (*ptr == delim && !inside_quotes) { + *ptr = '\0'; + state = START; } - } else if ((*ptr == delim) && !quot) { - *ptr++ = '\0'; + ++ptr; break; - } } } + /* strip quotes, escaped chars and leading / trailing spaces */ + for (i = 0; i < count; ++i) { + array[i] = cleanup_separated_string(array[i]); + } + return count; +} + +/* Separate a string using a delimiter that is a space */ +static unsigned int separate_string_blank_delim(char *buf, char **array, int arraylen) +{ + enum tokenizer_state { + START, + SKIP_INITIAL_SPACE, + FIND_DELIM, + SKIP_ENDING_SPACE + } state = START; + + unsigned int count = 0; + char *ptr = buf; + int inside_quotes = 0; + int i; - if (*ptr) { - array[argc++] = ptr; - } + while (*ptr && count < arraylen) { + switch (state) { + case START: + array[count++] = ptr; + state = SKIP_INITIAL_SPACE; + break; + + case SKIP_INITIAL_SPACE: + if (*ptr == ' ') { + ++ptr; + } else { + state = FIND_DELIM; + } + break; - /* strip quotes and leading / trailing spaces */ - for (x = 0; x < argc; x++) { - char *p; + case FIND_DELIM: + if (*ptr == '\\') { + ++ptr; + } else if (*ptr == '\'') { + inside_quotes = (1 - inside_quotes); + } else if (*ptr == ' ' && !inside_quotes) { + *ptr = '\0'; + state = SKIP_ENDING_SPACE; + } + ++ptr; + break; - while(*(array[x]) == ' ') { - (array[x])++; - } - p = array[x]; - while((p = strchr(array[x], qc))) { - memmove(p, p+1, strlen(p)); - p++; - } - p = array[x] + (strlen(array[x]) - 1); - while(*p == ' ') { - *p-- = '\0'; + case SKIP_ENDING_SPACE: + if (*ptr == ' ') { + ++ptr; + } else { + state = START; + } + break; } } + /* strip quotes, escaped chars and leading / trailing spaces */ + for (i = 0; i < count; ++i) { + array[i] = cleanup_separated_string(array[i]); + } + return count; +} + +SWITCH_DECLARE(unsigned int) switch_separate_string(char *buf, char delim, char **array, int arraylen) +{ + if (!buf || !array || !arraylen) { + return 0; + } + + memset(array, 0, arraylen * sizeof (*array)); - return argc; + return (delim == ' ' ? + separate_string_blank_delim(buf, array, arraylen) : + separate_string_char_delim(buf, delim, array, arraylen)); } SWITCH_DECLARE(const char *) switch_cut_path(const char *in)

1 0

[commit] r7250 - freeswitch/trunk/src/mod/applications/mod_limit
by Freeswitch SVN 16 Jan '08

16 Jan '08

Author: silik0n Date: Wed Jan 16 15:16:37 2008 New Revision: 7250 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Log: Change limit query to allow for sql wildcard in query you can now do things like <application="limit" data="realm id 2"/> <application="limit" data="realm % 10"/> this will allow both individual extension limits and realm limits Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Wed Jan 16 15:16:37 2008 @@ -616,7 +616,7 @@ cbt.buf = buf; cbt.len = sizeof(buf); - sql = switch_mprintf("select count(hostname) from limit_data where realm='%q' and id='%q'", realm, id); + sql = switch_mprintf("select count(hostname) from limit_data where realm='%q' and id like '%q'", realm, id); limit_execute_sql_callback(NULL, sql, sql2str_callback, &cbt); got = atoi(buf);

1 0

[commit] r7249 - freeswitch/trunk/src
by Freeswitch SVN 16 Jan '08

16 Jan '08

Author: anthm Date: Wed Jan 16 13:09:09 2008 New Revision: 7249 Modified: freeswitch/trunk/src/switch_rtp.c Log: just to be safe Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Jan 16 13:09:09 2008 @@ -1033,11 +1033,11 @@ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTO_CNG) && rtp_session->timer.samplecount >= (rtp_session->last_write_samplecount + (rtp_session->samples_per_interval * 50))) { - uint8_t data[2] = { 0 }; + uint8_t data[10] = { 0 }; switch_frame_flag_t frame_flags = SFF_NONE; data[0] = 65; rtp_session->cn++; - rtp_common_write(rtp_session, NULL, (void *) data, sizeof(data), rtp_session->cng_pt, 0, &frame_flags); + rtp_common_write(rtp_session, NULL, (void *) data, 2, rtp_session->cng_pt, 0, &frame_flags); } }

1 0

[commit] r7248 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 16 Jan '08

16 Jan '08

Author: anthm Date: Wed Jan 16 10:06:33 2008 New Revision: 7248 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: return stale on invalid auth header Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Wed Jan 16 10:06:33 2008 @@ -823,6 +823,7 @@ if (cnt != 8) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Authorization header!\n"); + ret = AUTH_STALE; goto end; }

1 0

[commit] r7247 - in freeswitch/trunk: . scripts
by Freeswitch SVN 16 Jan '08

16 Jan '08

Author: stkn Date: Wed Jan 16 09:27:03 2008 New Revision: 7247 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/scripts/fsxs.in Log: The fsxs tool (sort of apxs for FreeSWITCH) is back from the dead. Changes include an extended usage message and support for e.g. "fsxs --cflags" style calls to get one or more defined variables on one line (instead of the "show" command; easier for scripting). Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Wed Jan 16 09:27:03 2008 @@ -157,7 +157,7 @@ libfreeswitch_la_LDFLAGS += -lodbc endif -bin_SCRIPTS = scripts/gentls_cert +bin_SCRIPTS = scripts/gentls_cert scripts/fsxs libs/libedit/src/.libs/libedit.a: @@ -305,6 +305,27 @@ dox: cd docs && doxygen $(PWD)/docs/Doxygen.conf +scripts/fsxs: scripts/fsxs.in + @echo creating fsxs + @sed -e "s,@MODULES_DIR\@,$(PREFIX)/mod," \ + -e "s,@LIB_DIR\@,$(PREFIX)/lib," \ + -e "s,@BIN_DIR\@,$(PREFIX)/bin," \ + -e "s,@INC_DIR\@,$(PREFIX)/include," \ + -e "s,@CFG_DIR\@,$(PREFIX)/conf," \ + -e "s,@DB_DIR\@,$(PREFIX)/db," \ + -e "s,@PREFIX\@,$(PREFIX)," \ + -e "s,@CC\@,$(CC)," \ + -e "s,@LD\@,$(CC)," \ + -e "s,@INSTALL\@,$(INSTALL)," \ + -e "s,@MKINSTALLDIRS\@,$(mkdir_p)," \ + \ + -e "s|@CFLAGS\@|$(CFLAGS) `$(switch_srcdir)/libs/apr/apr-1-config --cflags --cppflags`|" \ + -e "s|@INCLUDES\@|-I$(PREFIX)/include|" \ + -e "s|@SOLINK\@|$(SOLINK)|" \ + -e "s|@LDFLAGS\@|-L$(PREFIX)/lib|" \ + -e "s|@LIBS\@|`$(switch_srcdir)/libs/apr/apr-1-config --libs` `$(switch_srcdir)/libs/apr-util/apu-1-config --libs`|" \ + scripts/fsxs.in > scripts/fsxs + eclean: clean rm -f `find . -type f -name \*~` rm -f `find . -type f -name \.*~` Modified: freeswitch/trunk/scripts/fsxs.in ============================================================================== --- freeswitch/trunk/scripts/fsxs.in (original) +++ freeswitch/trunk/scripts/fsxs.in Wed Jan 16 09:27:03 2008 @@ -52,14 +52,16 @@ } sub fsxs_usage { - print "FreeSwitch fsxs\n(C) 2006 Stefan Knoblich <stkn\(a)netdomination.org>\n"; + print "FreeSwitch fsxs\n(C) 2006-2008 Stefan Knoblich <stkn\(a)netdomination.org>\n"; print "\n"; print "Usage:\n"; print "\t$0 compile [options] <file1 ...>\n"; print "\t$0 link [options] <target> <file1 ...>\n"; print "\t$0 build [options] <target> <file1 ...>\n"; - print "\t$0 install [options] <file1 ...>\n"; - print "\t$0 show <var1 ...>\n\n"; + print "\t$0 install [options] <file1 ...>\n\n"; + print "\t$0 show <var1>...[varN]\n"; + print "\t$0 <--var1>...<--varN>\n\n"; + print "Command description:\n"; print "\tcompile: Compile source file(s) into object file(s)\n"; print "\tlink: Create module from object file(s)\n"; @@ -80,6 +82,11 @@ print "\t--destdir Installation prefix [install]\n"; print "\n"; + print "Variable names for \"fsxs show\" / \"fsxs --var\":\n"; + print "\tcflags ldflags libs solink includes cc ld mkdir install\n"; + print "\tprefix lib_dir modules_dir db_dir inc_dir cfg_dir bin_dir\n"; + print "\n"; + print "Examples:\n"; print "\t$0 compile --add-cflags=\"-DFOO=1 -DBAR\" mod_test.c mod_test2.c\n\n"; print "\t$0 link --add-ldflags=\"-ltest\" mod_test.so mod_test.o mod_test2.o\n\n"; @@ -168,23 +175,50 @@ } } +sub fsxs_showq { + my @varlist = @_; + + if( $#varlist >= 0 ) { + foreach( @varlist ) { + if( defined $vars{$_} ) { + print "$vars{$_} "; + } + } + } +} + # # main part # if( $#ARGV < 0 ) { fsxs_usage; } -chomp( $command = shift @ARGV ); -if( $command =~ /^install|build|link|compile|show$/ ) { - - if( $command =~ /^show|compile|install$/ ) { - $needs_target = 0; - } +if( @ARGV[0] =~ /^\--.+$/ ) { + # 'show' shortcut for using fsxs in scripts + $needs_target = 0; + $command = "showq"; } else { - print STDERR "Unknown command: $command\n"; - fsxs_usage; + chomp( $command = shift @ARGV ); + + if( $command =~ /^install|build|link|compile|show$/ ) { + + # add -lfreeswitch to the front of the library list + # we don't want it to be in the show / showq output + # but we still want to be able to override it with --set-libs + if( $command ne "show" ) { + $vars{LIBS} = "-lfreeswitch $vars{LIBS}"; + } + + if( $command =~ /^show|compile|install$/ ) { + $needs_target = 0; + } + } + else { + print STDERR "Unknown command: $command\n"; + fsxs_usage; + } } # parse environment variables @@ -196,7 +230,7 @@ foreach(@ARGV) { chomp( $_ ); - if( $command ne 'show' ) + if( $command ne "show" && $command ne "showq" ) { if( /^\--add-cflags=(.*)$/ ) { $vars{CFLAGS} = "$vars{CFLAGS} $1"; @@ -272,6 +306,9 @@ elsif( $command eq 'show' ) { fsxs_show( @files ); } +elsif( $command eq 'showq' ) { + fsxs_showq( @files ); +} elsif( $command eq 'install' ) { fsxs_install( @files ); }

1 0

[commit] r7246 - freeswitch/trunk
by Freeswitch SVN 16 Jan '08

16 Jan '08

Author: stkn Date: Wed Jan 16 06:42:01 2008 New Revision: 7246 Modified: freeswitch/trunk/Makefile.am Log: Change order of libaprutil and libapr in CORE_LIBS, this fixes undefined apr_ symbols in libfreeswitch (libaprutil depends on libapr, symbols used by libaprutil but not by libfreeswitch object files were lost at link time (and added to the freeswitch binary)) Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Wed Jan 16 06:42:01 2008 @@ -122,7 +122,7 @@ CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/crypto/include CORE_CFLAGS += $(RESAMPLE_CFLAGS) -CORE_LIBS = libs/apr/libapr-1.la libs/apr-util/libaprutil-1.la +CORE_LIBS = libs/apr-util/libaprutil-1.la libs/apr/libapr-1.la CORE_LIBS += libs/sqlite/libsqlite3.la libs/pcre/libpcre.la CORE_LIBS += libs/srtp/libsrtp.la $(RESAMPLE_LIB)

1 0