changeset 292:ebb5217967e1 draft

We should use caddr_t instead of our own types for arp hardware addresses.
author Roy Marples <roy@marples.name>
date Thu, 17 Jan 2008 17:51:00 +0000
parents 898203adec5f
children 1992d3f4ac10
files arp.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/arp.c	Thu Jan 17 14:16:13 2008 +0000
+++ b/arp.c	Thu Jan 17 17:51:00 2008 +0000
@@ -59,11 +59,11 @@
 
 /* Linux does not seem to define these handy macros */
 #ifndef ar_sha
-#define ar_sha(ap) (((unsigned char *) ((ap) + 1)) + 0)
-#define ar_spa(ap) (((unsigned char *) ((ap) + 1)) + (ap)->ar_hln)
-#define ar_tha(ap) (((unsigned char *) ((ap) + 1)) + \
+#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) (((unsigned char *) ((ap) + 1)) + \
+#define ar_tpa(ap) (((caddr_t) ((ap) + 1)) + \
 		    2 * (ap)->ar_hln + (ap)->ar_pln)
 #endif
 
@@ -80,7 +80,7 @@
 {
 	struct arphdr *arp;
 	int arpsize = arphdr_len2 (iface->hwlen, sizeof (struct in_addr));
-	char *tha;
+	caddr_t tha;
 	int retval;
 
 	arp = xmalloc (arpsize);