mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 23:56:57 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: server/ip: centralize server ip updates

Browse Source 
Add a new helper function named _srv_update_inetaddr() to centralize ip
addr and port updates during runtime.
This commit is contained in:
Aurelien DARRAGON 2023-11-13 16:42:56 +01:00 committed by Christopher Faulet
parent 24da4d3ee7
commit c886fb58eb
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/server.c
View File

@ -166,6 +166,16 @@ int srv_getinter(const struct check *check)
return (check->fastinter)?(check->fastinter):(check->inter); return (check->fastinter)?(check->fastinter):(check->inter);
} }
/* Update server's addr:svc_port tuple in INET context
*
* Must be called with server lock held
*/
void _srv_set_inetaddr(struct server *srv, const struct sockaddr_storage *addr, unsigned int svc_port)
{
ipcpy(addr, &srv->addr);
srv->svc_port = svc_port;
}
/* fill common server event data members struct /* fill common server event data members struct
* must be called with server lock or under thread isolate * must be called with server lock or under thread isolate
*/ */
@ -3592,7 +3602,7 @@ int srv_update_addr(struct server *s, void *ip, int ip_sin_family, const char *u
_srv_event_hdl_prepare_inetaddr(&cb_data.addr, &s->addr, s->svc_port, &new_addr, s->svc_port, 0); _srv_event_hdl_prepare_inetaddr(&cb_data.addr, &s->addr, s->svc_port, &new_addr, s->svc_port, 0);
/* apply the new IP address */ /* apply the new IP address */
ipcpy(&new_addr, &s->addr); _srv_set_inetaddr(s, &new_addr, s->svc_port);
_srv_event_hdl_publish(EVENT_HDL_SUB_SERVER_INETADDR, cb_data, s); _srv_event_hdl_publish(EVENT_HDL_SUB_SERVER_INETADDR, cb_data, s);
@ -3856,16 +3866,10 @@ const char *srv_update_addr_port(struct server *s, const char *addr, const char
((port_change) ? new_port : s->svc_port), ((port_change) ? new_port : s->svc_port),
1); 1);
if (ip_change) { /* apply new ip and port */
/* apply new ip */ _srv_set_inetaddr(s,
ipcpy(&sa, &s->addr); ((ip_change) ? &sa : &s->addr),
} ((port_change) ? new_port : s->svc_port));
if (port_change) {
/* apply new port */
s->svc_port = new_port;
}
_srv_event_hdl_publish(EVENT_HDL_SUB_SERVER_INETADDR, cb_data, s); _srv_event_hdl_publish(EVENT_HDL_SUB_SERVER_INETADDR, cb_data, s);
@ -4274,11 +4278,15 @@ struct server *snr_check_ip_callback(struct server *srv, void *ip, unsigned char
*/ */
int srv_set_addr_via_libc(struct server *srv, int *err_code) int srv_set_addr_via_libc(struct server *srv, int *err_code)
{ {
if (str2ip2(srv->hostname, &srv->addr, 1) == NULL) { struct sockaddr_storage new_addr;
memset(&new_addr, 0, sizeof(new_addr));
if (str2ip2(srv->hostname, &new_addr, 1) == NULL) {
if (err_code) if (err_code)
*err_code |= ERR_WARN; *err_code |= ERR_WARN;
return 1; return 1;
} }
_srv_set_inetaddr(srv, &new_addr, srv->svc_port);
return 0; return 0;
} }
@ -4354,11 +4362,15 @@ int srv_set_fqdn(struct server *srv, const char *hostname, int resolv_locked)
*/ */
static int srv_apply_lastaddr(struct server *srv, int *err_code) static int srv_apply_lastaddr(struct server *srv, int *err_code)
{ {
if (!str2ip2(srv->lastaddr, &srv->addr, 0)) { struct sockaddr_storage new_addr;
memset(&new_addr, 0, sizeof(new_addr));
if (!str2ip2(srv->lastaddr, &new_addr, 0)) {
if (err_code) if (err_code)
*err_code |= ERR_WARN; *err_code |= ERR_WARN;
return 1; return 1;
} }
_srv_set_inetaddr(srv, &new_addr, srv->svc_port);
return 0; return 0;
} }
@ -4420,7 +4432,7 @@ static int srv_iterate_initaddr(struct server *srv)
return return_code; return return_code;
case SRV_IADDR_IP: case SRV_IADDR_IP:
ipcpy(&srv->init_addr, &srv->addr); _srv_set_inetaddr(srv, &srv->init_addr, srv->svc_port);
if (return_code) { if (return_code) {
ha_warning("could not resolve address '%s', falling back to configured address.\n", ha_warning("could not resolve address '%s', falling back to configured address.\n",
name); name);