SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shared: in-addr-utils - add default_subnet_mask and default_prefixlen methods

Browse Source 
These use the (deprecated) IPv4 address classes to deduce the corresponding subnet masks. This is useful when addresses
without subnet masks and prefix lengths are given.

Make use of these new functions from sd-dhcp-lease.
This commit is contained in:
Tom Gundersen
2014-10-27 17:40:24 +01:00
parent 1dfcee5985
commit df40eee8ed
3 changed files with 54 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd-network/sd-dhcp-lease.c
+9 -15
View File
@@ -30,6 +30,7 @@
#include "list.h"
#include "mkdir.h"
#include "fileio.h"
#include "in-addr-util.h"
#include "dhcp-protocol.h"
#include "dhcp-internal.h"
@@ -803,27 +804,20 @@ int dhcp_lease_load(const char *lease_file, sd_dhcp_lease **ret) {
}
int dhcp_lease_set_default_subnet_mask(sd_dhcp_lease *lease) {
uint32_t address;
struct in_addr address;
struct in_addr mask;
int r;
assert(lease);
assert(lease->address != INADDR_ANY);
address = be32toh(lease->address);
address.s_addr = lease->address;
/* fall back to the default subnet masks based on address class */
r = in_addr_default_subnet_mask(&address, &mask);
if (r < 0)
return r;
if ((address >> 31) == 0x0)
/* class A, leading bits: 0 */
lease->subnet_mask = htobe32(0xff000000);
else if ((address >> 30) == 0x2)
/* class B, leading bits 10 */
lease->subnet_mask = htobe32(0xffff0000);
else if ((address >> 29) == 0x6)
/* class C, leading bits 110 */
lease->subnet_mask = htobe32(0xffffff00);
else
/* class D or E, no default mask. give up */
return -ERANGE;
lease->subnet_mask = mask.s_addr;
return 0;
}