[svn-commits] crichter: branch 1.4 r89445 - /branches/1.4/channels/chan_misdn.c

[SVN commits to the Digium repositories]

Author: crichter
Date: Tue Nov 20 07:40:55 2007
New Revision: 89445

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89445
Log:
added RR patch from iroot #10908, thanks.

Modified:
    branches/1.4/channels/chan_misdn.c

Modified: branches/1.4/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_misdn.c?view=diff&rev=89445&r1=89444&r2=89445
==============================================================================
--- branches/1.4/channels/chan_misdn.c (original)
+++ branches/1.4/channels/chan_misdn.c Tue Nov 20 07:40:55 2007
@@ -3143,16 +3143,12 @@
 			if (!rr->port)
 				rr->port = misdn_cfg_get_next_port_spin(rr->port);
 			
-			for (; rr->port > 0 && rr->port != port_start;
-				 rr->port = misdn_cfg_get_next_port_spin(rr->port)) {
+			for (; rr->port > 0; rr->port = misdn_cfg_get_next_port_spin(rr->port)) {
 				int port_up;
 				int check;
 				int max_chan;
 				int last_chance = 0;
 
-				if (!port_start)
-					port_start = rr->port;
-
 				misdn_cfg_get(rr->port, MISDN_CFG_GROUPNAME, cfg_group, BUFFERSIZE);
 				if (strcasecmp(cfg_group, group))
 					continue;
@@ -3165,6 +3161,12 @@
 
 				if (check && port_up < 0)
 					ast_log(LOG_WARNING,"This port (%d) is blocked\n", rr->port);
+
+				if ((port_start == rr->port) && (port_up <= 0))
+					break;
+
+				if (!port_start)
+					port_start = rr->port;
 
 				if (port_up <= 0)
 					continue;