luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server: my_port -> server_port

Browse Source
This commit is contained in:
Viktor Szakats 2024-09-22 17:52:20 +02:00
parent c46a02c514
commit 4b90317428
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/mk-bundle-server.pl
View File

@ -48,7 +48,7 @@ my @reused_symbols = (
"configurable",
"configfile",
"resetdefaults",
"my_port",
"server_port",
"config",
"prevtestno",
"prevpartno",

10
tests/server/mqttd.c
View File

@ -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;
}

14
tests/server/sockfilt.c
View File

@ -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;

10
tests/server/socksd.c
View File

@ -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;
}