summaryrefslogtreecommitdiffstats
path: root/src/openvpn/route.c
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-03-21 14:18:41 +0100
committerGert Doering <gert@greenie.muc.de>2014-03-23 21:57:43 +0100
commit05660e788a10ea28f886360ce7a0c100577f5813 (patch)
tree5c580fc279563fd41b4ea40c1ec32460c5defbd5 /src/openvpn/route.c
parent98e24cc7e8ce3dafada43e46aef32a3d6a7a4f27 (diff)
downloadopenvpn-05660e788a10ea28f886360ce7a0c100577f5813.tar.gz
openvpn-05660e788a10ea28f886360ce7a0c100577f5813.tar.xz
openvpn-05660e788a10ea28f886360ce7a0c100577f5813.zip
Add gateway and device to android control messages
Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <1395407925-25518-9-git-send-email-arne@rfc2549.org> URL: http://article.gmane.org/gmane.network.openvpn.devel/8368 Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/route.c')
-rw-r--r--src/openvpn/route.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/openvpn/route.c b/src/openvpn/route.c
index 1dd14fb..13eed5f 100644
--- a/src/openvpn/route.c
+++ b/src/openvpn/route.c
@@ -1311,9 +1311,12 @@ add_route (struct route_ipv4 *r,
status = openvpn_execve_check (&argv, es, 0, "ERROR: Linux route add command failed");
#elif defined (TARGET_ANDROID)
- struct buffer out = alloc_buf_gc (64, &gc);
+ struct buffer out = alloc_buf_gc (128, &gc);
- buf_printf (&out, "%s %s", network, netmask);
+ if (rgi)
+ buf_printf (&out, "%s %s %s dev %s", network, netmask, gateway, rgi->iface);
+ else
+ buf_printf (&out, "%s %s %s", network, netmask, gateway);
management_android_control (management, "ROUTE", buf_bptr(&out));
#elif defined (WIN32)
@@ -1593,7 +1596,7 @@ add_route_ipv6 (struct route_ipv6 *r6, const struct tuntap *tt, unsigned int fla
#elif defined (TARGET_ANDROID)
struct buffer out = alloc_buf_gc (64, &gc);
- buf_printf (&out, "%s/%d", network, r6->netbits);
+ buf_printf (&out, "%s/%d %s", network, r6->netbits, device);
management_android_control (management, "ROUTE6", buf_bptr(&out));