diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-28 16:00:19 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-28 16:00:19 +0000 |
| commit | f76a823f67909ab70af23bdb74d143120ed9b7b3 (patch) | |
| tree | f54c744da738790027a3a283aca0ca09dec29679 /apps | |
| parent | f4056d9f182741f9ffc297f661ec2bc68f821939 (diff) | |
merging the zap_and_dahdi_trunk branch up to trunk
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134050 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_chanspy.c | 13 | ||||
| -rw-r--r-- | apps/app_dahdiscan.c | 2 | ||||
| -rw-r--r-- | apps/app_meetme.c | 2 |
3 files changed, 4 insertions, 13 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 7615ad4c8..4c5ab3333 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -219,13 +219,6 @@ AST_APP_OPTIONS(spy_opts, { }); static int next_unique_id_to_use = 0; -static int PSEUDO_CHAN_LEN; - -static void determine_pseudo_chan_len(void) -{ - PSEUDO_CHAN_LEN = dahdi_chan_name_len + strlen("/pseudo"); -} - struct chanspy_translation_helper { /* spy data */ @@ -602,7 +595,7 @@ static struct chanspy_ds *next_channel(struct ast_channel *chan, const char *exten, const char *context, struct chanspy_ds *chanspy_ds) { struct ast_channel *next; - char channel_name[AST_CHANNEL_NAME]; + const size_t pseudo_len = strlen("DAHDI/pseudo"); redo: if (!ast_strlen_zero(spec)) @@ -615,8 +608,7 @@ redo: if (!next) return NULL; - snprintf(channel_name, AST_CHANNEL_NAME, "%s/pseudo", dahdi_chan_name); - if (!strncmp(next->name, channel_name, PSEUDO_CHAN_LEN)) { + if (!strncmp(next->name, "DAHDI/pseudo", pseudo_len)) { last = next; ast_channel_unlock(next); goto redo; @@ -1109,7 +1101,6 @@ static int load_module(void) { int res = 0; - determine_pseudo_chan_len(); res |= ast_register_application(app_chan, chanspy_exec, tdesc, desc_chan); res |= ast_register_application(app_ext, extenspy_exec, tdesc, desc_ext); diff --git a/apps/app_dahdiscan.c b/apps/app_dahdiscan.c index d1d37fa51..70335b334 100644 --- a/apps/app_dahdiscan.c +++ b/apps/app_dahdiscan.c @@ -68,7 +68,7 @@ static char *descrip = static struct ast_channel *get_dahdi_channel_locked(int num) { char name[80]; - snprintf(name, sizeof(name), "%s/%d-1", dahdi_chan_name, num); + snprintf(name, sizeof(name), "DAHDI/%d-1", num); return ast_get_channel_by_name_locked(name); } diff --git a/apps/app_meetme.c b/apps/app_meetme.c index ee158b1fe..1c55bb6dd 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1927,7 +1927,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c ast_mutex_unlock(&conf->playlock); goto outrun; } - ast_debug(1, "Placed channel %s in ZAP conf %d\n", chan->name, conf->dahdiconf); + ast_debug(1, "Placed channel %s in DAHDI conf %d\n", chan->name, conf->dahdiconf); if (!sent_event) { manager_event(EVENT_FLAG_CALL, "MeetmeJoin", |