From: Aurelien DARRAGON <adarragon@haproxy.com>
Date: Mon, 11 Dec 2023 08:20:18 +0000 (+0100)
Subject: CLEANUP: server/event_hdl: remove purge_conn hint in INETADDR event
X-Git-Tag: v3.0-dev1~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d0c7f59357685d91636b428ff2ace6840325a72;p=thirdparty%2Fhaproxy.git

CLEANUP: server/event_hdl: remove purge_conn hint in INETADDR event

Now that purge_conn hint is now being ignored thanks to previous commit,
we can simply get rid of it.
---

diff --git a/include/haproxy/server-t.h b/include/haproxy/server-t.h
index 9a9b48bd84..0108372c94 100644
--- a/include/haproxy/server-t.h
+++ b/include/haproxy/server-t.h
@@ -626,7 +626,6 @@ struct event_hdl_cb_data_server_inetaddr {
 	struct {
 		struct server_inetaddr prev;
 		struct server_inetaddr next;
-		uint8_t purge_conn; /* set to 1 if the network change will force a connection cleanup */
 	} safe;
 	/* no unsafe data */
 };
diff --git a/src/server.c b/src/server.c
index 6d175f7da5..43919d5b1c 100644
--- a/src/server.c
+++ b/src/server.c
@@ -437,8 +437,7 @@ void _srv_event_hdl_prepare_state(struct event_hdl_cb_data_server_state *cb_data
 static void _srv_event_hdl_prepare_inetaddr(struct event_hdl_cb_data_server_inetaddr *cb_data,
                                             struct server *srv,
                                             const struct sockaddr_storage *next_addr,
-                                            unsigned int next_port, uint8_t next_mapports,
-                                            uint8_t purge_conn)
+                                            unsigned int next_port, uint8_t next_mapports)
 {
 	struct sockaddr_storage *prev_addr = &srv->addr;
 	unsigned int prev_port = srv->svc_port;
@@ -475,8 +474,6 @@ static void _srv_event_hdl_prepare_inetaddr(struct event_hdl_cb_data_server_inet
 		       sizeof(struct in6_addr));
 	cb_data->safe.next.port.svc = next_port;
 	cb_data->safe.next.port.map = next_mapports;
-
-	cb_data->safe.purge_conn = purge_conn;
 }
 
 /* server event publishing helper: publish in both global and
@@ -3832,8 +3829,7 @@ int srv_update_addr(struct server *s, void *ip, int ip_sin_family, const char *u
 
 	_srv_event_hdl_prepare(&cb_data.common, s, 0);
 	_srv_event_hdl_prepare_inetaddr(&cb_data.addr, s,
-                                        &new_addr, s->svc_port, !!(s->flags & SRV_F_MAPPORTS),
-                                        0);
+                                        &new_addr, s->svc_port, !!(s->flags & SRV_F_MAPPORTS));
 
 	/* server_atomic_sync_task will apply the changes for us */
 	_srv_event_hdl_publish(EVENT_HDL_SUB_SERVER_INETADDR, cb_data, s);
@@ -4093,8 +4089,7 @@ out:
 		_srv_event_hdl_prepare(&cb_data.common, s, 0);
 		_srv_event_hdl_prepare_inetaddr(&cb_data.addr, s,
 		                                ((ip_change) ? &sa : &s->addr),
-		                                ((port_change) ? new_port : s->svc_port), mapports,
-		                                1);
+		                                ((port_change) ? new_port : s->svc_port), mapports);
 
 		/* server_atomic_sync_task will apply the changes for us */
 		_srv_event_hdl_publish(EVENT_HDL_SUB_SERVER_INETADDR, cb_data, s);