chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
terminal/screen: fix GL/GR double-mapping
[elogind.git]
/
src
/
network
/
networkd-manager.c
diff --git
a/src/network/networkd-manager.c
b/src/network/networkd-manager.c
index 5a4f93a06ba2daa19994a48571be887ad4b77c73..a708e905f430d3acf1a228088a53d59b3068d732 100644
(file)
--- a/
src/network/networkd-manager.c
+++ b/
src/network/networkd-manager.c
@@
-36,6
+36,9
@@
#include "sd-rtnl.h"
#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",
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;
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;
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;
}
return -ENOMEM;
}
- m->netdevs = hashmap_new(
string_hash_func, string_compare_func
);
+ m->netdevs = hashmap_new(
&string_hash_ops
);
if (!m->netdevs)
return -ENOMEM;
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);
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)))
sd_event_unref(m->event);
while ((link = hashmap_first(m->links)))
@@
-257,8
+262,7
@@
static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
/* link is new, so add it */
r = link_add(m, message, &link);
if (r < 0) {
/* link is new, so add it */
r = link_add(m, message, &link);
if (r < 0) {
- log_debug("could not add new link: %s",
- strerror(-r));
+ log_debug_errno(r, "could not add new link: %m");
return 0;
}
}
return 0;
}
}
@@
-351,10
+355,8
@@
int manager_udev_listen(Manager *m) {
assert(m->udev_monitor);
r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_monitor, "net", NULL);
assert(m->udev_monitor);
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));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Could not add udev monitor filter: %m");
r = udev_monitor_enable_receiving(m->udev_monitor);
if (r < 0) {
r = udev_monitor_enable_receiving(m->udev_monitor);
if (r < 0) {
@@
-370,7
+372,7
@@
int manager_udev_listen(Manager *m) {
if (r < 0)
return r;
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;
if (r < 0)
return r;
@@
-487,15
+489,15
@@
int manager_save(Manager *m) {
assert(m->state_file);
/* We add all NTP and DNS server to a set, to filter out duplicates */
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;
if (!dns)
return -ENOMEM;
- ntp = set_new(
string_hash_func, string_compare_func
);
+ ntp = set_new(
&string_hash_ops
);
if (!ntp)
return -ENOMEM;
if (!ntp)
return -ENOMEM;
- domains = set_new(
string_hash_func, string_compare_func
);
+ domains = set_new(
&string_hash_ops
);
if (!domains)
return -ENOMEM;
if (!domains)
return -ENOMEM;
@@
-592,7
+594,7
@@
int manager_save(Manager *m) {
return 0;
fail:
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;
unlink(m->state_file);
unlink(temp_path);
return r;