[asterisk-commits] branch oej/peermatch r12342 - /team/oej/peermatch/channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue Mar  7 07:56:02 2006
New Revision: 12342

URL: http://svn.digium.com/view/asterisk?rev=12342&view=rev
Log:
According to Luigi Rizzo, ASTOBJ can't handle one object being linked
into two lists. Ooops.
>From now on, a type=friend is exactly the same as type=peer

Modified:
    team/oej/peermatch/channels/chan_sip.c

Modified: team/oej/peermatch/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/peermatch/channels/chan_sip.c?rev=12342&r1=12341&r2=12342&view=diff
==============================================================================
--- team/oej/peermatch/channels/chan_sip.c (original)
+++ team/oej/peermatch/channels/chan_sip.c Tue Mar  7 07:56:02 2006
@@ -12542,7 +12542,10 @@
 			if (!strcasecmp(utype, "user"))
 				type = SIP_USER;
 			else if (!strcasecmp(utype, "friend"))
-				type = SIP_USER | SIP_PEER;
+				/* type = SIP_USER | SIP_PEER; */
+				/* ASTOBJ can't linke one object to two lists, so we
+				   have to make a decision here */
+				type = SIP_PEER;
 			else if (!strcasecmp(utype, "peer"))
 				type = SIP_PEER;
 			else {