summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Black <grooverdan@users.sourceforge.net>2012-09-28 12:25:31 +1000
committerDaniel Black <grooverdan@users.sourceforge.net>2012-09-28 12:25:31 +1000
commitac81a99ca43e83aad27b09f9ff405c78f4581a2b (patch)
tree6f9792dff03050855df155515a7c8ead4eabd3b1
parentced5dbb9fa598a43cd9c114398cf83681166a4f4 (diff)
downloadrfc5077-ac81a99ca43e83aad27b09f9ff405c78f4581a2b.zip
rfc5077-ac81a99ca43e83aad27b09f9ff405c78f4581a2b.tar.gz
rfc5077-ac81a99ca43e83aad27b09f9ff405c78f4581a2b.tar.bz2
fix multiple reconnects that was broken after adding the delay option to *-client
-rw-r--r--gnutls-client.c3
-rw-r--r--nss-client.c5
-rw-r--r--openssl-client.c3
3 files changed, 7 insertions, 4 deletions
diff --git a/gnutls-client.c b/gnutls-client.c
index 297847e..173a173 100644
--- a/gnutls-client.c
+++ b/gnutls-client.c
@@ -199,7 +199,8 @@ connect_ssl(char *host, char *port,
gnutls_bye(session, GNUTLS_SHUT_RDWR);
close(s);
gnutls_deinit (session);
- if (--reconnect) break;
+ --reconnect;
+ if (reconnect < 0) break;
else {
start("waiting %d seconds",delay);
sleep(delay);
diff --git a/nss-client.c b/nss-client.c
index d0b21c8..b574e05 100644
--- a/nss-client.c
+++ b/nss-client.c
@@ -125,7 +125,7 @@ connect_ssl(char *host, char *port,
fail("Unable to configure US domestic policy:\n%s", SECU_ErrorString(PR_GetError()));
if (client_cert || client_key) {
- fail("Client certifcates not supported");
+ fail("Client certificates not supported");
}
addr = solve(host, port);
do {
@@ -173,7 +173,8 @@ connect_ssl(char *host, char *port,
start("End TLS connection");
PR_Close(sslSocket);
- if (--reconnect) break;
+ --reconnect;
+ if (reconnect < 0) break;
else {
start("waiting %d seconds",delay);
sleep(delay);
diff --git a/openssl-client.c b/openssl-client.c
index 793f464..7bd08c4 100644
--- a/openssl-client.c
+++ b/openssl-client.c
@@ -130,7 +130,8 @@ connect_ssl(char *host, char *port,
SSL_shutdown(ssl);
close(s);
SSL_free(ssl);
- if (--reconnect) break;
+ --reconnect;
+ if (reconnect < 0) break;
else {
start("waiting %d seconds",delay);
sleep(delay);