diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-09 20:19:28 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-09 20:19:28 +0000 |
| commit | 087e5058aad53ac4f067a24a622e84e4b949fa24 (patch) | |
| tree | a862345cf3b2b03df3a24be9e2130a8dfbf9fe54 /channels | |
| parent | 62dc62ed182ae15b3f37b234e49b508935d1aa63 (diff) | |
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/branches/1.4@74159 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_zap.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index a6a77e72b..4de1b7127 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -10686,6 +10686,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; @@ -11095,14 +11103,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")) { |