python: Raise IndexError when adding the same network twice

[people/ms/libloc.git] / src / network.c

diff --git a/src/network.c b/src/network.c
index 77425e6efe03cba5f4e46c7c4fccb361a91738ec..3d386126f103bd3c8716ea3f98ad353588cd4a80 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -59,7 +59,7 @@ static struct in6_addr prefix_to_bitmask(unsigned int prefix) {
        for (unsigned int i = 0; i < 16; i++)
                bitmask.s6_addr[i] = 0;
 
-       for (unsigned int i = prefix, j = 0; i > 0; i -= 8, j++) {
+       for (int i = prefix, j = 0; i > 0; i -= 8, j++) {
                if (i >= 8)
                        bitmask.s6_addr[j] = 0xff;
                else
@@ -86,7 +86,7 @@ static struct in6_addr make_last_address(const struct in6_addr* address, unsigne
 
        // Perform bitwise OR
        for (unsigned int i = 0; i < 4; i++)
-               a.s6_addr32[i] = address->s6_addr[i] | ~bitmask.s6_addr32[i];
+               a.s6_addr32[i] = address->s6_addr32[i] | ~bitmask.s6_addr32[i];
 
        return a;
 }
@@ -209,17 +209,17 @@ LOC_EXPORT struct loc_network* loc_network_unref(struct loc_network* network) {
        return NULL;
 }
 
-static int format_ipv6_address(struct loc_network* network, char* string, size_t length) {
-       const char* ret = inet_ntop(AF_INET6, &network->start_address, string, length);
+static int format_ipv6_address(const struct in6_addr* address, char* string, size_t length) {
+       const char* ret = inet_ntop(AF_INET6, address, string, length);
        if (!ret)
                return -1;
 
        return 0;
 }
 
-static int format_ipv4_address(struct loc_network* network, char* string, size_t length) {
+static int format_ipv4_address(const struct in6_addr* address, char* string, size_t length) {
        struct in_addr ipv4_address;
-       ipv4_address.s_addr = network->start_address.s6_addr32[3];
+       ipv4_address.s_addr = address->s6_addr32[3];
 
        const char* ret = inet_ntop(AF_INET, &ipv4_address, string, length);
        if (!ret)
@@ -241,11 +241,11 @@ LOC_EXPORT char* loc_network_str(struct loc_network* network) {
        int family = loc_network_address_family(network);
        switch (family) {
                case AF_INET6:
-                       r = format_ipv6_address(network, string, length);
+                       r = format_ipv6_address(&network->start_address, string, length);
                        break;
 
                case AF_INET:
-                       r = format_ipv4_address(network, string, length);
+                       r = format_ipv4_address(&network->start_address, string, length);
                        prefix -= 96;
                        break;
 
@@ -511,7 +511,7 @@ LOC_EXPORT int loc_network_tree_add_network(struct loc_network_tree* tree, struc
        // Check if node has not been set before
        if (node->network) {
                DEBUG(tree->ctx, "There is already a network at this path\n");
-               return 1;
+               return -EBUSY;
        }
 
        // Point node to the network