From 3f57a80c5ba6d4b87b3b1a2d703d4a5afa2ffb40 Mon Sep 17 00:00:00 2001 From: dbrooks Date: Mon, 2 Nov 2009 21:05:23 +0000 Subject: SIP channel name uniqueness SIP channel names were supposed to be unique by way of a name suffix derived from the pointer to the channel's private data. Uniqueness was preserved on 32-bit systems, but not on 64-bit systems. This patch, as suggested by kpfleming, replaces this suffix with a simple incremented unsigned int. (closes issue #15152) Reported by: palbrecht Review: https://reviewboard.asterisk.org/r/420/ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@226976 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_sip.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'channels/chan_sip.c') diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 4d98e98b2..8faed98ce 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -502,6 +502,8 @@ static const struct cfsip_methods { { SIP_PING, NO_RTP, "PING", CAN_CREATE_DIALOG_UNSUPPORTED_METHOD } }; +static unsigned int chan_idx; + /*! Define SIP option tags, used in Require: and Supported: headers We need to be aware of these properties in the phones to use the replace: header. We should not do that without knowing @@ -5713,7 +5715,7 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit sip_pvt_unlock(i); /* Don't hold a sip pvt lock while we allocate a channel */ - tmp = ast_channel_alloc(1, state, i->cid_num, i->cid_name, i->accountcode, i->exten, i->context, i->amaflags, "SIP/%s-%08x", my_name, (int)(long) i); + tmp = ast_channel_alloc(1, state, i->cid_num, i->cid_name, i->accountcode, i->exten, i->context, i->amaflags, "SIP/%s-%08x", my_name, ast_atomic_fetchadd_int((int *)&chan_idx, +1)); } if (!tmp) { -- cgit v1.2.3