From f00b3a2b3ada1f79018f515393aabb873d233dfc Mon Sep 17 00:00:00 2001 From: "Deomid \"rojer\" Ryabkov" Date: Thu, 30 Jan 2020 23:47:48 +0000 Subject: [PATCH] Move ssl_if_data to the end of mg_connection PUBLISHED_FROM=4fb65477b03bedc3206ac286e8236f0f9536f20e --- docs/c-api/mg_net.h/struct_mg_connection.md | 7 ++++--- mongoose.h | 7 ++++--- src/mg_net.h | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/docs/c-api/mg_net.h/struct_mg_connection.md b/docs/c-api/mg_net.h/struct_mg_connection.md index cf6bd7ff..7a549885 100644 --- a/docs/c-api/mg_net.h/struct_mg_connection.md +++ b/docs/c-api/mg_net.h/struct_mg_connection.md @@ -16,9 +16,6 @@ signature: | struct mbuf send_mbuf; /* Data scheduled for sending */ time_t last_io_time; /* Timestamp of the last socket IO */ double ev_timer_time; /* Timestamp of the future MG_EV_TIMER */ - #if MG_ENABLE_SSL - void *ssl_if_data; /* SSL library data. */ - #endif mg_event_handler_t proto_handler; /* Protocol-specific event handler */ void *proto_data; /* Protocol-specific data */ void (*proto_data_destructor)(void *proto_data); @@ -61,6 +58,10 @@ signature: | #define MG_F_USER_4 (1 << 23) #define MG_F_USER_5 (1 << 24) #define MG_F_USER_6 (1 << 25) + + #if MG_ENABLE_SSL + void *ssl_if_data; /* SSL library data. */ + #endif }; --- diff --git a/mongoose.h b/mongoose.h index 76b5235d..6dfc2425 100644 --- a/mongoose.h +++ b/mongoose.h @@ -3590,9 +3590,6 @@ struct mg_connection { struct mbuf send_mbuf; /* Data scheduled for sending */ time_t last_io_time; /* Timestamp of the last socket IO */ double ev_timer_time; /* Timestamp of the future MG_EV_TIMER */ -#if MG_ENABLE_SSL - void *ssl_if_data; /* SSL library data. */ -#endif mg_event_handler_t proto_handler; /* Protocol-specific event handler */ void *proto_data; /* Protocol-specific data */ void (*proto_data_destructor)(void *proto_data); @@ -3635,6 +3632,10 @@ struct mg_connection { #define MG_F_USER_4 (1 << 23) #define MG_F_USER_5 (1 << 24) #define MG_F_USER_6 (1 << 25) + +#if MG_ENABLE_SSL + void *ssl_if_data; /* SSL library data. */ +#endif }; /* diff --git a/src/mg_net.h b/src/mg_net.h index cbe75b4c..00378882 100644 --- a/src/mg_net.h +++ b/src/mg_net.h @@ -110,9 +110,6 @@ struct mg_connection { struct mbuf send_mbuf; /* Data scheduled for sending */ time_t last_io_time; /* Timestamp of the last socket IO */ double ev_timer_time; /* Timestamp of the future MG_EV_TIMER */ -#if MG_ENABLE_SSL - void *ssl_if_data; /* SSL library data. */ -#endif mg_event_handler_t proto_handler; /* Protocol-specific event handler */ void *proto_data; /* Protocol-specific data */ void (*proto_data_destructor)(void *proto_data); @@ -155,6 +152,10 @@ struct mg_connection { #define MG_F_USER_4 (1 << 23) #define MG_F_USER_5 (1 << 24) #define MG_F_USER_6 (1 << 25) + +#if MG_ENABLE_SSL + void *ssl_if_data; /* SSL library data. */ +#endif }; /*