diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-07 01:31:27 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-07 01:31:27 +0000 |
| commit | 5c67b22ec7ecb708460e7dec348e9e9dd6b4e72f (patch) | |
| tree | b3787252154234fd0cbf65571782e9619bb4377f /channels | |
| parent | a7060738ab2d40649e5f917e17b718dbc7643b51 (diff) | |
Also, parse useincomingcalleridonzaptransfer (and add appropriate deprecation
warnings).
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@136348 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 44804a812..b85e0ab38 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -10791,6 +10791,9 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct return -1; } else if (!strcasecmp(v->name, "zapchan") || !strcasecmp(v->name, "dahdichan")) { ast_copy_string(dahdichan, v->value, sizeof(dahdichan)); + if (v->name[0] == 'z' || v->name[0] == 'Z') { + ast_log(LOG_WARNING, "Option zapchan has been deprecated in favor of dahdichan (found in [%s])\n", cat); + } } else if (!strcasecmp(v->name, "usedistinctiveringdetection")) { if (ast_true(v->value)) confp->chan.usedistinctiveringdetection = 1; @@ -10968,8 +10971,11 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct ast_copy_string(confp->chan.cid_name, v->value, sizeof(confp->chan.cid_name)); } else if (!strcasecmp(v->name, "cid_number")) { ast_copy_string(confp->chan.cid_num, v->value, sizeof(confp->chan.cid_num)); - } else if (!strcasecmp(v->name, "useincomingcalleridondahditransfer")) { + } else if (!strcasecmp(v->name, "useincomingcalleridondahditransfer") || !strcasecmp(v->name, "useincomingcalleridonzaptransfer")) { confp->chan.dahditrcallerid = ast_true(v->value); + if (strstr(v->name, "zap")) { + ast_log(LOG_WARNING, "Option useincomingcalleridonzaptransfer has been deprecated in favor of useincomingcalleridondahditransfer (in [%s]).\n", cat); + } } else if (!strcasecmp(v->name, "restrictcid")) { confp->chan.restrictcid = ast_true(v->value); } else if (!strcasecmp(v->name, "usecallingpres")) { |