[Asterisk-cvs] asterisk enum.c,1.9,1.10 srv.c,1.3,1.4

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv2847

Modified Files:
	enum.c srv.c 
Log Message:
SRV and ENUM fixes (bug #'s 350 and 351)


Index: enum.c
===================================================================
RCS file: /usr/cvsroot/asterisk/enum.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- enum.c	27 Sep 2003 00:22:46 -0000	1.9
+++ enum.c	4 Oct 2003 21:58:16 -0000	1.10
@@ -112,20 +112,23 @@
 	if ((!strncasecmp(services, "e2u+sip", 7)) || 
 	    (!strncasecmp(services, "sip+e2u", 7))) {
 		strncpy(tech, "sip", techsize -1); 
-	} else if ((!strncasecmp(services, "e2u+h323", 7)) || 
-	    (!strncasecmp(services, "h323+e2u", 7))) {
+	} else if ((!strncasecmp(services, "e2u+h323", 8)) || 
+	    (!strncasecmp(services, "h323+e2u", 8))) {
 		strncpy(tech, "h323", techsize -1); 
 	} else if ((!strncasecmp(services, "e2u+iax", 7)) || 
 	    (!strncasecmp(services, "iax+e2u", 7))) {
 		strncpy(tech, "iax", techsize -1); 
-	} else if ((!strncasecmp(services, "e2u+iax2", 7)) || 
-	    (!strncasecmp(services, "iax2+e2u", 7))) {
+	} else if ((!strncasecmp(services, "e2u+iax2", 8)) || 
+	    (!strncasecmp(services, "iax2+e2u", 8))) {
 		strncpy(tech, "iax2", techsize -1); 
 	} else if ((!strncasecmp(services, "e2u+tel", 7)) || 
 	    (!strncasecmp(services, "tel+e2u", 7))) {
 		strncpy(tech, "tel", techsize -1); 
-	} else if (strncasecmp(services, "e2u+voice:", 10)) {
-		ast_log(LOG_WARNING, "Services must be e2u+sip, sip+e2u, e2u+h323, h323+e2u, e2u+iax, iax+e2u, e2u+iax2, iax2+e2u, e2u+tel, tel+e2u or e2u+voice:\n");
+	} else if (!strncasecmp(services, "e2u+voice:", 10)) {
+		strncpy(tech, services+10, techsize -1); 
+	} else {
+		ast_log(LOG_WARNING, 
+		"Services must be e2u+${tech}, ${tech}+e2u, or e2u+voice: where $tech is from (sip, h323, tel, iax, iax2). \n");
 		return -1;
 	}
 
@@ -202,9 +205,6 @@
 	}
 	*d = 0;
 	strncpy(dst, temp, dstsize);
-	d = strchr(services, ':');
-	if (d) 
-		strncpy(tech, d+1, techsize -1); 
 	return 0;
 }
 

Index: srv.c
===================================================================
RCS file: /usr/cvsroot/asterisk/srv.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- srv.c	27 Sep 2003 00:22:46 -0000	1.3
+++ srv.c	4 Oct 2003 21:58:16 -0000	1.4
@@ -113,9 +113,10 @@
 	if (chan)
 		ret |= ast_autoservice_stop(chan);
 
-	if (ret <= 0)
+	if (ret <= 0) {
+		strcpy(host, "");
+    		*port = -1;
 		return ret;
-	strcpy(host, "");
-    *port = -1;
+	}
 	return ret;
 }