[NetworkManager-vpnc: 2/5] src/nm-vpnc-service-vpnc-helper.c: Reorder code
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [NetworkManager-vpnc: 2/5] src/nm-vpnc-service-vpnc-helper.c: Reorder code
- Date: Sun, 10 May 2020 09:38:50 +0000 (UTC)
commit 3bc0249b6260770bffc58e97f46537a19c0ce41c
Author: Laurent Bigonville <bigon bigon be>
Date: Sat Sep 8 14:06:31 2018 +0200
src/nm-vpnc-service-vpnc-helper.c: Reorder code
Reorder the code to make it more clear what belong the generic config
and what's beling to the IPv4 one.
src/nm-vpnc-service-vpnc-helper.c | 36 +++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
---
diff --git a/src/nm-vpnc-service-vpnc-helper.c b/src/nm-vpnc-service-vpnc-helper.c
index 6743111..92d2f58 100644
--- a/src/nm-vpnc-service-vpnc-helper.c
+++ b/src/nm-vpnc-service-vpnc-helper.c
@@ -366,6 +366,25 @@ main (int argc, char *argv[])
else
helper_failed (proxy, "Tunnel Device");
+ /* Banner */
+ val = str_to_gvariant (getenv ("CISCO_BANNER"), TRUE);
+ if (val)
+ g_variant_builder_add (&builder, "{sv}", NM_VPN_PLUGIN_CONFIG_BANNER, val);
+
+ /* MTU */
+ tmp = getenv ("INTERNAL_IP4_MTU");
+ if (tmp && strlen (tmp)) {
+ errno = 0;
+ mtu = strtol (tmp, NULL, 10);
+ if (errno || mtu < 0 || mtu > 20000) {
+ _LOGW ("Ignoring invalid tunnel MTU '%s'", tmp);
+ mtu = 1412;
+ }
+ }
+ val = g_variant_new_uint32 ((guint32) mtu);
+ g_variant_builder_add (&builder, "{sv}", NM_VPN_PLUGIN_CONFIG_MTU, val);
+
+ /* IPv4 configuration */
/* IP address */
val = addr4_to_gvariant (getenv ("INTERNAL_IP4_ADDRESS"));
if (val)
@@ -437,23 +456,6 @@ main (int argc, char *argv[])
g_variant_builder_add (&ip4builder, "{sv}", NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT,
g_variant_new_boolean (TRUE));
}
- /* Banner */
- val = str_to_gvariant (getenv ("CISCO_BANNER"), TRUE);
- if (val)
- g_variant_builder_add (&builder, "{sv}", NM_VPN_PLUGIN_CONFIG_BANNER, val);
-
- /* MTU */
- tmp = getenv ("INTERNAL_IP4_MTU");
- if (tmp && strlen (tmp)) {
- errno = 0;
- mtu = strtol (tmp, NULL, 10);
- if (errno || mtu < 0 || mtu > 20000) {
- _LOGW ("Ignoring invalid tunnel MTU '%s'", tmp);
- mtu = 1412;
- }
- }
- val = g_variant_new_uint32 ((guint32) mtu);
- g_variant_builder_add (&builder, "{sv}", NM_VPN_PLUGIN_CONFIG_MTU, val);
ip4config = g_variant_builder_end (&ip4builder);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]