[asterisk-commits] tilghman: trunk r245945 - in /trunk: ./ configs/ funcs/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Feb 10 08:06:12 2010
New Revision: 245945

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=245945
Log:
Merged revisions 245944 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r245944 | tilghman | 2010-02-10 07:37:13 -0600 (Wed, 10 Feb 2010) | 2 lines
  
  Include examples of FILTER usage in extension patterns where a "." may be a risk.
........

Modified:
    trunk/   (props changed)
    trunk/configs/extensions.conf.sample
    trunk/funcs/func_strings.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/configs/extensions.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/extensions.conf.sample?view=diff&rev=245945&r1=245944&r2=245945
==============================================================================
--- trunk/configs/extensions.conf.sample (original)
+++ trunk/configs/extensions.conf.sample Wed Feb 10 08:06:12 2010
@@ -316,7 +316,7 @@
 ; International long distance through trunk
 ;
 exten => _9011.,1,Macro(dundi-e164,${EXTEN:4})
-exten => _9011.,n,Dial(${GLOBAL(TRUNK)}/${EXTEN:${GLOBAL(TRUNKMSD)}})
+exten => _9011.,n,Dial(${GLOBAL(TRUNK)}/${FILTER(0-9,${EXTEN:${GLOBAL(TRUNKMSD)}})})
 
 [trunkld]
 ;
@@ -624,7 +624,7 @@
 ; An extension like the one below can be used for FWD, Nikotel, sipgate etc.
 ; Note that you must have a [sipprovider] section in sip.conf
 ;
-;exten => _41X.,1,Dial(SIP/${EXTEN:2}@sipprovider,,r)
+;exten => _41X.,1,Dial(SIP/${FILTER(0-9,${EXTEN:2})}@sipprovider,,r)
 
 ; Real extensions would go here. Generally you want real extensions to be
 ; 4 or 5 digits long (although there is no such requirement) and start with a

Modified: trunk/funcs/func_strings.c
URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_strings.c?view=diff&rev=245945&r1=245944&r2=245945
==============================================================================
--- trunk/funcs/func_strings.c (original)
+++ trunk/funcs/func_strings.c Wed Feb 10 08:06:12 2010
@@ -38,6 +38,7 @@
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 #include "asterisk/localtime.h"
+#include "asterisk/test.h"
 
 AST_THREADSTORAGE(result_buf);
 AST_THREADSTORAGE(tmp_buf);
@@ -593,8 +594,9 @@
 	char *outbuf = buf, ac;
 	char allowed[256] = "";
 	size_t allowedlen = 0;
-
-	AST_STANDARD_APP_ARGS(args, parse);
+	int32_t bitfield[8] = { 0, }; /* 256 bits */
+
+	AST_STANDARD_RAW_ARGS(args, parse);
 
 	if (!args.string) {
 		ast_log(LOG_ERROR, "Usage: FILTER(<allowed-chars>,<string>)\n");
@@ -619,16 +621,23 @@
 			 * Looks a little strange, until you realize that we can overflow
 			 * the size of a char.
 			 */
-			for (ac = c1; ac != c2 && allowedlen < sizeof(allowed) - 1; ac++)
-				allowed[allowedlen++] = ac;
-			allowed[allowedlen++] = ac;
+			for (ac = c1; ac != c2; ac++) {
+				bitfield[ac / 32] |= 1 << (ac % 32);
+			}
 
 			ast_debug(4, "c1=%d, c2=%d\n", c1, c2);
 
 			/* Decrement before the loop increment */
 			(args.allowed)--;
-		} else
-			allowed[allowedlen++] = c1;
+		} else {
+			bitfield[c1 / 32] |= 1 << (c1 % 32);
+		}
+	}
+
+	for (ac = 1; ac != 0; ac++) {
+		if (bitfield[ac / 32] & (1 << (ac % 32))) {
+			allowed[allowedlen++] = ac;
+		}
 	}
 
 	ast_debug(1, "Allowed: %s\n", allowed);
@@ -1421,10 +1430,48 @@
 	.read2 = passthru,
 };
 
+#ifdef TEST_FRAMEWORK
+AST_TEST_DEFINE(test_FILTER)
+{
+	int i, res = AST_TEST_PASS;
+	const char *test_strings[][2] = {
+		{"A-R",            "DAHDI"},
+		{"A\\-R",          "A"},
+		{"\\x41-R",        "DAHDI"},
+		{"0-9A-Ca-c",      "0042133333A12212"},
+		{"0-9a-cA-C_+\\-", "0042133333A12212"},
+		{NULL,             NULL},
+	};
+
+	switch (cmd) {
+	case TEST_INIT:
+		info->name = "func_FILTER_test";
+		info->category = "funcs/func_strings/";
+		info->summary = "Test FILTER function";
+		info->description = "Verify FILTER behavior";
+		return AST_TEST_NOT_RUN;
+	case TEST_EXECUTE:
+		break;
+	}
+
+	for (i = 0; test_strings[i][0]; i++) {
+		char tmp[256], tmp2[256] = "";
+		snprintf(tmp, sizeof(tmp), "${FILTER(%s,0042133333&DAHDI/g1/2212)}", test_strings[i][0]);
+		pbx_substitute_variables_helper(NULL, tmp, tmp2, sizeof(tmp2) - 1);
+		if (strcmp(test_strings[i][1], tmp2)) {
+			ast_test_status_update(test, "Format string '%s' substituted to '%s'.  Expected '%s'.\n", test_strings[i][0], tmp2, test_strings[i][1]);
+			res = AST_TEST_FAIL;
+		}
+	}
+	return res;
+}
+#endif
+
 static int unload_module(void)
 {
 	int res = 0;
 
+	AST_TEST_UNREGISTER(test_FILTER);
 	res |= ast_custom_function_unregister(&fieldqty_function);
 	res |= ast_custom_function_unregister(&filter_function);
 	res |= ast_custom_function_unregister(&replace_function);
@@ -1456,6 +1503,7 @@
 {
 	int res = 0;
 
+	AST_TEST_REGISTER(test_FILTER);
 	res |= ast_custom_function_register(&fieldqty_function);
 	res |= ast_custom_function_register(&filter_function);
 	res |= ast_custom_function_register(&replace_function);