| Message ID | 1516137848-22565-1-git-send-email-arne@rfc2549.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [Openvpn-devel] Replace buffer backed strings for management_android_control with simple stack variables | expand |
Hi, The commit message summary and description lines are slightly long. Try to not exceed 72 chars line length. On 16-01-18 22:24, Arne Schwabe wrote: > This simplifies the code a bit and also silences compiler warnings about uint8_t pointers passed to char pointers without cast > --- > src/openvpn/route.c | 14 +++++++------- > src/openvpn/tun.c | 12 ++++++------ > 2 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/src/openvpn/route.c b/src/openvpn/route.c > index 2bd5845b..6826b4cc 100644 > --- a/src/openvpn/route.c > +++ b/src/openvpn/route.c > @@ -1610,17 +1610,17 @@ 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(128, &gc); > + char out[128]; > > if (rgi) > { > - buf_printf(&out, "%s %s %s dev %s", network, netmask, gateway, rgi->iface); > + snprintf(out, sizeof(out), "%s %s %s dev %s", network, netmask, gateway, rgi->iface); We have an openvpn_snprintf to account for "certain bugger snprintf implementations that do not null-terminate" (see buffer.c). I have no idea what implementation that actually are (or whether it's still valid at all), but let's use openvpn_snprintf() to be sure until we know :) > } > else > { > - buf_printf(&out, "%s %s %s", network, netmask, gateway); > + snprintf(out, sizeof(out), "%s %s %s", network, netmask, gateway); > } > - management_android_control(management, "ROUTE", buf_bptr(&out)); > + management_android_control(management, "ROUTE", out); > > #elif defined (_WIN32) > { > @@ -1963,11 +1963,11 @@ add_route_ipv6(struct route_ipv6 *r6, const struct tuntap *tt, unsigned int flag > status = openvpn_execve_check(&argv, es, 0, "ERROR: Linux route -6/-A inet6 add command failed"); > > #elif defined (TARGET_ANDROID) > - struct buffer out = alloc_buf_gc(64, &gc); > + char out[64]; > > - buf_printf(&out, "%s/%d %s", network, r6->netbits, device); > + snprintf(out, sizeof(out), "%s/%d %s", network, r6->netbits, device); > > - management_android_control(management, "ROUTE6", buf_bptr(&out)); > + management_android_control(management, "ROUTE6", out); > > #elif defined (_WIN32) > > diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c > index 6e163489..46ed5d0d 100644 > --- a/src/openvpn/tun.c > +++ b/src/openvpn/tun.c > @@ -1031,12 +1031,12 @@ do_ifconfig(struct tuntap *tt, > > if (do_ipv6) > { > - struct buffer out6 = alloc_buf_gc(64, &gc); > - buf_printf(&out6, "%s/%d", ifconfig_ipv6_local,tt->netbits_ipv6); > - management_android_control(management, "IFCONFIG6",buf_bptr(&out6)); > + char out6[64]; > + snprintf(out6, sizeof(out6), "%s/%d", ifconfig_ipv6_local,tt->netbits_ipv6); > + management_android_control(management, "IFCONFIG6", out6); > } > > - struct buffer out = alloc_buf_gc(64, &gc); > + char out[64]; > > char *top; > switch (tt->topology) > @@ -1057,8 +1057,8 @@ do_ifconfig(struct tuntap *tt, > top = "undef"; > } > > - buf_printf(&out, "%s %s %d %s", ifconfig_local, ifconfig_remote_netmask, tun_mtu, top); > - management_android_control(management, "IFCONFIG", buf_bptr(&out)); > + snprintf(out, sizeof(out), "%s %s %d %s", ifconfig_local, ifconfig_remote_netmask, tun_mtu, top); > + management_android_control(management, "IFCONFIG", out); > > #elif defined(TARGET_SOLARIS) > /* Solaris 2.6 (and 7?) cannot set all parameters in one go... > Otherwise this looks good. -Steffan ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
Hi, On Tue, Jan 16, 2018 at 10:24:08PM +0100, Arne Schwabe wrote: > if (rgi) > { > - buf_printf(&out, "%s %s %s dev %s", network, netmask, gateway, rgi->iface); > + snprintf(out, sizeof(out), "%s %s %s dev %s", network, netmask, gateway, rgi->iface); Everything else uses openvpn_snprintf(), which presumably works around snprintf() platform undefined'ness wrt null-termination on too-long input. Most likely this is not *needed* on TARGET_ANDROID code, but for clarity it might be worth considering. gert
diff --git a/src/openvpn/route.c b/src/openvpn/route.c index 2bd5845b..6826b4cc 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -1610,17 +1610,17 @@ 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(128, &gc); + char out[128]; if (rgi) { - buf_printf(&out, "%s %s %s dev %s", network, netmask, gateway, rgi->iface); + snprintf(out, sizeof(out), "%s %s %s dev %s", network, netmask, gateway, rgi->iface); } else { - buf_printf(&out, "%s %s %s", network, netmask, gateway); + snprintf(out, sizeof(out), "%s %s %s", network, netmask, gateway); } - management_android_control(management, "ROUTE", buf_bptr(&out)); + management_android_control(management, "ROUTE", out); #elif defined (_WIN32) { @@ -1963,11 +1963,11 @@ add_route_ipv6(struct route_ipv6 *r6, const struct tuntap *tt, unsigned int flag status = openvpn_execve_check(&argv, es, 0, "ERROR: Linux route -6/-A inet6 add command failed"); #elif defined (TARGET_ANDROID) - struct buffer out = alloc_buf_gc(64, &gc); + char out[64]; - buf_printf(&out, "%s/%d %s", network, r6->netbits, device); + snprintf(out, sizeof(out), "%s/%d %s", network, r6->netbits, device); - management_android_control(management, "ROUTE6", buf_bptr(&out)); + management_android_control(management, "ROUTE6", out); #elif defined (_WIN32) diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 6e163489..46ed5d0d 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -1031,12 +1031,12 @@ do_ifconfig(struct tuntap *tt, if (do_ipv6) { - struct buffer out6 = alloc_buf_gc(64, &gc); - buf_printf(&out6, "%s/%d", ifconfig_ipv6_local,tt->netbits_ipv6); - management_android_control(management, "IFCONFIG6",buf_bptr(&out6)); + char out6[64]; + snprintf(out6, sizeof(out6), "%s/%d", ifconfig_ipv6_local,tt->netbits_ipv6); + management_android_control(management, "IFCONFIG6", out6); } - struct buffer out = alloc_buf_gc(64, &gc); + char out[64]; char *top; switch (tt->topology) @@ -1057,8 +1057,8 @@ do_ifconfig(struct tuntap *tt, top = "undef"; } - buf_printf(&out, "%s %s %d %s", ifconfig_local, ifconfig_remote_netmask, tun_mtu, top); - management_android_control(management, "IFCONFIG", buf_bptr(&out)); + snprintf(out, sizeof(out), "%s %s %d %s", ifconfig_local, ifconfig_remote_netmask, tun_mtu, top); + management_android_control(management, "IFCONFIG", out); #elif defined(TARGET_SOLARIS) /* Solaris 2.6 (and 7?) cannot set all parameters in one go...