Hi,

On Thu, Aug 20, 2020 at 03:49:46PM +0200, Jan Seeger wrote:
> --- a/src/openvpn/route.c
> +++ b/src/openvpn/route.c
> @@ -1463,6 +1463,7 @@ setenv_route_ipv6(struct env_set *es, const struct 
> route_ipv6 *r6, int i)
>          struct buffer name1 = alloc_buf_gc( 256, &gc );
>          struct buffer val = alloc_buf_gc( 256, &gc );
>          struct buffer name2 = alloc_buf_gc( 256, &gc );
> +        struct buffer name3 = alloc_buf_gc( 256, &gc );
>  
>          buf_printf( &name1, "route_ipv6_network_%d", i );
>          buf_printf( &val, "%s/%d", print_in6_addr( r6->network, 0, &gc ),
> @@ -1471,6 +1472,11 @@ setenv_route_ipv6(struct env_set *es, const struct 
> route_ipv6 *r6, int i)
>  
>          buf_printf( &name2, "route_ipv6_gateway_%d", i );
>          setenv_str( es, BSTR(&name2), print_in6_addr( r6->gateway, 0, &gc ));
> +
> +        if (r6->flags & RT_METRIC_DEFINED) {
> +            buf_printf( &name3, "route_ipv6_metric_%d", i) ;
> +            setenv_int( es, BSTR(&name3), r6->metric);
> +        }

style guide demands "{" on a separate line, so

           if (r6->flags & RT_METRIC_DEFINED)
           {

also, I'd move the allocation of "name3" into this block.

           if (r6->flags & RT_METRIC_DEFINED)
           {
               struct buffer name3 = alloc_buf_gc( 256, &gc );
               ...

(no need to allocate memory if this is never used - also, with our
move towards C99, new code is encouraged to declare variables where
first needed, not "at the top of the function")

gert

-- 
"If was one thing all people took for granted, was conviction that if you 
 feed honest figures into a computer, honest figures come out. Never doubted 
 it myself till I met a computer with a sense of humor."
                             Robert A. Heinlein, The Moon is a Harsh Mistress

Gert Doering - Munich, Germany                             g...@greenie.muc.de

Attachment: signature.asc
Description: PGP signature

_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

Reply via email to