d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add interface for allowing consumers to register for ARP updates,

Browse Source 
redirects, and path MTU changes

Reviewed by: silby
This commit is contained in:
Kip Macy 2007-12-12 20:53:25 +00:00
parent 284333d353
commit 8e7e854cd6
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/net/route.c
View File

@ -318,7 +318,7 @@ rtredirect(struct sockaddr *dst,
int flags, int flags,
struct sockaddr *src) struct sockaddr *src)
{ {
struct rtentry *rt; struct rtentry *rt, *rt0 = NULL;
int error = 0; int error = 0;
short *stat = NULL; short *stat = NULL;
struct rt_addrinfo info; struct rt_addrinfo info;
@ -362,8 +362,9 @@ rtredirect(struct sockaddr *dst,
* Create new route, rather than smashing route to net. * Create new route, rather than smashing route to net.
*/ */
create: create:
if (rt) rt0 = rt;
rtfree(rt); rt = NULL;
flags |= RTF_GATEWAY | RTF_DYNAMIC; flags |= RTF_GATEWAY | RTF_DYNAMIC;
bzero((caddr_t)&info, sizeof(info)); bzero((caddr_t)&info, sizeof(info));
info.rti_info[RTAX_DST] = dst; info.rti_info[RTAX_DST] = dst;
@ -371,14 +372,19 @@ rtredirect(struct sockaddr *dst,
info.rti_info[RTAX_NETMASK] = netmask; info.rti_info[RTAX_NETMASK] = netmask;
info.rti_ifa = ifa; info.rti_ifa = ifa;
info.rti_flags = flags; info.rti_flags = flags;
rt = NULL;
error = rtrequest1(RTM_ADD, &info, &rt); error = rtrequest1(RTM_ADD, &info, &rt);
if (rt != NULL) { if (rt != NULL) {
RT_LOCK(rt); RT_LOCK(rt);
EVENTHANDLER_INVOKE(route_event, RTEVENT_REDIRECT_UPDATE, rt0, rt, dst);
flags = rt->rt_flags; flags = rt->rt_flags;
} }
if (rt0)
RTFREE_LOCKED(rt0);
stat = &rtstat.rts_dynamic; stat = &rtstat.rts_dynamic;
} else { } else {
struct rtentry *gwrt;
/* /*
* Smash the current notion of the gateway to * Smash the current notion of the gateway to
* this destination. Should check about netmask!!! * this destination. Should check about netmask!!!
@ -390,6 +396,9 @@ rtredirect(struct sockaddr *dst,
* add the key and gateway (in one malloc'd chunk). * add the key and gateway (in one malloc'd chunk).
*/ */
rt_setgate(rt, rt_key(rt), gateway); rt_setgate(rt, rt_key(rt), gateway);
gwrt = rtalloc1(gateway, 1, 0);
EVENTHANDLER_INVOKE(route_event, RTEVENT_REDIRECT_UPDATE, rt, gwrt, dst);
RTFREE_LOCKED(gwrt);
} }
} else } else
error = EHOSTUNREACH; error = EHOSTUNREACH;

7
sys/net/route.h
View File

@ -359,6 +359,13 @@ int rtrequest(int, struct sockaddr *,
struct sockaddr *, struct sockaddr *, int, struct rtentry **); struct sockaddr *, struct sockaddr *, int, struct rtentry **);
int rtrequest1(int, struct rt_addrinfo *, struct rtentry **); int rtrequest1(int, struct rt_addrinfo *, struct rtentry **);
int rt_check(struct rtentry **, struct rtentry **, struct sockaddr *); int rt_check(struct rtentry **, struct rtentry **, struct sockaddr *);
#include <sys/eventhandler.h>
#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 *, struct sockaddr *);
EVENTHANDLER_DECLARE(route_event, rtevent_fn);
#endif #endif
#endif #endif

9
sys/netinet/if_ether.c
View File

@ -578,7 +578,10 @@ in_arpinput(struct mbuf *m)
#ifdef DEV_CARP #ifdef DEV_CARP
int carp_match = 0; int carp_match = 0;
#endif #endif
struct sockaddr_in sin;
sin.sin_len = sizeof(struct sockaddr_in);
sin.sin_family = AF_INET;
if (ifp->if_bridge) if (ifp->if_bridge)
bridged = 1; bridged = 1;
@ -772,6 +775,10 @@ match:
la->la_preempt = arp_maxtries; la->la_preempt = arp_maxtries;
hold = la->la_hold; hold = la->la_hold;
la->la_hold = NULL; la->la_hold = NULL;
sin.sin_addr.s_addr = ntohl(itaddr.s_addr);
EVENTHANDLER_INVOKE(route_event, RTEVENT_ARP_UPDATE, rt, NULL,
(struct sockaddr *)&sin);
RT_UNLOCK(rt); RT_UNLOCK(rt);
if (hold != NULL) if (hold != NULL)
(*ifp->if_output)(ifp, hold, rt_key(rt), rt); (*ifp->if_output)(ifp, hold, rt_key(rt), rt);