Module Name: src
Committed By: jakllsch
Date: Sat Mar 29 14:30:16 UTC 2014
Modified Files:
src/sys/lib/libsa: ether.c globals.c iodesc.h net.h rarp.c
Log Message:
Obtain and/or use ETHER_ADDR_LEN.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/lib/libsa/ether.c
cvs rdiff -u -r1.10 -r1.11 src/sys/lib/libsa/globals.c
cvs rdiff -u -r1.9 -r1.10 src/sys/lib/libsa/iodesc.h
cvs rdiff -u -r1.26 -r1.27 src/sys/lib/libsa/net.h
cvs rdiff -u -r1.31 -r1.32 src/sys/lib/libsa/rarp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libsa/ether.c
diff -u src/sys/lib/libsa/ether.c:1.22 src/sys/lib/libsa/ether.c:1.23
--- src/sys/lib/libsa/ether.c:1.22 Mon Jan 12 11:32:45 2009
+++ src/sys/lib/libsa/ether.c Sat Mar 29 14:30:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ether.c,v 1.22 2009/01/12 11:32:45 tsutsui Exp $ */
+/* $NetBSD: ether.c,v 1.23 2014/03/29 14:30:16 jakllsch Exp $ */
/*
* Copyright (c) 1992 Regents of the University of California.
@@ -108,8 +108,8 @@ readether(struct iodesc *d, void *pkt, s
return -1;
/* Validate Ethernet address. */
- if (memcmp(d->myea, eh->ether_dhost, 6) != 0 &&
- memcmp(bcea, eh->ether_dhost, 6) != 0) {
+ if (memcmp(d->myea, eh->ether_dhost, ETHER_ADDR_LEN) != 0 &&
+ memcmp(bcea, eh->ether_dhost, ETHER_ADDR_LEN) != 0) {
#ifdef ETHER_DEBUG
if (debug)
printf("readether: not ours (ea=%s)\n",
Index: src/sys/lib/libsa/globals.c
diff -u src/sys/lib/libsa/globals.c:1.10 src/sys/lib/libsa/globals.c:1.11
--- src/sys/lib/libsa/globals.c:1.10 Sun Jan 5 21:38:25 2014
+++ src/sys/lib/libsa/globals.c Sat Mar 29 14:30:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: globals.c,v 1.10 2014/01/05 21:38:25 jakllsch Exp $ */
+/* $NetBSD: globals.c,v 1.11 2014/03/29 14:30:16 jakllsch Exp $ */
/*
* globals.c:
@@ -8,13 +8,14 @@
*/
#include <sys/param.h>
+#include <net/if_ether.h> /* for ETHER_ADDR_LEN */
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include "stand.h"
#include "net.h"
-u_char bcea[6] = BA; /* broadcast ethernet address */
+u_char bcea[ETHER_ADDR_LEN] = BA; /* broadcast ethernet address */
char rootpath[FNAME_SIZE]; /* root mount path */
char bootfile[FNAME_SIZE]; /* bootp says to boot this */
Index: src/sys/lib/libsa/iodesc.h
diff -u src/sys/lib/libsa/iodesc.h:1.9 src/sys/lib/libsa/iodesc.h:1.10
--- src/sys/lib/libsa/iodesc.h:1.9 Sat Jan 17 14:00:36 2009
+++ src/sys/lib/libsa/iodesc.h Sat Mar 29 14:30:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: iodesc.h,v 1.9 2009/01/17 14:00:36 tsutsui Exp $ */
+/* $NetBSD: iodesc.h,v 1.10 2014/03/29 14:30:16 jakllsch Exp $ */
/*
* Copyright (c) 1993 Adam Glass
@@ -41,6 +41,8 @@
#ifndef __SYS_LIBNETBOOT_IODESC_H
#define __SYS_LIBNETBOOT_IODESC_H
+#include <net/if_ether.h> /* for ETHER_ADDR_LEN */
+
#ifdef _STANDALONE
/*
* libsa code uses the following types to avoid 64 bit time_t:
@@ -66,7 +68,7 @@ struct iodesc {
u_short destport; /* dest. port, net order */
u_short myport; /* local port, net order */
u_long xid; /* transaction identification */
- u_char myea[6]; /* my ethernet address */
+ u_char myea[ETHER_ADDR_LEN]; /* my ethernet address */
void *io_netif;
};
Index: src/sys/lib/libsa/net.h
diff -u src/sys/lib/libsa/net.h:1.26 src/sys/lib/libsa/net.h:1.27
--- src/sys/lib/libsa/net.h:1.26 Wed May 11 16:23:40 2011
+++ src/sys/lib/libsa/net.h Sat Mar 29 14:30:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: net.h,v 1.26 2011/05/11 16:23:40 zoltan Exp $ */
+/* $NetBSD: net.h,v 1.27 2014/03/29 14:30:16 jakllsch Exp $ */
/*
* Copyright (c) 1993 Adam Glass
@@ -38,6 +38,7 @@
* SUCH DAMAGE.
*/
+#include <net/if_ether.h> /* for ETHER_ADDR_LEN */
#include <netinet/in.h>
#include <netinet/in_systm.h>
@@ -57,7 +58,7 @@
/* Returns true if n_long's on the same net */
#define SAMENET(a1, a2, m) ((a1.s_addr & m) == (a2.s_addr & m))
-#define MACPY(s, d) memcpy(d, s, 6)
+#define MACPY(s, d) memcpy(d, s, ETHER_ADDR_LEN)
#define MAXTMO 20 /* seconds */
#define MINTMO 2 /* seconds */
@@ -89,7 +90,7 @@
#define TCP_TOTAL_HEADER_SIZE (ETHERNET_HEADER_SIZE + IP_HEADER_SIZE + TCP_HEADER_SIZE)
-extern u_char bcea[6];
+extern u_char bcea[ETHER_ADDR_LEN];
extern char rootpath[FNAME_SIZE];
extern char bootfile[FNAME_SIZE];
extern char hostname[FNAME_SIZE];
Index: src/sys/lib/libsa/rarp.c
diff -u src/sys/lib/libsa/rarp.c:1.31 src/sys/lib/libsa/rarp.c:1.32
--- src/sys/lib/libsa/rarp.c:1.31 Wed May 11 16:23:40 2011
+++ src/sys/lib/libsa/rarp.c Sat Mar 29 14:30:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rarp.c,v 1.31 2011/05/11 16:23:40 zoltan Exp $ */
+/* $NetBSD: rarp.c,v 1.32 2014/03/29 14:30:16 jakllsch Exp $ */
/*
* Copyright (c) 1992 Regents of the University of California.
@@ -122,8 +122,8 @@ rarp_getipaddress(int sock)
ap->arp_hln = sizeof(ap->arp_sha); /* hardware address length */
ap->arp_pln = sizeof(ap->arp_spa); /* protocol address length */
ap->arp_op = htons(ARPOP_REVREQUEST);
- (void)memcpy(ap->arp_sha, d->myea, 6);
- (void)memcpy(ap->arp_tha, d->myea, 6);
+ (void)memcpy(ap->arp_sha, d->myea, ETHER_ADDR_LEN);
+ (void)memcpy(ap->arp_tha, d->myea, ETHER_ADDR_LEN);
if (sendrecv(d,
rarpsend, &wbuf.data, sizeof(wbuf.data),
@@ -223,7 +223,7 @@ rarprecv(struct iodesc *d, void *pkt, si
}
/* Is the reply for our Ethernet address? */
- if (memcmp(ap->arp_tha, d->myea, 6)) {
+ if (memcmp(ap->arp_tha, d->myea, ETHER_ADDR_LEN)) {
#ifdef RARP_DEBUG
if (debug)
printf("unwanted address\n");
