[asterisk-commits] branch oej/metermaids-trunk r35582 - in /team/oej/metermaids-trunk: channels/...

[asterisk-commits at lists.digium.com]

Author: oej
Date: Thu Jun 22 16:10:26 2006
New Revision: 35582

URL: http://svn.digium.com/view/asterisk?rev=35582&view=rev
Log:
- Update config example
- Remove stuff from chan_local.c

Modified:
    team/oej/metermaids-trunk/channels/chan_local.c
    team/oej/metermaids-trunk/configs/extensions.conf.sample

Modified: team/oej/metermaids-trunk/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids-trunk/channels/chan_local.c?rev=35582&r1=35581&r2=35582&view=diff
==============================================================================
--- team/oej/metermaids-trunk/channels/chan_local.c (original)
+++ team/oej/metermaids-trunk/channels/chan_local.c Thu Jun 22 16:10:26 2006
@@ -123,13 +123,10 @@
 {
 	char *exten;
 	char *context;
-	char *option;
-	int parkmode = 0;
 	int res;
 		
 	exten = ast_strdupa(data);
 	context = strchr(exten, '@');
-	option = strchr(exten, '/');	/* Find parking option */
 
 	if (!context) {
 		ast_log(LOG_WARNING, "Someone used Local/%s somewhere without a @context. This is bad.\n", exten);
@@ -139,21 +136,14 @@
 	*context = '\0';
 	context++;
 
-	if (option) {
-		*option = '\0';
-		option++;
-		if (!strcasecmp(option, "park"))
-			parkmode = 1;
-	}
-
 	if (option_debug > 2)
-		ast_log(LOG_DEBUG, "Checking if extension %s@%s exists (devicestate%s)\n", exten, context, parkmode ? ", parkmode" : "");
+		ast_log(LOG_DEBUG, "Checking if extension %s@%s exists (devicestate)\n", exten, context);
 	res = ast_exists_extension(NULL, context, exten, 1, NULL);
 
 	if (!res)
-		return parkmode ? AST_DEVICE_NOT_INUSE : AST_DEVICE_INVALID;
+		return AST_DEVICE_INVALID;
 	else
-		return parkmode ? AST_DEVICE_INUSE : AST_DEVICE_UNKNOWN;
+		return AST_DEVICE_UNKNOWN;
 }
 
 static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_frame *f, struct ast_channel *us)

Modified: team/oej/metermaids-trunk/configs/extensions.conf.sample
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids-trunk/configs/extensions.conf.sample?rev=35582&r1=35581&r2=35582&view=diff
==============================================================================
--- team/oej/metermaids-trunk/configs/extensions.conf.sample (original)
+++ team/oej/metermaids-trunk/configs/extensions.conf.sample Thu Jun 22 16:10:26 2006
@@ -518,7 +518,7 @@
 ;If you want to subscribe to the status of a parking space, this is
 ;how you do it. Subscribe to extension 6600 in sip, and you will see
 ;the status of the first parking lot with this extensions help
-;exten => 6600,hint,local/701 at parkedcalls/park
+;exten => 6600,hint,park:701 at parkedcalls
 ;exten => 6600,1,noop
 ;
 ; Some other handy things are an extension for checking voicemail via