- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6673 - freeswitch/trunk/src
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Tue Dec 11 16:31:57 2007 New Revision: 6673 Modified: freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_core_hash.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_loadable_module.c freeswitch/trunk/src/switch_log.c freeswitch/trunk/src/switch_odbc.c freeswitch/trunk/src/switch_utils.c Log: cleanup, null checks. etc. Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Dec 11 16:31:57 2007 @@ -536,7 +536,9 @@ #ifdef WIN32 snprintf(path, sizeof(path), "Global\\Freeswitch.%d", getpid()); shutdown_event = CreateEvent(NULL, FALSE, FALSE, path); - WaitForSingleObject(shutdown_event, INFINITE); + if (shutdown_event) { + WaitForSingleObject(shutdown_event, INFINITE); + } #else runtime.running = 1; while (runtime.running) { Modified: freeswitch/trunk/src/switch_core_hash.c ============================================================================== --- freeswitch/trunk/src/switch_core_hash.c (original) +++ freeswitch/trunk/src/switch_core_hash.c Tue Dec 11 16:31:57 2007 @@ -145,9 +145,9 @@ { if (key) { *key = sqliteHashKey((HashElem *) hi); - } - if (klen) { - *klen = strlen((char *) *key) + 1; + if (klen) { + *klen = strlen((char *) *key) + 1; + } } if (val) { *val = sqliteHashData((HashElem *) hi); Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Tue Dec 11 16:31:57 2007 @@ -270,13 +270,13 @@ int x; for (x = 0; x < argc; x++) { - const char *val; - if ((val = switch_channel_get_variable(channel, argv[x]))) { - char *var = argv[x]; - if (!strncasecmp(var, "nolocal:", 8)) { - var += 8; + const char *vval; + if ((vval = switch_channel_get_variable(channel, argv[x]))) { + char *vvar = argv[x]; + if (!strncasecmp(vvar, "nolocal:", 8)) { + vvar += 8; } - switch_channel_set_variable(peer_channel, var, val); + switch_channel_set_variable(peer_channel, vvar, vval); } } } Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Dec 11 16:31:57 2007 @@ -850,6 +850,7 @@ ret = vasprintf(&data, fmt, ap); #else data = (char *) malloc(2048); + switch_assert(data); ret = vsnprintf(data, 2048, fmt, ap); #endif va_end(ap); Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Tue Dec 11 16:31:57 2007 @@ -1030,7 +1030,6 @@ while (apr_dir_read(&finfo, finfo_flags, module_dir_handle) == APR_SUCCESS) { const char *fname = finfo.fname; - const char *err; if (finfo.filetype != APR_REG) { continue; Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Tue Dec 11 16:31:57 2007 @@ -80,7 +80,7 @@ switch_assert(p); if ((argc = switch_separate_string(p, ',', argv, (sizeof(argv) / sizeof(argv[0]))))) { - for (x = 0; x < argc; x++) { + for (x = 0; x < argc && argv[x]; x++) { if (!strcasecmp(argv[x], "all")) { mask = 0xFF; break; @@ -221,6 +221,7 @@ len = (uint32_t) (strlen(extra_fmt) + strlen(date) + strlen(filep) + 32 + strlen(funcp) + strlen(fmt)); new_fmt = malloc(len + 1); + switch_assert(new_fmt); snprintf(new_fmt, len, extra_fmt, date, switch_log_level2str(level), filep, line, funcp, 128, fmt); fmt = new_fmt; } Modified: freeswitch/trunk/src/switch_odbc.c ============================================================================== --- freeswitch/trunk/src/switch_odbc.c (original) +++ freeswitch/trunk/src/switch_odbc.c Tue Dec 11 16:31:57 2007 @@ -407,9 +407,10 @@ { switch_odbc_handle_t *handle = NULL; - if (handlep) { - handle = *handlep; + if (!handlep) { + return; } + handle = *handlep; if (handle) { switch_odbc_handle_disconnect(handle); Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Tue Dec 11 16:31:57 2007 @@ -45,7 +45,7 @@ s++; } - if (*s == open) { + if (s && *s == open) { depth++; for (e = s + 1; e && *e; e++) { if (*e == open) { @@ -266,11 +266,11 @@ } if (file) { - const char *filename = switch_cut_path(file); + const char *stipped_file = switch_cut_path(file); const char *new_type; char *ext; - if ((ext = strrchr(filename, '.'))) { + if ((ext = strrchr(stipped_file, '.'))) { ext++; if ((new_type = switch_core_mime_ext2type(ext))) { mime_type = new_type; @@ -283,7 +283,7 @@ "Content-Transfer-Encoding: base64\n" "Content-Description: Sound attachment.\n" "Content-Disposition: attachment; filename=\"%s\"\n\n", - bound, mime_type, filename, filename); + bound, mime_type, stipped_file, stipped_file); if (!write_buf(fd, buf)) return SWITCH_FALSE; @@ -379,6 +379,11 @@ SWITCH_DECLARE(switch_bool_t) switch_ast2regex(char *pat, char *rbuf, size_t len) { char *p = pat; + + if (!pat) { + return SWITCH_FALSE; + } + memset(rbuf, 0, len); *(rbuf + strlen(rbuf)) = '^'; @@ -1101,6 +1106,7 @@ char *dest, *tmp; dest = (char *) malloc(sizeof(char)); + switch_assert(dest); for (i = 0; i < string_len; i++) { if (switch_string_match(string + i, string_len - i, search, search_len) == SWITCH_STATUS_SUCCESS) {

