diff options
author | mvs <mvs@cvs.openbsd.org> | 2020-07-29 12:09:32 +0000 |
---|---|---|
committer | mvs <mvs@cvs.openbsd.org> | 2020-07-29 12:09:32 +0000 |
commit | 00f032473f31e6f252c68d901354f3b06b083b3b (patch) | |
tree | f26c20f1b8bcf28db7df1a52a869a511a95aaac7 /sys/net | |
parent | 5f7af4caf2a70d87cce3ff3be56436512c2fe1f6 (diff) |
Interface index is unsigned integer. Fix the places where it referenced
as signed. u_int used within pipex(4) for consistency with other code.
ok dlg@ mpi@
Diffstat (limited to 'sys/net')
-rw-r--r-- | sys/net/if_bridge.h | 4 | ||||
-rw-r--r-- | sys/net/if_var.h | 4 | ||||
-rw-r--r-- | sys/net/pipex.c | 4 | ||||
-rw-r--r-- | sys/net/pipex.h | 6 | ||||
-rw-r--r-- | sys/net/pipex_local.h | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/sys/net/if_bridge.h b/sys/net/if_bridge.h index 03aa5777495..96f853c30f9 100644 --- a/sys/net/if_bridge.h +++ b/sys/net/if_bridge.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bridge.h,v 1.68 2020/07/22 20:37:35 mvs Exp $ */ +/* $OpenBSD: if_bridge.h,v 1.69 2020/07/29 12:09:31 mvs Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -329,7 +329,7 @@ struct bstp_tcn_unit { struct bstp_port { LIST_ENTRY(bstp_port) bp_next; - int bp_ifindex; /* parent interface index */ + unsigned int bp_ifindex; /* parent interface index */ struct bstp_state *bp_bs; struct task bp_ltask; /* if linkstate hook */ u_int8_t bp_active; diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 64ad80a313c..2de907c7a7f 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_var.h,v 1.111 2020/07/24 18:17:15 mvs Exp $ */ +/* $OpenBSD: if_var.h,v 1.112 2020/07/29 12:09:31 mvs Exp $ */ /* $NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $ */ /* @@ -139,7 +139,7 @@ struct ifnet { /* and the entries */ caddr_t if_pf_kif; /* pf interface abstraction */ union { struct srpl carp_s; /* carp if list (used by !carp ifs) */ - int carp_idx; /* index of carpdev (used by carp + unsigned int carp_idx; /* index of carpdev (used by carp ifs) */ } if_carp_ptr; #define if_carp if_carp_ptr.carp_s diff --git a/sys/net/pipex.c b/sys/net/pipex.c index f83a03268df..2ad7757fee9 100644 --- a/sys/net/pipex.c +++ b/sys/net/pipex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pipex.c,v 1.121 2020/07/28 12:53:20 mvs Exp $ */ +/* $OpenBSD: pipex.c,v 1.122 2020/07/29 12:09:31 mvs Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -145,7 +145,7 @@ pipex_init(void) } void -pipex_iface_init(struct pipex_iface_context *pipex_iface, int ifindex) +pipex_iface_init(struct pipex_iface_context *pipex_iface, u_int ifindex) { struct pipex_session *session; diff --git a/sys/net/pipex.h b/sys/net/pipex.h index c8727efa715..bba010b46aa 100644 --- a/sys/net/pipex.h +++ b/sys/net/pipex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pipex.h,v 1.25 2020/07/17 08:57:27 mvs Exp $ */ +/* $OpenBSD: pipex.h,v 1.26 2020/07/29 12:09:31 mvs Exp $ */ /* * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -190,7 +190,7 @@ struct pipex_session; * N net lock */ struct pipex_iface_context { - int ifindex; /* [I] outer interface index */ + u_int ifindex; /* [I] outer interface index */ u_int pipexmode; /* [N] pipex mode */ /* [I] virtual pipex_session entry for multicast routing */ struct pipex_session *multicast_session; @@ -198,7 +198,7 @@ struct pipex_iface_context { __BEGIN_DECLS void pipex_init (void); -void pipex_iface_init (struct pipex_iface_context *, int); +void pipex_iface_init (struct pipex_iface_context *, u_int); void pipex_iface_fini (struct pipex_iface_context *); int pipex_notify_close_session(struct pipex_session *session); diff --git a/sys/net/pipex_local.h b/sys/net/pipex_local.h index 29948c0d0c6..7dd181d1566 100644 --- a/sys/net/pipex_local.h +++ b/sys/net/pipex_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pipex_local.h,v 1.37 2020/07/17 08:57:27 mvs Exp $ */ +/* $OpenBSD: pipex_local.h,v 1.38 2020/07/29 12:09:31 mvs Exp $ */ /* * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -183,7 +183,7 @@ struct pipex_session { int ip6_prefixlen; /* [I] remote IPv6 prefixlen */ struct pipex_iface_context* pipex_iface; /* [N] context for interface */ - int ifindex; /* [N] interface index */ + u_int ifindex; /* [N] interface index */ uint32_t ppp_flags; /* [I] configure flags */ #ifdef PIPEX_MPPE |