#include <stdio.h>
#include <net/ethernet.h>
#include <net/if_arp.h>
+#include <netinet/ether.h>
#include <sys/param.h>
#include <sys/ioctl.h>
#include "util.h"
#include "list.h"
#include "refcnt.h"
+#include "async.h"
#include "dhcp-protocol.h"
#include "dhcp-internal.h"
assert_return(client, -EINVAL);
assert_return (IN_SET(client->state, DHCP_STATE_INIT,
DHCP_STATE_STOPPED), -EBUSY);
- assert_return(interface_index >= -1, -EINVAL);
+ assert_return(interface_index > 0, -EINVAL);
client->index = interface_index;
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);
static sd_dhcp_client *client_stop(sd_dhcp_client *client, int error) {
assert_return(client, NULL);
- log_dhcp_client(client, "STOPPED: %s", strerror(-error));
+ if (error < 0)
+ log_dhcp_client(client, "STOPPED: %s", strerror(-error));
+ else {
+ switch(error) {
+ case DHCP_EVENT_STOP:
+ log_dhcp_client(client, "STOPPED");
+ break;
+ case DHCP_EVENT_NO_LEASE:
+ log_dhcp_client(client, "STOPPED: No lease");
+ break;
+ default:
+ log_dhcp_client(client, "STOPPED: Unknown reason");
+ break;
+ }
+ }
client = client_notify(client, error);
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_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);
}
}
+ sd_dhcp_lease_unref(client->lease);
client->lease = lease;
lease = NULL;
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;
r = client_start(client);
if (r >= 0)
- log_dhcp_client(client, "STARTED");
+ log_dhcp_client(client, "STARTED on ifindex %u with address %s",
+ client->index,
+ ether_ntoa(&client->client_id.mac_addr));
return r;
}
sd_dhcp_client_detach_event(client);
+ sd_dhcp_lease_unref(client->lease);
+
free(client->req_opts);
free(client);