==== //depot/projects/ethng/src/sys/net/if.h#2 (text+ko) - //depot/projects/toestack/sys/net/if.h#2 (text+ko) ==== content @@ -210,6 +210,8 @@ #define IFCAP_TSO4 0x0100 /* can do TCP Segmentation Offload */ #define IFCAP_TSO6 0x0200 /* can do TCP6 Segmentation Offload */ #define IFCAP_LRO 0x0400 /* can do Large Receive Offload */ +#define IFCAP_TOE 0x0800 /* can do TCP Offload */ + #define IFCAP_HWCSUM (IFCAP_RXCSUM | IFCAP_TXCSUM) #define IFCAP_TSO (IFCAP_TSO4 | IFCAP_TSO6) ==== //depot/projects/ethng/src/sys/net/if_ethersubr.c#6 (text+ko) - //depot/projects/toestack/sys/net/if_ethersubr.c#7 (text+ko) ==== content @@ -684,7 +684,7 @@ etype = ntohs(eh->ether_type); if ((m->m_flags & M_PKTHDR) == 0) - if_printf(ifp, "discard frame w/o packet header\n"); + if_printf(ifp, "discard frame w/o packet header m=%p\n", m); if (m->m_len < ETHER_HDR_LEN) if_printf(ifp, "discard frame w/o leading ethernet " "header (len %u pkt len %u)\n", ==== //depot/projects/ethng/src/sys/net/route.c#8 (text+ko) - //depot/projects/toestack/sys/net/route.c#7 (text+ko) ==== content @@ -442,7 +442,7 @@ int flags, struct sockaddr *src) { - struct rtentry *rt; + struct rtentry *rt, *rt0 = NULL; int error = 0; short *stat = NULL; struct rt_addrinfo info; @@ -486,8 +486,8 @@ * Create new route, rather than smashing route to net. */ create: - if (rt) - rtfree(rt); + rt0 = rt; + flags |= RTF_GATEWAY | RTF_DYNAMIC; bzero((caddr_t)&info, sizeof(info)); info.rti_info[RTAX_DST] = dst; @@ -496,13 +496,20 @@ info.rti_ifa = ifa; info.rti_flags = flags; rt = NULL; + error = rtrequest1(RTM_ADD, &info, &rt); if (rt != NULL) { RT_LOCK(rt); + EVENTHANDLER_INVOKE(route_event, RTEVENT_REDIRECT_UPDATE, rt0, rt); flags = rt->rt_flags; } + if (rt0) + RTFREE_LOCKED(rt0); + stat = &rtstat.rts_dynamic; } else { + struct rtentry *gwrt; + /* * Smash the current notion of the gateway to * this destination. Should check about netmask!!! @@ -514,12 +521,15 @@ * add the key and gateway (in one malloc'd chunk). */ rt_setgate(rt, rt_key(rt), gateway); + gwrt = rtalloc1(gateway, 1, 0); + EVENTHANDLER_INVOKE(route_event, RTEVENT_REDIRECT_UPDATE, rt, gwrt); + RTFREE_LOCKED(gwrt); } } else error = EHOSTUNREACH; done: if (rt) - rtfree(rt); + RTFREE_LOCKED(rt); out: if (error) rtstat.rts_badredirect++; ==== //depot/projects/ethng/src/sys/net/route.h#4 (text+ko) - //depot/projects/toestack/sys/net/route.h#6 (text+ko) ==== content @@ -364,6 +364,17 @@ struct sockaddr *, struct sockaddr *, int, struct rtentry **); int rtrequest1(int, struct rt_addrinfo *, struct rtentry **); int rt_check(struct rtentry **, struct rtentry **, struct sockaddr *); + + +#include +#define RTEVENT_ARP_UPDATE 1 +#define RTEVENT_PMTU_UPDATE 2 +#define RTEVENT_REDIRECT_UPDATE 3 +typedef void (*rtevent_fn)(void *, int, struct rtentry *, struct rtentry *); +EVENTHANDLER_DECLARE(route_event, rtevent_fn); + + + #endif #endif