automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@34661 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 0b668730d321e0f863cc045cff7f67792e0eb91c..387e673f6e4c826cc31ff366179a1dd62d093297 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -8191,11 +8191,7 @@ static struct iax2_peer *build_peer(const char *name, struct ast_variable *v, in
                peer->peercontext[0] = '\0';
                while(v) {
                        if (!strcasecmp(v->name, "secret")) {
-                               if (!ast_strlen_zero(peer->secret)) {
-                                       strncpy(peer->secret + strlen(peer->secret), ";", sizeof(peer->secret)-strlen(peer->secret) - 1);
-                                       strncpy(peer->secret + strlen(peer->secret), v->value, sizeof(peer->secret)-strlen(peer->secret) - 1);
-                               } else
-                                       ast_copy_string(peer->secret, v->value, sizeof(peer->secret));
+                               ast_copy_string(peer->secret, v->value, sizeof(peer->secret));
                        } else if (!strcasecmp(v->name, "mailbox")) {
                                ast_copy_string(peer->mailbox, v->value, sizeof(peer->mailbox));
                        } else if (!strcasecmp(v->name, "dbsecret")) {

diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
index 26d637d8db1889a78c729e76e62e80f32f20459b..2329187d11c6b969312498b31a1fa7de47f738aa 100644 (file)
--- a/configs/iax.conf.sample
+++ b/configs/iax.conf.sample
@@ -412,7 +412,9 @@ host=216.207.245.47
 ;type=friend
 ;host=dynamic
 ;regexten=1234
-;secret=moofoo
+;secret=moofoo   ; Multiple secrets may be specified. For a "user", all
+;secret=foomoo   ; specified entries will be accepted as valid. For a "peer",
+;secret=shazbot  ; only the last specified secret will be used.
 ;context=default
 ;permit=0.0.0.0/0.0.0.0
 

diff --git a/pbx.c b/pbx.c
index c45ec8e3b9299162f840941e7ebed0da30162059..ad57810a9da72bcbf3f8ccc9471f0e044e405d16 100644 (file)
--- a/pbx.c
+++ b/pbx.c
@@ -5432,7 +5432,8 @@ static int pbx_builtin_ringing(struct ast_channel *chan, void *data)
 static int pbx_builtin_busy(struct ast_channel *chan, void *data)
 {
        ast_indicate(chan, AST_CONTROL_BUSY);           
-       ast_setstate(chan, AST_STATE_BUSY);
+       if (chan->_state != AST_STATE_UP)
+               ast_setstate(chan, AST_STATE_BUSY);
        wait_for_hangup(chan, data);
        return -1;
 }
@@ -5443,7 +5444,8 @@ static int pbx_builtin_busy(struct ast_channel *chan, void *data)
 static int pbx_builtin_congestion(struct ast_channel *chan, void *data)
 {
        ast_indicate(chan, AST_CONTROL_CONGESTION);
-       ast_setstate(chan, AST_STATE_BUSY);
+       if (chan->_state != AST_STATE_UP)
+               ast_setstate(chan, AST_STATE_BUSY);
        wait_for_hangup(chan, data);
        return -1;
 }