ipconfig: Fix connman_ipaddress_set_ipv6 prototype

Switch the gateway and prefix_length order to be consistent with the ipv4
version.

diff --git a/include/ipconfig.h b/include/ipconfig.h
index 22e8c54..a0673af 100644 (file)
--- a/include/ipconfig.h
+++ b/include/ipconfig.h
@@ -47,8 +47,9 @@ int connman_ipaddress_set_ipv4(struct connman_ipaddress *ipaddress,
                                const char *address, const char *netmask,
                                const char *gateway);
 int connman_ipaddress_set_ipv6(struct connman_ipaddress *ipaddress,
-                               const char *address, const char *gateway,
-                               unsigned char prefix_length);
+                               const char *address,
+                               unsigned char prefix_length,
+                               const char *gateway);
 void connman_ipaddress_set_peer(struct connman_ipaddress *ipaddress,
                                const char *peer);
 void connman_ipaddress_clear(struct connman_ipaddress *ipaddress);

diff --git a/plugins/openconnect.c b/plugins/openconnect.c
index 94bfcfc..5c8db26 100644 (file)
--- a/plugins/openconnect.c
+++ b/plugins/openconnect.c
@@ -146,7 +146,7 @@ static int oc_notify(DBusMessage *msg, struct connman_provider *provider)
                                                netmask, gateway);
        else
                connman_ipaddress_set_ipv6(ipaddress, addressv6,
-                                               gateway, prefix_len);
+                                               prefix_len, gateway);
        connman_provider_set_ipaddress(provider, ipaddress);
        connman_provider_set_domain(provider, domain);
 

diff --git a/src/ipconfig.c b/src/ipconfig.c
index 22dd03b..92ac8f6 100644 (file)
--- a/src/ipconfig.c
+++ b/src/ipconfig.c
@@ -153,8 +153,9 @@ static gboolean check_ipv6_address(const char *address)
 }
 
 int connman_ipaddress_set_ipv6(struct connman_ipaddress *ipaddress,
-                               const char *address, const char *gateway,
-                                               unsigned char prefix_length)
+                               const char *address,
+                               unsigned char prefix_length,
+                               const char *gateway)
 {
        if (ipaddress == NULL)
                return -EINVAL;
@@ -1947,7 +1948,7 @@ int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig,
                else
                        return connman_ipaddress_set_ipv6(
                                        ipconfig->address, address,
-                                               gateway, prefix_length);
+                                               prefix_length, gateway);
                break;
 
        case CONNMAN_IPCONFIG_METHOD_DHCP: