treewide: no need to negate errno for log_*_errno()

[elogind.git] / src / network / networkd-manager.c

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 5a4f93a06ba2daa19994a48571be887ad4b77c73..98a12c277abbeeffa0cf7ba438c723f35949293c 100644 (file)
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -36,6 +36,9 @@
 
 #include "sd-rtnl.h"
 
+/* use 8 MB for receive socket kernel queue. */
+#define RCVBUF_SIZE    (8*1024*1024)
+
 const char* const network_dirs[] = {
         "/etc/systemd/network",
         "/run/systemd/network",
@@ -98,6 +101,10 @@ int manager_new(Manager **ret) {
         if (r < 0)
                 return r;
 
+        r = sd_rtnl_inc_rcvbuf(m->rtnl, RCVBUF_SIZE);
+        if (r < 0)
+                return r;
+
         r = sd_bus_default_system(&m->bus);
         if (r < 0 && r != -ENOENT) /* TODO: drop when we can rely on kdbus */
                 return r;
@@ -115,7 +122,7 @@ int manager_new(Manager **ret) {
                         return -ENOMEM;
         }
 
-        m->netdevs = hashmap_new(string_hash_func, string_compare_func);
+        m->netdevs = hashmap_new(&string_hash_ops);
         if (!m->netdevs)
                 return -ENOMEM;
 
@@ -146,8 +153,6 @@ void manager_free(Manager *m) {
         udev_unref(m->udev);
         sd_bus_unref(m->bus);
         sd_event_source_unref(m->udev_event_source);
-        sd_event_source_unref(m->sigterm_event_source);
-        sd_event_source_unref(m->sigint_event_source);
         sd_event_unref(m->event);
 
         while ((link = hashmap_first(m->links)))
@@ -352,7 +357,7 @@ int manager_udev_listen(Manager *m) {
 
         r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_monitor, "net", NULL);
         if (r < 0) {
-                log_error("Could not add udev monitor filter: %s", strerror(-r));
+                log_error_errno(r, "Could not add udev monitor filter: %m");
                 return r;
         }
 
@@ -370,7 +375,7 @@ int manager_udev_listen(Manager *m) {
         if (r < 0)
                 return r;
 
-        r = sd_event_source_set_name(m->udev_event_source, "networkd-udev");
+        r = sd_event_source_set_description(m->udev_event_source, "networkd-udev");
         if (r < 0)
                 return r;
 
@@ -487,15 +492,15 @@ int manager_save(Manager *m) {
         assert(m->state_file);
 
         /* We add all NTP and DNS server to a set, to filter out duplicates */
-        dns = set_new(string_hash_func, string_compare_func);
+        dns = set_new(&string_hash_ops);
         if (!dns)
                 return -ENOMEM;
 
-        ntp = set_new(string_hash_func, string_compare_func);
+        ntp = set_new(&string_hash_ops);
         if (!ntp)
                 return -ENOMEM;
 
-        domains = set_new(string_hash_func, string_compare_func);
+        domains = set_new(&string_hash_ops);
         if (!domains)
                 return -ENOMEM;
 
@@ -592,7 +597,7 @@ int manager_save(Manager *m) {
         return 0;
 
 fail:
-        log_error("Failed to save network state to %s: %s", m->state_file, strerror(-r));
+        log_error_errno(r, "Failed to save network state to %s: %m", m->state_file);
         unlink(m->state_file);
         unlink(temp_path);
         return r;