automerge commit

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 0f561e00530399172ef5d0e38ffb1f58a0cf8605..3bdd540fbd2349cfd96e7ce4663c8c3cf11731fb 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -2811,11 +2811,11 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, char *title)
        fmt = ast_best_codec(tmp->nativeformats);
 
        if (title)
-               snprintf(tmp->name, sizeof(tmp->name), "SIP/%s-%04x", title, thread_safe_rand() & 0xffff);
+               snprintf(tmp->name, sizeof(tmp->name), "SIP/%s-%08x", title, (int)(long) i);
        else if (strchr(i->fromdomain,':'))
-               snprintf(tmp->name, sizeof(tmp->name), "SIP/%s-%08x", strchr(i->fromdomain,':')+1, (int)(long)(i));
+               snprintf(tmp->name, sizeof(tmp->name), "SIP/%s-%08x", strchr(i->fromdomain,':') + 1, (int)(long) i);
        else
-               snprintf(tmp->name, sizeof(tmp->name), "SIP/%s-%08x", i->fromdomain, (int)(long)(i));
+               snprintf(tmp->name, sizeof(tmp->name), "SIP/%s-%08x", i->fromdomain, (int)(long) i);
 
        tmp->type = channeltype;
        if (ast_test_flag(i, SIP_DTMF) ==  SIP_DTMF_INBAND) {