picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

dhcp-network: don't pass ifindex to bind_udp_socket

Browse source 
UDP sockets can anyway not be bound to specific netdev's. The packages would have to be filtered
when received instead.
This commit is contained in:
Tom Gundersen 2014-05-06 21:57:09 +02:00
parent b408026b98
commit 085cabf266
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libsystemd-network/dhcp-internal.h
View file

@ -30,7 +30,7 @@
#include "dhcp-protocol.h"
int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link, uint32_t xid);
int dhcp_network_bind_udp_socket(int index, be32_t address, uint16_t port);
int dhcp_network_bind_udp_socket(be32_t address, uint16_t port);
int dhcp_network_send_raw_socket(int s, const union sockaddr_union *link,
const void *packet, size_t len);
int dhcp_network_send_udp_socket(int s, be32_t address, uint16_t port,

2
src/libsystemd-network/dhcp-network.c
View file

@ -96,7 +96,7 @@ int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link, uint32_t
return s;
}
int dhcp_network_bind_udp_socket(int index, be32_t address, uint16_t port)
int dhcp_network_bind_udp_socket(be32_t address, uint16_t port)
{
int s;
union sockaddr_union src = {

3
src/libsystemd-network/sd-dhcp-client.c
View file

@ -770,8 +770,7 @@ static int client_timeout_t1(sd_event_source *s, uint64_t usec,
client->state = DHCP_STATE_RENEWING;
client->attempt = 1;
r = dhcp_network_bind_udp_socket(client->index,
client->lease->address,
r = dhcp_network_bind_udp_socket(client->lease->address,
DHCP_PORT_CLIENT);
if (r < 0) {
client_stop(client, r);

2
src/libsystemd-network/test-dhcp-client.c
View file

@ -204,7 +204,7 @@ int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link, uint32_t
return test_fd[0];
}
int dhcp_network_bind_udp_socket(int index, be32_t address, uint16_t port)
int dhcp_network_bind_udp_socket(be32_t address, uint16_t port)
{
return 0;
}