update NSPR to 4.24 and keep NSPR Bug 1586070 and win64 patch intact.

This commit is contained in:
Roy Tam 2020-01-03 13:34:04 +08:00
commit 0b9855b841
487 changed files with 42933 additions and 48679 deletions

View file

@ -12,12 +12,12 @@
**
** Modification History:
** 14-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
** The debug mode will print all of the printfs associated with this test.
** The regress mode will be the default mode. Since the regress tool limits
** The debug mode will print all of the printfs associated with this test.
** The regress mode will be the default mode. Since the regress tool limits
** the output to a one line status:PASS or FAIL,all of the printf statements
** have been handled with an if (debug_mode) statement.
** have been handled with an if (debug_mode) statement.
** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
** recognize the return code from tha main program.
** recognize the return code from tha main program.
***********************************************************************/
/***********************************************************************
@ -51,93 +51,113 @@ int main(int argc, char **argv)
PRIntn npds;
PRInt32 retVal;
/* The command line argument: -d is used to determine if the test is being run
in debug mode. The regress tool requires only one line output:PASS or FAIL.
All of the printfs associated with this test has been handled with a if (debug_mode)
test.
Usage: test_name -d
*/
PLOptStatus os;
PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
/* The command line argument: -d is used to determine if the test is being run
in debug mode. The regress tool requires only one line output:PASS or FAIL.
All of the printfs associated with this test has been handled with a if (debug_mode)
test.
Usage: test_name -d
*/
PLOptStatus os;
PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
{
if (PL_OPT_BAD == os) continue;
if (PL_OPT_BAD == os) {
continue;
}
switch (opt->option)
{
case 'd': /* debug mode */
debug_mode = 1;
break;
default:
break;
case 'd': /* debug mode */
debug_mode = 1;
break;
default:
break;
}
}
PL_DestroyOptState(opt);
PL_DestroyOptState(opt);
/* main test */
/* main test */
PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
PR_STDIO_INIT();
if (debug_mode) {
printf("This program tests PR_Poll with sockets.\n");
printf("Timeout is tested.\n\n");
}
printf("This program tests PR_Poll with sockets.\n");
printf("Timeout is tested.\n\n");
}
/* Create two listening sockets */
if ((listenSock1 = PR_NewTCPSocket()) == NULL) {
fprintf(stderr, "Can't create a new TCP socket\n");
if (!debug_mode) failed_already=1;
goto exit_now;
fprintf(stderr, "Can't create a new TCP socket\n");
if (!debug_mode) {
failed_already=1;
}
goto exit_now;
}
memset(&addr, 0, sizeof(addr));
addr.inet.family = PR_AF_INET;
addr.inet.ip = PR_htonl(PR_INADDR_ANY);
addr.inet.port = PR_htons(0);
if (PR_Bind(listenSock1, &addr) == PR_FAILURE) {
fprintf(stderr, "Can't bind socket\n");
if (!debug_mode) failed_already=1;
goto exit_now;
fprintf(stderr, "Can't bind socket\n");
if (!debug_mode) {
failed_already=1;
}
goto exit_now;
}
if (PR_GetSockName(listenSock1, &addr) == PR_FAILURE) {
fprintf(stderr, "PR_GetSockName failed\n");
if (!debug_mode) failed_already=1;
goto exit_now;
fprintf(stderr, "PR_GetSockName failed\n");
if (!debug_mode) {
failed_already=1;
}
goto exit_now;
}
listenPort1 = PR_ntohs(addr.inet.port);
if (PR_Listen(listenSock1, 5) == PR_FAILURE) {
fprintf(stderr, "Can't listen on a socket\n");
if (!debug_mode) failed_already=1;
goto exit_now;
fprintf(stderr, "Can't listen on a socket\n");
if (!debug_mode) {
failed_already=1;
}
goto exit_now;
}
if ((listenSock2 = PR_NewTCPSocket()) == NULL) {
fprintf(stderr, "Can't create a new TCP socket\n");
if (!debug_mode) failed_already=1;
goto exit_now;
fprintf(stderr, "Can't create a new TCP socket\n");
if (!debug_mode) {
failed_already=1;
}
goto exit_now;
}
addr.inet.family = PR_AF_INET;
addr.inet.ip = PR_htonl(PR_INADDR_ANY);
addr.inet.port = PR_htons(0);
if (PR_Bind(listenSock2, &addr) == PR_FAILURE) {
fprintf(stderr, "Can't bind socket\n");
if (!debug_mode) failed_already=1;
goto exit_now;
fprintf(stderr, "Can't bind socket\n");
if (!debug_mode) {
failed_already=1;
}
goto exit_now;
}
if (PR_GetSockName(listenSock2, &addr) == PR_FAILURE) {
fprintf(stderr, "PR_GetSockName failed\n");
if (!debug_mode) failed_already=1;
goto exit_now;
fprintf(stderr, "PR_GetSockName failed\n");
if (!debug_mode) {
failed_already=1;
}
goto exit_now;
}
listenPort2 = PR_ntohs(addr.inet.port);
if (PR_Listen(listenSock2, 5) == PR_FAILURE) {
fprintf(stderr, "Can't listen on a socket\n");
if (!debug_mode) failed_already=1;
goto exit_now;
fprintf(stderr, "Can't listen on a socket\n");
if (!debug_mode) {
failed_already=1;
}
goto exit_now;
}
PR_snprintf(buf, sizeof(buf),
"The server thread is listening on ports %hu and %hu\n\n",
listenPort1, listenPort2);
if (debug_mode) printf("%s", buf);
"The server thread is listening on ports %hu and %hu\n\n",
listenPort1, listenPort2);
if (debug_mode) {
printf("%s", buf);
}
/* Set up the poll descriptor array */
pds = pds0;
@ -150,17 +170,23 @@ int main(int argc, char **argv)
npds = 2;
/* Testing timeout */
if (debug_mode) printf("PR_Poll should time out in 5 seconds\n");
if (debug_mode) {
printf("PR_Poll should time out in 5 seconds\n");
}
retVal = PR_Poll(pds, npds, PR_SecondsToInterval(5));
if (retVal != 0) {
PR_snprintf(buf, sizeof(buf),
"PR_Poll should time out and return 0, but it returns %ld\n",
retVal);
fprintf(stderr, "%s", buf);
if (!debug_mode) failed_already=1;
goto exit_now;
PR_snprintf(buf, sizeof(buf),
"PR_Poll should time out and return 0, but it returns %ld\n",
retVal);
fprintf(stderr, "%s", buf);
if (!debug_mode) {
failed_already=1;
}
goto exit_now;
}
if (debug_mode) {
printf("PR_Poll timed out. Test passed.\n\n");
}
if (debug_mode) printf("PR_Poll timed out. Test passed.\n\n");
exit_now:
@ -173,9 +199,11 @@ exit_now:
PR_Cleanup();
if(failed_already)
return 1;
else
return 0;
if(failed_already) {
return 1;
}
else {
return 0;
}
}