As done for bgpd recently, rename if_mediatype to if_type in ospfd/ospf6d.

And some ifmedia64 fixes.
"move forward" deraadt@

5 files changed, 16 insertions, 16 deletions

diff --git a/usr.sbin/ospfd/interface.c b/usr.sbin/ospfd/interface.c
index 8c0849ebc2a..1c8fca2f388 100644
--- a/usr.sbin/ospfd/interface.c
+++ b/usr.sbin/ospfd/interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: interface.c,v 1.78 2015/07/20 23:45:39 benno Exp $ */
+/*	$OpenBSD: interface.c,v 1.79 2015/09/27 17:31:50 stsp Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -198,7 +198,7 @@ if_new(struct kif *kif, struct kif_addr *ka)
 	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;
 
 	/* set address, mask and p2p addr */
@@ -340,11 +340,11 @@ if_act_start(struct iface *iface)
 
 	if (!(iface->flags & IFF_UP) ||
 	    (!LINK_STATE_IS_UP(iface->linkstate) &&
-	    !(iface->media_type == IFT_CARP &&
+	    !(iface->if_type == IFT_CARP &&
 	    iface->linkstate == LINK_STATE_DOWN)))
 		return (0);
 
-	if (iface->media_type == IFT_CARP && iface->passive == 0) {
+	if (iface->if_type == IFT_CARP && iface->passive == 0) {
 		/* force passive mode on carp interfaces */
 		log_warnx("if_act_start: forcing interface %s to passive",
 		    iface->name);
@@ -639,7 +639,7 @@ if_to_ctl(struct iface *iface)
 	ictl.rxmt_interval = iface->rxmt_interval;
 	ictl.type = iface->type;
 	ictl.linkstate = iface->linkstate;
-	ictl.mediatype = iface->media_type;
+	ictl.if_type = iface->if_type;
 	ictl.priority = iface->priority;
 	ictl.passive = iface->passive;
 	ictl.auth_type = iface->auth_type;
diff --git a/usr.sbin/ospfd/kroute.c b/usr.sbin/ospfd/kroute.c
index 101d6ca53c3..b8e53405ba2 100644
--- a/usr.sbin/ospfd/kroute.c
+++ b/usr.sbin/ospfd/kroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kroute.c,v 1.102 2015/07/20 23:45:39 benno Exp $ */
+/*	$OpenBSD: kroute.c,v 1.103 2015/09/27 17:31:50 stsp Exp $ */
 
 /*
  * Copyright (c) 2004 Esben Norby <norby@openbsd.org>
@@ -883,7 +883,7 @@ kif_update(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;
 	kif->k.mtu = ifd->ifi_mtu;
 
diff --git a/usr.sbin/ospfd/ospfd.c b/usr.sbin/ospfd/ospfd.c
index 7fdf9327826..d821f0a9b35 100644
--- a/usr.sbin/ospfd/ospfd.c
+++ b/usr.sbin/ospfd/ospfd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ospfd.c,v 1.85 2015/07/20 23:45:39 benno Exp $ */
+/*	$OpenBSD: ospfd.c,v 1.86 2015/09/27 17:31:50 stsp Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -862,7 +862,7 @@ merge_interfaces(struct area *a, struct area *xa)
 			i->self->priority = i->priority;
 		i->flags = xi->flags; /* needed? */
 		i->type = xi->type; /* needed? */
-		i->media_type = xi->media_type; /* needed? */
+		i->if_type = xi->if_type; /* needed? */
 		i->linkstate = xi->linkstate; /* needed? */
 
 		i->auth_type = xi->auth_type;
diff --git a/usr.sbin/ospfd/ospfd.h b/usr.sbin/ospfd/ospfd.h
index 617f7abc3d2..7205a65d731 100644
--- a/usr.sbin/ospfd/ospfd.h
+++ b/usr.sbin/ospfd/ospfd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ospfd.h,v 1.91 2013/01/17 10:07:56 markus Exp $ */
+/*	$OpenBSD: ospfd.h,v 1.92 2015/09/27 17:31:50 stsp Exp $ */
 
 /*
  * Copyright (c) 2004 Esben Norby <norby@openbsd.org>
@@ -345,7 +345,7 @@ struct iface {
 	u_int16_t		 metric;
 	enum iface_type		 type;
 	enum auth_type		 auth_type;
-	u_int8_t		 media_type;
+	u_int8_t		 if_type;
 	u_int8_t		 auth_keyid;
 	u_int8_t		 linkstate;
 	u_int8_t		 priority;
@@ -416,7 +416,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 */
 };
@@ -461,7 +461,7 @@ struct ctl_iface {
 	u_int16_t		 rxmt_interval;
 	enum iface_type		 type;
 	u_int8_t		 linkstate;
-	u_int8_t		 mediatype;
+	u_int8_t		 if_type;
 	u_int8_t		 priority;
 	u_int8_t		 passive;
 	enum auth_type		 auth_type;
diff --git a/usr.sbin/ospfd/ospfe.c b/usr.sbin/ospfd/ospfe.c
index d04d0975f83..b3c7ac26c9d 100644
--- a/usr.sbin/ospfd/ospfe.c
+++ b/usr.sbin/ospfd/ospfe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ospfe.c,v 1.90 2015/02/10 05:24:48 claudio Exp $ */
+/*	$OpenBSD: ospfe.c,v 1.91 2015/09/27 17:31:50 stsp Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -879,7 +879,7 @@ orig_rtr_lsa(struct area *area)
 			 */
 			if (!(iface->flags & IFF_UP) ||
 			    (!LINK_STATE_IS_UP(iface->linkstate) &&
-			    !(iface->media_type == IFT_CARP &&
+			    !(iface->if_type == IFT_CARP &&
 			    iface->linkstate == LINK_STATE_DOWN)))
 				continue;
 			log_debug("orig_rtr_lsa: stub net, "
@@ -895,7 +895,7 @@ orig_rtr_lsa(struct area *area)
 			 * backup carp interfaces are anounced with high metric
 			 * for faster failover.
 			 */
-			if (iface->media_type == IFT_CARP &&
+			if (iface->if_type == IFT_CARP &&
 			    iface->linkstate == LINK_STATE_DOWN)
 				rtr_link.metric = MAX_METRIC;
 			else