diff options
| author | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-09 21:28:52 +0000 |
|---|---|---|
| committer | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-09 21:28:52 +0000 |
| commit | 8793d5bf3e1ff068f430b683e4fac355d49dcb5f (patch) | |
| tree | 0566815847d39fa96554abd20a1e9df9b5ee299c /channels | |
| parent | bedd0ecc2bafa7e02886c91c87912bfb08792d91 (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@74210 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 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")) { |