[vlc-devel] [PATCH] rootwrap: make setsockopt 1 usage consistent

Rémi Denis-Courmont remi at remlab.net
Sun Nov 22 19:49:51 CET 2020


Le sunnuntaina 22. marraskuuta 2020, 20.32.45 EET Tristan Matthews a écrit :
> ---
>  bin/rootwrap.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/bin/rootwrap.c b/bin/rootwrap.c
> index 0258773b90..ed8d4bdf0b 100644
> --- a/bin/rootwrap.c
> +++ b/bin/rootwrap.c
> @@ -161,12 +161,10 @@ static void rootprocess (int fd)
>          sock = socket (family, SOCK_STREAM, IPPROTO_TCP);
>          if (sock != -1)
>          {
> -            const int val = 1;
> -
> -            setsockopt (sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof
> (val)); +            setsockopt (sock, SOL_SOCKET, SO_REUSEADDR, &(int){ 1
> }, sizeof (int)); #ifdef AF_INET6
>              if (addr.sa.sa_family == AF_INET6)
> -                setsockopt (sock, IPPROTO_IPV6, IPV6_V6ONLY, &val, sizeof
> (val)); +                setsockopt (sock, IPPROTO_IPV6, IPV6_V6ONLY, 
> &(int){ 1 }, sizeof (int)); #endif
>              if (bind (sock, &addr.sa, len) == 0)
>              {

LGTM.

Maybe it's time to retire that code though.
Pretty sure nobody uses it.

-- 
雷米‧德尼-库尔蒙
http://www.remlab.net/





More information about the vlc-devel mailing list