[svn-commits] irroot: branch irroot/distrotech-customers-trunk r344961 - /team/irroot/distr...

[SVN commits to the Digium repositories]

Author: irroot
Date: Sat Nov 12 08:38:26 2011
New Revision: 344961

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=344961
Log:
Fixup wrap arround in chan_misdn round robin routing

Modified:
    team/irroot/distrotech-customers-trunk/channels/chan_misdn.c

Modified: team/irroot/distrotech-customers-trunk/channels/chan_misdn.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/chan_misdn.c?view=diff&rev=344961&r1=344960&r2=344961
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/chan_misdn.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/chan_misdn.c Sat Nov 12 08:38:26 2011
@@ -7891,6 +7891,7 @@
 			int port_up;
 			int check;
 			int maxbchans;
+			int wraped = 0;
 
 			if (!rr->port) {
 				rr->port = misdn_cfg_get_next_port_spin(0);
@@ -7926,6 +7927,11 @@
 					maxbchans = misdn_lib_get_maxchans(rr->port);
 
 					for (;rr->channel <= maxbchans;rr->channel++) {
+						/* ive come full circle and can stop now */
+						if (wraped && (rr->port == port_start) && (rr->channel == bchan_start)) {
+							break;
+						}
+
 						chan_misdn_log(4, rr->port, "Checking channel %d\n",  rr->channel);
 
 						if ((newbc = misdn_lib_get_free_bc(rr->port, rr->channel, 0, 0))) {
@@ -7940,9 +7946,9 @@
 					}
 
 				}
+				wraped = 1;
 			} while (!newbc && (rr->port > 0) &&
 				 ((rr->port != port_start) || ((rr->port == port_start) && (rr->channel < bchan_start))));
-
 		} else {
 			for (port = misdn_cfg_get_next_port(0); port > 0;
 				port = misdn_cfg_get_next_port(port)) {