path: root/doc
diff options
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-08-22 20:21:36 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-08-22 20:21:36 +0000
commit7cfb554bf63d2603089d66ae9d65882c07580cc0 (patch)
tree63f9173d3291623373adb5a46c25bead4035bcab /doc
parenta3794b65b87cf7e0c2ac0de816446c369f522966 (diff)
Merge changes from team/russell/iax_refcount.
This set of changes fixes problems with the handling of iax2_user and iax2_peer objects. It was very possible for a thread to still hold a reference to one of these objects while a reload operation tries to delete them. The fix here is to ensure that all references to these objects are tracked so that they can't go away while still in use. To accomplish this, I used the astobj2 reference counted object model. This code has been in one of Luigi Rizzo's branches for a long time and was primarily developed by one of his students, Marta Carbone. I wanted to go ahead and bring this in to 1.4 because there are other problems similar to the ones fixed by these changes, so we might as well go ahead and use the new astobj if we're going to go through all of the work necessary to fix the problems. As a nice side benefit of these changes, peer and user handling got more efficient. Using astobj2 lets us not hold the container lock for peers or users nearly as long while iterating. Also, by changing a define at the top of chan_iax2.c, the objects will be distributed in a hash table, drastically increasing lookup speed in these containers, which will have a very big impact on systems that have a large number of users or peers. The use of the hash table will be made the default in trunk. It is not the default in 1.4 because it changes the behavior slightly. Previously, since peers and users were stored in memory in the same order they were specified in the configuration file, you could influence peer and user matching order based on the order they are specified in the configuration. The hash table does not guarantee any order in the container, so this behavior will be going away. It just means that you have to be a little more careful ensuring that peers and users are matched explicitly and not forcing chan_iax2 to have to guess which user is the right one based on secret, host, and access list settings, instead of simply using the username. If you have any questions, feel free to ask on the asterisk-dev list. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@80362 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'doc')
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/iax.txt b/doc/iax.txt
index 9a17c098d..cf952a113 100644
--- a/doc/iax.txt
+++ b/doc/iax.txt
@@ -16,7 +16,7 @@ the peer will select one.
The peer uses a score to determine the best user entry to match against if
one is not specified:
-1. User entry last specified in iax.conf (this is the baseline).
+1. User entry with secret and no ACL specified.
2. User entry with secret specified and ACL specified.
3. User entry with no secret specified and no ACL specified.
4. User entry with no secret specified and ACL specified.