chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
machined: make sure GetMachineAddresses() is available for unprivileged processes
[elogind.git]
/
src
/
libsystemd-network
/
sd-dhcp-client.c
diff --git
a/src/libsystemd-network/sd-dhcp-client.c
b/src/libsystemd-network/sd-dhcp-client.c
index ab9f68d528657afd6d20fb679a526e257ad666fc..94235cf2f57d1a60ae479be27ccee1db59e28b55 100644
(file)
--- a/
src/libsystemd-network/sd-dhcp-client.c
+++ b/
src/libsystemd-network/sd-dhcp-client.c
@@
-30,6
+30,7
@@
#include "util.h"
#include "list.h"
#include "refcnt.h"
#include "util.h"
#include "list.h"
#include "refcnt.h"
+#include "async.h"
#include "dhcp-protocol.h"
#include "dhcp-internal.h"
#include "dhcp-protocol.h"
#include "dhcp-internal.h"
@@
-209,7
+210,7
@@
static int client_initialize(sd_dhcp_client *client) {
client->receive_message =
sd_event_source_unref(client->receive_message);
client->receive_message =
sd_event_source_unref(client->receive_message);
- client->fd =
safe
_close(client->fd);
+ client->fd =
asynchronous
_close(client->fd);
client->timeout_resend = sd_event_source_unref(client->timeout_resend);
client->timeout_resend = sd_event_source_unref(client->timeout_resend);
@@
-236,7
+237,7
@@
static sd_dhcp_client *client_stop(sd_dhcp_client *client, int error) {
else {
switch(error) {
case DHCP_EVENT_STOP:
else {
switch(error) {
case DHCP_EVENT_STOP:
- log_dhcp_client(client, "STOPPED
: Requested by user
");
+ log_dhcp_client(client, "STOPPED");
break;
case DHCP_EVENT_NO_LEASE:
log_dhcp_client(client, "STOPPED: No lease");
break;
case DHCP_EVENT_NO_LEASE:
log_dhcp_client(client, "STOPPED: No lease");
@@
-747,7
+748,7
@@
static int client_timeout_t2(sd_event_source *s, uint64_t usec, void *userdata)
int r;
client->receive_message = sd_event_source_unref(client->receive_message);
int r;
client->receive_message = sd_event_source_unref(client->receive_message);
- client->fd =
safe
_close(client->fd);
+ client->fd =
asynchronous
_close(client->fd);
client->state = DHCP_STATE_REBINDING;
client->attempt = 1;
client->state = DHCP_STATE_REBINDING;
client->attempt = 1;
@@
-1153,7
+1154,7
@@
static int client_handle_message(sd_dhcp_client *client, DHCPMessage *message,
client->receive_message =
sd_event_source_unref(client->receive_message);
client->receive_message =
sd_event_source_unref(client->receive_message);
- client->fd =
safe
_close(client->fd);
+ client->fd =
asynchronous
_close(client->fd);
} else if (r == -ENOMSG)
/* invalid message, let's ignore it */
return 0;
} else if (r == -ENOMSG)
/* invalid message, let's ignore it */
return 0;