1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DEV: tcploop: make the current address the default address

Browse Source 
It's difficult to refine bind/connect right now, let's make the address
optionall by turning it to the default one.
This commit is contained in:
Willy Tarreau 2022-06-07 11:36:20 +02:00
parent 98028c8d0a
commit 7184ca23c6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dev/tcploop/tcploop.c
View File

@ -732,7 +732,7 @@ int tcp_fork(int sock, const char *arg)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
struct sockaddr_storage ss; struct sockaddr_storage default_addr;
struct err_msg err; struct err_msg err;
const char *arg0; const char *arg0;
int loop_arg; int loop_arg;
@ -765,7 +765,7 @@ int main(int argc, char **argv)
pid = getpid(); pid = getpid();
signal(SIGCHLD, sig_handler); signal(SIGCHLD, sig_handler);
if (addr_to_ss(argv[1], &ss, &err) < 0) if (addr_to_ss(argv[1], &default_addr, &err) < 0)
die(1, "%s\n", err.msg); die(1, "%s\n", err.msg);
gettimeofday(&start_time, NULL); gettimeofday(&start_time, NULL);
@ -777,7 +777,7 @@ int main(int argc, char **argv)
case 'L': case 'L':
/* silently ignore existing connections */ /* silently ignore existing connections */
if (sock == -1) if (sock == -1)
sock = tcp_listen(&ss, argv[arg]); sock = tcp_listen(&default_addr, argv[arg]);
if (sock < 0) if (sock < 0)
die(1, "Fatal: tcp_listen() failed.\n"); die(1, "Fatal: tcp_listen() failed.\n");
break; break;
@ -785,7 +785,7 @@ int main(int argc, char **argv)
case 'C': case 'C':
/* silently ignore existing connections */ /* silently ignore existing connections */
if (sock == -1) if (sock == -1)
sock = tcp_connect(&ss, argv[arg]); sock = tcp_connect(&default_addr, argv[arg]);
if (sock < 0) if (sock < 0)
die(1, "Fatal: tcp_connect() failed.\n"); die(1, "Fatal: tcp_connect() failed.\n");
dolog("connect\n"); dolog("connect\n");