1 0

[commit] r6672 - in freeswitch/trunk/conf: autoload_configs sip_profiles
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: brian Date: Tue Dec 11 15:58:39 2007 New Revision: 6672 Modified: freeswitch/trunk/conf/autoload_configs/console.conf.xml freeswitch/trunk/conf/sip_profiles/default.xml freeswitch/trunk/conf/sip_profiles/nat.xml freeswitch/trunk/conf/sip_profiles/outbound.xml Log: make it a bit more quiet by default Modified: freeswitch/trunk/conf/autoload_configs/console.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/console.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/console.conf.xml Tue Dec 11 15:58:39 2007 @@ -6,7 +6,7 @@ name can be a file name, function name or 'all' value is one or more of debug,info,notice,warning,err,crit,alert,all --> - <map name="all" value="debug,info,notice,warning,err,crit,alert"/> + <map name="all" value="info,notice,warning,err,crit,alert"/> </mappings> <settings>  Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Tue Dec 11 15:58:39 2007 @@ -15,7 +15,7 @@ </domains> <settings> - <param name="debug" value="1"/> + <param name="debug" value="0"/> <param name="context" value="public"/> <param name="rfc2833-pt" value="101"/> <param name="sip-port" value="5060"/> Modified: freeswitch/trunk/conf/sip_profiles/nat.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/nat.xml (original) +++ freeswitch/trunk/conf/sip_profiles/nat.xml Tue Dec 11 15:58:39 2007 @@ -5,7 +5,7 @@ </gateways> <settings> - <param name="debug" value="1"/> + <param name="debug" value="0"/> <param name="rfc2833-pt" value="101"/> <param name="sip-port" value="5070"/> <param name="dialplan" value="XML"/> Modified: freeswitch/trunk/conf/sip_profiles/outbound.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/outbound.xml (original) +++ freeswitch/trunk/conf/sip_profiles/outbound.xml Tue Dec 11 15:58:39 2007 @@ -10,7 +10,7 @@ </domains> <settings> - <param name="debug" value="1"/> + <param name="debug" value="0"/> <param name="rfc2833-pt" value="101"/> <param name="sip-port" value="5080"/> <param name="dialplan" value="XML"/>

1 0

[commit] r6671 - freeswitch/trunk/src
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: anthm Date: Tue Dec 11 15:50:52 2007 New Revision: 6671 Modified: freeswitch/trunk/src/switch_core_sqldb.c Log: update sql Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Tue Dec 11 15:50:52 2007 @@ -154,10 +154,12 @@ uint8_t trans = 0, nothing_in_queue = 0; uint32_t target = 1000; switch_size_t len = 0, sql_len = SQLLEN; - char *sqlbuf = (char *) malloc(sql_len); + char *tmp, *sqlbuf = (char *) malloc(sql_len); char *sql; switch_size_t newlen; + switch_assert(sqlbuf); + if (!sql_manager.event_db) { sql_manager.event_db = switch_core_db_handle(); } @@ -180,10 +182,12 @@ itterations++; if (len + newlen > sql_len) { sql_len = len + SQLLEN; - if (!(sqlbuf = realloc(sqlbuf, sql_len))) { + if (!(tmp = realloc(sqlbuf, sql_len))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "SQL thread ending on mem err\n"); + abort(); break; } + sqlbuf = tmp; } sprintf(sqlbuf + len, "%s;\n", sql); len += newlen;

