diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2011-07-21 18:06:47 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2011-07-21 18:06:47 +0000 |
| commit | 54f92a68c78def1c6c2694f05a7cfd13f00118df (patch) | |
| tree | 44d014727e86942e3d2727e9821709fa8a10dfbe /channels/chan_dahdi.c | |
| parent | a2e30b19082cddb82e7e0e50128b5b2d111173ec (diff) | |
Merged revisions 329204 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
................
r329204 | rmudgett | 2011-07-21 13:05:18 -0500 (Thu, 21 Jul 2011) | 13 lines
Merged revisions 329203 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r329203 | rmudgett | 2011-07-21 13:04:09 -0500 (Thu, 21 Jul 2011) | 6 lines
Document parkinglot in chan_dahdi.conf.sample.
* Document existing feature in chan_dahdi.conf.sample.
* Remove some dead code related to the parkinglot option.
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329205 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 079831340..ab31df413 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -410,8 +410,6 @@ static struct dahdi_ring_cadence AS_RP_cadence = {{250, 10000}}; static char defaultcic[64] = ""; static char defaultozz[64] = ""; -static char parkinglot[AST_MAX_EXTENSION] = ""; /*!< Default parking lot for this channel */ - /*! Run this script when the MWI state changes on an FXO line, if mwimonitor is enabled */ static char mwimonitornotify[PATH_MAX] = ""; #ifndef HAVE_DAHDI_LINEREVERSE_VMWI @@ -16927,11 +16925,6 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct if (!ast_jb_read_conf(&global_jbconf, v->name, v->value)) continue; - /* must have parkinglot in confp before build_channels is called */ - if (!strcasecmp(v->name, "parkinglot")) { - ast_copy_string(confp->chan.parkinglot, v->value, sizeof(confp->chan.parkinglot)); - } - /* Create the interface list */ if (!strcasecmp(v->name, "channel") || !strcasecmp(v->name, "channels")) { if (options & PROC_DAHDI_OPT_NOCHAN) { @@ -17095,7 +17088,7 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct } else if (!strcasecmp(v->name, "mohsuggest")) { ast_copy_string(confp->chan.mohsuggest, v->value, sizeof(confp->chan.mohsuggest)); } else if (!strcasecmp(v->name, "parkinglot")) { - ast_copy_string(parkinglot, v->value, sizeof(parkinglot)); + ast_copy_string(confp->chan.parkinglot, v->value, sizeof(confp->chan.parkinglot)); } else if (!strcasecmp(v->name, "stripmsd")) { ast_log(LOG_NOTICE, "Configuration option \"%s\" has been deprecated. Please use dialplan instead\n", v->name); confp->chan.stripmsd = atoi(v->value); |