[asterisk-commits] oej: branch 1.4 r46631 - in /branches/1.4: funcs/ include/asterisk/ main/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue Oct 31 04:56:20 2006
New Revision: 46631

URL: http://svn.digium.com/view/asterisk?rev=46631&view=rev
Log:
Issue #8089 - Fix the ENUM support (picking one record by number). Thanks otmar!

Modified:
    branches/1.4/funcs/func_enum.c
    branches/1.4/include/asterisk/enum.h
    branches/1.4/main/enum.c

Modified: branches/1.4/funcs/func_enum.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/funcs/func_enum.c?rev=46631&r1=46630&r2=46631&view=diff
==============================================================================
--- branches/1.4/funcs/func_enum.c (original)
+++ branches/1.4/funcs/func_enum.c Tue Oct 31 04:56:20 2006
@@ -65,6 +65,7 @@
 	char dest[256] = "", tmp[2] = "", num[AST_MAX_EXTENSION] = "";
 	struct ast_module_user *u;
 	char *s, *p;
+	unsigned int record = 1;
 
 	buf[0] = '\0';
 
@@ -88,7 +89,10 @@
 		args.zone = "e164.arpa";
 
 	if (!args.options)
-		args.options = "1";
+		args.options = "";
+
+	if (args.record)
+		record = atoi(args.record);
 
 	/* strip any '-' signs from number */
 	for (s = p = args.number; *s; s++) {
@@ -100,7 +104,7 @@
 	}
 
 	res = ast_get_enum(chan, num, dest, sizeof(dest), tech, sizeof(tech), args.zone,
-			   args.options);
+			   args.options, record);
 
 	p = strchr(dest, ':');
 	if (p && strcasecmp(tech, "ALL"))

Modified: branches/1.4/include/asterisk/enum.h
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk/enum.h?rev=46631&r1=46630&r2=46631&view=diff
==============================================================================
--- branches/1.4/include/asterisk/enum.h (original)
+++ branches/1.4/include/asterisk/enum.h Tue Oct 31 04:56:20 2006
@@ -35,9 +35,11 @@
                        If you need any record, then set it to empty string
 	\param maxtech  Max length
 	\param suffix   Zone suffix (if is NULL then use enum.conf 'search' variable)
-	\param options  Options ('c' to count number of NAPTR RR, or number - the position of required RR in the answer list
+	\param options  Options ('c' to count number of NAPTR RR)
+	\param record   The position of required RR in the answer list
 */
-int ast_get_enum(struct ast_channel *chan, const char *number, char *location, int maxloc, char *technology, int maxtech, char* suffix, char* options);
+int ast_get_enum(struct ast_channel *chan, const char *number, char *location, int maxloc, char *technology, 
+		int maxtech, char* suffix, char* options, unsigned int record);
 
 /*!	\brief Lookup DNS TXT record (used by app TXTCIDnum
 	\param chan	Channel

Modified: branches/1.4/main/enum.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/enum.c?rev=46631&r1=46630&r2=46631&view=diff
==============================================================================
--- branches/1.4/main/enum.c (original)
+++ branches/1.4/main/enum.c Tue Oct 31 04:56:20 2006
@@ -387,7 +387,7 @@
 }
 
 /*! \brief ENUM lookup */
-int ast_get_enum(struct ast_channel *chan, const char *number, char *dst, int dstlen, char *tech, int techlen, char* suffix, char* options)
+int ast_get_enum(struct ast_channel *chan, const char *number, char *dst, int dstlen, char *tech, int techlen, char* suffix, char* options, unsigned int record)
 {
 	struct enum_context context;
 	char tmp[259 + 512];
@@ -412,7 +412,7 @@
 	context.tech = tech;
 	context.techlen = techlen;
 	context.options = 0;
-	context.position = 1;
+	context.position = record;
 	context.naptr_rrs = NULL;
 	context.naptr_rrs_count = 0;
 
@@ -420,12 +420,11 @@
 		if (*options == 'c') {
 			context.options = ENUMLOOKUP_OPTIONS_COUNT;
 			context.position = 0;
-		} else {
-			context.position = atoi(options);
-			if (context.position < 1)
-				context.position = 1;
-		}
-	}
+		}
+	}
+
+	ast_log(LOG_DEBUG, "ast_get_enum(): n='%s', tech='%s', suffix='%s', options='%d', record='%d'\n",
+			number, tech, suffix, context.options, context.position);
 
 	if (pos > 128)
 		pos = 128;
@@ -466,25 +465,34 @@
 	if (chan && ast_autoservice_start(chan) < 0)
 		return -1;
 
-	for (;;) {
-		ast_mutex_lock(&enumlock);
-		if (version != enumver) {
-			/* Ooh, a reload... */
-			s = toplevs;
-			version = enumver;
-		} else {
-			s = s->next;
-		}
-		ast_copy_string(tmp + newpos, suffix ? suffix : s->toplev, sizeof(tmp) - newpos);
-		ast_mutex_unlock(&enumlock);
-		if (!s)
-			break;
+	if(suffix) {
+		ast_copy_string(tmp + newpos, suffix, sizeof(tmp) - newpos);
 		ret = ast_search_dns(&context, tmp, C_IN, T_NAPTR, enum_callback);
-		if (ret > 0)
-			break;
-		if (suffix != NULL)
-			break;
-	}
+		ast_log(LOG_DEBUG, "ast_get_enum: ast_search_dns(%s) returned %d\n", tmp, ret);
+	} else {
+		ret = -1;		/* this is actually dead code since the demise of app_enum.c */
+		for (;;) {
+			ast_mutex_lock(&enumlock);
+			if (version != enumver) {
+				/* Ooh, a reload... */
+				s = toplevs;
+				version = enumver;
+			} else {
+				s = s->next;
+			}
+			ast_mutex_unlock(&enumlock);
+
+			if (!s)
+				break;
+	
+			ast_copy_string(tmp + newpos, s->toplev, sizeof(tmp) - newpos);
+			ret = ast_search_dns(&context, tmp, C_IN, T_NAPTR, enum_callback);
+			ast_log(LOG_DEBUG, "ast_get_enum: ast_search_dns(%s) returned %d\n", tmp, ret);
+			if (ret > 0)
+				break;
+		}
+	}
+
 	if (ret < 0) {
 		ast_log(LOG_DEBUG, "No such number found: %s (%s)\n", tmp, strerror(errno));
 		strcpy(dst, "0");