chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-network: rename the per-ifindex calls to sd_network_get_link_xxx()
[elogind.git]
/
src
/
network
/
networkd-link.c
diff --git
a/src/network/networkd-link.c
b/src/network/networkd-link.c
index e674b3b12c76070dafe56aa9d31dfa63bd26a1e5..d13a47bb2ebc705dc9fd0009b1bd015309c2ea93 100644
(file)
--- a/
src/network/networkd-link.c
+++ b/
src/network/networkd-link.c
@@
-311,7
+311,7
@@
static int link_enter_configured(Link *link) {
log_debug_link(link, "offering DHCPv4 leases");
log_debug_link(link, "offering DHCPv4 leases");
- r = sd_dhcp_server_set_address(link->dhcp_server, &address->in_addr.in);
+ r = sd_dhcp_server_set_address(link->dhcp_server, &address->in_addr.in
, address->prefixlen
);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-750,7
+750,7
@@
static int link_enter_set_addresses(Link *link) {
return r;
}
return r;
}
- prefixlen =
net
_netmask_to_prefixlen(&netmask);
+ prefixlen =
in_addr
_netmask_to_prefixlen(&netmask);
r = address_new_dynamic(&address);
if (r < 0) {
r = address_new_dynamic(&address);
if (r < 0) {
@@
-983,7
+983,7
@@
static int dhcp_lease_lost(Link *link) {
sd_dhcp_lease_get_address(link->dhcp_lease, &addr);
sd_dhcp_lease_get_netmask(link->dhcp_lease, &netmask);
sd_dhcp_lease_get_address(link->dhcp_lease, &addr);
sd_dhcp_lease_get_netmask(link->dhcp_lease, &netmask);
- prefixlen =
net
_netmask_to_prefixlen(&netmask);
+ prefixlen =
in_addr
_netmask_to_prefixlen(&netmask);
address->family = AF_INET;
address->in_addr.in = addr;
address->family = AF_INET;
address->in_addr.in = addr;
@@
-1073,7
+1073,7
@@
static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) {
return r;
}
return r;
}
- prefixlen =
net
_netmask_to_prefixlen(&netmask);
+ prefixlen =
in_addr
_netmask_to_prefixlen(&netmask);
r = sd_dhcp_lease_get_router(lease, &gateway);
if (r < 0 && r != -ENOENT) {
r = sd_dhcp_lease_get_router(lease, &gateway);
if (r < 0 && r != -ENOENT) {