On Mon, Apr 17, 2023 at 06:33:50PM +0300, Vitaliy Makkoveev wrote:
> However, the renaming of `source' to `ar_source' diff is pretty small.
> We use 'art_root' structure in regress/sys/net/rtable/delete and in
> usr.bin/netstat/ but we don't touch `source'.
OK bluhm@
> Index: sys/net/art.h
> ===================================================================
> RCS file: /cvs/src/sys/net/art.h,v
> retrieving revision 1.21
> diff -u -p -r1.21 art.h
> --- sys/net/art.h 2 Mar 2021 17:50:41 -0000 1.21
> +++ sys/net/art.h 17 Apr 2023 15:32:43 -0000
> @@ -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)
> Index: sys/net/rtable.c
> ===================================================================
> RCS file: /cvs/src/sys/net/rtable.c,v
> retrieving revision 1.80
> diff -u -p -r1.80 rtable.c
> --- sys/net/rtable.c 29 Jun 2022 22:20:47 -0000 1.80
> +++ sys/net/rtable.c 17 Apr 2023 15:32:43 -0000
> @@ -379,7 +379,7 @@ rtable_setsource(unsigned int rtableid,
> 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,
> if (ar == NULL)
> return (NULL);
>
> - return (ar->source);
> + return (ar->ar_source);
> }
>
> void
