#define DHCP_DEFAULT_LEASE_TIME 3600 /* one hour */
-int sd_dhcp_server_set_lease_pool(sd_dhcp_server *server, struct in_addr *address,
+int sd_dhcp_server_set_lease_pool(sd_dhcp_server *server,
+ struct in_addr *address,
size_t size) {
assert_return(server, -EINVAL);
assert_return(address, -EINVAL);
return 0;
}
-int sd_dhcp_server_set_address(sd_dhcp_server *server, struct in_addr *address) {
+int sd_dhcp_server_set_address(sd_dhcp_server *server, struct in_addr *address,
+ unsigned char prefixlen) {
assert_return(server, -EINVAL);
assert_return(address, -EINVAL);
assert_return(address->s_addr, -EINVAL);
+ assert_return(prefixlen <= 32, -ERANGE);
assert_return(server->address == htobe32(INADDR_ANY), -EBUSY);
+ assert_return(server->netmask == htobe32(INADDR_ANY), -EBUSY);
server->address = address->s_addr;
+ server->netmask = htobe32(0xfffffffflu << (32 - prefixlen));
return 0;
}
return server;
}
-unsigned long client_id_hash_func(const void *p, const uint8_t hash_key[HASH_KEY_SIZE]) {
+unsigned long client_id_hash_func(const void *p,
+ const uint8_t hash_key[HASH_KEY_SIZE]) {
uint64_t u;
const DHCPClientId *id = p;
return memcmp(a->data, b->data, a->length);
}
+static const struct hash_ops client_id_hash_ops = {
+ .hash = client_id_hash_func,
+ .compare = client_id_compare_func
+};
+
static void dhcp_lease_free(DHCPLease *lease) {
if (!lease)
return;
server->fd_raw = -1;
server->fd = -1;
server->address = htobe32(INADDR_ANY);
+ server->netmask = htobe32(INADDR_ANY);
server->index = ifindex;
- server->leases_by_client_id = hashmap_new(client_id_hash_func, client_id_compare_func);
+ server->leases_by_client_id = hashmap_new(&client_id_hash_ops);
*ret = server;
server = NULL;
return 0;
}
-int sd_dhcp_server_attach_event(sd_dhcp_server *server, sd_event *event, int priority) {
+int sd_dhcp_server_attach_event(sd_dhcp_server *server, sd_event *event,
+ int priority) {
int r;
assert_return(server, -EINVAL);
return 0;
}
-static int dhcp_server_send_unicast_raw(sd_dhcp_server *server, DHCPPacket *packet,
- size_t len) {
+static int dhcp_server_send_unicast_raw(sd_dhcp_server *server,
+ DHCPPacket *packet, size_t len) {
union sockaddr_union link = {
.ll.sll_family = AF_PACKET,
.ll.sll_protocol = htons(ETH_P_IP),
memcpy(&link.ll.sll_addr, &packet->dhcp.chaddr, ETH_ALEN);
dhcp_packet_append_ip_headers(packet, server->address, DHCP_PORT_SERVER,
- packet->dhcp.yiaddr, DHCP_PORT_CLIENT, len);
+ packet->dhcp.yiaddr,
+ DHCP_PORT_CLIENT, len);
r = dhcp_network_send_raw_socket(server->fd_raw, &link, packet, len);
if (r < 0)
return dhcp_server_send_udp(server, destination, &packet->dhcp,
sizeof(DHCPMessage) + optoffset);
else if (requested_broadcast(req) || type == DHCP_NAK)
- return dhcp_server_send_udp(server, INADDR_BROADCAST, &packet->dhcp,
+ return dhcp_server_send_udp(server, INADDR_BROADCAST,
+ &packet->dhcp,
sizeof(DHCPMessage) + optoffset);
else
- /* we cannot send UDP packet to specific MAC address when the address is
- not yet configured, so must fall back to raw packets */
+ /* we cannot send UDP packet to specific MAC address when the
+ address is not yet configured, so must fall back to raw
+ packets */
return dhcp_server_send_unicast_raw(server, packet,
sizeof(DHCPPacket) + optoffset);
}
static int server_message_init(sd_dhcp_server *server, DHCPPacket **ret,
- uint8_t type, size_t *_optoffset, DHCPRequest *req) {
+ uint8_t type, size_t *_optoffset,
+ DHCPRequest *req) {
_cleanup_free_ DHCPPacket *packet = NULL;
size_t optoffset = 0;
int r;
if (!packet)
return -ENOMEM;
- r = dhcp_message_init(&packet->dhcp, BOOTREPLY, be32toh(req->message->xid),
- type, req->max_optlen, &optoffset);
+ r = dhcp_message_init(&packet->dhcp, BOOTREPLY,
+ be32toh(req->message->xid), type, ARPHRD_ETHER,
+ req->max_optlen, &optoffset);
if (r < 0)
return r;
return 0;
}
-static int server_send_offer(sd_dhcp_server *server, DHCPRequest *req, be32_t address) {
+static int server_send_offer(sd_dhcp_server *server, DHCPRequest *req,
+ be32_t address) {
_cleanup_free_ DHCPPacket *packet = NULL;
size_t offset;
be32_t lease_time;
lease_time = htobe32(req->lifetime);
r = dhcp_option_append(&packet->dhcp, req->max_optlen, &offset, 0,
- DHCP_OPTION_IP_ADDRESS_LEASE_TIME, 4, &lease_time);
+ DHCP_OPTION_IP_ADDRESS_LEASE_TIME, 4,
+ &lease_time);
+ if (r < 0)
+ return r;
+
+ r = dhcp_option_append(&packet->dhcp, req->max_optlen, &offset, 0,
+ DHCP_OPTION_SUBNET_MASK, 4, &server->netmask);
+ if (r < 0)
+ return r;
+
+ r = dhcp_option_append(&packet->dhcp, req->max_optlen, &offset, 0,
+ DHCP_OPTION_ROUTER, 4, &server->address);
if (r < 0)
return r;
return 0;
}
-static int server_send_ack(sd_dhcp_server *server, DHCPRequest *req, be32_t address) {
+static int server_send_ack(sd_dhcp_server *server, DHCPRequest *req,
+ be32_t address) {
_cleanup_free_ DHCPPacket *packet = NULL;
size_t offset;
be32_t lease_time;
lease_time = htobe32(req->lifetime);
r = dhcp_option_append(&packet->dhcp, req->max_optlen, &offset, 0,
- DHCP_OPTION_IP_ADDRESS_LEASE_TIME, 4, &lease_time);
+ DHCP_OPTION_IP_ADDRESS_LEASE_TIME, 4,
+ &lease_time);
+ if (r < 0)
+ return r;
+
+ r = dhcp_option_append(&packet->dhcp, req->max_optlen, &offset, 0,
+ DHCP_OPTION_SUBNET_MASK, 4, &server->netmask);
+ if (r < 0)
+ return r;
+
+ r = dhcp_option_append(&packet->dhcp, req->max_optlen, &offset, 0,
+ DHCP_OPTION_ROUTER, 4, &server->address);
if (r < 0)
return r;
return 0;
}
-static int server_send_forcerenew(sd_dhcp_server *server, be32_t address, be32_t gateway,
- uint8_t chaddr[]) {
+static int server_send_forcerenew(sd_dhcp_server *server, be32_t address,
+ be32_t gateway, uint8_t chaddr[]) {
_cleanup_free_ DHCPPacket *packet = NULL;
size_t optoffset = 0;
int r;
return -ENOMEM;
r = dhcp_message_init(&packet->dhcp, BOOTREPLY, 0,
- DHCP_FORCERENEW, DHCP_MIN_OPTIONS_SIZE,
- &optoffset);
+ DHCP_FORCERENEW, ARPHRD_ETHER,
+ DHCP_MIN_OPTIONS_SIZE, &optoffset);
if (r < 0)
return r;
req->message = message;
- /* set client id based on mac address if client did not send an explicit one */
+ /* set client id based on MAC address if client did not send an explicit
+ one */
if (!req->client_id.data) {
uint8_t *data;
/* this only fails on critical errors */
return r;
- existing_lease = hashmap_get(server->leases_by_client_id, &req->client_id);
+ existing_lease = hashmap_get(server->leases_by_client_id,
+ &req->client_id);
switch(type) {
case DHCP_DISCOVER:
return -ENOMEM;
}
lease->client_id.length = req->client_id.length;
- memcpy(&lease->chaddr, &req->message->chaddr, ETH_ALEN);
+ memcpy(&lease->chaddr, &req->message->chaddr,
+ ETH_ALEN);
lease->gateway = req->message->giaddr;
} else
lease = existing_lease;
- r = sd_event_now(server->event, clock_boottime_or_monotonic(), &time_now);
+ r = sd_event_now(server->event,
+ clock_boottime_or_monotonic(),
+ &time_now);
if (r < 0)
time_now = now(clock_boottime_or_monotonic());
lease->expiration = req->lifetime * USEC_PER_SEC + time_now;
be32toh(req->message->xid));
server->bound_leases[pool_offset] = lease;
- hashmap_put(server->leases_by_client_id, &lease->client_id, lease);
+ hashmap_put(server->leases_by_client_id,
+ &lease->client_id, lease);
return DHCP_ACK;
}
cmsg->cmsg_len == CMSG_LEN(sizeof(struct in_pktinfo))) {
struct in_pktinfo *info = (struct in_pktinfo*)CMSG_DATA(cmsg);
- /* TODO figure out if this can be done as a filter on the socket, like for IPv6 */
+ /* TODO figure out if this can be done as a filter on
+ * the socket, like for IPv6 */
if (server->index != info->ipi_ifindex)
return 0;
~ianmdlvl / elogind.git / blobdiff