hi, there!
I would like to commit ARP support for link level addresses with
arbitrary length. Patches against HEAD attached. Most of this stuff
was taken from NetBSD.
/fjoe
--- net/if.c.orig Wed Jul 18 23:47:39 2001
+++ net/if.c Tue Jul 17 16:36:04 2001
@@ -229,6 +229,7 @@
sdl->sdl_data[--namelen] = 0xff;
TAILQ_INSERT_HEAD(&ifp->if_addrhead, ifa, ifa_link);
}
+ ifp->if_broadcastaddr = 0; /* reliably crash if used uninitialized */
}
/*
--- net/if_arp.h.orig Mon Jul 16 19:30:56 2001
+++ net/if_arp.h Mon Jul 16 19:57:59 2001
@@ -51,6 +51,7 @@
u_short ar_hrd; /* format of hardware address */
#define ARPHRD_ETHER 1 /* ethernet hardware format */
#define ARPHRD_IEEE802 6 /* token-ring hardware format */
+#define ARPHRD_ARCNET 7 /* arcnet hardware format */
#define ARPHRD_FRELAY 15 /* frame relay hardware format */
u_short ar_pro; /* format of protocol address */
u_char ar_hln; /* length of hardware address */
@@ -73,6 +74,15 @@
u_char ar_tpa[]; /* target protocol address */
#endif
};
+
+#define ar_sha(ap) (((caddr_t)((ap)+1)) + 0)
+#define ar_spa(ap) (((caddr_t)((ap)+1)) + (ap)->ar_hln)
+#define ar_tha(ap) (((caddr_t)((ap)+1)) + (ap)->ar_hln + (ap)->ar_pln)
+#define ar_tpa(ap) (((caddr_t)((ap)+1)) + 2*(ap)->ar_hln + (ap->ar_pln))
+
+#define arphdr_len2(ar_hln, ar_pln) \
+ (sizeof(struct arphdr) + 2*(ar_hln) + 2*(ar_pln))
+#define arphdr_len(ap) (arphdr_len2((ap)->ar_hln, (ap)->ar_pln))
/*
* ARP ioctl request
--- net/if_ethersubr.c.orig Mon Jul 16 20:02:04 2001
+++ net/if_ethersubr.c Tue Jul 17 16:41:27 2001
@@ -175,7 +175,7 @@
switch (dst->sa_family) {
#ifdef INET
case AF_INET:
- if (!arpresolve(ac, rt, m, dst, edst, rt0))
+ if (!arpresolve(ifp, rt, m, dst, edst, rt0))
return (0); /* if not yet resolved */
off = m->m_pkthdr.len - m->m_len;
type = htons(ETHERTYPE_IP);
@@ -686,6 +686,7 @@
#ifdef BRIDGE
bdgtakeifaces();
#endif
+ ifp->if_broadcastaddr = etherbroadcastaddr;
}
/*
@@ -727,7 +728,7 @@
#ifdef INET
case AF_INET:
ifp->if_init(ifp->if_softc); /* before arpwhohas */
- arp_ifinit(IFP2AC(ifp), ifa);
+ arp_ifinit(ifp, ifa);
break;
#endif
#ifdef IPX
--- net/if_fddisubr.c.orig Mon Jul 16 20:08:32 2001
+++ net/if_fddisubr.c Tue Jul 17 16:41:04 2001
@@ -166,7 +166,7 @@
#ifdef INET
case AF_INET: {
#if !defined(__bsdi__) || _BSDI_VERSION >= 199401
- if (!ARPRESOLVE(ac, rt, m, dst, edst, rt0))
+ if (!ARPRESOLVE(ifp, rt, m, dst, edst, rt0))
return (0); /* if not yet resolved */
#else
int usetrailers;
@@ -547,6 +547,7 @@
break;
}
#endif
+ ifp->if_broadcastaddr = fddibroadcastaddr;
}
static int
--- net/if_iso88025subr.c.orig Mon Jul 16 20:08:40 2001
+++ net/if_iso88025subr.c Tue Jul 17 16:39:04 2001
@@ -111,6 +111,7 @@
sdl->sdl_type = IFT_ISO88025;
sdl->sdl_alen = ifp->if_addrlen;
bcopy(((struct arpcom *)ifp)->ac_enaddr, LLADDR(sdl), ifp->if_addrlen);
+ ifp->if_broadcastaddr = etherbroadcastaddr;
}
/*
@@ -142,7 +143,7 @@
#ifdef INET
case AF_INET:
ifp->if_init(ifp->if_softc); /* before arpwhohas */
- arp_ifinit((struct arpcom *)ifp, ifa);
+ arp_ifinit(ifp, ifa);
break;
#endif /* INET */
#ifdef IPX
@@ -272,7 +273,7 @@
switch (dst->sa_family) {
#ifdef INET
case AF_INET:
- if (!arpresolve(ac, rt, m, dst, edst, rt0))
+ if (!arpresolve(ifp, rt, m, dst, edst, rt0))
return (0); /* if not yet resolved */
snap_type = ETHERTYPE_IP;
break;
--- net/if_var.h.orig Tue Jul 17 15:59:38 2001
+++ net/if_var.h Tue Jul 17 16:34:28 2001
@@ -149,6 +149,7 @@
struct ifqueue if_snd; /* output queue */
struct ifqueue *if_poll_slowq; /* input queue for slow devices */
struct ifprefixhead if_prefixhead; /* list of prefixes per if */
+ u_int8_t *if_broadcastaddr; /* linklevel broadcast bytestring */
};
typedef void if_init_f_t __P((void *));
@@ -428,6 +429,9 @@
int if_clone_create __P((char *, int));
int if_clone_destroy __P((const char *));
+
+#define IFP_LLADDR(ifp) \
+ LLADDR((struct sockaddr_dl *) ifnet_addrs[(ifp)->if_index - 1]->ifa_addr)
#endif /* _KERNEL */
--- net/if_vlan.c.orig Mon Jul 16 20:24:26 2001
+++ net/if_vlan.c Mon Jul 16 20:27:59 2001
@@ -483,7 +483,7 @@
switch (ifa->ifa_addr->sa_family) {
#ifdef INET
case AF_INET:
- arp_ifinit(&ifv->ifv_ac, ifa);
+ arp_ifinit(&ifv->ifv_if, ifa);
break;
#endif
default:
--- netinet/if_ether.c.orig Mon Jul 16 17:29:40 2001
+++ netinet/if_ether.c Wed Jul 18 22:52:25 2001
@@ -67,7 +67,7 @@
#include <netinet/in.h>
#include <netinet/in_var.h>
#include <netinet/if_ether.h>
-
+#include <net/if_arc.h>
#include <net/iso88025.h>
#define SIN(s) ((struct sockaddr_in *)s)
@@ -116,7 +116,7 @@
static void arp_init __P((void));
static void arp_rtrequest __P((int, struct rtentry *, struct sockaddr *));
-static void arprequest __P((struct arpcom *,
+static void arprequest __P((struct ifnet *,
struct in_addr *, struct in_addr *, u_char *));
static void arpintr __P((void));
static void arptfree __P((struct llinfo_arp *));
@@ -196,7 +196,7 @@
}
/* Announce a new entry if requested. */
if (rt->rt_flags & RTF_ANNOUNCE)
- arprequest((struct arpcom *)rt->rt_ifp,
+ arprequest(rt->rt_ifp,
&SIN(rt_key(rt))->sin_addr,
&SIN(rt_key(rt))->sin_addr,
(u_char *)LLADDR(SDL(gate)));
@@ -233,15 +233,17 @@
* in `arp -a' listings as unresolved. It's not actually
* functional. Then the same for broadcast.
*/
- if (IN_MULTICAST(ntohl(SIN(rt_key(rt))->sin_addr.s_addr))) {
+ if (IN_MULTICAST(ntohl(SIN(rt_key(rt))->sin_addr.s_addr))
+ && rt->rt_ifp->if_type != IFT_ARCNET) {
ETHER_MAP_IP_MULTICAST(&SIN(rt_key(rt))->sin_addr,
LLADDR(SDL(gate)));
SDL(gate)->sdl_alen = 6;
rt->rt_expire = 0;
}
if (in_broadcast(SIN(rt_key(rt))->sin_addr, rt->rt_ifp)) {
- memcpy(LLADDR(SDL(gate)), etherbroadcastaddr, 6);
- SDL(gate)->sdl_alen = 6;
+ memcpy(LLADDR(SDL(gate)), rt->rt_ifp->if_broadcastaddr,
+ rt->rt_ifp->if_addrlen);
+ SDL(gate)->sdl_alen = rt->rt_ifp->if_addrlen;
rt->rt_expire = 0;
}
#endif
@@ -259,8 +261,8 @@
* the route to force traffic out to the hardware.
*/
rt->rt_expire = 0;
- Bcopy(((struct arpcom *)rt->rt_ifp)->ac_enaddr,
- LLADDR(SDL(gate)), SDL(gate)->sdl_alen = 6);
+ Bcopy(IFP_LLADDR(rt->rt_ifp), LLADDR(SDL(gate)),
+ SDL(gate)->sdl_alen = rt->rt_ifp->if_addrlen);
if (useloopback)
rt->rt_ifp = loif;
@@ -287,35 +289,54 @@
* - arp header source ethernet address
*/
static void
-arprequest(ac, sip, tip, enaddr)
- register struct arpcom *ac;
+arprequest(ifp, sip, tip, enaddr)
+ register struct ifnet *ifp;
register struct in_addr *sip, *tip;
register u_char *enaddr;
{
register struct mbuf *m;
register struct ether_header *eh;
- register struct ether_arp *ea;
+ register struct arc_header *arh;
+ register struct arphdr *ah;
struct sockaddr sa;
static u_char llcx[] = { 0x82, 0x40, LLC_SNAP_LSAP, LLC_SNAP_LSAP,
LLC_UI, 0x00, 0x00, 0x00, 0x08, 0x06 };
+ u_short ar_hrd;
if ((m = m_gethdr(M_DONTWAIT, MT_DATA)) == NULL)
return;
m->m_pkthdr.rcvif = (struct ifnet *)0;
- switch (ac->ac_if.if_type) {
+ switch (ifp->if_type) {
+ case IFT_ARCNET:
+ ar_hrd = htons(ARPHRD_ARCNET);
+
+ m->m_len = arphdr_len2(ifp->if_addrlen, sizeof(struct in_addr));
+ m->m_pkthdr.len = m->m_len;
+ MH_ALIGN(m, m->m_len);
+
+ arh = (struct arc_header *)sa.sa_data;
+ arh->arc_dhost = *ifp->if_broadcastaddr;
+ arh->arc_type = ARCTYPE_ARP;
+
+ ah = mtod(m, struct arphdr *);
+ break;
+
case IFT_ISO88025:
- m->m_len = sizeof(*ea) + sizeof(llcx);
- m->m_pkthdr.len = sizeof(*ea) + sizeof(llcx);
- MH_ALIGN(m, sizeof(*ea) + sizeof(llcx));
+ ar_hrd = htons(ARPHRD_IEEE802);
+
+ m->m_len = sizeof(llcx) +
+ arphdr_len2(ifp->if_addrlen, sizeof(struct in_addr));
+ m->m_pkthdr.len = m->m_len;
+ MH_ALIGN(m, m->m_len);
+
(void)memcpy(mtod(m, caddr_t), llcx, sizeof(llcx));
- (void)memcpy(sa.sa_data, etherbroadcastaddr, 6);
+ (void)memcpy(sa.sa_data, ifp->if_broadcastaddr, 6);
(void)memcpy(sa.sa_data + 6, enaddr, 6);
sa.sa_data[6] |= TR_RII;
sa.sa_data[12] = TR_AC;
sa.sa_data[13] = TR_LLC_FRAME;
- ea = (struct ether_arp *)(mtod(m, char *) + sizeof(llcx));
- bzero((caddr_t)ea, sizeof (*ea));
- ea->arp_hrd = htons(ARPHRD_IEEE802);
+
+ ah = (struct arphdr *)(mtod(m, char *) + sizeof(llcx));
break;
case IFT_FDDI:
case IFT_ETHER:
@@ -324,29 +345,34 @@
* listed, but this is our best guess
*/
default:
- m->m_len = sizeof(*ea);
- m->m_pkthdr.len = sizeof(*ea);
- MH_ALIGN(m, sizeof(*ea));
- ea = mtod(m, struct ether_arp *);
+ ar_hrd = htons(ARPHRD_ETHER);
+
+ m->m_len = arphdr_len2(ifp->if_addrlen, sizeof(struct in_addr));
+ m->m_pkthdr.len = m->m_len;
+ MH_ALIGN(m, m->m_len);
+
eh = (struct ether_header *)sa.sa_data;
- bzero((caddr_t)ea, sizeof (*ea));
/* if_output will not swap */
eh->ether_type = htons(ETHERTYPE_ARP);
- (void)memcpy(eh->ether_dhost, etherbroadcastaddr,
+ (void)memcpy(eh->ether_dhost, ifp->if_broadcastaddr,
sizeof(eh->ether_dhost));
- ea->arp_hrd = htons(ARPHRD_ETHER);
+
+ ah = mtod(m, struct arphdr *);
break;
}
- ea->arp_pro = htons(ETHERTYPE_IP);
- ea->arp_hln = sizeof(ea->arp_sha); /* hardware address length */
- ea->arp_pln = sizeof(ea->arp_spa); /* protocol address length */
- ea->arp_op = htons(ARPOP_REQUEST);
- (void)memcpy(ea->arp_sha, enaddr, sizeof(ea->arp_sha));
- (void)memcpy(ea->arp_spa, sip, sizeof(ea->arp_spa));
- (void)memcpy(ea->arp_tpa, tip, sizeof(ea->arp_tpa));
+
+ ah->ar_hrd = ar_hrd;
+ ah->ar_pro = htons(ETHERTYPE_IP);
+ ah->ar_hln = ifp->if_addrlen; /* hardware address length */
+ ah->ar_pln = sizeof(struct in_addr); /* protocol address length */
+ ah->ar_op = htons(ARPOP_REQUEST);
+ (void)memcpy(ar_sha(ah), enaddr, ah->ar_hln);
+ (void)memcpy(ar_spa(ah), sip, ah->ar_pln);
+ (void)memcpy(ar_tpa(ah), tip, ah->ar_pln);
+
sa.sa_family = AF_UNSPEC;
sa.sa_len = sizeof(sa);
- (*ac->ac_if.if_output)(&ac->ac_if, m, &sa, (struct rtentry *)0);
+ (*ifp->if_output)(ifp, m, &sa, (struct rtentry *)0);
}
/*
@@ -360,8 +386,8 @@
* taken over here, either now or for later transmission.
*/
int
-arpresolve(ac, rt, m, dst, desten, rt0)
- register struct arpcom *ac;
+arpresolve(ifp, rt, m, dst, desten, rt0)
+ register struct ifnet *ifp;
register struct rtentry *rt;
struct mbuf *m;
register struct sockaddr *dst;
@@ -372,10 +398,10 @@
struct sockaddr_dl *sdl;
if (m->m_flags & M_BCAST) { /* broadcast */
- (void)memcpy(desten, etherbroadcastaddr, sizeof(etherbroadcastaddr));
+ (void)memcpy(desten, ifp->if_broadcastaddr, ifp->if_addrlen);
return (1);
}
- if (m->m_flags & M_MCAST) { /* multicast */
+ if (m->m_flags & M_MCAST && ifp->if_type != IFT_ARCNET) {/* multicast */
ETHER_MAP_IP_MULTICAST(&SIN(dst)->sin_addr, desten);
return(1);
}
@@ -409,7 +435,7 @@
* Probably should not allocate empty llinfo struct if we are
* not going to be sending out an arp request.
*/
- if (ac->ac_if.if_flags & IFF_NOARP)
+ if (ifp->if_flags & IFF_NOARP)
return (0);
/*
* There is an arptab entry, but no ethernet address
@@ -424,9 +450,10 @@
if (la->la_asked == 0 || rt->rt_expire != time_second) {
rt->rt_expire = time_second;
if (la->la_asked++ < arp_maxtries)
- arprequest(ac,
+ arprequest(ifp,
&SIN(rt->rt_ifa->ifa_addr)->sin_addr,
- &SIN(dst)->sin_addr, ac->ac_enaddr);
+ &SIN(dst)->sin_addr,
+ IFP_LLADDR(ifp));
else {
rt->rt_flags |= RTF_REJECT;
rt->rt_expire += arpt_down;
@@ -464,7 +491,8 @@
ar = mtod(m, struct arphdr *);
if (ntohs(ar->ar_hrd) != ARPHRD_ETHER
- && ntohs(ar->ar_hrd) != ARPHRD_IEEE802) {
+ && ntohs(ar->ar_hrd) != ARPHRD_IEEE802
+ && ntohs(ar->ar_hrd) != ARPHRD_ARCNET) {
log(LOG_ERR,
"arp: unknown hardware address format (0x%2D)\n",
(unsigned char *)&ar->ar_hrd, "");
@@ -472,8 +500,8 @@
continue;
}
- if (m->m_pkthdr.len < sizeof(struct arphdr) + 2 * ar->ar_hln
- + 2 * ar->ar_pln) {
+ if (m->m_pkthdr.len < arphdr_len(ar) &&
+ (m = m_pullup(m, arphdr_len(ar))) == NULL) {
log(LOG_ERR, "arp: runt packet\n");
m_freem(m);
continue;
@@ -515,9 +543,10 @@
in_arpinput(m)
struct mbuf *m;
{
- register struct ether_arp *ea;
- register struct arpcom *ac = (struct arpcom *)m->m_pkthdr.rcvif;
+ register struct arphdr *ah;
+ register struct ifnet *ifp = m->m_pkthdr.rcvif;
struct ether_header *eh;
+ struct arc_header *arh;
struct iso88025_header *th = (struct iso88025_header *)0;
register struct llinfo_arp *la = 0;
register struct rtentry *rt;
@@ -526,17 +555,18 @@
struct sockaddr sa;
struct in_addr isaddr, itaddr, myaddr;
int op, rif_len;
+ int req_len;
- if (m->m_len < sizeof(struct ether_arp) &&
- (m = m_pullup(m, sizeof(struct ether_arp))) == NULL) {
+ ah = mtod(m, struct arphdr *);
+ req_len = arphdr_len2(ifp->if_addrlen, sizeof(struct in_addr));
+ if (m->m_len < req_len && (m = m_pullup(m, req_len)) == NULL) {
log(LOG_ERR, "in_arp: runt packet -- m_pullup failed\n");
return;
}
- ea = mtod(m, struct ether_arp *);
- op = ntohs(ea->arp_op);
- (void)memcpy(&isaddr, ea->arp_spa, sizeof (isaddr));
- (void)memcpy(&itaddr, ea->arp_tpa, sizeof (itaddr));
+ op = ntohs(ah->ar_op);
+ (void)memcpy(&isaddr, ar_spa(ah), sizeof (isaddr));
+ (void)memcpy(&itaddr, ar_tpa(ah), sizeof (itaddr));
TAILQ_FOREACH(ia, &in_ifaddrhead, ia_link) {
/*
* For a bridge, we want to check the address irrespective
@@ -548,7 +578,7 @@
#else
#define BRIDGE_TEST (0) /* cc will optimise the test away */
#endif
- if ((BRIDGE_TEST) || (ia->ia_ifp == &ac->ac_if)) {
+ if ((BRIDGE_TEST) || (ia->ia_ifp == ifp)) {
maybe_ia = ia;
if ((itaddr.s_addr == ia->ia_addr.sin_addr.s_addr) ||
(isaddr.s_addr == ia->ia_addr.sin_addr.s_addr)) {
@@ -561,62 +591,81 @@
return;
}
myaddr = ia ? ia->ia_addr.sin_addr : maybe_ia->ia_addr.sin_addr;
- if (!bcmp((caddr_t)ea->arp_sha, (caddr_t)ac->ac_enaddr,
- sizeof (ea->arp_sha))) {
+ if (!bcmp(ar_sha(ah), IFP_LLADDR(ifp), ifp->if_addrlen)) {
m_freem(m); /* it's from me, ignore it. */
return;
}
- if (!bcmp((caddr_t)ea->arp_sha, (caddr_t)etherbroadcastaddr,
- sizeof (ea->arp_sha))) {
+ if (!bcmp(ar_sha(ah), ifp->if_broadcastaddr, ifp->if_addrlen)) {
log(LOG_ERR,
- "arp: ether address is broadcast for IP address %s!\n",
+ "arp: link address is broadcast for IP address %s!\n",
inet_ntoa(isaddr));
m_freem(m);
return;
}
if (isaddr.s_addr == myaddr.s_addr) {
log(LOG_ERR,
- "arp: %6D is using my IP address %s!\n",
- ea->arp_sha, ":", inet_ntoa(isaddr));
+ "arp: %*D is using my IP address %s!\n",
+ ifp->if_addrlen, (u_char *)ar_sha(ah), ":",
+ inet_ntoa(isaddr));
itaddr = myaddr;
goto reply;
}
la = arplookup(isaddr.s_addr, itaddr.s_addr == myaddr.s_addr, 0);
if (la && (rt = la->la_rt) && (sdl = SDL(rt->rt_gateway))) {
/* the following is not an error when doing bridging */
- if (!BRIDGE_TEST && rt->rt_ifp != &ac->ac_if) {
+ if (!BRIDGE_TEST && rt->rt_ifp != ifp) {
if (log_arp_wrong_iface)
- log(LOG_ERR, "arp: %s is on %s%d but got reply from
%6D on %s%d\n",
+ log(LOG_ERR, "arp: %s is on %s%d but got reply from
+%*D on %s%d\n",
inet_ntoa(isaddr),
rt->rt_ifp->if_name, rt->rt_ifp->if_unit,
- ea->arp_sha, ":",
- ac->ac_if.if_name, ac->ac_if.if_unit);
+ ifp->if_addrlen, (u_char *)ar_sha(ah), ":",
+ ifp->if_name, ifp->if_unit);
goto reply;
}
if (sdl->sdl_alen &&
- bcmp((caddr_t)ea->arp_sha, LLADDR(sdl), sdl->sdl_alen)) {
+ bcmp(ar_sha(ah), LLADDR(sdl), sdl->sdl_alen)) {
if (rt->rt_expire)
- log(LOG_INFO, "arp: %s moved from %6D to %6D on %s%d\n",
- inet_ntoa(isaddr), (u_char *)LLADDR(sdl), ":",
- ea->arp_sha, ":",
- ac->ac_if.if_name, ac->ac_if.if_unit);
+ log(LOG_INFO, "arp: %s moved from %*D to %*D on %s%d\n",
+ inet_ntoa(isaddr),
+ ifp->if_addrlen, (u_char *)LLADDR(sdl), ":",
+ ifp->if_addrlen, (u_char *)ar_sha(ah), ":",
+ ifp->if_name, ifp->if_unit);
else {
log(LOG_ERR,
- "arp: %6D attempts to modify permanent entry for %s on
%s%d\n",
- ea->arp_sha, ":", inet_ntoa(isaddr),
- ac->ac_if.if_name, ac->ac_if.if_unit);
+ "arp: %*D attempts to modify permanent entry for %s on
+%s%d\n",
+ ifp->if_addrlen, (u_char *)ar_sha(ah), ":",
+ inet_ntoa(isaddr), ifp->if_name, ifp->if_unit);
goto reply;
}
}
- (void)memcpy(LLADDR(sdl), ea->arp_sha, sizeof(ea->arp_sha));
- sdl->sdl_alen = sizeof(ea->arp_sha);
+ /*
+ * sanity check for the address length.
+ * XXX this does not work for protocols with variable address
+ * length. -is
+ */
+ if (sdl->sdl_alen &&
+ sdl->sdl_alen != ah->ar_hln) {
+ log(LOG_WARNING,
+ "arp from %*D: new addr len %d, was %d",
+ ifp->if_addrlen, (u_char *) ar_sha(ah), ":",
+ ah->ar_hln, sdl->sdl_alen);
+ }
+ if (ifp->if_addrlen != ah->ar_hln) {
+ log(LOG_WARNING,
+ "arp from %*D: addr len: new %d, i/f %d (ignored)",
+ ifp->if_addrlen, (u_char *) ar_sha(ah), ":",
+ ah->ar_hln, ifp->if_addrlen);
+ goto reply;
+ }
+ (void)memcpy(LLADDR(sdl), ar_sha(ah),
+ sdl->sdl_alen = ah->ar_hln);
sdl->sdl_rcf = (u_short)0;
/*
* If we receive an arp from a token-ring station over
* a token-ring nic then try to save the source
* routing info.
*/
- if (ac->ac_if.if_type == IFT_ISO88025) {
+ if (ifp->if_type == IFT_ISO88025) {
th = (struct iso88025_header *)m->m_pkthdr.header;
rif_len = TR_RCF_RIFLEN(th->rcf);
if ((th->iso88025_shost[0] & TR_RII) &&
@@ -647,7 +696,7 @@
rt->rt_flags &= ~RTF_REJECT;
la->la_asked = 0;
if (la->la_hold) {
- (*ac->ac_if.if_output)(&ac->ac_if, la->la_hold,
+ (*ifp->if_output)(ifp, la->la_hold,
rt_key(rt), rt);
la->la_hold = 0;
}
@@ -659,8 +708,8 @@
}
if (itaddr.s_addr == myaddr.s_addr) {
/* I am the target */
- (void)memcpy(ea->arp_tha, ea->arp_sha, sizeof(ea->arp_sha));
- (void)memcpy(ea->arp_sha, ac->ac_enaddr, sizeof(ea->arp_sha));
+ (void)memcpy(ar_tha(ah), ar_sha(ah), ah->ar_hln);
+ (void)memcpy(ar_sha(ah), IFP_LLADDR(ifp), ah->ar_hln);
} else {
la = arplookup(itaddr.s_addr, 0, SIN_PROXY);
if (la == NULL) {
@@ -686,13 +735,13 @@
* as this one came out of, or we'll get into a fight
* over who claims what Ether address.
*/
- if (rt->rt_ifp == &ac->ac_if) {
+ if (rt->rt_ifp == ifp) {
rtfree(rt);
m_freem(m);
return;
}
- (void)memcpy(ea->arp_tha, ea->arp_sha, sizeof(ea->arp_sha));
- (void)memcpy(ea->arp_sha, ac->ac_enaddr, sizeof(ea->arp_sha));
+ (void)memcpy(ar_tha(ah), ar_sha(ah), ah->ar_hln);
+ (void)memcpy(ar_sha(ah), IFP_LLADDR(ifp), ah->ar_hln);
rtfree(rt);
/*
@@ -708,11 +757,11 @@
m_freem(m);
return;
}
- if (rt->rt_ifp != &ac->ac_if) {
+ if (rt->rt_ifp != ifp) {
log(LOG_INFO, "arp_proxy: ignoring request"
" from %s via %s%d, expecting %s%d\n",
- inet_ntoa(isaddr), ac->ac_if.if_name,
- ac->ac_if.if_unit, rt->rt_ifp->if_name,
+ inet_ntoa(isaddr), ifp->if_name,
+ ifp->if_unit, rt->rt_ifp->if_name,
rt->rt_ifp->if_unit);
rtfree(rt);
m_freem(m);
@@ -726,22 +775,28 @@
#endif
} else {
rt = la->la_rt;
- (void)memcpy(ea->arp_tha, ea->arp_sha, sizeof(ea->arp_sha));
+ (void)memcpy(ar_tha(ah), ar_sha(ah), ah->ar_hln);
sdl = SDL(rt->rt_gateway);
- (void)memcpy(ea->arp_sha, LLADDR(sdl), sizeof(ea->arp_sha));
+ (void)memcpy(ar_sha(ah), LLADDR(sdl), ah->ar_hln);
}
}
- (void)memcpy(ea->arp_tpa, ea->arp_spa, sizeof(ea->arp_spa));
- (void)memcpy(ea->arp_spa, &itaddr, sizeof(ea->arp_spa));
- ea->arp_op = htons(ARPOP_REPLY);
- ea->arp_pro = htons(ETHERTYPE_IP); /* let's be sure! */
- switch (ac->ac_if.if_type) {
+ (void)memcpy(ar_tpa(ah), ar_spa(ah), ah->ar_pln);
+ (void)memcpy(ar_spa(ah), &itaddr, ah->ar_pln);
+ ah->ar_op = htons(ARPOP_REPLY);
+ ah->ar_pro = htons(ETHERTYPE_IP); /* let's be sure! */
+ switch (ifp->if_type) {
+ case IFT_ARCNET:
+ arh = (struct arc_header *)sa.sa_data;
+ arh->arc_dhost = *ar_tha(ah);
+ arh->arc_type = ARCTYPE_ARP;
+ break;
+
case IFT_ISO88025:
/* Re-arrange the source/dest address */
memcpy(th->iso88025_dhost, th->iso88025_shost,
sizeof(th->iso88025_dhost));
- memcpy(th->iso88025_shost, ac->ac_enaddr,
+ memcpy(th->iso88025_shost, IFP_LLADDR(ifp),
sizeof(th->iso88025_shost));
/* Set the source routing bit if neccesary */
if (th->iso88025_dhost[0] & TR_RII) {
@@ -763,14 +818,14 @@
*/
default:
eh = (struct ether_header *)sa.sa_data;
- (void)memcpy(eh->ether_dhost, ea->arp_tha,
+ (void)memcpy(eh->ether_dhost, ar_tha(ah),
sizeof(eh->ether_dhost));
eh->ether_type = htons(ETHERTYPE_ARP);
break;
}
sa.sa_family = AF_UNSPEC;
sa.sa_len = sizeof(sa);
- (*ac->ac_if.if_output)(&ac->ac_if, m, &sa, (struct rtentry *)0);
+ (*ifp->if_output)(ifp, m, &sa, (struct rtentry *)0);
return;
}
#endif
@@ -833,13 +888,13 @@
}
void
-arp_ifinit(ac, ifa)
- struct arpcom *ac;
+arp_ifinit(ifp, ifa)
+ struct ifnet *ifp;
struct ifaddr *ifa;
{
if (ntohl(IA_SIN(ifa)->sin_addr.s_addr) != INADDR_ANY)
- arprequest(ac, &IA_SIN(ifa)->sin_addr,
- &IA_SIN(ifa)->sin_addr, ac->ac_enaddr);
+ arprequest(ifp, &IA_SIN(ifa)->sin_addr,
+ &IA_SIN(ifa)->sin_addr, IFP_LLADDR(ifp));
ifa->ifa_rtrequest = arp_rtrequest;
ifa->ifa_flags |= RTF_CLONING;
}
--- netinet/if_ether.h.orig Mon Jul 16 17:34:32 2001
+++ netinet/if_ether.h Mon Jul 16 19:27:00 2001
@@ -73,26 +73,6 @@
(enaddr)[5] = ((u_char *)ip6addr)[15]; \
}
-/*
- * Ethernet Address Resolution Protocol.
- *
- * See RFC 826 for protocol description. Structure below is adapted
- * to resolving internet addresses. Field names used correspond to
- * RFC 826.
- */
-struct ether_arp {
- struct arphdr ea_hdr; /* fixed-size header */
- u_char arp_sha[ETHER_ADDR_LEN]; /* sender hardware address */
- u_char arp_spa[4]; /* sender protocol address */
- u_char arp_tha[ETHER_ADDR_LEN]; /* target hardware address */
- u_char arp_tpa[4]; /* target protocol address */
-};
-#define arp_hrd ea_hdr.ar_hrd
-#define arp_pro ea_hdr.ar_pro
-#define arp_hln ea_hdr.ar_hln
-#define arp_pln ea_hdr.ar_pln
-#define arp_op ea_hdr.ar_op
-
struct sockaddr_inarp {
u_char sin_len;
u_char sin_family;
@@ -114,9 +94,9 @@
extern u_char ether_ipmulticast_max[ETHER_ADDR_LEN];
extern struct ifqueue arpintrq;
-int arpresolve __P((struct arpcom *, struct rtentry *, struct mbuf *,
+int arpresolve __P((struct ifnet *, struct rtentry *, struct mbuf *,
struct sockaddr *, u_char *, struct rtentry *));
-void arp_ifinit __P((struct arpcom *, struct ifaddr *));
+void arp_ifinit __P((struct ifnet *, struct ifaddr *));
#endif
#endif
