[asterisk-commits] branch oej/test-this-branch r12343 - in /team/oej/test-this-branch: ./ channels/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue Mar  7 07:58:25 2006
New Revision: 12343

URL: http://svn.digium.com/view/asterisk?rev=12343&view=rev
Log:
Oops. An ASTOBJ can't be linked into two lists. Thank you, Luigi,
for alerting me on this fact. From now on, type=friend is exactly
the same as type=peer.

Modified:
    team/oej/test-this-branch/README.test-this-branch
    team/oej/test-this-branch/channels/chan_sip.c

Modified: team/oej/test-this-branch/README.test-this-branch
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/README.test-this-branch?rev=12343&r1=12342&r2=12343&view=diff
==============================================================================
--- team/oej/test-this-branch/README.test-this-branch (original)
+++ team/oej/test-this-branch/README.test-this-branch Tue Mar  7 07:58:25 2006
@@ -27,6 +27,7 @@
 - amieventhook-561 rev 11712: Support for manager event hooks (#5161, anthm)
 - func_realtime: Realtime dialplan function (bweschke, #5695)
 - metermaids: Subscription support for parking lots (#5779)
+- filenamelen: Some code changes for file name lengths (oej)
 
 And the following stand-alone patches
 - New CLI commands for global variables (oej, #6506)

Modified: team/oej/test-this-branch/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/channels/chan_sip.c?rev=12343&r1=12342&r2=12343&view=diff
==============================================================================
--- team/oej/test-this-branch/channels/chan_sip.c (original)
+++ team/oej/test-this-branch/channels/chan_sip.c Tue Mar  7 07:58:25 2006
@@ -12903,7 +12903,8 @@
 			if (!strcasecmp(utype, "user"))
 				type = SIP_USER;
 			else if (!strcasecmp(utype, "friend"))
-				type = SIP_USER | SIP_PEER;
+				/* type = SIP_USER | SIP_PEER; */
+				type = SIP_PEER;
 			else if (!strcasecmp(utype, "peer"))
 				type = SIP_PEER;
 			else {
@@ -12920,7 +12921,7 @@
 			}
 			if (type & SIP_USER) {
 				/* We already have a device for a friend, link it in again */
-				if (!(type & SIP_PEER))	/* Friend ? Don't build a new object, just re-use the peer object */
+				/* if (!(type & SIP_PEER))*/	/* Friend ? Don't build a new object, just re-use the peer object */
 					device = build_user(cat, ast_variable_browse(cfg, cat), 0);
 				if (device) {
 					ASTOBJ_CONTAINER_LINK(&userl,device);