Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add new -i (ignore errors) command line option to strsclnt. Strsclnt now

Browse Source 
stops soon after the first error unless the -i option is given.
Strsclnt and tstclnt now look for an environment variable named
NSS_DEBUG_TIMEOUT, and if present, its value is used as a timeout time
for all socket IO operations.  Bug 332348. r=julien.pierre.


git-svn-id: svn://10.0.0.236/trunk@193485 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nelson%bolyard.com
2006-04-04 07:31:46 +00:00
parent 9ae9bbdaf4
commit f17f17ddf5
2 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
mozilla/security/nss/cmd/strsclnt/strsclnt.c
View File

@@ -144,10 +144,10 @@ static PRLock * threadLock; /* protects the global variables below */
static PRTime lastConnectFailure;
static PRTime lastConnectSuccess;
static PRTime lastThrottleUp;
static int remaining_connections; /* number of connections left */
static PRInt32 remaining_connections; /* number of connections left */
static int active_threads = 8; /* number of threads currently trying to
** connect */
static int numUsed;
static PRInt32 numUsed;
/* end of variables protected by threadLock */
static SSL3Statistics * ssl3stats;
@@ -157,7 +157,9 @@ static PRBool disableSSL3 = PR_FALSE;
static PRBool disableTLS = PR_FALSE;
static PRBool bypassPKCS11 = PR_FALSE;
static PRBool disableLocking = PR_FALSE;
static PRBool ignoreErrors = PR_FALSE;
PRIntervalTime maxInterval = PR_INTERVAL_NO_TIMEOUT;
char * ownPasswd( PK11SlotInfo *slot, PRBool retry, void *arg)
{
@@ -382,7 +384,7 @@ void
thread_wrapper(void * arg)
{
perThread * slot = (perThread *)arg;
PRBool die = PR_FALSE;
PRBool done = PR_FALSE;
do {
PRBool doop = PR_FALSE;
@@ -394,7 +396,7 @@ thread_wrapper(void * arg)
/* this thread isn't supposed to be running */
if (!ThrottleUp) {
/* we'll never need this thread again, so abort it */
die = PR_TRUE;
done = PR_TRUE;
} else if (remaining_connections > 0) {
/* we may still need this thread, so just sleep for 1s */
dosleep = PR_TRUE;
@@ -417,14 +419,14 @@ thread_wrapper(void * arg)
}
} else {
/* no more connections left, we are done */
die = PR_TRUE;
done = PR_TRUE;
}
} else {
/* this thread should run */
if (--remaining_connections >= 0) {
if (--remaining_connections >= 0) { /* protected by threadLock */
doop = PR_TRUE;
} else {
die = PR_TRUE;
done = PR_TRUE;
}
}
PR_Unlock(threadLock);
@@ -436,7 +438,7 @@ thread_wrapper(void * arg)
if (dosleep) {
PR_Sleep(PR_SecondsToInterval(1));
}
} while (!die);
} while (!done && (!failed_already || ignoreErrors));
}
SECStatus
@@ -457,8 +459,8 @@ launch_thread(
return SECFailure;
}
i = numUsed;
slot = &threads[numUsed++];
i = numUsed++;
slot = &threads[i];
slot->a = a;
slot->b = b;
slot->tid = tid;
@@ -486,7 +488,6 @@ launch_thread(
int
reap_threads(void)
{
perThread * slot;
int i;
for (i = 0; i < MAX_THREADS; ++i) {
@@ -595,12 +596,13 @@ do_writes(
while (sent < bigBuf.len) {
count = PR_Write(ssl_sock, bigBuf.data + sent, bigBuf.len - sent);
count = PR_Send(ssl_sock, bigBuf.data + sent, bigBuf.len - sent,
0, maxInterval);
if (count < 0) {
errWarn("PR_Write bigBuf");
errWarn("PR_Send bigBuf");
break;
}
FPRINTF(stderr, "strsclnt: PR_Write wrote %d bytes from bigBuf\n",
FPRINTF(stderr, "strsclnt: PR_Send wrote %d bytes from bigBuf\n",
count );
sent += count;
}
@@ -639,9 +641,9 @@ handle_fdx_connection( PRFileDesc * ssl_sock, int connection)
/* do reads here. */
PRInt32 count;
count = PR_Read(ssl_sock, buf, RD_BUF_SIZE);
count = PR_Recv(ssl_sock, buf, RD_BUF_SIZE, 0, maxInterval);
if (count < 0) {
errWarn("PR_Read");
errWarn("PR_Recv");
break;
}
countRead += count;
@@ -686,9 +688,9 @@ handle_connection( PRFileDesc *ssl_sock, int tid)
/* compose the http request here. */
rv = PR_Write(ssl_sock, request, strlen(request));
rv = PR_Send(ssl_sock, request, strlen(request), 0, maxInterval);
if (rv <= 0) {
errWarn("PR_Write");
errWarn("PR_Send");
PR_Free(buf);
buf = 0;
failed_already = 1;
@@ -698,12 +700,13 @@ handle_connection( PRFileDesc *ssl_sock, int tid)
/* read until EOF */
while (1) {
rv = PR_Read(ssl_sock, buf, RD_BUF_SIZE);
rv = PR_Recv(ssl_sock, buf, RD_BUF_SIZE, 0, maxInterval);
if (rv == 0) {
break; /* EOF */
}
if (rv < 0) {
errWarn("PR_Read");
errWarn("PR_Recv");
failed_already = 1;
break;
}
@@ -1335,7 +1338,7 @@ main(int argc, char **argv)
progName = progName ? progName + 1 : tmp;
optstate = PL_CreateOptState(argc, argv, "2:3BC:DNP:TUc:d:n:op:qst:vw:");
optstate = PL_CreateOptState(argc, argv, "2:3BC:DNP:TUc:d:in:op:qst:vw:");
while ((status = PL_GetNextOpt(optstate)) == PL_OPT_OK) {
switch(optstate->option) {
@@ -1361,6 +1364,8 @@ main(int argc, char **argv)
case 'd': dir = optstate->value; break;
case 'i': ignoreErrors = PR_TRUE; break;
case 'n': nickName = PL_strdup(optstate->value); break;
case 'o': MakeCertOK++; break;
@@ -1414,6 +1419,14 @@ main(int argc, char **argv)
PK11_SetPasswordFunc(SECU_GetModulePassword);
}
tmp = PR_GetEnv("NSS_DEBUG_TIMEOUT");
if (tmp && tmp[0]) {
int sec = PORT_Atoi(tmp);
if (sec > 0) {
maxInterval = PR_SecondsToInterval(sec);
}
}
/* Call the libsec initialization routines */
rv = NSS_Initialize(dir, "", "", SECMOD_DB, NSS_INIT_READONLY);
if (rv != SECSuccess) {

17
mozilla/security/nss/cmd/tstclnt/tstclnt.c
View File

@@ -77,6 +77,8 @@
#define MAX_WAIT_FOR_SERVER 600
#define WAIT_INTERVAL 100
PRIntervalTime maxInterval = PR_INTERVAL_NO_TIMEOUT;
int ssl2CipherSuites[] = {
SSL_EN_RC4_128_WITH_MD5, /* A */
SSL_EN_RC4_128_EXPORT40_WITH_MD5, /* B */
@@ -374,7 +376,7 @@ thread_main(void * arg)
rc = PR_Read(std_in, buf, sizeof buf);
if (rc <= 0)
break;
wc = PR_Write(ps, buf, rc);
wc = PR_Send(ps, buf, rc, 0, maxInterval);
} while (wc == rc);
PR_Close(ps);
}
@@ -419,6 +421,7 @@ int main(int argc, char **argv)
char * certDir = NULL;
char * nickname = NULL;
char * cipherString = NULL;
char * tmp;
int multiplier = 0;
SECStatus rv;
PRStatus status;
@@ -448,6 +451,14 @@ int main(int argc, char **argv)
progName = strrchr(argv[0], '\\');
progName = progName ? progName+1 : argv[0];
tmp = PR_GetEnv("NSS_DEBUG_TIMEOUT");
if (tmp && tmp[0]) {
int sec = PORT_Atoi(tmp);
if (sec > 0) {
maxInterval = PR_SecondsToInterval(sec);
}
}
optstate = PL_CreateOptState(argc, argv, "23BTfc:h:p:d:m:n:oqsvw:x");
while ((optstatus = PL_GetNextOpt(optstate)) == PL_OPT_OK) {
switch (optstate->option) {
@@ -875,7 +886,7 @@ int main(int argc, char **argv)
FPRINTF(stderr, "%s: Writing %d bytes to server\n",
progName, nb);
do {
PRInt32 cc = PR_Write(s, bufp, nb);
PRInt32 cc = PR_Send(s, bufp, nb, 0, maxInterval);
if (cc < 0) {
PRErrorCode err = PR_GetError();
if (err != PR_WOULD_BLOCK_ERROR) {
@@ -916,7 +927,7 @@ int main(int argc, char **argv)
#endif
) {
/* Read from socket and write to stdout */
nb = PR_Read(pollset[SSOCK_FD].fd, buf, sizeof(buf));
nb = PR_Recv(pollset[SSOCK_FD].fd, buf, sizeof buf, 0, maxInterval);
FPRINTF(stderr, "%s: Read from server %d bytes\n", progName, nb);
if (nb < 0) {
if (PR_GetError() != PR_WOULD_BLOCK_ERROR) {