merging the zap_and_dahdi_trunk branch up to trunk

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134050 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index 7615ad4c8b4af0188e1d5667832f8746b2a51646..4c5ab333358deda952669dbfebd2d0b46f20031f 100644 (file)
--- 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 d1d37fa51bfcecac3bbfb45c524142c0f52535a3..70335b3345f6c3bd627252969b4f689de399bc8f 100644 (file)
--- 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 ee158b1fe85b856d622b7b89053dc5b3fb8ed332..1c55bb6dd77cc514685aa3d6330fc84e73563299 100644 (file)
--- 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", 

diff --git a/main/asterisk.c b/main/asterisk.c
index 9ef8d6522c1d257a5291fc6d9f6445302aaa1e93..20dd36343fe5089d5f8266c24c271c3cf89c3917 100644 (file)
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -158,8 +158,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;
 
 /*! @} */
 
@@ -2786,11 +2784,6 @@ static void ast_readconfig(void)
                                option_minmemfree = 0;
                        }
 #endif
-               } else if (!strcasecmp(v->name, "dahdichanname")) {
-                       if (!strcasecmp(v->value, "yes")) {
-                               ast_copy_string(dahdi_chan_name, "DAHDI", sizeof(dahdi_chan_name));
-                               dahdi_chan_name_len = 5;
-                       }
                } else if (!strcasecmp(v->name, "entityid")) {
                        struct ast_eid tmp_eid;
                        if (!ast_str_to_eid(&tmp_eid, v->value)) {