diff options
author | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-27 18:33:22 +0000 |
---|---|---|
committer | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-27 18:33:22 +0000 |
commit | 28bd62dcdd9a101ffb19607c1e98b65db9e61bcb (patch) | |
tree | 3e26e90bd243d22e0095f08d8f61b20e47339ef1 | |
parent | 377e69c30bdf62e82e93a00de3b71a8652d2508f (diff) |
Merged revisions 125980 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r125980 | mattf | 2008-06-27 13:32:17 -0500 (Fri, 27 Jun 2008) | 1 line
Add support for new commands to block/unblock all CICs on a linkset
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@125981 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | channels/chan_dahdi.c | 85 |
1 files changed, 83 insertions, 2 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 1b19e64c7..8893a61ca 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -13205,6 +13205,45 @@ static char *handle_ss7_block_cic(struct ast_cli_entry *e, int cmd, struct ast_c return CLI_SUCCESS; } +static char *handle_ss7_block_linkset(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) +{ + int linkset; + int i; + switch (cmd) { + case CLI_INIT: + e->command = "ss7 block linkset"; + e->usage = + "Usage: ss7 block linkset <linkset number>\n" + " Sends a remote blocking request for all CICs on the given linkset\n"; + return NULL; + case CLI_GENERATE: + return NULL; + } + if (a->argc == 4) + linkset = atoi(a->argv[3]); + else + return CLI_SHOWUSAGE; + + if ((linkset < 1) || (linkset > NUM_SPANS)) { + ast_cli(a->fd, "Invalid linkset %s. Should be a number %d to %d\n", a->argv[3], 1, NUM_SPANS); + return CLI_SUCCESS; + } + + if (!linksets[linkset-1].ss7) { + ast_cli(a->fd, "No SS7 running on linkset %d\n", linkset); + return CLI_SUCCESS; + } + + for (i = 0; i < linksets[linkset-1].numchans; i++) { + ast_cli(a->fd, "Sending remote blocking request on CIC %d\n", linksets[linkset-1].pvts[i]->cic); + ast_mutex_lock(&linksets[linkset-1].lock); + isup_blo(linksets[linkset-1].ss7, linksets[linkset-1].pvts[i]->cic, linksets[linkset-1].pvts[i]->dpc); + ast_mutex_unlock(&linksets[linkset-1].lock); + } + + return CLI_SUCCESS; +} + static char *handle_ss7_unblock_cic(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { int linkset, cic; @@ -13258,6 +13297,46 @@ static char *handle_ss7_unblock_cic(struct ast_cli_entry *e, int cmd, struct ast return CLI_SUCCESS; } +static char *handle_ss7_unblock_linkset(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) +{ + int linkset; + int i; + switch (cmd) { + case CLI_INIT: + e->command = "ss7 unblock linkset"; + e->usage = + "Usage: ss7 unblock linkset <linkset number>\n" + " Sends a remote unblocking request for all CICs on the specified linkset\n"; + return NULL; + case CLI_GENERATE: + return NULL; + } + + if (a->argc == 4) + linkset = atoi(a->argv[3]); + else + return CLI_SHOWUSAGE; + + if ((linkset < 1) || (linkset > NUM_SPANS)) { + ast_cli(a->fd, "Invalid linkset %s. Should be a number %d to %d\n", a->argv[3], 1, NUM_SPANS); + return CLI_SUCCESS; + } + + if (!linksets[linkset-1].ss7) { + ast_cli(a->fd, "No SS7 running on linkset %d\n", linkset); + return CLI_SUCCESS; + } + + for (i = 0; i < linksets[linkset-1].numchans; i++) { + ast_cli(a->fd, "Sending remote unblock request on CIC %d\n", linksets[linkset-1].pvts[i]->cic); + ast_mutex_lock(&linksets[linkset-1].lock); + isup_ubl(linksets[linkset-1].ss7, linksets[linkset-1].pvts[i]->cic, linksets[linkset-1].pvts[i]->dpc); + ast_mutex_unlock(&linksets[linkset-1].lock); + } + + return CLI_SUCCESS; +} + static char *handle_ss7_show_linkset(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { int linkset; @@ -13295,8 +13374,10 @@ static char *handle_ss7_show_linkset(struct ast_cli_entry *e, int cmd, struct as static struct ast_cli_entry dahdi_ss7_cli[] = { AST_CLI_DEFINE(handle_ss7_debug, "Enables SS7 debugging on a linkset"), AST_CLI_DEFINE(handle_ss7_no_debug, "Disables SS7 debugging on a linkset"), - AST_CLI_DEFINE(handle_ss7_block_cic, "Disables SS7 debugging on a linkset"), - AST_CLI_DEFINE(handle_ss7_unblock_cic, "Disables SS7 debugging on a linkset"), + AST_CLI_DEFINE(handle_ss7_block_cic, "Blocks the given CIC"), + AST_CLI_DEFINE(handle_ss7_unblock_cic, "Unblocks the given CIC"), + AST_CLI_DEFINE(handle_ss7_block_linkset, "Blocks all CICs on a linkset"), + AST_CLI_DEFINE(handle_ss7_unblock_linkset, "Unblocks all CICs on a linkset"), AST_CLI_DEFINE(handle_ss7_show_linkset, "Shows the status of a linkset"), }; #endif /* HAVE_SS7 */ |