dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 74159 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.4

Closes issue #9186
................
r74159 | qwell | 2007-07-09 15:19:28 -0500 (Mon, 09 Jul 2007) | 16 lines

Merged revisions 74158 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r74158 | qwell | 2007-07-09 15:18:15 -0500 (Mon, 09 Jul 2007) | 8 lines

Several chan_zap options were not working on reload because they were arbitrarily
 disallowed when reloading some/most PRI options (such as signalling) was disallowed.

Options such as polarityonanswerdelay and answeronpolarityswitch can safely be changed on a reload.
This corrects that behavior.

Issue 9186, patch by tzafrir.

........

................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@74160 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
qwell 2007-07-09 20:21:13 +00:00
parent e1baa0a2b7
commit 66be536ad1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
channels/chan_zap.c
View File

@ -12131,6 +12131,14 @@ static int process_zap(struct zt_chan_conf *confp, struct ast_variable *v, int r
ast_log(LOG_WARNING, "Invalid AMA flags: %s at line %d\n", v->value, v->lineno);
else
confp->chan.amaflags = y;
} else if (!strcasecmp(v->name, "polarityonanswerdelay")) {
confp->chan.polarityonanswerdelay = atoi(v->value);
} else if (!strcasecmp(v->name, "answeronpolarityswitch")) {
confp->chan.answeronpolarityswitch = ast_true(v->value);
} else if (!strcasecmp(v->name, "hanguponpolarityswitch")) {
confp->chan.hanguponpolarityswitch = ast_true(v->value);
} else if (!strcasecmp(v->name, "sendcalleridafter")) {
confp->chan.sendcalleridafter = atoi(v->value);
} else if (!reload){
if (!strcasecmp(v->name, "signalling")) {
confp->chan.outsigmod = -1;
@ -12627,14 +12635,6 @@ static int process_zap(struct zt_chan_conf *confp, struct ast_variable *v, int r
}
}
close(ctlfd);
} else if (!strcasecmp(v->name, "polarityonanswerdelay")) {
confp->chan.polarityonanswerdelay = atoi(v->value);
} else if (!strcasecmp(v->name, "answeronpolarityswitch")) {
confp->chan.answeronpolarityswitch = ast_true(v->value);
} else if (!strcasecmp(v->name, "hanguponpolarityswitch")) {
confp->chan.hanguponpolarityswitch = ast_true(v->value);
} else if (!strcasecmp(v->name, "sendcalleridafter")) {
confp->chan.sendcalleridafter = atoi(v->value);
} else if (!strcasecmp(v->name, "defaultcic")) {
ast_copy_string(defaultcic, v->value, sizeof(defaultcic));
} else if (!strcasecmp(v->name, "defaultozz")) {