1 0

[commit] r6670 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: brian Date: Tue Dec 11 15:49:06 2007 New Revision: 6670 Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml Log: remove pending music Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/modules.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/modules.conf.xml Tue Dec 11 15:49:06 2007 @@ -66,7 +66,7 @@    - <load module="mod_local_stream"/> +

1 0

[commit] r6669 - freeswitch/trunk/src/mod/applications/mod_enum
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: anthm Date: Tue Dec 11 15:39:55 2007 New Revision: 6669 Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Log: fix enum Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Tue Dec 11 15:39:55 2007 @@ -55,6 +55,7 @@ unsigned char dn[DNS_MAXDN]; enum dns_type qtyp; /* type of the query */ enum_record_t *results; + int errs; }; typedef struct query enum_query_t; @@ -203,9 +204,10 @@ static void dnserror(enum_query_t * q, int errnum) { - + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "unable to lookup %s record for %s: %s\n", dns_typename(q->qtyp), dns_dntosp(q->dn), dns_strerror(errnum)); + q->errs++; } @@ -501,7 +503,7 @@ j += i; - if (j > globals.timeout || query.results) { + if (j > globals.timeout || query.results || query.errs) { break; } @@ -509,8 +511,9 @@ tv.tv_usec = 0; i = select((int) (fd + 1), &fds, 0, 0, &tv); now = time(NULL); - if (i > 0) + if (i > 0) { dns_ioevent(nctx, now); + } } if (!query.results) {

1 0

[commit] r6668 - freeswitch/trunk/src
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: anthm Date: Tue Dec 11 15:32:40 2007 New Revision: 6668 Modified: freeswitch/trunk/src/switch_utils.c Log: whatever Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Tue Dec 11 15:32:40 2007 @@ -1098,7 +1098,7 @@ size_t replace_len = strlen(replace); size_t i, n; size_t dest_len = 0; - char *dest; + char *dest, *tmp; dest = (char *) malloc(sizeof(char)); @@ -1107,13 +1107,17 @@ for (n = 0; n < replace_len; n++) { dest[dest_len] = replace[n]; dest_len++; - dest = (char *) realloc(dest, sizeof(char) * (dest_len + 1)); + tmp = (char *) realloc(dest, sizeof(char) * (dest_len + 1)); + switch_assert(tmp); + dest = tmp; } i += search_len - 1; } else { dest[dest_len] = string[i]; dest_len++; - dest = (char *) realloc(dest, sizeof(char) * (dest_len + 1)); + tmp = (char *) realloc(dest, sizeof(char) * (dest_len + 1)); + switch_assert(tmp); + dest = tmp; } }

1 0

[commit] r6667 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: brian Date: Tue Dec 11 15:30:26 2007 New Revision: 6667 Modified: freeswitch/trunk/conf/sip_profiles/default.xml freeswitch/trunk/conf/sip_profiles/nat.xml freeswitch/trunk/conf/sip_profiles/outbound.xml Log: correct URl for config file Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Tue Dec 11 15:30:26 2007 @@ -1,4 +1,4 @@ - + <profile name="default">  <aliases> Modified: freeswitch/trunk/conf/sip_profiles/nat.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/nat.xml (original) +++ freeswitch/trunk/conf/sip_profiles/nat.xml Tue Dec 11 15:30:26 2007 @@ -1,4 +1,4 @@ - + <profile name="nat"> <gateways> <X-PRE-PROCESS cmd="include" data="nat/*.xml"/> Modified: freeswitch/trunk/conf/sip_profiles/outbound.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/outbound.xml (original) +++ freeswitch/trunk/conf/sip_profiles/outbound.xml Tue Dec 11 15:30:26 2007 @@ -1,4 +1,4 @@ - + <profile name="outbound">  <gateways>

1 0

