Module Name: src
Committed By: drochner
Date: Thu Aug 23 12:06:32 UTC 2012
Modified Files:
src/sbin/brconfig: brconfig.c
src/sys/net: if_bridgevar.h
Log Message:
the address expire counter is just a time difference; it can turn
negative after the timer expired until the entry is deleted.
make it signed, so that we don't get output like
"00:1b:78:12:50:46 wm0 18446744073709551349 flags=0<>"
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sbin/brconfig/brconfig.c
cvs rdiff -u -r1.14 -r1.15 src/sys/net/if_bridgevar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/brconfig/brconfig.c
diff -u src/sbin/brconfig/brconfig.c:1.13 src/sbin/brconfig/brconfig.c:1.14
--- src/sbin/brconfig/brconfig.c:1.13 Mon Aug 29 14:29:21 2011
+++ src/sbin/brconfig/brconfig.c Thu Aug 23 12:06:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: brconfig.c,v 1.13 2011/08/29 14:29:21 joerg Exp $ */
+/* $NetBSD: brconfig.c,v 1.14 2012/08/23 12:06:32 drochner Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -43,7 +43,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: brconfig.c,v 1.13 2011/08/29 14:29:21 joerg Exp $");
+__RCSID("$NetBSD: brconfig.c,v 1.14 2012/08/23 12:06:32 drochner Exp $");
#endif
@@ -485,7 +485,7 @@ show_addresses(int sock, const char *bri
ifba = ifbac.ifbac_req + i;
memcpy(ea.ether_addr_octet, ifba->ifba_dst,
sizeof(ea.ether_addr_octet));
- printf("%s%s %s %lu ", prefix, ether_ntoa(&ea),
+ printf("%s%s %s %ld ", prefix, ether_ntoa(&ea),
ifba->ifba_ifsname, ifba->ifba_expire);
printb("flags", ifba->ifba_flags, IFBAFBITS);
printf("\n");
Index: src/sys/net/if_bridgevar.h
diff -u src/sys/net/if_bridgevar.h:1.14 src/sys/net/if_bridgevar.h:1.15
--- src/sys/net/if_bridgevar.h:1.14 Sat Apr 4 10:00:23 2009
+++ src/sys/net/if_bridgevar.h Thu Aug 23 12:06:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridgevar.h,v 1.14 2009/04/04 10:00:23 bouyer Exp $ */
+/* $NetBSD: if_bridgevar.h,v 1.15 2012/08/23 12:06:32 drochner Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -162,7 +162,7 @@ struct ifbifconf {
struct ifbareq {
char ifba_ifsname[IFNAMSIZ]; /* member if name */
/*XXX: time_t */
- unsigned long ifba_expire; /* address expire time */
+ long ifba_expire; /* address expire time */
uint8_t ifba_flags; /* address flags */
uint8_t ifba_dst[ETHER_ADDR_LEN];/* destination address */
};
