corrected reporting of VPN IP addresses.

This commit is contained in:
Nikos Mavrogiannopoulos
2014-01-11 22:03:47 +01:00
parent 5ba6deb66f
commit a66a620f58

View File

@@ -599,13 +599,6 @@ int handle_list_users_cmd(DBusConnection * conn, const char *arg)
goto error_parse;
dbus_message_iter_get_basic(&subs, &device);
if (!dbus_message_iter_next(&subs))
goto error_recv;
if (dbus_message_iter_get_arg_type(&subs) != DBUS_TYPE_STRING)
goto error_parse;
dbus_message_iter_get_basic(&subs, &vpn_ipv4);
if (!dbus_message_iter_next(&subs))
goto error_recv;
@@ -618,7 +611,7 @@ int handle_list_users_cmd(DBusConnection * conn, const char *arg)
if (dbus_message_iter_get_arg_type(&subs) != DBUS_TYPE_STRING)
goto error_parse;
dbus_message_iter_get_basic(&subs, &vpn_ipv6);
dbus_message_iter_get_basic(&subs, &vpn_ipv4);
if (!dbus_message_iter_next(&subs))
goto error_recv;
@@ -627,6 +620,13 @@ int handle_list_users_cmd(DBusConnection * conn, const char *arg)
goto error_parse;
dbus_message_iter_get_basic(&subs, &vpn_ptp_ipv6);
if (!dbus_message_iter_next(&subs))
goto error_recv;
if (dbus_message_iter_get_arg_type(&subs) != DBUS_TYPE_STRING)
goto error_parse;
dbus_message_iter_get_basic(&subs, &vpn_ipv6);
if (!dbus_message_iter_next(&subs))
goto error_recv;
@@ -780,13 +780,6 @@ int common_info_cmd(DBusMessageIter * args)
goto error_parse;
dbus_message_iter_get_basic(&subs, &device);
if (!dbus_message_iter_next(&subs))
goto error_recv;
if (dbus_message_iter_get_arg_type(&subs) != DBUS_TYPE_STRING)
goto error_parse;
dbus_message_iter_get_basic(&subs, &vpn_ipv4);
if (!dbus_message_iter_next(&subs))
goto error_recv;
@@ -799,7 +792,7 @@ int common_info_cmd(DBusMessageIter * args)
if (dbus_message_iter_get_arg_type(&subs) != DBUS_TYPE_STRING)
goto error_parse;
dbus_message_iter_get_basic(&subs, &vpn_ipv6);
dbus_message_iter_get_basic(&subs, &vpn_ipv4);
if (!dbus_message_iter_next(&subs))
goto error_recv;
@@ -808,6 +801,13 @@ int common_info_cmd(DBusMessageIter * args)
goto error_parse;
dbus_message_iter_get_basic(&subs, &vpn_ptp_ipv6);
if (!dbus_message_iter_next(&subs))
goto error_recv;
if (dbus_message_iter_get_arg_type(&subs) != DBUS_TYPE_STRING)
goto error_parse;
dbus_message_iter_get_basic(&subs, &vpn_ipv6);
if (!dbus_message_iter_next(&subs))
goto error_recv;