Merged revisions 115315 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r115315 | russell | 2008-05-05 15:28:17 -0500 (Mon, 05 May 2008) | 2 lines

Remove my rant, since I have now replaced the rant with code.

........


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@115316 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 1 insertions, 14 deletions

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 6ec27becf..84c7759b2 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -1581,20 +1581,7 @@ static void remove_by_peercallno(struct chan_iax2_pvt *pvt)
 	ao2_unlink(iax_peercallno_pvts, pvt);
 }
 
-/*!
- * \todo XXX Note that this function contains a very expensive operation that
- * happens for *every* incoming media frame.  It iterates through every
- * possible call number, locking and unlocking each one, to try to match the
- * incoming frame to an active call.  Call numbers can be up to 2^15, 32768.
- * So, for a call with a local call number of 20000, every incoming audio
- * frame would require 20000 mutex lock and unlock operations.  Ouch.
- *
- * It's a shame that IAX2 media frames carry the source call number instead of
- * the destination call number.  If they did, this lookup wouldn't be needed.
- * However, it's too late to change that now.  Instead, we need to come up with
- * a better way of indexing active calls so that these frequent lookups are not
- * so expensive.
- *
+/*
  * \note Calling this function while holding another pvt lock can cause a deadlock.
  */
 static int __find_callno(unsigned short callno, unsigned short dcallno, struct sockaddr_in *sin, int new, int sockfd, int return_locked, int full_frame)