fix interrupted read checks in log collection

[project/netifd.git] / interface-ip.c

diff --git a/interface-ip.c b/interface-ip.c
index 0845169..a5efad5 100644 (file)
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -1,6 +1,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <unistd.h>
+
+#include <arpa/inet.h>
 
 #include "netifd.h"
 #include "device.h"
@@ -13,19 +16,15 @@
 static int
 addr_cmp(const void *k1, const void *k2, void *ptr)
 {
-       const struct device_addr *a1 = k1, *a2 = k2;
-
-       return memcmp(&a1->mask, &a2->mask,
-               sizeof(*a1) - offsetof(struct device_addr, mask));
+       return memcmp(k1, k2, sizeof(struct device_addr) -
+                     offsetof(struct device_addr, mask));
 }
 
 static int
 route_cmp(const void *k1, const void *k2, void *ptr)
 {
-       const struct device_route *r1 = k1, *r2 = k2;
-
-       return memcmp(&r1->mask, &r2->mask,
-               sizeof(*r1) - offsetof(struct device_route, mask));
+       return memcmp(k1, k2, sizeof(struct device_route) -
+                     offsetof(struct device_route, mask));
 }
 
 static void
@@ -81,10 +80,173 @@ interface_update_proto_route(struct vlist_tree *tree,
 }
 
 void
+interface_add_dns_server(struct interface *iface, const char *str)
+{
+       struct dns_server *s;
+
+       s = calloc(1, sizeof(*s));
+       s->af = AF_INET;
+       if (inet_pton(s->af, str, &s->addr.in))
+               goto add;
+
+       s->af = AF_INET6;
+       if (inet_pton(s->af, str, &s->addr.in))
+               goto add;
+
+       free(s);
+       return;
+
+add:
+       D(INTERFACE, "Add IPv%c DNS server: %s\n",
+         s->af == AF_INET6 ? '6' : '4', str);
+       list_add_tail(&s->list, &iface->proto_dns_servers);
+}
+
+void
+interface_add_dns_server_list(struct interface *iface, struct blob_attr *list)
+{
+       struct blob_attr *cur;
+       int rem;
+
+       blobmsg_for_each_attr(cur, list, rem) {
+               if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
+                       continue;
+
+               if (!blobmsg_check_attr(cur, NULL))
+                       continue;
+
+               interface_add_dns_server(iface, blobmsg_data(cur));
+       }
+}
+
+void
+interface_add_dns_search_domain(struct interface *iface, const char *str)
+{
+       struct dns_search_domain *s;
+       int len = strlen(str);
+
+       s = calloc(1, sizeof(*s) + len + 1);
+       if (!s)
+               return;
+
+       D(INTERFACE, "Add DNS search domain: %s\n", str);
+       memcpy(s->name, str, len);
+       list_add_tail(&s->list, &iface->proto_dns_search);
+}
+
+void
+interface_add_dns_search_list(struct interface *iface, struct blob_attr *list)
+{
+       struct blob_attr *cur;
+       int rem;
+
+       blobmsg_for_each_attr(cur, list, rem) {
+               if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
+                       continue;
+
+               if (!blobmsg_check_attr(cur, NULL))
+                       continue;
+
+               interface_add_dns_server(iface, blobmsg_data(cur));
+       }
+}
+
+static void
+interface_clear_dns_servers(struct interface *iface)
+{
+       struct dns_server *s, *tmp;
+
+       list_for_each_entry_safe(s, tmp, &iface->proto_dns_servers, list) {
+               list_del(&s->list);
+               free(s);
+       }
+}
+
+static void
+interface_clear_dns_search(struct interface *iface)
+{
+       struct dns_search_domain *s, *tmp;
+
+       list_for_each_entry_safe(s, tmp, &iface->proto_dns_search, list) {
+               list_del(&s->list);
+               free(s);
+       }
+}
+
+void
+interface_clear_dns(struct interface *iface)
+{
+       interface_clear_dns_servers(iface);
+       interface_clear_dns_search(iface);
+}
+
+void
+interface_write_resolv_conf(void)
+{
+       struct interface *iface;
+       struct dns_server *s;
+       struct dns_search_domain *d;
+       char *path = alloca(strlen(resolv_conf) + 5);
+       const char *str;
+       char buf[32];
+       FILE *f;
+
+       sprintf(path, "%s.tmp", resolv_conf);
+       unlink(path);
+       f = fopen(path, "w");
+       if (!f) {
+               D(INTERFACE, "Failed to open %s for writing\n", path);
+               return;
+       }
+
+       vlist_for_each_element(&interfaces, iface, node) {
+               if (iface->state != IFS_UP)
+                       continue;
+
+               if (list_empty(&iface->proto_dns_search) &&
+                   list_empty(&iface->proto_dns_servers))
+                       continue;
+
+               fprintf(f, "# Interface %s\n", iface->name);
+               list_for_each_entry(s, &iface->proto_dns_servers, list) {
+                       str = inet_ntop(s->af, &s->addr, buf, sizeof(buf));
+                       if (!str)
+                               continue;
+
+                       fprintf(f, "nameserver %s\n", str);
+               }
+
+               list_for_each_entry(d, &iface->proto_dns_search, list) {
+                       fprintf(f, "search %s\n", d->name);
+               }
+       }
+       fclose(f);
+       if (rename(path, resolv_conf) < 0) {
+               D(INTERFACE, "Failed to replace %s\n", resolv_conf);
+               unlink(path);
+       }
+}
+
+void
+interface_ip_update_start(struct interface *iface)
+{
+       interface_clear_dns(iface);
+       vlist_update(&iface->proto_route);
+       vlist_update(&iface->proto_addr);
+}
+
+void
+interface_ip_update_complete(struct interface *iface)
+{
+       vlist_flush(&iface->proto_route);
+       vlist_flush(&iface->proto_addr);
+}
+
+void
 interface_ip_init(struct interface *iface)
 {
        vlist_init(&iface->proto_route, route_cmp, interface_update_proto_route,
-                  struct device_route, node);
+                  struct device_route, node, mask);
        vlist_init(&iface->proto_addr, addr_cmp, interface_update_proto_addr,
-                  struct device_addr, node);
+                  struct device_addr, node, mask);
 }