From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Wed, 23 May 2001 15:17:47 +0000 (+0000)
Subject: updated to new api
X-Git-Tag: gnutls_0_1_4~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63ec90e73bb6889fec4c22d8bacf2a79e4c380a9;p=thirdparty%2Fgnutls.git

updated to new api
---

diff --git a/src/cli.c b/src/cli.c
index 862bd640bf..f13817e3fd 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -92,7 +92,7 @@ int main()
 	if (ret < 0) {
 		fprintf(stderr, "*** Handshake has failed\n");
 		gnutls_perror(ret);
-		gnutls_deinit(&state);
+		gnutls_deinit(state);
 		return 1;
 	} else {
 		printf("- Handshake was completed\n");
@@ -123,7 +123,7 @@ int main()
 	gnutls_close(sd, state);
 	shutdown( sd, SHUT_WR);
 	close(sd);	
-	gnutls_deinit( &state);	
+	gnutls_deinit( state);	
 	
 	printf("\n\n- Connecting again- trying to resume previous session\n");
 	sd = socket(AF_INET, SOCK_STREAM, 0);
@@ -157,7 +157,7 @@ int main()
 	if (ret < 0) {
 		fprintf(stderr, "*** Handshake failed\n");
 		gnutls_perror(ret);
-		gnutls_deinit(&state);
+		gnutls_deinit(state);
 		return 1;
 	} else {
 		printf("- Handshake was completed\n");
@@ -216,11 +216,17 @@ int main()
 					break;
 				}
 			} else {
-				printf("- Received[%d]: ", ret);
-				for (ii=0;ii<ret;ii++) {
-					fputc(buffer[ii], stdout);
+				if (ret==GNUTLS_E_WARNING_ALERT_RECEIVED || ret==GNUTLS_E_FATAL_ALERT_RECEIVED)
+					printf("* Received alert [%d]\n", gnutls_get_last_alert(state));
+				else {
+					if (ret > 0) {
+						printf("- Received[%d]: ", ret);
+						for (ii=0;ii<ret;ii++) {
+							fputc(buffer[ii], stdout);
+						}
+						fputs("\n", stdout);
+					}
 				}
-				fputs("\n", stdout);
 			}
 			if (user_term!=0) break;
 		}
@@ -240,6 +246,6 @@ int main()
 	shutdown( sd, SHUT_RDWR); /* no more receptions */
 	close(sd);
 	
-	gnutls_deinit(&state);
+	gnutls_deinit( state);
 	return 0;
 }
diff --git a/src/serv.c b/src/serv.c
index a7b5803d46..c4a7d58053 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -36,7 +36,7 @@
 
 int main()
 {
-    int err, listen_sd;
+    int err, listen_sd, i;
     int sd, ret;
     struct sockaddr_in sa_serv;
     struct sockaddr_in sa_cli;
@@ -95,7 +95,7 @@ int main()
 	ret = gnutls_handshake(sd, state);
 	if (ret < 0) {
 	    close(sd);
-	    gnutls_deinit(&state);
+	    gnutls_deinit( state);
 	    fprintf(stderr, "*** Handshake has failed (%d)\n", ret);
 	    gnutls_perror(ret);
 	    continue;
@@ -125,11 +125,12 @@ int main()
 			sizeof("hello client"));
 	if (ret < 0) {
 	    close(sd);
-	    gnutls_deinit(&state);
+	    gnutls_deinit( state);
 	    gnutls_perror(ret);
 	    continue;
 	}
 */
+	i = 0;
 	for (;;) {
 	    bzero( buffer, MAX_BUF+1);
 	    ret = gnutls_read(sd, state, buffer, MAX_BUF);
@@ -143,12 +144,21 @@ int main()
 		}
 
 	    }
-	    gnutls_write(sd, state, buffer, strlen(buffer));
+		if (ret==GNUTLS_E_WARNING_ALERT_RECEIVED || ret==GNUTLS_E_FATAL_ALERT_RECEIVED) {
+			ret = gnutls_get_last_alert(state);
+			if (ret==GNUTLS_NO_RENEGOTIATION)
+				printf("* Received NO_RENEGOTIATION alert. Client Does not support renegotiation.\n");
+		} else
+			 if (ret > 0)
+			    gnutls_write(sd, state, buffer, strlen(buffer));
+
+	    i++;
+	    if (i==10) gnutls_send_hello_request(sd ,state);
 	}
 	fprintf(stderr, "\n");
 	gnutls_close(sd, state);
 	close(sd);
-	gnutls_deinit(&state);
+	gnutls_deinit( state);
     }
     close(listen_sd);
     return 0;