mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-09 16:47:18 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: server/event_hdl: add server_inetaddr struct to facilitate event data usage

Browse Source 
event_hdl_cb_data_server_inetaddr struct had some anonymous structs
defined in it, making it impossible to pass as a function argument and
harder to maintain since changes must be performed at multiple places
at once. So instead we define a storage struct named server_inetaddr
that helps to save addr:port server information in INET context.
This commit is contained in:
Aurelien DARRAGON 2023-12-07 16:18:39 +01:00 committed by Christopher Faulet
parent 835263047e
commit 14893a6a00
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/haproxy/server-t.h
View File

@ -597,6 +597,18 @@ struct event_hdl_cb_data_server_check {
} unsafe; } unsafe;
}; };
/* struct to store server address and port information in INET
* context
*/
struct server_inetaddr {
int family; /* AF_UNSPEC, AF_INET or AF_INET6 */
union {
struct in_addr v4;
struct in6_addr v6;
} addr; /* may hold v4 or v6 addr */
unsigned int svc_port;
};
/* data provided to EVENT_HDL_SUB_SERVER_INETADDR handlers through /* data provided to EVENT_HDL_SUB_SERVER_INETADDR handlers through
* event_hdl facility * event_hdl facility
* *
@ -609,22 +621,8 @@ struct event_hdl_cb_data_server_inetaddr {
*/ */
struct event_hdl_cb_data_server server; /* must be at the beginning */ struct event_hdl_cb_data_server server; /* must be at the beginning */
struct { struct {
struct { struct server_inetaddr prev;
int family; /* AF_UNSPEC, AF_INET or AF_INET6 */ struct server_inetaddr next;
union {
struct in_addr v4;
struct in6_addr v6;
} addr; /* may hold v4 or v6 addr */
unsigned int svc_port;
} prev;
struct {
int family; /* AF_UNSPEC, AF_INET or AF_INET6 */
union {
struct in_addr v4;
struct in6_addr v6;
} addr; /* may hold v4 or v6 addr */
unsigned int svc_port;
} next;
uint8_t purge_conn; /* set to 1 if the network change will force a connection cleanup */ uint8_t purge_conn; /* set to 1 if the network change will force a connection cleanup */
} safe; } safe;
/* no unsafe data */ /* no unsafe data */