From: Joshua Colp <jcolp@digium.com>
Date: Tue, 26 Sep 2006 20:20:34 +0000 (+0000)
Subject: Merged revisions 43697 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~4625
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=36a96562345456affcb7a0d696d332ede01fbb3a;p=thirdparty%2Fasterisk.git

Merged revisions 43697 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r43697 | file | 2006-09-26 16:19:33 -0400 (Tue, 26 Sep 2006) | 2 lines

Strip options off the argument passed for devicestate in chan_local. (issue #8034 reported by pcardozo)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43698 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_local.c b/channels/chan_local.c
index 63e230e34f..998a74ae09 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -127,7 +127,7 @@ static AST_LIST_HEAD_STATIC(locals, local_pvt);
 static int local_devicestate(void *data)
 {
 	char *exten = ast_strdupa(data);
-	char *context = NULL;
+	char *context = NULL, *opts = NULL;
 	int res;
 
 	if (!(context = strchr(exten, '@'))) {
@@ -137,6 +137,10 @@ static int local_devicestate(void *data)
 
 	*context++ = '\0';
 
+	/* Strip options if they exist */
+	if ((opts = strchr(context, '/')))
+		*opts = '\0';
+
 	if (option_debug > 2)
 		ast_log(LOG_DEBUG, "Checking if extension %s@%s exists (devicestate)\n", exten, context);
 	res = ast_exists_extension(NULL, context, exten, 1, NULL);