Date: Mon, 18 May 2009 06:20:37 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r192293 - in user/kmacy/releng_7_2_fcs: sbin/route sys/contrib/ipfilter/netinet sys/contrib/pf/net sys/dev/iicbus sys/dev/lmc sys/dev/ppbus sys/kern sys/net sys/net80211 sys/netgraph sy... Message-ID: <200905180620.n4I6Kb2D051920@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Mon May 18 06:20:37 2009 New Revision: 192293 URL: http://svn.freebsd.org/changeset/base/192293 Log: merge HEAD updates 191028 - use a shared lock for reads - remove stale comment 191033 - update bufring for ALTQ 191080 Extend route command: - add show as alias for get - add weights to allow mpath to do more than equal cost - add sticky / nostick to disable / re-enable per-connection load balancing This adds a field to rt_metrics_lite so network bits of world will need to be re-built. 191117 add an llentry to struct route{_in6} to allow it to be passed around with the rtentry 191120 make LLTABLE visible to netinet 191126 191148 Change if_output to take a struct route as its fourth argument in order to allow passing a cached struct llentry * down to L2 Modified: user/kmacy/releng_7_2_fcs/sbin/route/keywords user/kmacy/releng_7_2_fcs/sbin/route/route.c user/kmacy/releng_7_2_fcs/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c user/kmacy/releng_7_2_fcs/sys/contrib/pf/net/if_pflog.c user/kmacy/releng_7_2_fcs/sys/contrib/pf/net/if_pfsync.c user/kmacy/releng_7_2_fcs/sys/contrib/pf/net/pf.c user/kmacy/releng_7_2_fcs/sys/dev/iicbus/if_ic.c user/kmacy/releng_7_2_fcs/sys/dev/lmc/if_lmc.c user/kmacy/releng_7_2_fcs/sys/dev/lmc/if_lmc.h user/kmacy/releng_7_2_fcs/sys/dev/ppbus/if_plip.c user/kmacy/releng_7_2_fcs/sys/kern/vfs_vnops.c user/kmacy/releng_7_2_fcs/sys/net/ethernet.h user/kmacy/releng_7_2_fcs/sys/net/if_arc.h user/kmacy/releng_7_2_fcs/sys/net/if_arcsubr.c user/kmacy/releng_7_2_fcs/sys/net/if_atm.h user/kmacy/releng_7_2_fcs/sys/net/if_atmsubr.c user/kmacy/releng_7_2_fcs/sys/net/if_disc.c user/kmacy/releng_7_2_fcs/sys/net/if_enc.c user/kmacy/releng_7_2_fcs/sys/net/if_ethersubr.c user/kmacy/releng_7_2_fcs/sys/net/if_faith.c user/kmacy/releng_7_2_fcs/sys/net/if_fddisubr.c user/kmacy/releng_7_2_fcs/sys/net/if_fwsubr.c user/kmacy/releng_7_2_fcs/sys/net/if_gif.c user/kmacy/releng_7_2_fcs/sys/net/if_gif.h user/kmacy/releng_7_2_fcs/sys/net/if_gre.c user/kmacy/releng_7_2_fcs/sys/net/if_iso88025subr.c user/kmacy/releng_7_2_fcs/sys/net/if_lagg.c user/kmacy/releng_7_2_fcs/sys/net/if_lagg.h user/kmacy/releng_7_2_fcs/sys/net/if_loop.c user/kmacy/releng_7_2_fcs/sys/net/if_spppsubr.c user/kmacy/releng_7_2_fcs/sys/net/if_stf.c user/kmacy/releng_7_2_fcs/sys/net/if_tun.c user/kmacy/releng_7_2_fcs/sys/net/if_var.h user/kmacy/releng_7_2_fcs/sys/net/iso88025.h user/kmacy/releng_7_2_fcs/sys/net/radix_mpath.c user/kmacy/releng_7_2_fcs/sys/net/route.c user/kmacy/releng_7_2_fcs/sys/net/route.h user/kmacy/releng_7_2_fcs/sys/net/rtsock.c user/kmacy/releng_7_2_fcs/sys/net80211/ieee80211.c user/kmacy/releng_7_2_fcs/sys/net80211/ieee80211_output.c user/kmacy/releng_7_2_fcs/sys/net80211/ieee80211_proto.h user/kmacy/releng_7_2_fcs/sys/net80211/ieee80211_var.h user/kmacy/releng_7_2_fcs/sys/netgraph/ng_fec.c user/kmacy/releng_7_2_fcs/sys/netgraph/ng_iface.c user/kmacy/releng_7_2_fcs/sys/netinet/if_ether.c user/kmacy/releng_7_2_fcs/sys/netinet/in_pcb.h user/kmacy/releng_7_2_fcs/sys/netinet/in_var.h user/kmacy/releng_7_2_fcs/sys/netinet/ip_carp.c user/kmacy/releng_7_2_fcs/sys/netinet/ip_fastfwd.c user/kmacy/releng_7_2_fcs/sys/netinet/ip_output.c user/kmacy/releng_7_2_fcs/sys/netinet/sctp_structs.h user/kmacy/releng_7_2_fcs/sys/netinet6/in6.h user/kmacy/releng_7_2_fcs/sys/netinet6/nd6.c user/kmacy/releng_7_2_fcs/sys/netinet6/nd6.h user/kmacy/releng_7_2_fcs/sys/netipx/ipx_outputfl.c Modified: user/kmacy/releng_7_2_fcs/sbin/route/keywords ============================================================================== --- user/kmacy/releng_7_2_fcs/sbin/route/keywords Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sbin/route/keywords Mon May 18 06:20:37 2009 (r192293) @@ -33,6 +33,7 @@ mtu net netmask nostatic +nostick osi prefixlen proto1 @@ -44,8 +45,11 @@ rtt rttvar sa sendpipe +show ssthresh static +sticky +weight x25 xns xresolve Modified: user/kmacy/releng_7_2_fcs/sbin/route/route.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sbin/route/route.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sbin/route/route.c Mon May 18 06:20:37 2009 (r192293) @@ -169,6 +169,7 @@ main(argc, argv) if (*argv) switch (keyword(*argv)) { case K_GET: + case K_SHOW: uid = 0; /* FALLTHROUGH */ @@ -548,6 +549,7 @@ set_metric(value, key) caseof(K_SSTHRESH, RTV_SSTHRESH, rmx_ssthresh); caseof(K_RTT, RTV_RTT, rmx_rtt); caseof(K_RTTVAR, RTV_RTTVAR, rmx_rttvar); + caseof(K_WEIGHT, RTV_WEIGHT, rmx_weight); } rtm_inits |= flag; if (lockrest || locking) @@ -571,8 +573,9 @@ newroute(argc, argv) errx(EX_NOPERM, "must be root to alter routing table"); } cmd = argv[0]; - if (*cmd != 'g') + if (*cmd != 'g' && *cmd != 's') shutdown(s, SHUT_RD); /* Don't want to read back our messages */ + while (--argc > 0) { if (**(++argv)== '-') { switch (key = keyword(1 + *argv)) { @@ -635,6 +638,12 @@ newroute(argc, argv) case K_STATIC: flags |= RTF_STATIC; break; + case K_STICKY: + flags |= RTF_STICKY; + break; + case K_NOSTICK: + flags &= ~RTF_STICKY; + break; case K_IFA: if (!--argc) usage((char *)NULL); @@ -688,6 +697,7 @@ newroute(argc, argv) case K_SSTHRESH: case K_RTT: case K_RTTVAR: + case K_WEIGHT: if (!--argc) usage((char *)NULL); set_metric(*++argv, key); @@ -741,7 +751,7 @@ newroute(argc, argv) } else break; } - if (*cmd == 'g') + if (*cmd == 'g' || *cmd == 's') exit(ret != 0); if (!qflag) { oerrno = errno; @@ -1191,7 +1201,7 @@ rtmsg(cmd, flags) cmd = RTM_ADD; else if (cmd == 'c') cmd = RTM_CHANGE; - else if (cmd == 'g') { + else if (cmd == 'g' || cmd == 's') { cmd = RTM_GET; if (so_ifp.sa.sa_family == 0) { so_ifp.sa.sa_family = AF_LINK; @@ -1295,13 +1305,13 @@ char *msgtypes[] = { }; char metricnames[] = -"\011pksent\010rttvar\7rtt\6ssthresh\5sendpipe\4recvpipe\3expire\2hopcount" +"\011weight\010rttvar\7rtt\6ssthresh\5sendpipe\4recvpipe\3expire" "\1mtu"; char routeflags[] = -"\1UP\2GATEWAY\3HOST\4REJECT\5DYNAMIC\6MODIFIED\7DONE\010MASK_PRESENT" -"\011CLONING\012XRESOLVE\013LLINFO\014STATIC\015BLACKHOLE\016b016" -"\017PROTO2\020PROTO1\021PRCLONING\022WASCLONED\023PROTO3\024CHAINDELETE" -"\025PINNED\026LOCAL\027BROADCAST\030MULTICAST"; +"\1UP\2GATEWAY\3HOST\4REJECT\5DYNAMIC\6MODIFIED\7DONE" +"\012XRESOLVE\013LLINFO\014STATIC\015BLACKHOLE" +"\017PROTO2\020PROTO1\021PRCLONING\022WASCLONED\023PROTO3" +"\025PINNED\026LOCAL\027BROADCAST\030MULTICAST\035STICKY"; char ifnetflags[] = "\1UP\2BROADCAST\3DEBUG\4LOOPBACK\5PTP\6b6\7RUNNING\010NOARP" "\011PPROMISC\012ALLMULTI\013OACTIVE\014SIMPLEX\015LINK0\016LINK1" @@ -1464,14 +1474,13 @@ print_getmsg(rtm, msglen) #define msec(u) (((u) + 500) / 1000) /* usec to msec */ (void) printf("\n%s\n", "\ - recvpipe sendpipe ssthresh rtt,msec rttvar hopcount mtu expire"); + recvpipe sendpipe ssthresh rtt,msec mtu weight expire"); printf("%8ld%c ", rtm->rtm_rmx.rmx_recvpipe, lock(RPIPE)); printf("%8ld%c ", rtm->rtm_rmx.rmx_sendpipe, lock(SPIPE)); printf("%8ld%c ", rtm->rtm_rmx.rmx_ssthresh, lock(SSTHRESH)); printf("%8ld%c ", msec(rtm->rtm_rmx.rmx_rtt), lock(RTT)); - printf("%8ld%c ", msec(rtm->rtm_rmx.rmx_rttvar), lock(RTTVAR)); - printf("%8ld%c ", rtm->rtm_rmx.rmx_hopcount, lock(HOPCOUNT)); printf("%8ld%c ", rtm->rtm_rmx.rmx_mtu, lock(MTU)); + printf("%8ld%c ", rtm->rtm_rmx.rmx_weight, lock(WEIGHT)); if (rtm->rtm_rmx.rmx_expire) rtm->rtm_rmx.rmx_expire -= time(0); printf("%8ld%c\n", rtm->rtm_rmx.rmx_expire, lock(EXPIRE)); Modified: user/kmacy/releng_7_2_fcs/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Mon May 18 06:20:37 2009 (r192293) @@ -1034,7 +1034,7 @@ frdest_t *fdp; if (!ip->ip_sum) ip->ip_sum = in_cksum(m, hlen); error = (*ifp->if_output)(ifp, m, (struct sockaddr *)dst, - ro->ro_rt); + ro); goto done; } /* @@ -1115,7 +1115,7 @@ sendorfree: m->m_act = 0; if (error == 0) error = (*ifp->if_output)(ifp, m, - (struct sockaddr *)dst, ro->ro_rt); + (struct sockaddr *)dst, ro); else FREE_MB_T(m); } Modified: user/kmacy/releng_7_2_fcs/sys/contrib/pf/net/if_pflog.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/contrib/pf/net/if_pflog.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/contrib/pf/net/if_pflog.c Mon May 18 06:20:37 2009 (r192293) @@ -113,7 +113,7 @@ __FBSDID("$FreeBSD$"); void pflogattach(int); int pflogoutput(struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *); + struct route *); int pflogioctl(struct ifnet *, u_long, caddr_t); void pflogstart(struct ifnet *); #ifdef __FreeBSD__ @@ -287,7 +287,7 @@ pflogstart(struct ifnet *ifp) int pflogoutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, - struct rtentry *rt) + struct route *ro) { m_freem(m); return (0); Modified: user/kmacy/releng_7_2_fcs/sys/contrib/pf/net/if_pfsync.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/contrib/pf/net/if_pfsync.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/contrib/pf/net/if_pfsync.c Mon May 18 06:20:37 2009 (r192293) @@ -152,7 +152,7 @@ int pfsync_insert_net_state(struct pfsyn void pfsync_update_net_tdb(struct pfsync_tdb *); #endif int pfsyncoutput(struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *); + struct route *); int pfsyncioctl(struct ifnet *, u_long, caddr_t); void pfsyncstart(struct ifnet *); @@ -1083,7 +1083,7 @@ done: int pfsyncoutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, - struct rtentry *rt) + struct route *ro) { m_freem(m); return (0); Modified: user/kmacy/releng_7_2_fcs/sys/contrib/pf/net/pf.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/contrib/pf/net/pf.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/contrib/pf/net/pf.c Mon May 18 06:20:37 2009 (r192293) @@ -6234,7 +6234,7 @@ pf_route(struct mbuf **m, struct pf_rule } } PF_UNLOCK(); - error = (*ifp->if_output)(ifp, m0, sintosa(dst), ro->ro_rt); + error = (*ifp->if_output)(ifp, m0, sintosa(dst), ro); PF_LOCK(); goto done; } Modified: user/kmacy/releng_7_2_fcs/sys/dev/iicbus/if_ic.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/dev/iicbus/if_ic.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/dev/iicbus/if_ic.c Mon May 18 06:20:37 2009 (r192293) @@ -92,7 +92,7 @@ static int icattach(device_t); static int icioctl(struct ifnet *, u_long, caddr_t); static int icoutput(struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *); + struct route *); static void icintr(device_t, int, char *); @@ -341,7 +341,7 @@ icintr(device_t dev, int event, char *pt */ static int icoutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, - struct rtentry *rt) + struct route *ro) { device_t icdev = devclass_get_device(ic_devclass, ifp->if_dunit); device_t parent = device_get_parent(icdev); Modified: user/kmacy/releng_7_2_fcs/sys/dev/lmc/if_lmc.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/dev/lmc/if_lmc.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/dev/lmc/if_lmc.c Mon May 18 06:20:37 2009 (r192293) @@ -114,6 +114,7 @@ # include <net/if_types.h> # include <net/if_media.h> # include <net/netisr.h> +# include <net/route.h> # include <machine/bus.h> # include <machine/resource.h> # include <sys/rman.h> @@ -4583,7 +4584,7 @@ lmc_ifnet_start(struct ifnet *ifp) /* Called from a syscall (user context; no spinlocks). */ static int lmc_raw_output(struct ifnet *ifp, struct mbuf *m, - struct sockaddr *dst, struct rtentry *rt) + struct sockaddr *dst, struct route *ro) { softc_t *sc = IFP2SC(ifp); int error = 0; Modified: user/kmacy/releng_7_2_fcs/sys/dev/lmc/if_lmc.h ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/dev/lmc/if_lmc.h Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/dev/lmc/if_lmc.h Mon May 18 06:20:37 2009 (r192293) @@ -1595,7 +1595,7 @@ static int lmc_raw_ioctl(struct ifnet *, static int lmc_ifnet_ioctl(struct ifnet *, u_long, caddr_t); static void lmc_ifnet_start(struct ifnet *); static int lmc_raw_output(struct ifnet *, struct mbuf *, - struct sockaddr *, struct rtentry *); + struct sockaddr *, struct route *); static void lmc_ifnet_watchdog(struct ifnet *); # ifdef __OpenBSD__ static int ifmedia_change(struct ifnet *); Modified: user/kmacy/releng_7_2_fcs/sys/dev/ppbus/if_plip.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/dev/ppbus/if_plip.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/dev/ppbus/if_plip.c Mon May 18 06:20:37 2009 (r192293) @@ -99,6 +99,7 @@ __FBSDID("$FreeBSD$"); #include <net/if.h> #include <net/if_types.h> #include <net/netisr.h> +#include <net/route.h> #include <netinet/in.h> #include <netinet/in_var.h> @@ -168,7 +169,7 @@ static u_char *ctxmith; static int lpinittables(void); static int lpioctl(struct ifnet *, u_long, caddr_t); static int lpoutput(struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *); + struct route *); static void lp_intr(void *); #define DEVTOSOFTC(dev) \ @@ -603,8 +604,8 @@ lpoutbyte (u_char byte, int spin, device } static int -lpoutput (struct ifnet *ifp, struct mbuf *m, - struct sockaddr *dst, struct rtentry *rt) +lpoutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, + struct route *ro) { device_t dev = UNITODEVICE(ifp->if_dunit); device_t ppbus = device_get_parent(dev); Modified: user/kmacy/releng_7_2_fcs/sys/kern/vfs_vnops.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/kern/vfs_vnops.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/kern/vfs_vnops.c Mon May 18 06:20:37 2009 (r192293) @@ -363,14 +363,8 @@ vn_rdwr(rw, vp, base, len, offset, segfl != 0) return (error); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - } else { - /* - * XXX This should be LK_SHARED but I don't trust VFS - * enough to leave it like that until it has been - * reviewed further. - */ - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - } + } else + vn_lock(vp, LK_SHARED | LK_RETRY, td); } ASSERT_VOP_LOCKED(vp, "IO_NODELOCKED with no vp lock held"); Modified: user/kmacy/releng_7_2_fcs/sys/net/ethernet.h ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/ethernet.h Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/ethernet.h Mon May 18 06:20:37 2009 (r192293) @@ -365,7 +365,7 @@ struct ether_addr { struct ifnet; struct mbuf; -struct rtentry; +struct route; struct sockaddr; struct bpf_if; @@ -376,7 +376,7 @@ extern void ether_ifattach(struct ifnet extern void ether_ifdetach(struct ifnet *); extern int ether_ioctl(struct ifnet *, u_long, caddr_t); extern int ether_output(struct ifnet *, - struct mbuf *, struct sockaddr *, struct rtentry *); + struct mbuf *, struct sockaddr *, struct route *); extern int ether_output_frame(struct ifnet *, struct mbuf *); extern char *ether_sprintf(const u_int8_t *); void ether_vlan_mtap(struct bpf_if *, struct mbuf *, Modified: user/kmacy/releng_7_2_fcs/sys/net/if_arc.h ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/if_arc.h Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/if_arc.h Mon May 18 06:20:37 2009 (r192293) @@ -133,7 +133,7 @@ void arc_storelladdr(struct ifnet *, u_i int arc_isphds(u_int8_t); void arc_input(struct ifnet *, struct mbuf *); int arc_output(struct ifnet *, struct mbuf *, - struct sockaddr *, struct rtentry *); + struct sockaddr *, struct route *); int arc_ioctl(struct ifnet *, int, caddr_t); void arc_frag_init(struct ifnet *); Modified: user/kmacy/releng_7_2_fcs/sys/net/if_arcsubr.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/if_arcsubr.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/if_arcsubr.c Mon May 18 06:20:37 2009 (r192293) @@ -102,7 +102,7 @@ u_int8_t arcbroadcastaddr = 0; */ int arc_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, - struct rtentry *rt0) + struct route *ro) { struct arc_header *ah; int error; @@ -129,7 +129,8 @@ arc_output(struct ifnet *ifp, struct mbu else if (ifp->if_flags & IFF_NOARP) adst = ntohl(SIN(dst)->sin_addr.s_addr) & 0xFF; else { - error = arpresolve(ifp, rt0, m, dst, &adst, &lle); + error = arpresolve(ifp, ro ? ro->ro_rt : NULL, + m, dst, &adst, &lle); if (error) return (error == EWOULDBLOCK ? 0 : error); } Modified: user/kmacy/releng_7_2_fcs/sys/net/if_atm.h ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/if_atm.h Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/if_atm.h Mon May 18 06:20:37 2009 (r192293) @@ -293,7 +293,7 @@ void atm_ifdetach(struct ifnet *); void atm_input(struct ifnet *, struct atm_pseudohdr *, struct mbuf *, void *); int atm_output(struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *); + struct route *); struct atmio_vcctable *atm_getvccs(struct atmio_vcc **, u_int, u_int, struct mtx *, int); Modified: user/kmacy/releng_7_2_fcs/sys/net/if_atmsubr.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/if_atmsubr.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/if_atmsubr.c Mon May 18 06:20:37 2009 (r192293) @@ -113,17 +113,17 @@ MALLOC_DEFINE(M_IFATM, "ifatm", "atm int * "ifp" = ATM interface to output to * "m0" = the packet to output * "dst" = the sockaddr to send to (either IP addr, or raw VPI/VCI) - * "rt0" = the route to use + * "ro" = the route to use * returns: error code [0 == ok] * * note: special semantic: if (dst == NULL) then we assume "m" already * has an atm_pseudohdr on it and just send it directly. * [for native mode ATM output] if dst is null, then - * rt0 must also be NULL. + * ro->ro_rt must also be NULL. */ int atm_output(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst, - struct rtentry *rt0) + struct route *ro) { u_int16_t etype = 0; /* if using LLC/SNAP */ int error = 0, sz; @@ -157,7 +157,7 @@ atm_output(struct ifnet *ifp, struct mbu etype = ETHERTYPE_IPV6; else etype = ETHERTYPE_IP; - if (!atmresolve(rt0, m, dst, &atmdst)) { + if (!atmresolve(ro->ro_rt, m, dst, &atmdst)) { m = NULL; /* XXX: atmresolve already free'd it */ senderr(EHOSTUNREACH); Modified: user/kmacy/releng_7_2_fcs/sys/net/if_disc.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/if_disc.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/if_disc.c Mon May 18 06:20:37 2009 (r192293) @@ -66,7 +66,7 @@ struct disc_softc { }; static int discoutput(struct ifnet *, struct mbuf *, - struct sockaddr *, struct rtentry *); + struct sockaddr *, struct route *); static void discrtrequest(int, struct rtentry *, struct rt_addrinfo *); static int discioctl(struct ifnet *, u_long, caddr_t); static int disc_clone_create(struct if_clone *, int, caddr_t); @@ -156,7 +156,7 @@ DECLARE_MODULE(if_disc, disc_mod, SI_SUB static int discoutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, - struct rtentry *rt) + struct route *ro) { u_int32_t af; Modified: user/kmacy/releng_7_2_fcs/sys/net/if_enc.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/if_enc.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/if_enc.c Mon May 18 06:20:37 2009 (r192293) @@ -85,7 +85,7 @@ struct enc_softc { static int enc_ioctl(struct ifnet *, u_long, caddr_t); static int enc_output(struct ifnet *ifp, struct mbuf *m, - struct sockaddr *dst, struct rtentry *rt); + struct sockaddr *dst, struct route *ro); static int enc_clone_create(struct if_clone *, int, caddr_t); static void enc_clone_destroy(struct ifnet *); @@ -185,7 +185,7 @@ DECLARE_MODULE(enc, enc_mod, SI_SUB_PROT static int enc_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, - struct rtentry *rt) + struct route *ro) { m_freem(m); return (0); Modified: user/kmacy/releng_7_2_fcs/sys/net/if_ethersubr.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/if_ethersubr.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/if_ethersubr.c Mon May 18 06:20:37 2009 (r192293) @@ -163,17 +163,22 @@ static int ether_ipfw; */ int ether_output(struct ifnet *ifp, struct mbuf *m, - struct sockaddr *dst, struct rtentry *rt0) + struct sockaddr *dst, struct route *ro) { short type; - int error, hdrcmplt = 0; + int error = 0, hdrcmplt = 0; u_char esrc[ETHER_ADDR_LEN], edst[ETHER_ADDR_LEN]; struct llentry *lle = NULL; + struct rtentry *rt0 = NULL; struct ether_header *eh; struct pf_mtag *t; int loop_copy = 1; int hlen; /* link layer header length */ + if (ro != NULL) { + lle = ro->ro_lle; + rt0 = ro->ro_rt; + } #ifdef MAC error = mac_ifnet_check_transmit(ifp, m); if (error) @@ -191,7 +196,10 @@ ether_output(struct ifnet *ifp, struct m switch (dst->sa_family) { #ifdef INET case AF_INET: - error = arpresolve(ifp, rt0, m, dst, edst, &lle); + if (lle != NULL && (lle->la_flags & LLE_VALID)) + memcpy(edst, &lle->ll_addr.mac16, sizeof(edst)); + else + error = arpresolve(ifp, rt0, m, dst, edst, &lle); if (error) return (error == EWOULDBLOCK ? 0 : error); type = htons(ETHERTYPE_IP); @@ -226,7 +234,10 @@ ether_output(struct ifnet *ifp, struct m #endif #ifdef INET6 case AF_INET6: - error = nd6_storelladdr(ifp, m, dst, (u_char *)edst, &lle); + if (lle != NULL && (lle->la_flags & LLE_VALID)) + memcpy(edst, &lle->ll_addr.mac16, sizeof(edst)); + else + error = nd6_storelladdr(ifp, m, dst, (u_char *)edst, &lle); if (error) return error; type = htons(ETHERTYPE_IPV6); Modified: user/kmacy/releng_7_2_fcs/sys/net/if_faith.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/if_faith.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/if_faith.c Mon May 18 06:20:37 2009 (r192293) @@ -89,7 +89,7 @@ struct faith_softc { static int faithioctl(struct ifnet *, u_long, caddr_t); int faithoutput(struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *); + struct route *); static void faithrtrequest(int, struct rtentry *, struct rt_addrinfo *); #ifdef INET6 static int faithprefix(struct in6_addr *); @@ -189,17 +189,20 @@ faith_clone_destroy(ifp) } int -faithoutput(ifp, m, dst, rt) +faithoutput(ifp, m, dst, ro) struct ifnet *ifp; struct mbuf *m; struct sockaddr *dst; - struct rtentry *rt; + struct route *ro; { int isr; u_int32_t af; + struct rtentry *rt = NULL; M_ASSERTPKTHDR(m); + if (ro != NULL) + rt = ro->ro_rt; /* BPF writes need to be handled specially. */ if (dst->sa_family == AF_UNSPEC) { bcopy(dst->sa_data, &af, sizeof(af)); Modified: user/kmacy/releng_7_2_fcs/sys/net/if_fddisubr.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/if_fddisubr.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/if_fddisubr.c Mon May 18 06:20:37 2009 (r192293) @@ -98,7 +98,7 @@ static const u_char fddibroadcastaddr[FD static int fddi_resolvemulti(struct ifnet *, struct sockaddr **, struct sockaddr *); static int fddi_output(struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *); + struct route *); static void fddi_input(struct ifnet *ifp, struct mbuf *m); #define senderr(e) do { error = (e); goto bad; } while (0) @@ -111,18 +111,21 @@ static void fddi_input(struct ifnet *ifp * Assumes that ifp is actually pointer to arpcom structure. */ static int -fddi_output(ifp, m, dst, rt0) +fddi_output(ifp, m, dst, ro) struct ifnet *ifp; struct mbuf *m; struct sockaddr *dst; - struct rtentry *rt0; + struct route *ro; { u_int16_t type; int loop_copy = 0, error = 0, hdrcmplt = 0; u_char esrc[FDDI_ADDR_LEN], edst[FDDI_ADDR_LEN]; struct fddi_header *fh; struct llentry *lle; + struct rtentry *rt0 = NULL; + if (ro != NULL) + rt0 = ro->ro_rt; #ifdef MAC error = mac_ifnet_check_transmit(ifp, m); if (error) Modified: user/kmacy/releng_7_2_fcs/sys/net/if_fwsubr.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/if_fwsubr.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/if_fwsubr.c Mon May 18 06:20:37 2009 (r192293) @@ -77,7 +77,7 @@ struct fw_hwaddr firewire_broadcastaddr static int firewire_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, - struct rtentry *rt0) + struct route *ro) { struct fw_com *fc = IFP2FWC(ifp); int error, type; @@ -138,7 +138,7 @@ firewire_output(struct ifnet *ifp, struc * doesn't fit into the arp model. */ if (unicast) { - error = arpresolve(ifp, rt0, m, dst, (u_char *) destfw, &lle); + error = arpresolve(ifp, ro ? ro->ro_rt : NULL, m, dst, (u_char *) destfw, &lle); if (error) return (error == EWOULDBLOCK ? 0 : error); } Modified: user/kmacy/releng_7_2_fcs/sys/net/if_gif.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/if_gif.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/if_gif.c Mon May 18 06:20:37 2009 (r192293) @@ -388,11 +388,11 @@ gif_start(struct ifnet *ifp) } int -gif_output(ifp, m, dst, rt) +gif_output(ifp, m, dst, ro) struct ifnet *ifp; struct mbuf *m; struct sockaddr *dst; - struct rtentry *rt; /* added in net2 */ + struct route *ro; { INIT_VNET_GIF(ifp->if_vnet); struct gif_softc *sc = ifp->if_softc; Modified: user/kmacy/releng_7_2_fcs/sys/net/if_gif.h ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/if_gif.h Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/if_gif.h Mon May 18 06:20:37 2009 (r192293) @@ -106,7 +106,7 @@ struct etherip_header { /* Prototypes */ void gif_input(struct mbuf *, int, struct ifnet *); int gif_output(struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *); + struct route *); int gif_ioctl(struct ifnet *, u_long, caddr_t); int gif_set_tunnel(struct ifnet *, struct sockaddr *, struct sockaddr *); void gif_delete_tunnel(struct ifnet *); Modified: user/kmacy/releng_7_2_fcs/sys/net/if_gre.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/if_gre.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/if_gre.c Mon May 18 06:20:37 2009 (r192293) @@ -110,7 +110,7 @@ static int gre_clone_create(struct if_cl static void gre_clone_destroy(struct ifnet *); static int gre_ioctl(struct ifnet *, u_long, caddr_t); static int gre_output(struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *rt); + struct route *ro); IFC_SIMPLE_DECLARE(gre, 0); @@ -240,7 +240,7 @@ gre_clone_destroy(ifp) */ static int gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, - struct rtentry *rt) + struct route *ro) { #ifdef INET6 INIT_VNET_INET(ifp->if_vnet); Modified: user/kmacy/releng_7_2_fcs/sys/net/if_iso88025subr.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/if_iso88025subr.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/if_iso88025subr.c Mon May 18 06:20:37 2009 (r192293) @@ -232,11 +232,11 @@ iso88025_ioctl(struct ifnet *ifp, int co * ISO88025 encapsulation */ int -iso88025_output(ifp, m, dst, rt0) +iso88025_output(ifp, m, dst, ro) struct ifnet *ifp; struct mbuf *m; struct sockaddr *dst; - struct rtentry *rt0; + struct route *ro; { u_int16_t snap_type = 0; int loop_copy = 0, error = 0, rif_len = 0; @@ -245,6 +245,10 @@ iso88025_output(ifp, m, dst, rt0) struct iso88025_header gen_th; struct sockaddr_dl *sdl = NULL; struct llentry *lle; + struct rtentry *rt0 = NULL; + + if (ro != NULL) + rt0 = ro->ro_rt; #ifdef MAC error = mac_ifnet_check_transmit(ifp, m); Modified: user/kmacy/releng_7_2_fcs/sys/net/if_lagg.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/if_lagg.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/if_lagg.c Mon May 18 06:20:37 2009 (r192293) @@ -93,7 +93,7 @@ static void lagg_linkstate(struct lagg_s static void lagg_port_state(struct ifnet *, int); static int lagg_port_ioctl(struct ifnet *, u_long, caddr_t); static int lagg_port_output(struct ifnet *, struct mbuf *, - struct sockaddr *, struct rtentry *); + struct sockaddr *, struct route *); static void lagg_port_ifdetach(void *arg __unused, struct ifnet *); static int lagg_port_checkstacking(struct lagg_softc *); static void lagg_port2req(struct lagg_port *, struct lagg_reqport *); @@ -676,7 +676,7 @@ fallback: static int lagg_port_output(struct ifnet *ifp, struct mbuf *m, - struct sockaddr *dst, struct rtentry *rt0) + struct sockaddr *dst, struct route *ro) { struct lagg_port *lp = ifp->if_lagg; struct ether_header *eh; @@ -696,7 +696,7 @@ lagg_port_output(struct ifnet *ifp, stru */ switch (ntohs(type)) { case ETHERTYPE_PAE: /* EAPOL PAE/802.1x */ - return ((*lp->lp_output)(ifp, m, dst, rt0)); + return ((*lp->lp_output)(ifp, m, dst, ro)); } /* drop any other frames */ Modified: user/kmacy/releng_7_2_fcs/sys/net/if_lagg.h ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/if_lagg.h Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/if_lagg.h Mon May 18 06:20:37 2009 (r192293) @@ -218,7 +218,7 @@ struct lagg_port { /* Redirected callbacks */ int (*lp_ioctl)(struct ifnet *, u_long, caddr_t); int (*lp_output)(struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *); + struct route *); SLIST_ENTRY(lagg_port) lp_entries; }; Modified: user/kmacy/releng_7_2_fcs/sys/net/if_loop.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/if_loop.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/if_loop.c Mon May 18 06:20:37 2009 (r192293) @@ -98,7 +98,7 @@ int loioctl(struct ifnet *, u_long, caddr_t); static void lortrequest(int, struct rtentry *, struct rt_addrinfo *); int looutput(struct ifnet *ifp, struct mbuf *m, - struct sockaddr *dst, struct rtentry *rt); + struct sockaddr *dst, struct route *ro); static int lo_clone_create(struct if_clone *, int, caddr_t); static void lo_clone_destroy(struct ifnet *); @@ -178,15 +178,18 @@ DECLARE_MODULE(loop, loop_mod, SI_SUB_PR int looutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, - struct rtentry *rt) + struct route *ro) { u_int32_t af; + struct rtentry *rt = NULL; #ifdef MAC int error; #endif M_ASSERTPKTHDR(m); /* check if we have the packet header */ + if (ro != NULL) + rt = ro->ro_rt; #ifdef MAC error = mac_ifnet_check_transmit(ifp, m); if (error) { Modified: user/kmacy/releng_7_2_fcs/sys/net/if_spppsubr.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/if_spppsubr.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/if_spppsubr.c Mon May 18 06:20:37 2009 (r192293) @@ -263,7 +263,7 @@ static const u_short interactive_ports[8 int debug = ifp->if_flags & IFF_DEBUG static int sppp_output(struct ifnet *ifp, struct mbuf *m, - struct sockaddr *dst, struct rtentry *rt); + struct sockaddr *dst, struct route *ro); static void sppp_cisco_send(struct sppp *sp, int type, long par1, long par2); static void sppp_cisco_input(struct sppp *sp, struct mbuf *m); @@ -786,7 +786,7 @@ sppp_ifstart(struct ifnet *ifp) */ static int sppp_output(struct ifnet *ifp, struct mbuf *m, - struct sockaddr *dst, struct rtentry *rt) + struct sockaddr *dst, struct route *ro) { struct sppp *sp = IFP2SP(ifp); struct ppp_header *h; Modified: user/kmacy/releng_7_2_fcs/sys/net/if_stf.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/if_stf.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/if_stf.c Mon May 18 06:20:37 2009 (r192293) @@ -178,7 +178,7 @@ static int stfmodevent(module_t, int, vo static int stf_encapcheck(const struct mbuf *, int, int, void *); static struct in6_ifaddr *stf_getsrcifa6(struct ifnet *); static int stf_output(struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *); + struct route *); static int isrfc1918addr(struct in_addr *); static int stf_checkaddr4(struct stf_softc *, struct in_addr *, struct ifnet *); @@ -403,11 +403,11 @@ stf_getsrcifa6(ifp) } static int -stf_output(ifp, m, dst, rt) +stf_output(ifp, m, dst, ro) struct ifnet *ifp; struct mbuf *m; struct sockaddr *dst; - struct rtentry *rt; + struct route *ro; { struct stf_softc *sc; struct sockaddr_in6 *dst6; Modified: user/kmacy/releng_7_2_fcs/sys/net/if_tun.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/if_tun.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/if_tun.c Mon May 18 06:20:37 2009 (r192293) @@ -129,7 +129,7 @@ static int tunifioctl(struct ifnet *, u_ static int tuninit(struct ifnet *); static int tunmodevent(module_t, int, void *); static int tunoutput(struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *rt); + struct route *ro); static void tunstart(struct ifnet *); static int tun_clone_create(struct if_clone *, int, caddr_t); @@ -591,7 +591,7 @@ tunoutput( struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst, - struct rtentry *rt) + struct route *ro) { struct tun_softc *tp = ifp->if_softc; u_short cached_tun_flags; Modified: user/kmacy/releng_7_2_fcs/sys/net/if_var.h ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/if_var.h Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/if_var.h Mon May 18 06:20:37 2009 (r192293) @@ -70,6 +70,7 @@ struct socket; struct ether_header; struct carp_if; struct ifvlantrunk; +struct route; #endif #include <sys/queue.h> /* get TAILQ macros */ @@ -149,7 +150,7 @@ struct ifnet { /* procedure handles */ int (*if_output) /* output routine (enqueue) */ (struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *); + struct route *); void (*if_input) /* input routine (from h/w driver) */ (struct ifnet *, struct mbuf *); void (*if_start) /* initiate output routine */ @@ -571,6 +572,12 @@ drbr_enqueue(struct ifnet *ifp, struct b int len = m->m_pkthdr.len; int mflags = m->m_flags; +#ifdef ALTQ + if (ALTQ_IS_ENABLED(&ifp->if_snd)) { + IFQ_ENQUEUE(&ifp->if_snd, m, error); + return (error); + } +#endif if ((error = buf_ring_enqueue(br, m)) == ENOBUFS) { br->br_drops++; _IF_DROP(&ifp->if_snd); @@ -591,8 +598,31 @@ drbr_free(struct buf_ring *br, struct ma buf_ring_free(br, type); } + +static __inline struct mbuf * +drbr_dequeue(struct ifnet *ifp, struct buf_ring *br) +{ +#ifdef ALTQ + struct mbuf *m; + + if (ALTQ_IS_ENABLED(&ifp->if_snd)) { + IFQ_DRV_DEQUEUE(&ifp->if_snd, m); + return (m); + } #endif + return (buf_ring_dequeue_sc(br)); +} +static __inline int +drbr_empty(struct ifnet *ifp, struct buf_ring *br) +{ +#ifdef ALTQ + if (ALTQ_IS_ENABLED(&ifp->if_snd)) + return (IFQ_DRV_IS_EMPTY(&ifp->if_snd)); +#endif + return (buf_ring_empty(br)); +} +#endif /* * 72 was chosen below because it is the size of a TCP/IP * header (40) + the minimum mss (32). Modified: user/kmacy/releng_7_2_fcs/sys/net/iso88025.h ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/iso88025.h Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/iso88025.h Mon May 18 06:20:37 2009 (r192293) @@ -166,7 +166,7 @@ void iso88025_ifattach (struct ifnet *, void iso88025_ifdetach (struct ifnet *, int); int iso88025_ioctl (struct ifnet *, int , caddr_t ); int iso88025_output (struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *); + struct route *); void iso88025_input (struct ifnet *, struct mbuf *); #endif Modified: user/kmacy/releng_7_2_fcs/sys/net/radix_mpath.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/radix_mpath.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/radix_mpath.c Mon May 18 06:20:37 2009 (r192293) @@ -77,15 +77,18 @@ rn_mpath_next(struct radix_node *rn) return NULL; } -u_int32_t +uint32_t rn_mpath_count(struct radix_node *rn) { - u_int32_t i; - - i = 1; - while ((rn = rn_mpath_next(rn)) != NULL) - i++; - return i; + uint32_t i = 0; + struct rtentry *rt; + + while (rn != NULL) { + rt = (struct rtentry *)rn; + i += rt->rt_rmx.rmx_weight; + rn = rn_mpath_next(rn); + } + return (i); } struct rtentry * @@ -256,10 +259,12 @@ different: } void -rtalloc_mpath_fib(struct route *ro, u_int32_t hash, u_int fibnum) +rtalloc_mpath_fib(struct route *ro, uint32_t hash, u_int fibnum) { struct radix_node *rn0, *rn; u_int32_t n; + struct rtentry *rt; + int64_t weight; /* * XXX we don't attempt to lookup cached route again; what should @@ -284,25 +289,31 @@ rtalloc_mpath_fib(struct route *ro, u_in /* gw selection by Modulo-N Hash (RFC2991) XXX need improvement? */ hash += hashjitter; hash %= n; - while (hash-- > 0 && rn) { + for (weight = abs((int32_t)hash), rt = ro->ro_rt; + weight >= rt->rt_rmx.rmx_weight && rn; + weight -= rt->rt_rmx.rmx_weight) { + /* stay within the multipath routes */ if (rn->rn_dupedkey && rn->rn_mask != rn->rn_dupedkey->rn_mask) break; rn = rn->rn_dupedkey; + rt = (struct rtentry *)rn; } - /* XXX try filling rt_gwroute and avoid unreachable gw */ - /* if gw selection fails, use the first match (default) */ + /* gw selection has failed - there must be only zero weight routes */ if (!rn) { RT_UNLOCK(ro->ro_rt); + ro->ro_rt = NULL; return; } - - RTFREE_LOCKED(ro->ro_rt); - ro->ro_rt = (struct rtentry *)rn; - RT_LOCK(ro->ro_rt); - RT_ADDREF(ro->ro_rt); + if (ro->ro_rt != rt) { + RTFREE_LOCKED(ro->ro_rt); + ro->ro_rt = (struct rtentry *)rn; + RT_LOCK(ro->ro_rt); + RT_ADDREF(ro->ro_rt); + + } RT_UNLOCK(ro->ro_rt); } Modified: user/kmacy/releng_7_2_fcs/sys/net/route.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/route.c Mon May 18 06:19:17 2009 (r192292) +++ user/kmacy/releng_7_2_fcs/sys/net/route.c Mon May 18 06:20:37 2009 (r192293) @@ -803,6 +803,103 @@ bad: return (error); } +#ifdef RADIX_MPATH +static int +rn_mpath_update(int req, struct rt_addrinfo *info, + struct radix_node_head *rnh, struct rtentry **ret_nrt) +{ + /* + * if we got multipath routes, we require users to specify + * a matching RTAX_GATEWAY. + */ + struct rtentry *rt, *rto = NULL; + register struct radix_node *rn; + int error = 0; + + rn = rnh->rnh_matchaddr(dst, rnh); + if (rn == NULL) + return (ESRCH); + rto = rt = RNTORT(rn); + rt = rt_mpath_matchgate(rt, gateway); + if (rt == NULL) + return (ESRCH); + /* + * this is the first entry in the chain + */ + if (rto == rt) { + rn = rn_mpath_next((struct radix_node *)rt); + /* + * there is another entry, now it's active + */ + if (rn) { + rto = RNTORT(rn); + RT_LOCK(rto); + rto->rt_flags |= RTF_UP; + RT_UNLOCK(rto); + } else if (rt->rt_flags & RTF_GATEWAY) { + /* + * For gateway routes, we need to + * make sure that we we are deleting + * the correct gateway. + * rt_mpath_matchgate() does not + * check the case when there is only + * one route in the chain. + */ + if (gateway && + (rt->rt_gateway->sa_len != gateway->sa_len || + memcmp(rt->rt_gateway, gateway, gateway->sa_len))) + error = ESRCH; + goto done; + } + /* + * use the normal delete code to remove + * the first entry + */ + if (req != RTM_DELETE) + goto nondelete; + + error = ENOENT; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905180620.n4I6Kb2D051920>