[commit] r6666 - in freeswitch/trunk/conf: autoload_configs dialplan sip_profiles
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: brian Date: Tue Dec 11 15:28:42 2007 New Revision: 6666 Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/dialplan/public.xml freeswitch/trunk/conf/sip_profiles/default.xml freeswitch/trunk/conf/sip_profiles/nat.xml freeswitch/trunk/conf/sip_profiles/outbound.xml Log: add wiki links in config files for those looking to get help with those configs/modules Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/conference.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/conference.conf.xml Tue Dec 11 15:28:42 2007 @@ -1,3 +1,4 @@ +  <configuration name="conference.conf" description="Audio Conference">  Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Dec 11 15:28:42 2007 @@ -1,3 +1,4 @@ + <include> <context name="default"> <extension name="intercept"> Modified: freeswitch/trunk/conf/dialplan/public.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/public.xml (original) +++ freeswitch/trunk/conf/dialplan/public.xml Tue Dec 11 15:28:42 2007 @@ -1,3 +1,4 @@ + <include> <context name="public"> Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Tue Dec 11 15:28:42 2007 @@ -1,3 +1,4 @@ + <profile name="default">  <aliases> Modified: freeswitch/trunk/conf/sip_profiles/nat.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/nat.xml (original) +++ freeswitch/trunk/conf/sip_profiles/nat.xml Tue Dec 11 15:28:42 2007 @@ -1,3 +1,4 @@ + <profile name="nat"> <gateways> <X-PRE-PROCESS cmd="include" data="nat/*.xml"/> Modified: freeswitch/trunk/conf/sip_profiles/outbound.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/outbound.xml (original) +++ freeswitch/trunk/conf/sip_profiles/outbound.xml Tue Dec 11 15:28:42 2007 @@ -1,3 +1,4 @@ + <profile name="outbound">  <gateways>

1 0

[commit] r6665 - freeswitch/trunk/src/include
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Tue Dec 11 15:25:15 2007 New Revision: 6665 Modified: freeswitch/trunk/src/include/switch_platform.h freeswitch/trunk/src/include/switch_utils.h Log: cleanup some macros a bit more. Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Tue Dec 11 15:25:15 2007 @@ -69,7 +69,7 @@ #pragma include_alias(<libteletone_generate.h>, <../../libs/libteletone/src/libteletone_generate.h>) #pragma include_alias(<libteletone_detect.h>, <../../libs/libteletone/src/libteletone_detect.h>) -#if (_MSC_VER >= 1500) // VC8+ +#if (_MSC_VER >= 1500) // VC9+ #define switch_assert(expr) assert(expr);__analysis_assume( expr ) #endif Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Tue Dec 11 15:25:15 2007 @@ -352,9 +352,14 @@ #define switch_malloc(ptr, len) (void)( (!!(ptr = malloc(len))) || (fprintf(stderr,"ABORT! Malloc failure at: %s:%s", __FILE__, __LINE__),abort(), 0), ptr ) #define switch_zmalloc(ptr, len) (void)( (!!(ptr = malloc(len))) || (fprintf(stderr,"ABORT! Malloc failure at: %s:%s", __FILE__, __LINE__),abort(), 0), memset(ptr, 0, len)) #else +#if (_MSC_VER >= 1500) // VC9+ +#define switch_malloc(ptr, len) (void)(assert(((ptr) = malloc((len)))),ptr);__analysis_assume( ptr ) +#define switch_zmalloc(ptr, len) (void)(assert((ptr = malloc(len))),memset(ptr, 0, len));__analysis_assume( ptr ) +#else #define switch_malloc(ptr, len) (void)(assert(((ptr) = malloc((len)))),ptr) #define switch_zmalloc(ptr, len) (void)(assert((ptr = malloc(len))),memset(ptr, 0, len)) #endif +#endif SWITCH_END_EXTERN_C #endif

1 0

