diff options
| author | Tom Gundersen <teg@jklm.no> | 2014-05-22 15:18:28 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-06-24 17:05:39 +0200 |
| commit | 574cc928887851269c5919123dbdf8e1b2713b23 (patch) | |
| tree | f02b1a766239b3342f1291a30a94bcbcbc852cc1 /src/libsystemd-network/dhcp-internal.h | |
| parent | 3577de7ac39c54821e1d1d946db65e109dfb94b2 (diff) | |
sd-dhcp-client: return NULL from _unref() like the other sd-* libraries
Let's keep this behavior consistent across our libraries.
In order to keep the refcounting working, a DONT_DESTROY macro similar
to the one in sd-bus was introduced.
Diffstat (limited to 'src/libsystemd-network/dhcp-internal.h')
| -rw-r--r-- | src/libsystemd-network/dhcp-internal.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/libsystemd-network/dhcp-internal.h b/src/libsystemd-network/dhcp-internal.h index 03cc8243a9..6f6f1218d9 100644 --- a/src/libsystemd-network/dhcp-internal.h +++ b/src/libsystemd-network/dhcp-internal.h @@ -27,6 +27,7 @@ #include "socket-util.h" +#include "sd-dhcp-client.h" #include "dhcp-protocol.h" int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link, uint32_t xid); @@ -56,4 +57,13 @@ void dhcp_packet_append_ip_headers(DHCPPacket *packet, be32_t source_addr, int dhcp_packet_verify_headers(DHCPPacket *packet, size_t len, bool checksum); +DEFINE_TRIVIAL_CLEANUP_FUNC(sd_dhcp_client*, sd_dhcp_client_unref); +#define _cleanup_dhcp_client_unref_ _cleanup_(sd_dhcp_client_unrefp) + +/* If we are invoking callbacks of a dhcp-client, ensure unreffing the + * client from the callback doesn't destroy the object we are working + * on */ +#define DHCP_CLIENT_DONT_DESTROY(client) \ + _cleanup_dhcp_client_unref_ _unused_ sd_dhcp_client *_dont_destroy_##client = sd_dhcp_client_ref(client) + #define log_dhcp_client(client, fmt, ...) log_meta(LOG_DEBUG, __FILE__, __LINE__, __func__, "DHCP CLIENT (0x%x): " fmt, client->xid, ##__VA_ARGS__) |