[asterisk-commits] oej: trunk r237284 - in /trunk: channels/chan_mgcp.c res/res_pktccops.c

[SVN commits to the Asterisk project]

Author: oej
Date: Mon Jan  4 01:55:30 2010
New Revision: 237284

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=237284
Log:
- Disable res_pktccops by default
- Add dependency in chan_mgcp that was missing
- Add a small amount of doc to the source code

Modified:
    trunk/channels/chan_mgcp.c
    trunk/res/res_pktccops.c

Modified: trunk/channels/chan_mgcp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_mgcp.c?view=diff&rev=237284&r1=237283&r2=237284
==============================================================================
--- trunk/channels/chan_mgcp.c (original)
+++ trunk/channels/chan_mgcp.c Mon Jan  4 01:55:30 2010
@@ -24,9 +24,14 @@
  *
  * \par See also
  * \arg \ref Config_mgcp
+ * \arg \ref res_pktccops
  *
  * \ingroup channel_drivers
  */
+
+/*** MODULEINFO
+        <depend>res_pktccops</depend>
+ ***/
 
 #include "asterisk.h"
 

Modified: trunk/res/res_pktccops.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pktccops.c?view=diff&rev=237284&r1=237283&r2=237284
==============================================================================
--- trunk/res/res_pktccops.c (original)
+++ trunk/res/res_pktccops.c Mon Jan  4 01:55:30 2010
@@ -21,7 +21,18 @@
  * \brief PacketCable COPS
  * 
  * \author Attila Domjan <attila.domjan.hu at gmail.com>
+ *
+ * \note 
+ * This module is an add-on to chan_mgcp. It adds support for the
+ * PacketCable MGCP variation called NCS. Res_pktccops implements COPS
+ * (RFC 2748), a protocol used to manage dynamic bandwith allocation in
+ * CMTS's (HFC gateways). When you use NCS, you need to talk COPS with
+ * the CMTS to complete the calls.
  */
+
+/*** MODULEINFO
+        <defaultenabled>no</defaultenabled>
+ ***/
 
 #include "asterisk.h"
 
@@ -1368,7 +1379,7 @@
 		e->command = "pktccops set debug {on|off}";
 		e->usage = 
 			"Usage: pktccops set debug {on|off}\n"
-			"				Turn on/off debuging\n";
+			"	Turn on/off debuging\n";
 		return NULL;
 	case CLI_GENERATE:
 		return NULL;
@@ -1466,7 +1477,7 @@
 		pktccops_thread = AST_PTHREADT_STOP;
 		ast_mutex_unlock(&pktccops_lock);
 	} else {
-		ast_log(LOG_WARNING, "Unable to lock the pktccops_thread\n");
+		ast_log(LOG_ERROR, "Unable to lock the pktccops_thread\n");
 		return -1;
 	}
 
@@ -1488,7 +1499,7 @@
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "PktcCOPS manager",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "PktcCOPS manager for MGCP",
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload_module,