chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log: add an "error" parameter to all low-level logging calls and intrdouce log_error_...
[elogind.git]
/
src
/
network
/
networkd-wait-online-link.c
diff --git
a/src/network/networkd-wait-online-link.c
b/src/network/networkd-wait-online-link.c
index 9dc95f577cf86cc43d9e045daff9d5f67437c1a6..268ab676c958b56cb5884bcf8e45d453a35dcc15 100644
(file)
--- a/
src/network/networkd-wait-online-link.c
+++ b/
src/network/networkd-wait-online-link.c
@@
-34,12
+34,11
@@
int link_new(Manager *m, Link **ret, int ifindex, const char *ifname) {
assert(m);
assert(ifindex > 0);
assert(m);
assert(ifindex > 0);
- r = hashmap_ensure_allocated(&m->links, NULL
, NULL
);
+ r = hashmap_ensure_allocated(&m->links, NULL);
if (r < 0)
return r;
if (r < 0)
return r;
- r = hashmap_ensure_allocated(&m->links_by_name,
- string_hash_func, string_compare_func);
+ r = hashmap_ensure_allocated(&m->links_by_name, &string_hash_ops);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-86,7
+85,7
@@
Link *link_free(Link *l) {
}
int link_update_rtnl(Link *l, sd_rtnl_message *m) {
}
int link_update_rtnl(Link *l, sd_rtnl_message *m) {
- char *ifname;
+ c
onst c
har *ifname;
int r;
assert(l);
int r;
assert(l);
@@
-126,12
+125,12
@@
int link_update_monitor(Link *l) {
free(l->operational_state);
l->operational_state = NULL;
free(l->operational_state);
l->operational_state = NULL;
- sd_network_
get_link
_operational_state(l->ifindex, &l->operational_state);
+ sd_network_
link_get
_operational_state(l->ifindex, &l->operational_state);
free(l->state);
l->state = NULL;
free(l->state);
l->state = NULL;
- sd_network_
get_link
_state(l->ifindex, &l->state);
+ sd_network_
link_get_setup
_state(l->ifindex, &l->state);
return 0;
}
return 0;
}
@@
-139,18
+138,8
@@
int link_update_monitor(Link *l) {
bool link_relevant(Link *l) {
assert(l);
bool link_relevant(Link *l) {
assert(l);
- /* A link is relevant if it isn't a loopback device and has at
- * least one relevant IP address */
-
if (l->flags & IFF_LOOPBACK)
return false;
if (l->flags & IFF_LOOPBACK)
return false;
-/*
- if (l->operational_state && !STR_IN_SET(l->operational_state, "unknown", "degraded", "routable"))
- return false;
- LIST_FOREACH(addresses, a, l->addresses)
- if (link_address_relevant(a))
- return true;
-*/
return true;
}
return true;
}