Set mem_offset for every bufferevent type

diff --git a/bufferevent_async.c b/bufferevent_async.c
index 024c97e46a8d196125e2a3863675e7b9a47532e6..480f44a71cad4c6b29d0179bf235a31ac1812d4b 100644 (file)
--- a/bufferevent_async.c
+++ b/bufferevent_async.c
@@ -66,17 +66,6 @@ static void be_async_destruct(struct bufferevent *);
 static int be_async_flush(struct bufferevent *, short, enum bufferevent_flush_mode);
 static int be_async_ctrl(struct bufferevent *, enum bufferevent_ctrl_op, union bufferevent_ctrl_data *);
 
-const struct bufferevent_ops bufferevent_ops_async = {
-       "socket_async",
-       0,
-       be_async_enable,
-       be_async_disable,
-       be_async_destruct,
-       _bufferevent_generic_adj_timeouts,
-       be_async_flush,
-       be_async_ctrl,
-};
-
 struct bufferevent_async {
        struct bufferevent_private bev;
        struct event_overlapped connect_overlapped;
@@ -87,6 +76,17 @@ struct bufferevent_async {
        unsigned ok : 1;
 };
 
+const struct bufferevent_ops bufferevent_ops_async = {
+       "socket_async",
+       evutil_offsetof(struct bufferevent_async, bev.bev),
+       be_async_enable,
+       be_async_disable,
+       be_async_destruct,
+       _bufferevent_generic_adj_timeouts,
+       be_async_flush,
+       be_async_ctrl,
+};
+
 static inline struct bufferevent_async *
 upcast(struct bufferevent *bev)
 {

diff --git a/bufferevent_filter.c b/bufferevent_filter.c
index 7acbc52019443edd899ab331b3d2f2f0d6bae2a4..4fe64b5414f6ca176656914f506eedf8c29e2a0b 100644 (file)
--- a/bufferevent_filter.c
+++ b/bufferevent_filter.c
@@ -94,7 +94,7 @@ struct bufferevent_filtered {
 
 const struct bufferevent_ops bufferevent_ops_filter = {
        "filter",
-       evutil_offsetof(struct bufferevent_filtered, bev),
+       evutil_offsetof(struct bufferevent_filtered, bev.bev),
        be_filter_enable,
        be_filter_disable,
        be_filter_destruct,

diff --git a/bufferevent_openssl.c b/bufferevent_openssl.c
index 86e674b97f9aeacff5fc2d06b3018682f9d7b00b..c1f18454ac558296d80c548eddafd12fa1e3b42b 100644 (file)
--- a/bufferevent_openssl.c
+++ b/bufferevent_openssl.c
@@ -324,7 +324,7 @@ static int be_openssl_ctrl(struct bufferevent *, enum bufferevent_ctrl_op, union
 
 const struct bufferevent_ops bufferevent_ops_openssl = {
        "ssl",
-       evutil_offsetof(struct bufferevent_openssl, bev),
+       evutil_offsetof(struct bufferevent_openssl, bev.bev),
        be_openssl_enable,
        be_openssl_disable,
        be_openssl_destruct,

diff --git a/bufferevent_pair.c b/bufferevent_pair.c
index 2d3ea8532e48482456872ae1f7892e2abb62e5cb..b826bc7de638516e3542fe5e49ac385fb91649a3 100644 (file)
--- a/bufferevent_pair.c
+++ b/bufferevent_pair.c
@@ -308,7 +308,7 @@ be_pair_flush(struct bufferevent *bev, short iotype,
 
 const struct bufferevent_ops bufferevent_ops_pair = {
        "pair_elt",
-       evutil_offsetof(struct bufferevent_pair, bev),
+       evutil_offsetof(struct bufferevent_pair, bev.bev),
        be_pair_enable,
        be_pair_disable,
        be_pair_destruct,

diff --git a/bufferevent_sock.c b/bufferevent_sock.c
index 11e69da889986d4a15af943d1c8e950edf6b5106..4f64555199bf33e795323d5874edad7b3bb0eaeb 100644 (file)
--- a/bufferevent_sock.c
+++ b/bufferevent_sock.c
@@ -86,7 +86,7 @@ static void be_socket_setfd(struct bufferevent *, evutil_socket_t);
 
 const struct bufferevent_ops bufferevent_ops_socket = {
        "socket",
-       0,
+       evutil_offsetof(struct bufferevent_private, bev),
        be_socket_enable,
        be_socket_disable,
        be_socket_destruct,