diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-28 16:13:34 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-28 16:13:34 +0000 |
commit | 8c653dc5c125614f66b4d353e2187e3e0c4ea215 (patch) | |
tree | 88e7e23f664c1b884a8f699fadd6173b156ed596 | |
parent | fbb76c4a14728417f6f6a538d7251c54116b6522 (diff) |
Merged revisions 134050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r134050 | mmichelson | 2008-07-28 11:00:19 -0500 (Mon, 28 Jul 2008) | 3 lines
merging the zap_and_dahdi_trunk branch up to trunk
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@134052 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | apps/app_chanspy.c | 13 | ||||
-rw-r--r-- | apps/app_dahdiscan.c | 2 | ||||
-rw-r--r-- | apps/app_meetme.c | 2 | ||||
-rw-r--r-- | include/asterisk/options.h | 2 | ||||
-rw-r--r-- | main/asterisk.c | 2 |
5 files changed, 4 insertions, 17 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index b657bcb29..126e1815a 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -168,13 +168,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 */ @@ -506,7 +499,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)) @@ -520,8 +513,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; @@ -955,7 +947,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 57cc231f3..83032d358 100644 --- a/apps/app_dahdiscan.c +++ b/apps/app_dahdiscan.c @@ -67,7 +67,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 418d56b36..a38194967 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1901,7 +1901,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", diff --git a/include/asterisk/options.h b/include/asterisk/options.h index 3d6f89ceb..f08b3bcf3 100644 --- a/include/asterisk/options.h +++ b/include/asterisk/options.h @@ -141,8 +141,6 @@ extern struct timeval ast_lastreloadtime; extern pid_t ast_mainpid; extern char record_cache_dir[AST_CACHE_DIR_LEN]; -extern char dahdi_chan_name[AST_CHANNEL_NAME]; -extern int dahdi_chan_name_len; extern int ast_language_is_prefix; diff --git a/main/asterisk.c b/main/asterisk.c index 6a02ea8b3..97a3e6cbe 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -162,8 +162,6 @@ int option_maxfiles; /*!< Max number of open file handles (files, sockets) */ #if defined(HAVE_SYSINFO) long option_minmemfree; /*!< Minimum amount of free system memory - stop accepting calls if free memory falls below this watermark */ #endif -char dahdi_chan_name[AST_CHANNEL_NAME] = "ZAP"; -int dahdi_chan_name_len = 3; /*! @} */ |