*
* Connection Manager
*
- * Copyright (C) 2007-2012 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2013 Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
#include "connman.h"
+unsigned char connman_ipaddress_calc_netmask_len(const char *netmask)
+{
+ unsigned char bits;
+ in_addr_t mask;
+ in_addr_t host;
+
+ if (!netmask)
+ return 32;
+
+ mask = inet_network(netmask);
+ host = ~mask;
+
+ /* a valid netmask must be 2^n - 1 */
+ if ((host & (host + 1)) != 0)
+ return -1;
+
+ bits = 0;
+ for (; mask; mask <<= 1)
+ ++bits;
+
+ return bits;
+}
+
struct connman_ipaddress *connman_ipaddress_alloc(int family)
{
struct connman_ipaddress *ipaddress;
ipaddress = g_try_new0(struct connman_ipaddress, 1);
- if (ipaddress == NULL)
+ if (!ipaddress)
return NULL;
ipaddress->family = family;
void connman_ipaddress_free(struct connman_ipaddress *ipaddress)
{
- if (ipaddress == NULL)
+ if (!ipaddress)
return;
g_free(ipaddress->broadcast);
g_free(ipaddress);
}
-unsigned char __connman_ipaddress_netmask_prefix_len(const char *netmask)
-{
- unsigned char bits;
- in_addr_t mask;
- in_addr_t host;
-
- if (netmask == NULL)
- return 32;
-
- mask = inet_network(netmask);
- host = ~mask;
-
- /* a valid netmask must be 2^n - 1 */
- if ((host & (host + 1)) != 0)
- return -1;
-
- bits = 0;
- for (; mask; mask <<= 1)
- ++bits;
-
- return bits;
-}
-
-static gboolean check_ipv6_address(const char *address)
+static bool check_ipv6_address(const char *address)
{
unsigned char buf[sizeof(struct in6_addr)];
int err;
- if (address == NULL)
- return FALSE;
+ if (!address)
+ return false;
err = inet_pton(AF_INET6, address, buf);
if (err > 0)
- return TRUE;
+ return true;
- return FALSE;
+ return false;
}
int connman_ipaddress_set_ipv6(struct connman_ipaddress *ipaddress,
unsigned char prefix_length,
const char *gateway)
{
- if (ipaddress == NULL)
+ if (!ipaddress)
return -EINVAL;
- if (check_ipv6_address(address) == FALSE)
+ if (!check_ipv6_address(address))
return -EINVAL;
DBG("prefix_len %d address %s gateway %s",
return 0;
}
+int connman_ipaddress_get_ip(struct connman_ipaddress *ipaddress,
+ const char **address,
+ unsigned char *netmask_prefix_length)
+{
+ if (!ipaddress)
+ return -EINVAL;
+
+ *netmask_prefix_length = ipaddress->prefixlen;
+ *address = ipaddress->local;
+
+ return 0;
+}
+
int connman_ipaddress_set_ipv4(struct connman_ipaddress *ipaddress,
const char *address, const char *netmask, const char *gateway)
{
- if (ipaddress == NULL)
+ if (!ipaddress)
return -EINVAL;
ipaddress->family = AF_INET;
- ipaddress->prefixlen = __connman_ipaddress_netmask_prefix_len(netmask);
+ ipaddress->prefixlen = connman_ipaddress_calc_netmask_len(netmask);
g_free(ipaddress->local);
ipaddress->local = g_strdup(address);
void connman_ipaddress_set_peer(struct connman_ipaddress *ipaddress,
const char *peer)
{
- if (ipaddress == NULL)
+ if (!ipaddress)
return;
g_free(ipaddress->peer);
void connman_ipaddress_clear(struct connman_ipaddress *ipaddress)
{
- if (ipaddress == NULL)
+ if (!ipaddress)
return;
ipaddress->prefixlen = 0;
/*
* Note that this copy function only copies the actual address and
- * prefixlen. If you need full copy of ipaddress struct, then you need
- * to create a new function that does that.
+ * prefixlen. Use the other copy function to copy the whole struct.
*/
void connman_ipaddress_copy_address(struct connman_ipaddress *ipaddress,
struct connman_ipaddress *source)
{
- if (ipaddress == NULL || source == NULL)
+ if (!ipaddress || !source)
return;
ipaddress->family = source->family;
g_free(ipaddress->local);
ipaddress->local = g_strdup(source->local);
}
+
+struct connman_ipaddress *
+connman_ipaddress_copy(struct connman_ipaddress *ipaddress)
+{
+ struct connman_ipaddress *copy;
+
+ if (!ipaddress)
+ return NULL;
+
+ copy = g_new0(struct connman_ipaddress, 1);
+
+ copy->family = ipaddress->family;
+ copy->prefixlen = ipaddress->prefixlen;
+ copy->local = g_strdup(ipaddress->local);
+ copy->peer = g_strdup(ipaddress->peer);
+ copy->broadcast = g_strdup(ipaddress->broadcast);
+ copy->gateway = g_strdup(ipaddress->gateway);
+
+ return copy;
+}