unet-cli: strip initial newline in usage message

[project/unetd.git] / service.c

diff --git a/service.c b/service.c
index 29b41a20a684c6e417761e5be7a1478b78a569e1..73cf5b8146ff5c289f86cffd671aaa4ce18918fd 100644 (file)
--- a/service.c
+++ b/service.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2022 Felix Fietkau <nbd@nbd.name>
  */
@@ -23,6 +23,31 @@ void network_services_free(struct network *net)
        vlist_flush_all(&net->services);
 }
 
+static int
+__service_add_member(struct network_host **list, int *n, struct network_host *member)
+{
+       int i;
+
+       for (i = 0; i < *n; i++) {
+               if (list[i] == member)
+                       return 0;
+       }
+
+       list[(*n)++] = member;
+       return 1;
+}
+
+static int
+__service_add_group(struct network_host **list, int *n, struct network_group *group)
+{
+       int i, count = 0;
+
+       for (i = 0; i < group->n_members; i++)
+               count += __service_add_member(list, n, group->members[i]);
+
+       return count;
+}
+
 static int
 __service_parse_members(struct network *net, struct network_service *s,
                        const char *name)
@@ -37,7 +62,7 @@ __service_parse_members(struct network *net, struct network_service *s,
                        return 0;
 
                if (s)
-                       s->members[s->n_members++] = host;
+                       __service_add_member(s->members, &s->n_members, host);
 
                return 1;
        }
@@ -47,13 +72,10 @@ __service_parse_members(struct network *net, struct network_service *s,
        if (!group)
                return 0;
 
-       if (s) {
-               memcpy(&s->members[s->n_members], group->members,
-                      group->n_members * sizeof(group->members[0]));
-               s->n_members += group->n_members;
-       }
-
-       return group->n_members;
+       if (s)
+               return __service_add_group(s->members, &s->n_members, group);
+       else
+               return group->n_members;
 }
 
 static int
@@ -104,7 +126,7 @@ service_add(struct network *net, struct blob_attr *data)
                s->type = strcpy(type_buf, type);
        if (config)
                s->config = memcpy(config_buf, config, blob_pad_len(config));
-#ifdef linux
+#ifdef VXLAN_SUPPORT
        if (type && !strcmp(type, "vxlan"))
                s->ops = &vxlan_ops;
 #endif