Re: [Openvpn-devel] +++ route.c 2011-05-18 09:15:17.000000000 +0200

2011-05-19 Thread Peter Stuge
David Sommerseth wrote:
> Please do a git commit -s to your local git tree (you have all rights to do
> so, its all on your own computer) then do 'git format-patch HEAD~1' and
> send the 0001-whatever-comes-here.patch via git send-email.

git send-email HEAD~1 # is shorthand for that


//Peter



Re: [Openvpn-devel] +++ route.c 2011-05-18 09:15:17.000000000 +0200

2011-05-19 Thread David Sommerseth
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1


In addition to Gert's comments, I would like to see a complete commit
patch.  It seems you just did "git diff | git send-email", which makes this
patch more difficult to apply.

Please do a git commit -s to your local git tree (you have all rights to do
so, its all on your own computer) then do 'git format-patch HEAD~1' and
send the 0001-whatever-comes-here.patch via git send-email.

When doing git commit -s, you need to put in an explanation/comment to your
commit.  First a short one-line summary, a blank line and a more verbose
description of why this change is needed.

But you might want to get answer Gert's comment before submitting a new patch.


Kind regards,

David Sommerseth


On 18/05/11 16:38, Xavier Franquet wrote:
>if (!r->defined)
>  return;
> @@ -1113,23 +1114,26 @@ add_route (struct route *r, const struct tuntap *tt, 
> unsigned int flags, const s
>  
>  #if defined(TARGET_LINUX)
>  #ifdef CONFIG_FEATURE_IPROUTE
> -  argv_printf (, "%s route add %s/%d via %s",
> +  argv_printf (, "%s route add %s/%d via %s dev %s",
> iproute_path,
> network,
> count_netmask_bits(netmask),
> -   gateway);
> +   gateway,
> +   device);
>if (r->metric_defined)
>  argv_printf_cat (, "metric %d", r->metric);
>  
>  #else
> -  argv_printf (, "%s add -net %s netmask %s gw %s",
> +  argv_printf (, "%s add -net %s netmask %s gw %s dev %s",
>   ROUTE_PATH,
> network,
> netmask,
> -   gateway);
> +   gateway,
> +   device);
>if (r->metric_defined)
>  argv_printf_cat (, "metric %d", r->metric);
>  #endif  /*CONFIG_FEATURE_IPROUTE*/
> +
>argv_msg (D_ROUTE, );
>status = openvpn_execve_check (, es, 0, "ERROR: Linux route add 
> command failed");
>  
> @@ -1452,6 +1456,7 @@ delete_route (const struct route *r, const struct 
> tuntap *tt, unsigned int flags
>const char *network;
>const char *netmask;
>const char *gateway;
> +  const char *device = tt->actual_name;
>  
>if (!r->defined)
>  return;
> @@ -1465,16 +1470,18 @@ delete_route (const struct route *r, const struct 
> tuntap *tt, unsigned int flags
>  
>  #if defined(TARGET_LINUX)
>  #ifdef CONFIG_FEATURE_IPROUTE
> -  argv_printf (, "%s route del %s/%d",
> +  argv_printf (, "%s route del %s/%d dev %s",
> iproute_path,
> network,
> -   count_netmask_bits(netmask));
> +   count_netmask_bits(netmask),
> +   device);
>  #else
>  
> -  argv_printf (, "%s del -net %s netmask %s",
> +  argv_printf (, "%s del -net %s netmask %s dev %s",
>   ROUTE_PATH,
> network,
> -   netmask);
> +   netmask,
> +   device);
>  #endif /*CONFIG_FEATURE_IPROUTE*/
>if (r->metric_defined)
>  argv_printf_cat (, "metric %d", r->metric);
> 

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/

iEYEARECAAYFAk3U81UACgkQDC186MBRfroMHwCgirtiLfD2eYx4kUd36m5URLAb
nUUAn05ktAbALzn21y5miaclKtMSs8tH
=j4/1
-END PGP SIGNATURE-



Re: [Openvpn-devel] +++ route.c 2011-05-18 09:15:17.000000000 +0200

2011-05-18 Thread Gert Doering
Hi,

On Wed, May 18, 2011 at 04:38:21PM +0200, Xavier Franquet wrote:
>if (!r->defined)
>  return;
> @@ -1113,23 +1114,26 @@ add_route (struct route *r, const struct tuntap *tt, 
> unsigned int flags, const s
>  
>  #if defined(TARGET_LINUX)
>  #ifdef CONFIG_FEATURE_IPROUTE
> -  argv_printf (, "%s route add %s/%d via %s",
> +  argv_printf (, "%s route add %s/%d via %s dev %s",

A few words on why exactly this patch is needed, and what problems it
solves would be appreciated...

As it stands, I'd NAK it, because "the existing code works for me", and 
your code just makes it more complicated.

gert
-- 
USENET is *not* the non-clickable part of WWW!
   //www.muc.de/~gert/
Gert Doering - Munich, Germany g...@greenie.muc.de
fax: +49-89-35655025g...@net.informatik.tu-muenchen.de


pgpiMBI3tjaio.pgp
Description: PGP signature