[PATCH 2/4] ofono: IPv4 index was set too late if method is set to dhcp

[Jukka Rissanen]

If IPv4 method is dhcp, then context index is not set correctly.
---
 plugins/ofono.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/ofono.c b/plugins/ofono.c
index 8a29d24..e1088c5 100644
--- a/plugins/ofono.c
+++ b/plugins/ofono.c
@@ -817,14 +817,17 @@ static void extract_ipv4_settings(DBusMessageIter *array,
        if (index < 0)
                goto out;
 
+       context->index = index;
+
        if (context->ipv4_method != CONNMAN_IPCONFIG_METHOD_FIXED)
                goto out;
 
        context->ipv4_address = 
connman_ipaddress_alloc(CONNMAN_IPCONFIG_TYPE_IPV4);
-       if (!context->ipv4_address)
+       if (!context->ipv4_address) {
+               context->index = -1;
                goto out;
+       }
 
-       context->index = index;
        connman_ipaddress_set_ipv4(context->ipv4_address, address,
                                netmask, gateway);
 
-- 
1.8.3.1

_______________________________________________
connman mailing list
connman@connman.net
https://lists.connman.net/mailman/listinfo/connman