[asterisk-commits] oej: branch oej/moremanager r63358 - in /team/oej/moremanager: ./ channels/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue May  8 00:40:01 2007
New Revision: 63358

URL: http://svn.digium.com/view/asterisk?view=rev&rev=63358
Log:
After thinking about it, adding yet another use of "Status:" wasn't a good idea (TM).

Modified:
    team/oej/moremanager/CHANGES.moremanager
    team/oej/moremanager/channels/chan_iax2.c
    team/oej/moremanager/channels/chan_sip.c

Modified: team/oej/moremanager/CHANGES.moremanager
URL: http://svn.digium.com/view/asterisk/team/oej/moremanager/CHANGES.moremanager?view=diff&rev=63358&r1=63357&r2=63358
==============================================================================
--- team/oej/moremanager/CHANGES.moremanager (original)
+++ team/oej/moremanager/CHANGES.moremanager Tue May  8 00:40:01 2007
@@ -12,7 +12,7 @@
 ----------------------------
 - The Hold/Unhold events
 	- Both are now "Hold" events
-		For hold, there's a "Status: On" header, for unhold, status is off
+		For hold, there's a "HoldStatus: On" header, for unhold, status is off
 	- Modules chan_sip/chan_iax2
 
 - The Ping Action
@@ -127,6 +127,11 @@
   	  Module: <name>          Asterisk module name (not including extension)
 	Returns:
 		If module is loaded, returns version number of the module
+		
+		Note: This will have to change. I don't like sending Response: failure
+		on both command not found (trying this command in earlier versions of
+		Asterisk) and module not found.
+		Also, check if other manager actions behave that way.
 
 * NEW EVENTS
 ------------

Modified: team/oej/moremanager/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/oej/moremanager/channels/chan_iax2.c?view=diff&rev=63358&r1=63357&r2=63358
==============================================================================
--- team/oej/moremanager/channels/chan_iax2.c (original)
+++ team/oej/moremanager/channels/chan_iax2.c Tue May  8 00:40:01 2007
@@ -6729,7 +6729,7 @@
 				        /* Generate Manager Hold event, if necessary*/
 					if (iaxs[fr->callno]->owner) {
 						manager_event(EVENT_FLAG_CALL, "Hold",
-							"Status: On\r\n"
+							"HoldStatus: On\r\n"
 							"Channel: %s\r\n"
 							"Uniqueid: %s\r\n",
 							iaxs[fr->callno]->owner->name, 
@@ -6752,7 +6752,7 @@
 				        /* Generate Manager Unhold event, if necessary*/
 					if (iaxs[fr->callno]->owner && ast_test_flag(iaxs[fr->callno], IAX_QUELCH)) {
 						manager_event(EVENT_FLAG_CALL, "Hold",
-							"Status: Off\r\n"
+							"HoldStatus: Off\r\n"
 							"Channel: %s\r\n"
 							"Uniqueid: %s\r\n",
 							iaxs[fr->callno]->owner->name, 

Modified: team/oej/moremanager/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/moremanager/channels/chan_sip.c?view=diff&rev=63358&r1=63357&r2=63358
==============================================================================
--- team/oej/moremanager/channels/chan_sip.c (original)
+++ team/oej/moremanager/channels/chan_sip.c Tue May  8 00:40:01 2007
@@ -5259,7 +5259,7 @@
 			append_history(p, "Unhold", "%s", req->data);
 			if (global_callevents)
 				manager_event(EVENT_FLAG_CALL, "Hold",
-					"Status: Off\r\n"
+					"HoldStatus: Off\r\n"
 					"Channel: %s\r\n"
 					"Uniqueid: %s\r\n",
 					p->owner->name, 
@@ -5274,7 +5274,7 @@
 
 		if (global_callevents && !ast_test_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD)) {
 			manager_event(EVENT_FLAG_CALL, "Hold",
-				"Status: On\r\n"
+				"HoldStatus: On\r\n"
 				"Channel: %s\r\n"
 				"Uniqueid: %s\r\n",
 				p->owner->name,