chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: dont configure route if lease doesn't have one
[elogind.git]
/
src
/
libsystemd-network
/
sd-dhcp-lease.c
diff --git
a/src/libsystemd-network/sd-dhcp-lease.c
b/src/libsystemd-network/sd-dhcp-lease.c
index acdcca87ecf61bc5c4a691e8924347de04ad9e3c..3e43ab635f00ab787e8c7890f27f1ae38e2040ec 100644
(file)
--- a/
src/libsystemd-network/sd-dhcp-lease.c
+++ b/
src/libsystemd-network/sd-dhcp-lease.c
@@
-126,7
+126,10
@@
int sd_dhcp_lease_get_router(sd_dhcp_lease *lease, struct in_addr *addr) {
assert_return(lease, -EINVAL);
assert_return(addr, -EINVAL);
assert_return(lease, -EINVAL);
assert_return(addr, -EINVAL);
- addr->s_addr = lease->router;
+ if (lease->router != INADDR_ANY)
+ addr->s_addr = lease->router;
+ else
+ return -ENOENT;
return 0;
}
return 0;
}
@@
-297,6
+300,7
@@
int dhcp_lease_new(sd_dhcp_lease **ret) {
if (!lease)
return -ENOMEM;
if (!lease)
return -ENOMEM;
+ lease->router = INADDR_ANY;
lease->n_ref = REFCNT_INIT;
*ret = lease;
lease->n_ref = REFCNT_INIT;
*ret = lease;
@@
-370,18
+374,16
@@
int dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file) {
"# This is private data. Do not parse.\n"
"ADDRESS=%s\n", inet_ntoa(address));
"# This is private data. Do not parse.\n"
"ADDRESS=%s\n", inet_ntoa(address));
- r = sd_dhcp_lease_get_router(lease, &address);
- if (r < 0)
- goto finish;
-
- fprintf(f, "ROUTER=%s\n", inet_ntoa(address));
-
r = sd_dhcp_lease_get_netmask(lease, &address);
if (r < 0)
goto finish;
fprintf(f, "NETMASK=%s\n", inet_ntoa(address));
r = sd_dhcp_lease_get_netmask(lease, &address);
if (r < 0)
goto finish;
fprintf(f, "NETMASK=%s\n", inet_ntoa(address));
+ r = sd_dhcp_lease_get_router(lease, &address);
+ if (r >= 0)
+ fprintf(f, "ROUTER=%s\n", inet_ntoa(address));
+
r = sd_dhcp_lease_get_server_identifier(lease, &address);
if (r >= 0)
fprintf(f, "SERVER_ADDRESS=%s\n",
r = sd_dhcp_lease_get_server_identifier(lease, &address);
if (r >= 0)
fprintf(f, "SERVER_ADDRESS=%s\n",
@@
-474,11
+476,13
@@
int dhcp_lease_load(const char *lease_file, sd_dhcp_lease **ret) {
lease->address = addr.s_addr;
lease->address = addr.s_addr;
- r = inet_pton(AF_INET, router, &addr);
- if (r < 0)
- return r;
+ if (router) {
+ r = inet_pton(AF_INET, router, &addr);
+ if (r < 0)
+ return r;
- lease->router = addr.s_addr;
+ lease->router = addr.s_addr;
+ }
r = inet_pton(AF_INET, netmask, &addr);
if (r < 0)
r = inet_pton(AF_INET, netmask, &addr);
if (r < 0)