This concludes my tweaking of things.
authorJoshua Colp <jcolp@digium.com>
Wed, 30 May 2007 16:11:57 +0000 (16:11 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 30 May 2007 16:11:57 +0000 (16:11 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66604 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_features.c
channels/chan_zap.c

index 0979270..813e701 100644 (file)
@@ -462,7 +462,7 @@ static struct ast_channel *features_new(struct feature_pvt *p, int state, int in
        for (x=1;x<4;x++) {
                if (b2)
                        free(b2);
-               asprintf(&b2, "Feature/%s/%s-%d", p->tech, p->dest, x);
+               asprintf(&b2, "%s/%s-%d", p->tech, p->dest, x);
                for (y=0;y<3;y++) {
                        if (y == index)
                                continue;
@@ -472,7 +472,7 @@ static struct ast_channel *features_new(struct feature_pvt *p, int state, int in
                if (y >= 3)
                        break;
        }
-       tmp = ast_channel_alloc(0, state, 0,0, "", "", "", 0, b2);
+       tmp = ast_channel_alloc(0, state, 0,0, "", "", "", 0, "Feature/%s", b2);
        /* free up the name, it was copied into the channel name */
        if (b2)
                free(b2);
index d1a6032..d4454c6 100644 (file)
@@ -5532,20 +5532,20 @@ static struct ast_channel *zt_new(struct zt_pvt *i, int state, int startpbx, int
                        free(b2);
 #ifdef HAVE_PRI
                if (i->bearer || (i->pri && (i->sig == SIG_FXSKS)))
-                       asprintf(&b2, "Zap/%d:%d-%d", i->pri->trunkgroup, i->channel, y);
+                       asprintf(&b2, "%d:%d-%d", i->pri->trunkgroup, i->channel, y);
                else
 #endif
                if (i->channel == CHAN_PSEUDO)
-                       asprintf(&b2, "Zap/pseudo-%ld", ast_random());
+                       asprintf(&b2, "pseudo-%ld", ast_random());
                else    
-                       asprintf(&b2, "Zap/%d-%d", i->channel, y);
+                       asprintf(&b2, "%d-%d", i->channel, y);
                for (x = 0; x < 3; x++) {
                        if ((index != x) && i->subs[x].owner && !strcasecmp(b2, i->subs[x].owner->name))
                                break;
                }
                y++;
        } while (x < 3);
-       tmp = ast_channel_alloc(0, state, i->cid_num, i->cid_name, i->accountcode, i->exten, i->context, i->amaflags, b2);
+       tmp = ast_channel_alloc(0, state, i->cid_num, i->cid_name, i->accountcode, i->exten, i->context, i->amaflags, "Zap/%s", b2);
        if (b2) /*!> b2 can be freed now, it's been copied into the channel structure */
                free(b2);
        if (!tmp)