aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-04 07:55:30 +0000
committeroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-04 07:55:30 +0000
commitf35824d4c4af809da05f25bf700dff6ba346e00d (patch)
treedad21468f836fc0ec1278dc7a62c6baf144ab073
parentc2bd29204f9189c0c214618020ecc35bad8337d7 (diff)
- Disable res_pktccops by default
- Add dependency in chan_mgcp that was missing - Add a small amount of doc to the source code git-svn-id: http://svn.digium.com/svn/asterisk/trunk@237284 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_mgcp.c5
-rw-r--r--res/res_pktccops.c17
2 files changed, 19 insertions, 3 deletions
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index e3cc64e98..4910b0035 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -24,10 +24,15 @@
*
* \par See also
* \arg \ref Config_mgcp
+ * \arg \ref res_pktccops
*
* \ingroup channel_drivers
*/
+/*** MODULEINFO
+ <depend>res_pktccops</depend>
+ ***/
+
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/res/res_pktccops.c b/res/res_pktccops.c
index 512e88255..f16c695f0 100644
--- a/res/res_pktccops.c
+++ b/res/res_pktccops.c
@@ -21,8 +21,19 @@
* \brief PacketCable COPS
*
* \author Attila Domjan <attila.domjan.hu@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"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@@ -1368,7 +1379,7 @@ static char *pktccops_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
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 @@ static int unload_module(void)
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 @@ static int reload_module(void)
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,