patch-2.1.99 linux/net/ipv4/route.c

• Lines: 64
• Date: Tue Apr 28 11:10:11 1998
• Orig file: v2.1.98/linux/net/ipv4/route.c
• Orig date: Thu Mar 26 15:57:13 1998

diff -u --recursive --new-file v2.1.98/linux/net/ipv4/route.c linux/net/ipv4/route.c
@@ -5,7 +5,7 @@
  *
  *		ROUTE - implementation of the IP router.
  *
- * Version:	$Id: route.c,v 1.42 1998/03/20 09:12:09 davem Exp $
+ * Version:	$Id: route.c,v 1.47 1998/04/28 06:22:01 davem Exp $
  *
  * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
  *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
@@ -577,7 +577,7 @@
 	if (rt != NULL) {
 		if (dst->obsolete || rt->rt_flags&RTCF_REDIRECTED) {
 #if RT_CACHE_DEBUG >= 1
-			printk(KERN_DEBUG "ip_rt_advice: redirect to %08x/%02x dropped\n", rt->rt_dst, rt->key.tos);
+			printk(KERN_DEBUG "ip_rt_advice: redirect to %d.%d.%d.%d/%02x dropped\n", NIPQUAD(rt->rt_dst), rt->key.tos);
 #endif
 			ip_rt_put(rt);
 			rt_cache_flush(0);
@@ -725,11 +725,11 @@
 
 					mtu = guess_mtu(old_mtu);
 				}
-				if (mtu < rth->u.dst.pmtu) {
-					/* New mtu received -> path was valid */
-					dst_confirm(&rth->u.dst);
-
-					rth->u.dst.pmtu = mtu;
+				if (mtu <= rth->u.dst.pmtu) {
+					if (mtu < rth->u.dst.pmtu) { 
+						dst_confirm(&rth->u.dst);
+						rth->u.dst.pmtu = mtu;
+					}
 					est_mtu = mtu;
 				}
 			}
@@ -808,11 +808,18 @@
 #endif
 		rt->u.dst.window= fi->fib_window ? : 0;
 		rt->u.dst.rtt	= fi->fib_rtt ? : TCP_TIMEOUT_INIT;
+#ifdef CONFIG_NET_CLS_ROUTE
+		rt->u.dst.tclassid = FIB_RES_NH(*res).nh_tclassid;
+#endif
 	} else {
 		rt->u.dst.pmtu	= rt->u.dst.dev->mtu;
 		rt->u.dst.window= 0;
 		rt->u.dst.rtt	= TCP_TIMEOUT_INIT;
 	}
+#ifdef CONFIG_NET_CLS_ROUTE
+	if (rt->u.dst.tclassid == 0)
+		rt->u.dst.tclassid = fib_rules_tclass(res);
+#endif
         rt->rt_type = res->type;
 }
 
@@ -1205,6 +1212,9 @@
 	key.oif = oif;
 	key.scope = (tos&RTO_ONLINK) ? RT_SCOPE_LINK : RT_SCOPE_UNIVERSE;
 	res.fi = NULL;
+#ifdef CONFIG_IP_MULTIPLE_TABLES
+	res.r = NULL;
+#endif
 
 	if (saddr) {
 		if (MULTICAST(saddr) || BADCLASS(saddr) || ZERONET(saddr))