diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-09 20:18:15 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-09 20:18:15 +0000 |
| commit | 317142ea9fb6ad0430de62b4e97653d24efd1214 (patch) | |
| tree | 3242af6b2cd4b5984670e7bc2b74e67a63776011 | |
| parent | 3ca3c3b8bd9a1f748a6cc9b47787e0345a4cee8a (diff) | |
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.2@74158 f38db490-d61c-443f-a65b-d21fe96a405b
| -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 6471cb0fc..e66e171db 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -10664,6 +10664,14 @@ static int setup_zap(int reload) ast_log(LOG_WARNING, "Invalid AMA flags: %s at line %d\n", v->value, v->lineno); else chan_conf.amaflags = y; + } else if (!strcasecmp(v->name, "polarityonanswerdelay")) { + chan_conf.polarityonanswerdelay = atoi(v->value); + } else if (!strcasecmp(v->name, "answeronpolarityswitch")) { + chan_conf.answeronpolarityswitch = ast_true(v->value); + } else if (!strcasecmp(v->name, "hanguponpolarityswitch")) { + chan_conf.hanguponpolarityswitch = ast_true(v->value); + } else if (!strcasecmp(v->name, "sendcalleridafter")) { + chan_conf.sendcalleridafter = atoi(v->value); } else if(!reload){ if (!strcasecmp(v->name, "signalling")) { if (!strcasecmp(v->value, "em")) { @@ -11042,14 +11050,6 @@ static int setup_zap(int reload) } } close(ctlfd); - } else if (!strcasecmp(v->name, "polarityonanswerdelay")) { - chan_conf.polarityonanswerdelay = atoi(v->value); - } else if (!strcasecmp(v->name, "answeronpolarityswitch")) { - chan_conf.answeronpolarityswitch = ast_true(v->value); - } else if (!strcasecmp(v->name, "hanguponpolarityswitch")) { - chan_conf.hanguponpolarityswitch = ast_true(v->value); - } else if (!strcasecmp(v->name, "sendcalleridafter")) { - chan_conf.sendcalleridafter = atoi(v->value); } else if (!strcasecmp(v->name, "defaultcic")) { ast_copy_string(defaultcic, v->value, sizeof(defaultcic)); } else if (!strcasecmp(v->name, "defaultozz")) { |