From f7be96907198acf5e871e07bc74fbde6be85c46c Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 5 Dec 1995 04:59:56 +0000 Subject: [PATCH] Submitted by: john hay >From jhay@mikom.csir.co.za Mon Dec 4 09:48:12 1995 Subject: Yet another IPXrouted fix I think these should should make IPXrouted fairly stable. These last problems only showed when we had more than one route of the same cost to a net. This will fix some endless loops in the clone code. John -- John Hay -- John.Hay@csir.co.za --- usr.sbin/IPXrouted/output.c | 4 ++-- usr.sbin/IPXrouted/sap_output.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/usr.sbin/IPXrouted/output.c b/usr.sbin/IPXrouted/output.c index e2dcb5667e82..b8975e23413b 100644 --- a/usr.sbin/IPXrouted/output.c +++ b/usr.sbin/IPXrouted/output.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: output.c,v 1.6 1995/10/11 18:57:22 jhay Exp $ + * $Id: output.c,v 1.1 1995/10/26 21:28:20 julian Exp $ */ #ifndef lint @@ -166,7 +166,7 @@ supply(dst, flags, ifp) crt = rt->rt_clone; while (crt) { if (crt->rt_ifp == ifp) - continue; + goto next; crt = crt->rt_clone; } diff --git a/usr.sbin/IPXrouted/sap_output.c b/usr.sbin/IPXrouted/sap_output.c index 472e03848109..9456d81cd8bc 100644 --- a/usr.sbin/IPXrouted/sap_output.c +++ b/usr.sbin/IPXrouted/sap_output.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sap_output.c,v 1.1 1995/10/26 21:28:24 julian Exp $ + * $Id: sap_output.c,v 1.2 1995/11/13 21:01:34 julian Exp $ */ /* @@ -157,7 +157,7 @@ sap_supply(dst, flags, ifp, ServType) csap = sap->clone; while (csap) { if (csap->ifp == ifp) - continue; + goto next; csap = csap->clone; } @@ -172,6 +172,7 @@ sap_supply(dst, flags, ifp, ServType) *n = sap->sap; n->hops = htons(metric); n++; +next: } if (n != sap_msg->sap) { size = (char *)n - (char *)sap_msg;