[asterisk-commits] branch oej/multiparking - r8314 in /team/oej/multiparking: channels/ res/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Thu Jan 19 18:09:48 2006
New Revision: 8314

URL: http://svn.digium.com/view/asterisk?rev=8314&view=rev
Log:
Adding parking lot to iax2 show peer

Modified:
    team/oej/multiparking/channels/chan_iax2.c
    team/oej/multiparking/res/res_features.c

Modified: team/oej/multiparking/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/channels/chan_iax2.c?rev=8314&r1=8313&r2=8314&view=diff
==============================================================================
--- team/oej/multiparking/channels/chan_iax2.c (original)
+++ team/oej/multiparking/channels/chan_iax2.c Thu Jan 19 18:09:48 2006
@@ -1936,6 +1936,7 @@
 		ast_cli(fd, "  * Name       : %s\n", peer->name);
 		ast_cli(fd, "  Secret       : %s\n", ast_strlen_zero(peer->secret)?"<Not set>":"<Set>");
 		ast_cli(fd, "  Context      : %s\n", peer->context);
+		ast_cli(fd, "  Parking lot  : %s\n", peer->parkinglot);
 		ast_cli(fd, "  Mailbox      : %s\n", peer->mailbox);
 		ast_cli(fd, "  Dynamic      : %s\n", ast_test_flag(peer, IAX_DYNAMIC) ? "Yes":"No");
 		ast_cli(fd, "  Callerid     : %s\n", ast_callerid_merge(cbuf, sizeof(cbuf), peer->cid_name, peer->cid_num, "<unspecified>"));

Modified: team/oej/multiparking/res/res_features.c
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/res/res_features.c?rev=8314&r1=8313&r2=8314&view=diff
==============================================================================
--- team/oej/multiparking/res/res_features.c (original)
+++ team/oej/multiparking/res/res_features.c Thu Jan 19 18:09:48 2006
@@ -105,9 +105,7 @@
 
 static int parkedplay = 0;				/*!< Who to play the courtesy tone to */
 
-/*! \brief Structure for parking lots in a linked list. 
- * You set parkinglot by setting channel var PARKINGLOT for now
- * Maybe a channel setting later */
+/*! \brief Structure for parking lots in a linked list. */
 struct ast_parkinglot {
 	char name[AST_MAX_EXTENSION];			/*!< Name for this lot (used in other configs) */
 	char parking_con[AST_MAX_EXTENSION];		/*!< Context for which parking is made accessible */
@@ -336,7 +334,8 @@
 	if (!parkinglot)
 		parkinglot = default_parkinglot;
 
-	ast_log(LOG_DEBUG, "---------**--------- Parkinglot: %s\n", parkinglot->name);
+	if (option_debug)
+		ast_log(LOG_DEBUG, "---------**--------- Parkinglot: %s\n", parkinglot->name);
 
 	pu = malloc(sizeof(struct parkeduser));
 	if (!pu) {
@@ -1809,7 +1808,7 @@
 
 	parkinglotname = findparkinglotname(chan);
 	if (parkinglotname) {
-		ast_log(LOG_DEBUG, "---------**--------- Found chanvar Parkinglot: %s\n", parkinglotname);
+		ast_log(LOG_DEBUG, "---------**--------- Using parking lot: %s\n", parkinglotname);
 		parkinglot = find_parkinglot(parkinglotname);	
 	}
 	pu = parkinglot->occupiedlots;