summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorclaudio <claudio@openbsd.org>2007-09-11 18:05:36 +0000
committerclaudio <claudio@openbsd.org>2007-09-11 18:05:36 +0000
commit90cb0607e6b0083df111e37b81ddfd89d3e3487b (patch)
treecc675ff00d15bec24a2ba0c6793335367ef08a0d
parent64bit baudrate and %llu to print (diff)
downloadwireguard-openbsd-90cb0607e6b0083df111e37b81ddfd89d3e3487b.tar.xz
wireguard-openbsd-90cb0607e6b0083df111e37b81ddfd89d3e3487b.zip
More baudrate fixes. Again don't forget to initialize the iface->baudrate.
-rw-r--r--usr.sbin/ripd/interface.c3
-rw-r--r--usr.sbin/ripd/ripd.h9
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/ripd/interface.c b/usr.sbin/ripd/interface.c
index f5ecc524102..36153e476a7 100644
--- a/usr.sbin/ripd/interface.c
+++ b/usr.sbin/ripd/interface.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: interface.c,v 1.2 2006/11/28 19:21:15 reyk Exp $ */
+/* $OpenBSD: interface.c,v 1.3 2007/09/11 18:05:36 claudio Exp $ */
/*
* Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
@@ -406,6 +406,7 @@ if_new(struct kif *kif)
iface->flags = kif->flags;
iface->linkstate = kif->link_state;
iface->media_type = kif->media_type;
+ iface->baudrate = kif->baudrate;
/* get address */
if (ioctl(s, SIOCGIFADDR, ifr) < 0)
diff --git a/usr.sbin/ripd/ripd.h b/usr.sbin/ripd/ripd.h
index f4ad0a7b6eb..a4508133bdb 100644
--- a/usr.sbin/ripd/ripd.h
+++ b/usr.sbin/ripd/ripd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ripd.h,v 1.6 2007/09/11 17:26:22 henning Exp $ */
+/* $OpenBSD: ripd.h,v 1.7 2007/09/11 18:05:36 claudio Exp $ */
/*
* Copyright (c) 2004 Esben Norby <norby@openbsd.org>
@@ -213,9 +213,9 @@ struct iface {
struct packet_head rp_list;
struct auth_md_head auth_md_list;
+ u_int64_t baudrate;
time_t uptime;
- u_long mtu;
- u_long baudrate; /* XXX u_int64_t */
+ u_int mtu;
int fd; /* XXX */
int state;
u_short ifindex;
@@ -312,8 +312,7 @@ struct ctl_iface {
time_t uptime;
time_t report_timer;
- u_int32_t baudrate; /* XXX 32bit only? */
-
+ u_int64_t baudrate;
unsigned int ifindex;
int state;
int mtu;