chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4a8cf55
)
sd-dhcp-client: fix mixup between raw and udp sockets
author
Tom Gundersen
<teg@jklm.no>
Wed, 19 Feb 2014 18:44:06 +0000
(19:44 +0100)
committer
Tom Gundersen
<teg@jklm.no>
Wed, 19 Feb 2014 18:48:10 +0000
(19:48 +0100)
src/libsystemd-dhcp/sd-dhcp-client.c
patch
|
blob
|
history
diff --git
a/src/libsystemd-dhcp/sd-dhcp-client.c
b/src/libsystemd-dhcp/sd-dhcp-client.c
index d58755a603d664aa23fb3a218b3fdb84edc7b4b0..ed81ab2d79e135597c87ac0ce18f9cbf759bda8e 100644
(file)
--- a/
src/libsystemd-dhcp/sd-dhcp-client.c
+++ b/
src/libsystemd-dhcp/sd-dhcp-client.c
@@
-798,7
+798,7
@@
error:
return 0;
}
return 0;
}
-static int client_receive_message_
raw
(sd_event_source *s, int fd,
+static int client_receive_message_
udp
(sd_event_source *s, int fd,
uint32_t revents, void *userdata) {
sd_dhcp_client *client = userdata;
uint8_t buf[sizeof(DHCPMessage) + DHCP_MIN_OPTIONS_SIZE];
uint32_t revents, void *userdata) {
sd_dhcp_client *client = userdata;
uint8_t buf[sizeof(DHCPMessage) + DHCP_MIN_OPTIONS_SIZE];
@@
-822,7
+822,7
@@
static int client_receive_message_raw(sd_event_source *s, int fd,
time_now);
}
time_now);
}
-static int client_receive_message_
udp
(sd_event_source *s, int fd,
+static int client_receive_message_
raw
(sd_event_source *s, int fd,
uint32_t revents, void *userdata) {
sd_dhcp_client *client = userdata;
uint8_t buf[sizeof(DHCPPacket) + DHCP_MIN_OPTIONS_SIZE];
uint32_t revents, void *userdata) {
sd_dhcp_client *client = userdata;
uint8_t buf[sizeof(DHCPPacket) + DHCP_MIN_OPTIONS_SIZE];
@@
-876,7
+876,7
@@
int sd_dhcp_client_start(sd_dhcp_client *client) {
client->start_time = now(CLOCK_MONOTONIC);
client->secs = 0;
client->start_time = now(CLOCK_MONOTONIC);
client->secs = 0;
- return client_initialize_events(client, client_receive_message_
udp
,
+ return client_initialize_events(client, client_receive_message_
raw
,
client->start_time);
}
client->start_time);
}