[commit] r6664 - in freeswitch/trunk: conf/directory/default scripts
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: brian Date: Tue Dec 11 14:56:40 2007 New Revision: 6664 Added: freeswitch/trunk/conf/directory/default/voipuser.org.noload Modified: freeswitch/trunk/scripts/sipsetup Log: add template for voipuser.org Added: freeswitch/trunk/conf/directory/default/voipuser.org.noload ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/voipuser.org.noload Tue Dec 11 14:56:40 2007 @@ -0,0 +1,21 @@ + + +<include> + <user id="%VUUSERNAME%"> + <gateways> + <gateway name="sip.voipuser.org"> + <param name="username" value="%VUUSERNAME%"/> + <param name="password" value="%VUPASSWORD%"/> + <param name="expire-seconds" value="600"/> + <param name="register" value="true"/> + <param name="retry_seconds" value="30"/> + <param name="extension" value="%VUEXTENSION%"/> + <param name="context" value="public"/> + </gateway> + </gateways> + <params> + <param name="password" value="%VUPASSWORD%"/> + </params> + </user> +</include> + Modified: freeswitch/trunk/scripts/sipsetup ============================================================================== --- freeswitch/trunk/scripts/sipsetup (original) +++ freeswitch/trunk/scripts/sipsetup Tue Dec 11 14:56:40 2007 @@ -12,159 +12,169 @@ my $PREFIX = "/usr/local/freeswitch"; my $providers = { - "1" => "FWD", - "2" => "SP", - "3" => "IS", - "4" => "AL", - "5" => "SB" - }; + "1" => "FWD", + "2" => "SP", + "3" => "IS", + "4" => "AL", + "5" => "SB", + "6" => "VU" + }; my $FWD = { - "type" => "network", - "register" => "true", - "fields" => [number, password, extension], - "domain" => "pulver.com", - "dialprefix" => "1-393" - }; - -my $SP = { - "type" => "network", - "register" => "true", - "fields" => [username, password, extension], - "domain" => "sipphone.com", - "dialprefix" => "1-747, 1-222" - }; - -my $IS = { - "type" => "network", - "register" => "true", - "fields" => [username, password, extension], - "domain" => "ideasip.com", - "dialprefix" => "1-101" - }; - -my $AL = { - "type" => "pstn", - "register" => "true", - "fields" => [username, password, extension], - "domain" => "asterlink.com", - }; - -my $SB = { - "type" => "peer", - "domain" => "sipbroker.com", - "dialprefix" => "*XXX" - }; + "type" => "network", + "register" => "true", + "fields" => [number, password, extension], + "domain" => "pulver.com", + "dialprefix" => "1-393" + }; + +my $SIPHONE = { + "type" => "network", + "register" => "true", + "fields" => [username, password, extension], + "domain" => "sipphone.com", + "dialprefix" => "1-747, 1-222" + }; + +my $IDEASIP = { + "type" => "network", + "register" => "true", + "fields" => [username, password, extension], + "domain" => "ideasip.com", + "dialprefix" => "1-101" + }; + +my $VOIPUSER = { + "type" => "network", + "register" => "true", + "fields" => [username, password, extension], + "domain" => "voipuser.org" + }; + +my $ASTERLINK = { + "type" => "pstn", + "register" => "true", + "fields" => [username, password, extension], + "domain" => "asterlink.com", +}; + +my $SIPBROKER = { + "type" => "peer", + "domain" => "sipbroker.com", + "dialprefix" => "*XXX" + }; my $TEMPLATES = { - "FWD" => $FWD, - "SP" => $SP, - "IS" => $IS, - "AL" => $AL, - "SB" => $SB - }; + "FWD" => $FWD, + "SP" => $SIPPHONE, + "IS" => $IDEASIP, + "AL" => $ASTERLINK, + "SB" => $SIPBROKER, + "VU" => $VOIPUSER + }; print "\n" x 60; &welcome; sub welcome { - print <<WELCOME + print <<WELCOME - Welcome to the FreeSWITCH setup assistant. + Welcome to the FreeSWITCH setup assistant. - 1. Configure Free World Dialup - 2. Configure SIPPhone.com - 3. Configure ideaSIP.com - 4. Configure Asterlink.com - 5. Configure SIPBroker.com + 1. Configure Free World Dialup + 2. Configure SIPPhone.com + 3. Configure ideaSIP.com + 4. Configure Asterlink.com + 5. Configure SIPBroker.com + 6. Configure voipuser.org - X. Exit + X. Exit WELCOME - ; - print "Which provider do you wish to setup? "; - my $i = <STDIN>; - chomp($i); - if ($i =~ m/X|x/) { - print "Thanks you!\n"; exit; - } elsif ($i > 5) { - print "Invalid Choice\n"; &welcome; - } else { - if (exists($providers->{$i})) { - configure_sip_provider($providers->{$i}); - } - }; - &welcome; +; + print "Which provider do you wish to setup? "; + my $i = <STDIN>; + chomp($i); + if ($i =~ m/X|x/) { + print "Thanks you!\n"; exit; + } elsif ($i > 6) { + print "Invalid Choice\n"; &welcome; + } else { + if (exists($providers->{$i})) { + configure_sip_provider($providers->{$i}); + } + }; + &welcome; } sub configure_sip_provider($) { - my $provider = shift; - my $template = $TEMPLATES->{$provider}; - my $config; - my $check = 1; - foreach $field (@{$template->{fields}}) { - print "\nPlease your $template->{domain} $field: "; - $tmp = "$provider" . uc($field); - $i = <STDIN>; - chomp($i); - $config->{$tmp} = $i; - } + my $provider = shift; + my $template = $TEMPLATES->{$provider}; + my $config; + my $check = 1; + foreach $field (@{$template->{fields}}) { + print "\nPlease your $template->{domain} $field: "; + $tmp = "$provider" . uc($field); + $i = <STDIN>; + chomp($i); + $config->{$tmp} = $i; + } - while($check) { - $check = &are_you_sure; - }; - - if ($template->{type} eq "network" || $template->{type} eq "pstn") { - do_config($provider, $config); - } - if ($template->{dialprefix}) { - enable_extension($provider, $config); - } - print "\n\n\nConfiguration Complete!!!\n\n\n\n\n"; - sleep(2); - &welcome; + while($check) { + $check = &are_you_sure; + }; + + if ($template->{type} eq "network" || $template->{type} eq "pstn") { + do_config($provider, $config); + } + if ($template->{dialprefix}) { + enable_extension($provider, $config); + } + print "\n\n\nConfiguration Complete!!!\n\n\n\n\n"; + sleep(2); + &welcome; } sub enable_extension($$) { - my $provider = shift; - my $config = shift; + my $provider = shift; + my $config = shift; - my $todo = $TEMPLATES->{$provider}; + my $todo = $TEMPLATES->{$provider}; - copy("$PREFIX/conf/dialplan/extensions/$todo->{domain}.noload", "$PREFIX/conf/dialplan/extensions/$todo->{domain}.xml"); - print "\nExtension prefix $todo->{dialprefix} enabled for dialing $todo->{domain}...\n"; + copy("$PREFIX/conf/dialplan/extensions/$todo->{domain}.noload", "$PREFIX/conf/dialplan/extensions/$todo->{domain}.xml"); + print "\nExtension prefix $todo->{dialprefix} enabled for dialing $todo->{domain}...\n"; } sub do_config($$) { - my $provider = shift; - my $config = shift; - my $todo = $TEMPLATES->{$provider}; - - open(TEMPLATE, "<$PREFIX/conf/directory/default/$todo->{domain}.noload"); - @lines = <TEMPLATE>; - close(TEMPLATE); - open(CONFIG, ">$PREFIX/conf/directory/default/$todo->{domain}.xml"); - foreach $line (@lines) { - foreach $key (sort keys %{$config}) { - $line =~ s/%$key%/$config->{$key}/g; + my $provider = shift; + my $config = shift; + my $todo = $TEMPLATES->{$provider}; + + open(TEMPLATE, "<$PREFIX/conf/directory/default/$todo->{domain}.noload"); + @lines = <TEMPLATE>; + close(TEMPLATE); + open(CONFIG, ">$PREFIX/conf/directory/default/$todo->{domain}.xml"); + foreach $line (@lines) { + foreach $key (sort keys %{$config}) { + $line =~ s/%$key%/$config->{$key}/g; + } + print CONFIG $line; } - print CONFIG $line; - } - close(CONFIG); - print "Config Created...\n"; + close(CONFIG); + print "Config Created...\n"; } sub are_you_sure { - my $sure = 1; - while($sure) { - print "Are you sure? (yes/no)"; - $i = <STDIN>; - chomp($i); - if($i =~ m/No|no|NO|n/) { - &welcome; - } elsif ($i =~ m/Yes|yes|YES|y/) { - return 0; + my $sure = 1; + while($sure) { + print "Are you sure? (yes/no)"; + $i = <STDIN>; + chomp($i); + if($i =~ m/No|no|NO|n/) { + &welcome; + } elsif ($i =~ m/Yes|yes|YES|y/) { + return 0; + } } - } }

1 0