#include "dhcp-internal.h"
-int dhcp_network_send_raw_packet(int index, const void *packet, size_t len)
+int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link)
{
- _cleanup_close_ int s;
- union sockaddr_union link = {};
+ int s;
- s = socket(AF_PACKET, SOCK_DGRAM | SOCK_CLOEXEC, htons(ETH_P_IP));
+ assert(index > 0);
+ assert(link);
+
+ s = socket(AF_PACKET, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK,
+ htons(ETH_P_IP));
if (s < 0)
return -errno;
- link.ll.sll_family = AF_PACKET;
- link.ll.sll_protocol = htons(ETH_P_IP);
- link.ll.sll_ifindex = index;
- link.ll.sll_halen = ETH_ALEN;
- memset(&link.ll.sll_addr, 0xff, ETH_ALEN);
+ link->ll.sll_family = AF_PACKET;
+ link->ll.sll_protocol = htons(ETH_P_IP);
+ link->ll.sll_ifindex = index;
+ link->ll.sll_halen = ETH_ALEN;
+ memset(link->ll.sll_addr, 0xff, ETH_ALEN);
- if (bind(s, &link.sa, sizeof(link.ll)) < 0)
+ if (bind(s, &link->sa, sizeof(link->ll)) < 0) {
+ close_nointr_nofail(s);
return -errno;
+ }
+
+ return s;
+}
+
+int dhcp_network_bind_udp_socket(int index, be32_t client_address)
+{
+ int s;
+ union sockaddr_union src = {
+ .in.sin_family = AF_INET,
+ .in.sin_port = htobe16(DHCP_PORT_CLIENT),
+ .in.sin_addr.s_addr = client_address,
+ };
+
+ s = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0);
+ if (s < 0)
+ return -errno;
+
+ if (bind(s, &src.sa, sizeof(src.in)) < 0) {
+ close_nointr_nofail(s);
+ return -errno;
+ }
+
+ return s;
+}
+
+int dhcp_network_send_raw_socket(int s, const union sockaddr_union *link,
+ const void *packet, size_t len)
+{
+ assert(link);
+ assert(packet);
+ assert(len);
+
+ if (sendto(s, packet, len, 0, &link->sa, sizeof(link->ll)) < 0)
+ return -errno;
+
+ return 0;
+}
+
+int dhcp_network_send_udp_socket(int s, be32_t server_address,
+ const void *packet, size_t len)
+{
+ union sockaddr_union dest = {
+ .in.sin_family = AF_INET,
+ .in.sin_port = htobe16(DHCP_PORT_SERVER),
+ .in.sin_addr.s_addr = server_address,
+ };
- if (sendto(s, packet, len, 0, &link.sa, sizeof(link.ll)) < 0)
+ if (sendto(s, packet, len, 0, &dest.sa, sizeof(dest.in)) < 0)
return -errno;
return 0;