summaryrefslogtreecommitdiff
path: root/usr.sbin/ospfd
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2007-09-11 16:02:56 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2007-09-11 16:02:56 +0000
commitff2f214842462eb348c66befeef1b63d508aa3fe (patch)
tree035ecc019641ed8d2eeecbfa8f1dc927c8aa633b /usr.sbin/ospfd
parent05b3685146bf542c7cac2ed3e84c6c1e2627ba4a (diff)
Switch some more baudrates to 64 bit and initialize iface->baudrate.
Diffstat (limited to 'usr.sbin/ospfd')
-rw-r--r--usr.sbin/ospfd/interface.c3
-rw-r--r--usr.sbin/ospfd/ospfd.h8
2 files changed, 6 insertions, 5 deletions
diff --git a/usr.sbin/ospfd/interface.c b/usr.sbin/ospfd/interface.c
index 393d277ab96..13b2e7c9503 100644
--- a/usr.sbin/ospfd/interface.c
+++ b/usr.sbin/ospfd/interface.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: interface.c,v 1.59 2007/05/29 22:08:25 claudio Exp $ */
+/* $OpenBSD: interface.c,v 1.60 2007/09/11 16:02:55 claudio Exp $ */
/*
* Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -198,6 +198,7 @@ if_new(struct kif *kif, struct kif_addr *ka)
iface->flags = kif->flags;
iface->linkstate = kif->link_state;
iface->media_type = kif->media_type;
+ iface->baudrate = kif->baudrate;
/* set address, mask and p2p addr */
iface->addr = ka->addr;
diff --git a/usr.sbin/ospfd/ospfd.h b/usr.sbin/ospfd/ospfd.h
index 9abb099d9e2..b80ae3f7b44 100644
--- a/usr.sbin/ospfd/ospfd.h
+++ b/usr.sbin/ospfd/ospfd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ospfd.h,v 1.68 2007/06/19 16:45:15 reyk Exp $ */
+/* $OpenBSD: ospfd.h,v 1.69 2007/09/11 16:02:55 claudio Exp $ */
/*
* Copyright (c) 2004 Esben Norby <norby@openbsd.org>
@@ -342,7 +342,7 @@ struct iface {
struct nbr *self;
struct area *area;
- u_int32_t baudrate;
+ u_int64_t baudrate;
u_int32_t dead_interval;
u_int32_t ls_ack_cnt;
u_int32_t crypt_seq_num;
@@ -438,7 +438,7 @@ struct kif_addr {
struct kif {
char ifname[IF_NAMESIZE];
- u_long baudrate;
+ u_int64_t baudrate;
int flags;
int mtu;
u_short ifindex;
@@ -472,7 +472,7 @@ struct ctl_iface {
struct in_addr bdr_addr;
time_t hello_timer;
time_t uptime;
- u_int32_t baudrate;
+ u_int64_t baudrate;
u_int32_t dead_interval;
unsigned int ifindex;
int state;