diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2018-10-24 13:05:58 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2018-10-25 08:13:14 +0200 |
| commit | 9d7403a07d523aa3f0b65114eab978c1d6409169 (patch) | |
| tree | 8ed23cbb6c8d567ce3457dd3a5f4b8cc63c1ea0d | |
| parent | 070f30fdcabadf4e3057cc8e530be45dcc607a5e (diff) | |
| download | gnutls-9d7403a07d523aa3f0b65114eab978c1d6409169.tar.gz | |
gnutls-cli: do not print errors twice
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
| -rw-r--r-- | src/cli.c | 4 | ||||
| -rw-r--r-- | src/socket.c | 3 | ||||
| -rw-r--r-- | src/socket.h | 1 |
3 files changed, 5 insertions, 3 deletions
@@ -836,7 +836,7 @@ static int try_rekey(socket_st * hd, unsigned peer) static int try_resume(socket_st * hd) { - int ret, socket_flags = 0; + int ret, socket_flags = SOCKET_FLAG_DONT_PRINT_ERRORS; gnutls_datum_t rdata = {NULL, 0}; if (gnutls_session_is_resumed(hd->session) == 0) { @@ -1107,7 +1107,7 @@ int main(int argc, char **argv) ssize_t bytes, keyboard_bytes; char *keyboard_buffer_ptr; inline_cmds_st inline_cmds; - int socket_flags = 0; + int socket_flags = SOCKET_FLAG_DONT_PRINT_ERRORS; FILE *server_fp = NULL; FILE *client_fp = NULL; #ifndef _WIN32 diff --git a/src/socket.c b/src/socket.c index eacff01b42..f488c531e5 100644 --- a/src/socket.c +++ b/src/socket.c @@ -588,7 +588,8 @@ socket_open2(socket_st * hd, const char *hostname, const char *service, continue; } else if (err < 0) { - fprintf(stderr, "*** handshake has failed: %s\n", gnutls_strerror(err)); + if (!(flags & SOCKET_FLAG_DONT_PRINT_ERRORS)) + fprintf(stderr, "*** handshake has failed: %s\n", gnutls_strerror(err)); exit(1); } } diff --git a/src/socket.h b/src/socket.h index 49aec0bf2b..b66e5c512d 100644 --- a/src/socket.h +++ b/src/socket.h @@ -7,6 +7,7 @@ #define SOCKET_FLAG_RAW (1<<3) /* unencrypted */ #define SOCKET_FLAG_VERBOSE (1<<4) #define SOCKET_FLAG_SKIP_INIT (1<<5) +#define SOCKET_FLAG_DONT_PRINT_ERRORS (1<<6) typedef struct { |