From 4b90317428b37dbbf3afdcd09a12f0ced4e4c38a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 22 Sep 2024 17:52:20 +0200 Subject: [PATCH] server: my_port -> server_port --- tests/mk-bundle-server.pl | 2 +- tests/server/mqttd.c | 10 +++++----- tests/server/sockfilt.c | 14 +++++++------- tests/server/socksd.c | 10 +++++----- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/mk-bundle-server.pl b/tests/mk-bundle-server.pl index 85914c7884..cbda2bfeba 100755 --- a/tests/mk-bundle-server.pl +++ b/tests/mk-bundle-server.pl @@ -48,7 +48,7 @@ my @reused_symbols = ( "configurable", "configfile", "resetdefaults", - "my_port", + "server_port", "config", "prevtestno", "prevpartno", diff --git a/tests/server/mqttd.c b/tests/server/mqttd.c index ba0484ad65..a5fefd686c 100644 --- a/tests/server/mqttd.c +++ b/tests/server/mqttd.c @@ -110,7 +110,7 @@ static char loglockfile[256]; static bool use_ipv6 = FALSE; #endif static const char *ipv_inuse = "IPv4"; -static unsigned short my_port = DEFAULT_PORT; +static unsigned short server_port = DEFAULT_PORT; static void resetdefaults(void) { @@ -996,7 +996,7 @@ int main(int argc, char *argv[]) argv[arg]); return 0; } - my_port = util_ultous(ulnum); + server_port = util_ultous(ulnum); arg++; } } @@ -1046,7 +1046,7 @@ int main(int argc, char *argv[]) { /* passive daemon style */ - sock = sockdaemon(sock, &my_port); + sock = sockdaemon(sock, &server_port); if(CURL_SOCKET_BAD == sock) { goto mqttd_cleanup; } @@ -1054,14 +1054,14 @@ int main(int argc, char *argv[]) } logmsg("Running %s version", ipv_inuse); - logmsg("Listening on port %hu", my_port); + logmsg("Listening on port %hu", server_port); wrotepidfile = write_pidfile(pidname); if(!wrotepidfile) { goto mqttd_cleanup; } - wroteportfile = write_portfile(portname, my_port); + wroteportfile = write_portfile(portname, server_port); if(!wroteportfile) { goto mqttd_cleanup; } diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c index 052c6b127d..97d92901db 100644 --- a/tests/server/sockfilt.c +++ b/tests/server/sockfilt.c @@ -141,7 +141,7 @@ static bool bind_only = FALSE; static bool use_ipv6 = FALSE; #endif static const char *ipv_inuse = "IPv4"; -static unsigned short my_port = DEFAULT_PORT; +static unsigned short server_port = DEFAULT_PORT; static unsigned short my_connectport = 0; /* if non-zero, we activate this mode */ enum sockmode { @@ -1142,7 +1142,7 @@ static bool juggle(curl_socket_t *sockfdp, /* Question asking us what PORT number we are listening to. Replies to PORT with "IPv[num]/[port]" */ msnprintf((char *)buffer, sizeof(buffer), "%s/%hu\n", - ipv_inuse, my_port); + ipv_inuse, server_port); buffer_len = (ssize_t)strlen((char *)buffer); msnprintf(data, sizeof(data), "PORT\n%04zx\n", buffer_len); if(!write_stdout(data, 10)) @@ -1461,7 +1461,7 @@ int main(int argc, char *argv[]) if(argc > arg) { char *endptr; unsigned long ulnum = strtoul(argv[arg], &endptr, 10); - my_port = util_ultous(ulnum); + server_port = util_ultous(ulnum); arg++; } } @@ -1574,7 +1574,7 @@ int main(int argc, char *argv[]) } else { /* passive daemon style */ - sock = sockdaemon(sock, &my_port); + sock = sockdaemon(sock, &server_port); if(CURL_SOCKET_BAD == sock) { write_stdout("FAIL\n", 5); goto sockfilt_cleanup; @@ -1587,9 +1587,9 @@ int main(int argc, char *argv[]) if(my_connectport) logmsg("Connected to port %hu", my_connectport); else if(bind_only) - logmsg("Bound without listening on port %hu", my_port); + logmsg("Bound without listening on port %hu", server_port); else - logmsg("Listening on port %hu", my_port); + logmsg("Listening on port %hu", server_port); wrotepidfile = write_pidfile(pidname); if(!wrotepidfile) { @@ -1597,7 +1597,7 @@ int main(int argc, char *argv[]) goto sockfilt_cleanup; } if(portname) { - wroteportfile = write_portfile(portname, my_port); + wroteportfile = write_portfile(portname, server_port); if(!wroteportfile) { write_stdout("FAIL\n", 5); goto sockfilt_cleanup; diff --git a/tests/server/socksd.c b/tests/server/socksd.c index 1d2898048c..ac2baff0c9 100644 --- a/tests/server/socksd.c +++ b/tests/server/socksd.c @@ -138,7 +138,7 @@ static const char *reqlogfile = DEFAULT_REQFILE; static const char *configfile = DEFAULT_CONFIG; static const char *socket_type = "IPv4"; -static unsigned short my_port = DEFAULT_PORT; +static unsigned short server_port = DEFAULT_PORT; static void resetdefaults(void) { @@ -1063,7 +1063,7 @@ int main(int argc, char *argv[]) if(argc > arg) { char *endptr; unsigned long ulnum = strtoul(argv[arg], &endptr, 10); - my_port = util_ultous(ulnum); + server_port = util_ultous(ulnum); arg++; } } @@ -1108,7 +1108,7 @@ int main(int argc, char *argv[]) { /* passive daemon style */ - sock = sockdaemon(sock, &my_port + sock = sockdaemon(sock, &server_port #ifdef USE_UNIX_SOCKETS , unix_socket #endif @@ -1129,7 +1129,7 @@ int main(int argc, char *argv[]) logmsg("Listening on Unix socket %s", unix_socket); else #endif - logmsg("Listening on port %hu", my_port); + logmsg("Listening on port %hu", server_port); wrotepidfile = write_pidfile(pidname); if(!wrotepidfile) { @@ -1137,7 +1137,7 @@ int main(int argc, char *argv[]) } if(portname) { - wroteportfile = write_portfile(portname, my_port); + wroteportfile = write_portfile(portname, server_port); if(!wroteportfile) { goto socks5_cleanup; }