diff options
| author |   claudio <claudio@openbsd.org> | 2007-09-11 18:23:05 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2007-09-11 18:23:05 +0000 |
| commit | ff83d30f5bb27009e28f297ac51c324f938187f7 (patch) | |
| tree | 06e9c41314bbfd3eb1ae1b4c3581dc07526f759d | |
| parent | Avoid setting a global pointer variable from signal handlers (diff) | |
| download | wireguard-openbsd-ff83d30f5bb27009e28f297ac51c324f938187f7.tar.xz wireguard-openbsd-ff83d30f5bb27009e28f297ac51c324f938187f7.zip | |
The same dance as in all other routing daemons. baudrate is 64bit plus
initialize iface->baudrate when the interface is created. An additional
gimmick don't set the ictl->baudrate twice when building the control message.
| -rw-r--r-- | usr.sbin/dvmrpd/dvmrpd.h | 7 | ||||
| -rw-r--r-- | usr.sbin/dvmrpd/interface.c | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/usr.sbin/dvmrpd/dvmrpd.h b/usr.sbin/dvmrpd/dvmrpd.h index bf62039d579..2a8e6d21d03 100644 --- a/usr.sbin/dvmrpd/dvmrpd.h +++ b/usr.sbin/dvmrpd/dvmrpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dvmrpd.h,v 1.7 2007/09/11 17:21:08 henning Exp $ */ +/* $OpenBSD: dvmrpd.h,v 1.8 2007/09/11 18:23:05 claudio Exp $ */ /* * Copyright (c) 2004, 2005, 2006 Esben Norby <norby@openbsd.org> @@ -206,10 +206,9 @@ struct iface { struct in_addr mask; struct in_addr querier; /* designated querier */ + u_int64_t baudrate; u_int32_t gen_id; u_int32_t group_cnt; - - u_int32_t baudrate; /* XXX 32bit only? */ u_int32_t probe_interval; u_int32_t query_interval; @@ -300,9 +299,9 @@ struct ctl_iface { time_t querier_present_timer; time_t uptime; + u_int64_t baudrate; u_int32_t gen_id; u_int32_t group_cnt; - u_int32_t baudrate; /* XXX 32bit only? */ u_int32_t probe_interval; u_int32_t query_interval; u_int32_t query_resp_interval; diff --git a/usr.sbin/dvmrpd/interface.c b/usr.sbin/dvmrpd/interface.c index 1ee259d535e..cbe3f67c121 100644 --- a/usr.sbin/dvmrpd/interface.c +++ b/usr.sbin/dvmrpd/interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interface.c,v 1.4 2006/12/03 20:14:37 michele Exp $ */ +/* $OpenBSD: interface.c,v 1.5 2007/09/11 18:23:05 claudio Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -196,6 +196,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, (caddr_t)ifr) < 0) @@ -647,7 +648,6 @@ if_to_ctl(struct iface *iface) ictl.gen_id = iface->gen_id; ictl.group_cnt = iface->group_cnt; - ictl.baudrate = iface->baudrate; ictl.probe_interval = iface->probe_interval; ictl.query_interval = iface->query_interval; ictl.query_resp_interval = iface->query_resp_interval; |