kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision 157977 from

Browse Source 
https://origsvn.digium.com/svn/asterisk/team/group/issue8824

........
Fixes JIRA ABE-1726

The dial extension could be empty if you are using MISDN_KEYPAD
to control ISDN provider features.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@158010 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2008-11-20 01:46:09 +00:00
parent 187f6d485a
commit 238cd9ea24
1 changed files with 45 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
channels/chan_misdn.c
View File

@@ -1946,22 +1946,10 @@ static int misdn_call(struct ast_channel *ast, char *dest, int timeout)
int r;
int exceed;
int bridging;
struct chan_list *ch = MISDN_ASTERISK_TECH_PVT(ast);
struct chan_list *ch;
struct misdn_bchannel *newbc;
char *opts = NULL, *ext, *tokb;
char *dest_cp = ast_strdupa(dest);
ext = strtok_r(dest_cp, "/", &tokb);
if (ext) {
ext = strtok_r(NULL, "/", &tokb);
if (ext) {
opts = strtok_r(NULL, "/", &tokb);
} else {
chan_misdn_log(0, 0, "misdn_call: No Extension given!\n");
return -1;
}
}
char *opts, *ext;
char *dest_cp;
if (!ast) {
ast_log(LOG_WARNING, " --> ! misdn_call called on ast_channel *ast where ast == NULL\n");
@@ -1975,6 +1963,7 @@ static int misdn_call(struct ast_channel *ast, char *dest, int timeout)
return -1;
}
ch = MISDN_ASTERISK_TECH_PVT(ast);
if (!ch) {
ast_log(LOG_WARNING, " --> ! misdn_call called on %s, neither down nor reserved (or dest==NULL)\n", ast->name);
ast->hangupcause = AST_CAUSE_NORMAL_TEMPORARY_FAILURE;
@@ -1983,7 +1972,6 @@ static int misdn_call(struct ast_channel *ast, char *dest, int timeout)
}
newbc = ch->bc;
if (!newbc) {
ast_log(LOG_WARNING, " --> ! misdn_call called on %s, neither down nor reserved (or dest==NULL)\n", ast->name);
ast->hangupcause = AST_CAUSE_NORMAL_TEMPORARY_FAILURE;
@@ -1991,6 +1979,22 @@ static int misdn_call(struct ast_channel *ast, char *dest, int timeout)
return -1;
}
/*
* dest is ---v
* Dial(mISDN/g:group_name[/extension[/options]])
* Dial(mISDN/port[:preselected_channel][/extension[/options]])
*
* The dial extension could be empty if you are using MISDN_KEYPAD
* to control ISDN provider features.
*/
dest_cp = ast_strdupa(dest);
strsep(&dest_cp, "/");/* Discard port/group token */
ext = strsep(&dest_cp, "/");
if (!ext) {
ext = "";
}
opts = dest_cp;
port = newbc->port;
if ((exceed = add_out_calls(port))) {
@@ -2979,23 +2983,30 @@ static struct ast_channel *misdn_request(const char *type, int format, void *dat
{
struct ast_channel *tmp = NULL;
char group[BUFFERSIZE + 1] = "";
char buf[128];
char buf2[128], *ext = NULL, *port_str;
char *tokb = NULL, *p = NULL;
int channel = 0, port = 0;
char dial_str[128];
char *buf2 = ast_strdupa(data);
char *ext;
char *port_str;
char *p = NULL;
int channel = 0;
int port = 0;
struct misdn_bchannel *newbc = NULL;
int dec = 0;
struct chan_list *cl = init_chan_list(ORG_AST);
snprintf(buf, sizeof(buf), "%s/%s", misdn_type, (char*)data);
ast_copy_string(buf2, data, 128);
snprintf(dial_str, sizeof(dial_str), "%s/%s", misdn_type, (char *) data);
port_str = strtok_r(buf2, "/", &tokb);
ext = strtok_r(NULL, "/", &tokb);
if (port_str) {
/*
* data is ---v
* Dial(mISDN/g:group_name[/extension[/options]])
* Dial(mISDN/port[:preselected_channel][/extension[/options]])
*
* The dial extension could be empty if you are using MISDN_KEYPAD
* to control ISDN provider features.
*/
port_str = strsep(&buf2, "/");
if (!ast_strlen_zero(port_str)) {
if (port_str[0] == 'g' && port_str[1] == ':' ) {
/* We make a group call lets checkout which ports are in my group */
port_str += 2;
@@ -3011,10 +3022,15 @@ static struct ast_channel *misdn_request(const char *type, int format, void *dat
port = atoi(port_str);
}
} else {
ast_log(LOG_WARNING, " --> ! IND : CALL dad:%s WITHOUT PORT/Group, check extensions.conf\n", ext);
ast_log(LOG_WARNING, " --> ! IND : Dial(%s) WITHOUT Port or Group, check extensions.conf\n", dial_str);
return NULL;
}
ext = strsep(&buf2, "/");
if (!ext) {
ext = "";
}
if (misdn_cfg_is_group_method(group, METHOD_STANDARD_DEC)) {
chan_misdn_log(4, port, " --> STARTING STANDARD DEC...\n");
dec = 1;
@@ -3571,7 +3587,7 @@ static void do_immediate_setup(struct misdn_bchannel *bc, struct chan_list *ch,
chan_misdn_log(1, bc->port, "* Starting Ast ctx:%s dad:%s oad:%s with 's' extension\n", ast->context, ast->exten, ast->cid.cid_num);
strncpy(ast->exten, "s", 2);
strcpy(ast->exten, "s");
if (pbx_start_chan(ch) < 0) {
ast = NULL;
@@ -4049,7 +4065,6 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data)
ch->originator = ORG_MISDN;
chan = misdn_new(ch, AST_STATE_RESERVED, bc->dad, bc->oad, AST_FORMAT_ALAW, bc->port, bc->channel);
if (!chan) {
misdn_lib_send_event(bc,EVENT_RELEASE_COMPLETE);
ast_log(LOG_ERROR, "cb_events: misdn_new failed !\n");