chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test: always use assert_se in tests
[elogind.git]
/
src
/
network
/
networkd-link.c
diff --git
a/src/network/networkd-link.c
b/src/network/networkd-link.c
index aa23bfbc995900bce786fa951528184d5f93c696..e2d61ae490f4024b986e13858018f0428ff53a19 100644
(file)
--- a/
src/network/networkd-link.c
+++ b/
src/network/networkd-link.c
@@
-105,7
+105,7
@@
int link_get(Manager *m, int ifindex, Link **ret) {
}
int link_add(Manager *m, struct udev_device *device, Link **ret) {
}
int link_add(Manager *m, struct udev_device *device, Link **ret) {
- Link *link;
+ Link *link
= NULL
;
Network *network;
int r;
Network *network;
int r;
@@
-395,11
+395,11
@@
static int set_hostname(sd_bus *bus, const char *hostname) {
r = sd_bus_message_new_method_call(
bus,
r = sd_bus_message_new_method_call(
bus,
+ &m,
"org.freedesktop.hostname1",
"/org/freedesktop/hostname1",
"org.freedesktop.hostname1",
"org.freedesktop.hostname1",
"/org/freedesktop/hostname1",
"org.freedesktop.hostname1",
- "SetHostname",
- &m);
+ "SetHostname");
if (r < 0)
return r;
if (r < 0)
return r;
@@
-446,8
+446,8
@@
static int link_set_mtu(Link *link, uint32_t mtu) {
log_debug_link(link, "setting MTU: %" PRIu32, mtu);
log_debug_link(link, "setting MTU: %" PRIu32, mtu);
- r = sd_rtnl_message_new_link(link->manager->rtnl,
RTM_SETLINK
,
-
link->ifindex, &req
);
+ r = sd_rtnl_message_new_link(link->manager->rtnl,
&req
,
+
RTM_SETLINK, link->ifindex
);
if (r < 0) {
log_error_link(link, "Could not allocate RTM_SETLINK message");
return r;
if (r < 0) {
log_error_link(link, "Could not allocate RTM_SETLINK message");
return r;
@@
-479,6
+479,8
@@
static int dhcp_lease_lost(Link *link) {
assert(link);
assert(link->dhcp_lease);
assert(link);
assert(link->dhcp_lease);
+ log_warning_link(link, "DHCP lease lost");
+
r = address_new_dynamic(&address);
if (r >= 0) {
sd_dhcp_lease_get_address(link->dhcp_lease, &addr);
r = address_new_dynamic(&address);
if (r >= 0) {
sd_dhcp_lease_get_address(link->dhcp_lease, &addr);
@@
-811,8
+813,8
@@
static int link_up(Link *link) {
log_debug_link(link, "bringing link up");
log_debug_link(link, "bringing link up");
- r = sd_rtnl_message_new_link(link->manager->rtnl,
RTM_SETLINK
,
-
link->ifindex, &req
);
+ r = sd_rtnl_message_new_link(link->manager->rtnl,
&req
,
+
RTM_SETLINK, link->ifindex
);
if (r < 0) {
log_error_link(link, "Could not allocate RTM_SETLINK message");
return r;
if (r < 0) {
log_error_link(link, "Could not allocate RTM_SETLINK message");
return r;
@@
-980,8
+982,8
@@
static int link_getlink(Link *link) {
log_debug_link(link, "requesting link status");
log_debug_link(link, "requesting link status");
- r = sd_rtnl_message_new_link(link->manager->rtnl,
RTM_GETLINK
,
-
link->ifindex, &req
);
+ r = sd_rtnl_message_new_link(link->manager->rtnl,
&req
,
+
RTM_GETLINK, link->ifindex
);
if (r < 0) {
log_error_link(link, "Could not allocate RTM_GETLINK message");
return r;
if (r < 0) {
log_error_link(link, "Could not allocate RTM_GETLINK message");
return r;