From f8c3e5b6990c5a80e41a3371439967dee3bbbbb1 Mon Sep 17 00:00:00 2001 From: mvs Date: Tue, 18 Apr 2023 10:19:16 +0000 Subject: [PATCH] Rename 'art_root' structure member `source' to `ar_source' to be in accordance with all other 'art_root' structure members. Proposed by bluhm@ ok bluhm@ kn@ --- sys/net/art.h | 4 ++-- sys/net/rtable.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/net/art.h b/sys/net/art.h index a3509206f85..98b8a60299a 100644 --- a/sys/net/art.h +++ b/sys/net/art.h @@ -1,4 +1,4 @@ -/* $OpenBSD: art.h,v 1.21 2021/03/02 17:50:41 deraadt Exp $ */ +/* $OpenBSD: art.h,v 1.22 2023/04/18 10:19:16 mvs Exp $ */ /* * Copyright (c) 2015 Martin Pieuchot @@ -41,7 +41,7 @@ struct art_root { uint8_t ar_nlvl; /* [I] Number of levels */ uint8_t ar_alen; /* [I] Address length in bits */ uint8_t ar_off; /* [I] Offset of key in bytes */ - struct sockaddr *source; /* [K] optional src addr to use */ + struct sockaddr *ar_source; /* [K] optional src addr to use */ }; #define ISLEAF(e) (((unsigned long)(e) & 1) == 0) diff --git a/sys/net/rtable.c b/sys/net/rtable.c index 90207ae54af..56c7789935e 100644 --- a/sys/net/rtable.c +++ b/sys/net/rtable.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtable.c,v 1.80 2022/06/29 22:20:47 bluhm Exp $ */ +/* $OpenBSD: rtable.c,v 1.81 2023/04/18 10:19:16 mvs Exp $ */ /* * Copyright (c) 2014-2016 Martin Pieuchot @@ -379,7 +379,7 @@ rtable_setsource(unsigned int rtableid, int af, struct sockaddr *src) if ((ar = rtable_get(rtableid, af)) == NULL) return (EAFNOSUPPORT); - ar->source = src; + ar->ar_source = src; return (0); } @@ -393,7 +393,7 @@ rtable_getsource(unsigned int rtableid, int af) if (ar == NULL) return (NULL); - return (ar->source); + return (ar->ar_source); } void -- 2.20.1