diff options
| author | Hans Dedecker <dedeckeh@gmail.com> | 2018-12-12 18:48:30 +0100 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2018-12-12 19:00:49 +0100 |
| commit | 2d2a3b840421cfc6328aee8cc52e5a5a51444fda (patch) | |
| tree | 81ab36b8122e0571c98e0c6337e814a8c5e86270 | |
| parent | 2a71c1e3b81eee44e0dec88159e814681a1d0bc6 (diff) | |
odhcpd: switch to libubox container_of implementation
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
| -rw-r--r-- | src/dhcpv6-ia.c | 6 | ||||
| -rw-r--r-- | src/odhcpd.h | 10 |
2 files changed, 4 insertions, 12 deletions
diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c index fb1c228..3b2dfaf 100644 --- a/src/dhcpv6-ia.c +++ b/src/dhcpv6-ia.c @@ -521,7 +521,8 @@ static void set_border_assignment_size(struct interface *iface, struct dhcpv6_as /* More data was received from TCP connection */ static void managed_handle_pd_data(struct ustream *s, _unused int bytes_new) { - struct dhcpv6_assignment *c = container_of(s, struct dhcpv6_assignment, managed_sock); + struct ustream_fd *fd = container_of(s, struct ustream_fd, stream); + struct dhcpv6_assignment *c = container_of(fd, struct dhcpv6_assignment, managed_sock); time_t now = odhcpd_time(); bool first = c->managed_size < 0; @@ -592,7 +593,8 @@ static void managed_handle_pd_data(struct ustream *s, _unused int bytes_new) /* TCP transmission has ended, either because of success or timeout or other error */ static void managed_handle_pd_done(struct ustream *s) { - struct dhcpv6_assignment *c = container_of(s, struct dhcpv6_assignment, managed_sock); + struct ustream_fd *fd = container_of(s, struct ustream_fd, stream); + struct dhcpv6_assignment *c = container_of(fd, struct dhcpv6_assignment, managed_sock); if (!(c->flags & OAF_STATIC)) c->valid_until = odhcpd_time() + 15; diff --git a/src/odhcpd.h b/src/odhcpd.h index 423deaa..80dbb40 100644 --- a/src/odhcpd.h +++ b/src/odhcpd.h @@ -20,16 +20,6 @@ #include <syslog.h> #include <libubox/blobmsg.h> - -#ifndef typeof -#define typeof __typeof -#endif - -#ifndef container_of -#define container_of(ptr, type, member) ( \ - (type *)( (char *)ptr - offsetof(type,member) )) -#endif - #include <libubox/list.h> #include <libubox/uloop.h> |