diff options
| author |   stsp <stsp@openbsd.org> | 2015-09-27 17:32:36 +0000 |
|---|---|---|
| committer | stsp <stsp@openbsd.org> | 2015-09-27 17:32:36 +0000 |
| commit | 16530d00b4f6e13c42c3cdf6f50cc6ae887d2296 (patch) | |
| tree | 0f248a35b8a3aa4e0e2569e74ef0567224314cd0 /usr.sbin/ripd | |
| parent | As done for bgpd recently, rename if_mediatype to if_type in ospfd/ospf6d. (diff) | |
| download | wireguard-openbsd-16530d00b4f6e13c42c3cdf6f50cc6ae887d2296.tar.xz wireguard-openbsd-16530d00b4f6e13c42c3cdf6f50cc6ae887d2296.zip | |
As done for bgpd recently, rename if_mediatype to if_type in ripd.
And some ifmedia64 fixes.
"move forward" deraadt@
Diffstat (limited to 'usr.sbin/ripd')
| -rw-r--r-- | usr.sbin/ripd/interface.c | 6 | ||||
| -rw-r--r-- | usr.sbin/ripd/kroute.c | 6 | ||||
| -rw-r--r-- | usr.sbin/ripd/ripd.h | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/usr.sbin/ripd/interface.c b/usr.sbin/ripd/interface.c index 65e5667578b..36c60fe2794 100644 --- a/usr.sbin/ripd/interface.c +++ b/usr.sbin/ripd/interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interface.c,v 1.12 2015/02/09 12:13:42 claudio Exp $ */ +/* $OpenBSD: interface.c,v 1.13 2015/09/27 17:32:36 stsp Exp $ */ /* * Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it> @@ -425,7 +425,7 @@ if_new(struct kif *kif) iface->ifindex = kif->ifindex; iface->flags = kif->flags; iface->linkstate = kif->link_state; - iface->media_type = kif->media_type; + iface->if_type = kif->if_type; iface->baudrate = kif->baudrate; /* get address */ @@ -494,7 +494,7 @@ if_to_ctl(struct iface *iface) ictl.type = iface->type; ictl.linkstate = iface->linkstate; ictl.passive = iface->passive; - ictl.mediatype = iface->media_type; + ictl.if_type = iface->if_type; gettimeofday(&now, NULL); diff --git a/usr.sbin/ripd/kroute.c b/usr.sbin/ripd/kroute.c index f82126c5897..6a602c6e506 100644 --- a/usr.sbin/ripd/kroute.c +++ b/usr.sbin/ripd/kroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kroute.c,v 1.30 2015/07/17 20:38:33 claudio Exp $ */ +/* $OpenBSD: kroute.c,v 1.31 2015/09/27 17:32:36 stsp Exp $ */ /* * Copyright (c) 2004 Esben Norby <norby@openbsd.org> @@ -665,7 +665,7 @@ if_change(u_short ifindex, int flags, struct if_data *ifd) kif->k.flags = flags; kif->k.link_state = ifd->ifi_link_state; - kif->k.media_type = ifd->ifi_type; + kif->k.if_type = ifd->ifi_type; kif->k.baudrate = ifd->ifi_baudrate; if ((reachable = (flags & IFF_UP) && @@ -993,7 +993,7 @@ fetchifs(int ifindex) kif->k.ifindex = ifm.ifm_index; kif->k.flags = ifm.ifm_flags; kif->k.link_state = ifm.ifm_data.ifi_link_state; - kif->k.media_type = ifm.ifm_data.ifi_type; + kif->k.if_type = ifm.ifm_data.ifi_type; kif->k.baudrate = ifm.ifm_data.ifi_baudrate; kif->k.mtu = ifm.ifm_data.ifi_mtu; kif->k.nh_reachable = (kif->k.flags & IFF_UP) && diff --git a/usr.sbin/ripd/ripd.h b/usr.sbin/ripd/ripd.h index 56db4403643..acaa5cc69b7 100644 --- a/usr.sbin/ripd/ripd.h +++ b/usr.sbin/ripd/ripd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ripd.h,v 1.21 2009/11/02 20:28:49 claudio Exp $ */ +/* $OpenBSD: ripd.h,v 1.22 2015/09/27 17:32:36 stsp Exp $ */ /* * Copyright (c) 2004 Esben Norby <norby@openbsd.org> @@ -181,7 +181,7 @@ struct iface { enum iface_type type; enum auth_type auth_type; u_int8_t linktype; - u_int8_t media_type; + u_int8_t if_type; u_int8_t passive; u_int8_t linkstate; u_int8_t auth_keyid; @@ -259,7 +259,7 @@ struct kif { int flags; int mtu; u_short ifindex; - u_int8_t media_type; + u_int8_t if_type; u_int8_t link_state; u_int8_t nh_reachable; /* for nexthop verification */ }; @@ -282,7 +282,7 @@ struct ctl_iface { u_int16_t metric; enum iface_type type; u_int8_t linkstate; - u_int8_t mediatype; + u_int8_t if_type; u_int8_t passive; }; |