updated

1 files changed, 147 insertions, 113 deletions

diff --git a/src/serv.c b/src/serv.c
index c4a7d58053..cec1c84c50 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -34,92 +34,114 @@
 #define ERR(err,s) if(err==-1) {perror(s);return(1);}
 #define MAX_BUF 100
 
+#define RENEGOTIATE
+
 int main()
 {
-    int err, listen_sd, i;
-    int sd, ret;
-    struct sockaddr_in sa_serv;
-    struct sockaddr_in sa_cli;
-    int client_len;
-    char topbuf[512], *tmp;
-    GNUTLS_STATE state;
-    char buffer[MAX_BUF+1];
-    int optval = 1;
-    SRP_SERVER_CREDENTIALS cred;
-    const SRP_AUTH_INFO *info;
- 
-    /* this is a password file (created with the included crypt utility) 
-     * Read README.crypt prior to using SRP.
-     */
-    cred.password_file="tpasswd";
-    cred.password_conf_file="tpasswd.conf";
-    
-    listen_sd = socket(AF_INET, SOCK_STREAM, 0);
-    ERR(listen_sd, "socket");
-
-    memset(&sa_serv, '\0', sizeof(sa_serv));
-    sa_serv.sin_family = AF_INET;
-    sa_serv.sin_addr.s_addr = INADDR_ANY;
-    sa_serv.sin_port = htons(PORT);	/* Server Port number */
-
-    setsockopt( listen_sd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(int));
-    err = bind(listen_sd, (SA *) & sa_serv, sizeof(sa_serv));
-    ERR(err, "bind");
-    err = listen(listen_sd, 1024);
-    ERR(err, "listen");
-
-
-
-    client_len = sizeof(sa_cli);
-    for (;;) {
-	gnutls_init(&state, GNUTLS_SERVER);
-	if ((ret = gnutls_set_db_name(state, "gnutls-rsm.db")) < 0)
-		fprintf(stderr, "*** DB error (%d)\n", ret);
-	gnutls_set_cipher_priority( state, GNUTLS_TWOFISH, GNUTLS_RIJNDAEL, GNUTLS_3DES, GNUTLS_ARCFOUR, 0);
-	gnutls_set_compression_priority( state, GNUTLS_ZLIB, GNUTLS_NULL_COMPRESSION, 0);
-	gnutls_set_kx_priority( state, GNUTLS_KX_SRP, GNUTLS_KX_ANON_DH, 0);
-	
-	gnutls_set_kx_cred( state, GNUTLS_KX_ANON_DH, NULL);
-	gnutls_set_kx_cred( state, GNUTLS_KX_SRP, &cred);
-	
-	gnutls_set_mac_priority( state, GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0);
-	sd = accept(listen_sd, (SA *) & sa_cli, &client_len);
-
-
-	printf("- connection from %s, port %d\n",
-		inet_ntop(AF_INET, &sa_cli.sin_addr, topbuf,
-			  sizeof(topbuf)), ntohs(sa_cli.sin_port));
-
-
-
-	ret = gnutls_handshake(sd, state);
-	if (ret < 0) {
-	    close(sd);
-	    gnutls_deinit( state);
-	    fprintf(stderr, "*** Handshake has failed (%d)\n", ret);
-	    gnutls_perror(ret);
-	    continue;
-	}
-	printf("- Handshake was completed\n");
+	int err, listen_sd, i;
+	int sd, ret;
+	struct sockaddr_in sa_serv;
+	struct sockaddr_in sa_cli;
+	int client_len;
+	char topbuf[512], *tmp;
+	GNUTLS_STATE state;
+	char buffer[MAX_BUF + 1];
+	int optval = 1;
+	SRP_SERVER_CREDENTIALS cred;
+	const SRP_AUTH_INFO *info;
+
+	/* this is a password file (created with the included crypt utility) 
+	 * Read README.crypt prior to using SRP.
+	 */
+	cred.password_file = "tpasswd";
+	cred.password_conf_file = "tpasswd.conf";
+
+	listen_sd = socket(AF_INET, SOCK_STREAM, 0);
+	ERR(listen_sd, "socket");
+
+	memset(&sa_serv, '\0', sizeof(sa_serv));
+	sa_serv.sin_family = AF_INET;
+	sa_serv.sin_addr.s_addr = INADDR_ANY;
+	sa_serv.sin_port = htons(PORT);	/* Server Port number */
+
+	setsockopt(listen_sd, SOL_SOCKET, SO_REUSEADDR, &optval,
+		   sizeof(int));
+	err = bind(listen_sd, (SA *) & sa_serv, sizeof(sa_serv));
+	ERR(err, "bind");
+	err = listen(listen_sd, 1024);
+	ERR(err, "listen");
+
+
+
+	client_len = sizeof(sa_cli);
+	for (;;) {
+		gnutls_init(&state, GNUTLS_SERVER);
+		if ((ret = gnutls_set_db_name(state, "gnutls-rsm.db")) < 0)
+			fprintf(stderr, "*** DB error (%d)\n", ret);
+		gnutls_set_cipher_priority(state, GNUTLS_TWOFISH,
+					   GNUTLS_RIJNDAEL, GNUTLS_3DES,
+					   GNUTLS_ARCFOUR, 0);
+		gnutls_set_compression_priority(state, GNUTLS_ZLIB,
+						GNUTLS_NULL_COMPRESSION,
+						0);
+		gnutls_set_kx_priority(state, GNUTLS_KX_SRP,
+				       GNUTLS_KX_ANON_DH, 0);
+
+		gnutls_set_kx_cred(state, GNUTLS_KX_ANON_DH, NULL);
+		gnutls_set_kx_cred(state, GNUTLS_KX_SRP, &cred);
+
+		gnutls_set_mac_priority(state, GNUTLS_MAC_SHA,
+					GNUTLS_MAC_MD5, 0);
+		sd = accept(listen_sd, (SA *) & sa_cli, &client_len);
+
+
+		printf("- connection from %s, port %d\n",
+		       inet_ntop(AF_INET, &sa_cli.sin_addr, topbuf,
+				 sizeof(topbuf)), ntohs(sa_cli.sin_port));
+
+
+
+		ret = gnutls_handshake(sd, state);
+		if (ret < 0) {
+			close(sd);
+			gnutls_deinit(state);
+			tmp = gnutls_strerror(ret);
+			fprintf(stderr, "*** Handshake has failed (%s)\n",
+				tmp);
+			free(tmp);
+			continue;
+		}
+		printf("- Handshake was completed\n");
+
+		/* print srp specific data */
+		if (gnutls_get_current_kx(state) == GNUTLS_KX_SRP) {
+			info = gnutls_get_auth_info(state);
+			if (info != NULL)
+				printf("\n- User '%s' connected\n",
+				       info->username);
+		}
 
-	/* print srp specific data */
-	if ( gnutls_get_current_kx( state) == GNUTLS_KX_SRP) {
-		info = gnutls_get_auth_info( state);
-		if (info != NULL)
-			printf("\n- User '%s' connected\n", info->username);
-	}
-	
-	/* print state information */
-	tmp = _gnutls_kx_get_name(gnutls_get_current_kx( state));
-	printf("- Key Exchange: %s\n", tmp); free(tmp);
-	tmp = _gnutls_compression_get_name(gnutls_get_current_compression_method( state));
-	printf("- Compression: %s\n", tmp); free(tmp);
-	tmp = _gnutls_cipher_get_name(gnutls_get_current_cipher( state));
-	printf("- Cipher: %s\n", tmp); free(tmp);
-	tmp = _gnutls_mac_get_name(gnutls_get_current_mac_algorithm( state));
-	printf("- MAC: %s\n", tmp); free(tmp);
-
-	printf("- Acting as echo server...\n");
+		/* print state information */
+		tmp = _gnutls_kx_get_name(gnutls_get_current_kx(state));
+		printf("- Key Exchange: %s\n", tmp);
+		free(tmp);
+		tmp =
+		    _gnutls_compression_get_name
+		    (gnutls_get_current_compression_method(state));
+		printf("- Compression: %s\n", tmp);
+		free(tmp);
+		tmp =
+		    _gnutls_cipher_get_name(gnutls_get_current_cipher
+					    (state));
+		printf("- Cipher: %s\n", tmp);
+		free(tmp);
+		tmp =
+		    _gnutls_mac_get_name(gnutls_get_current_mac_algorithm
+					 (state));
+		printf("- MAC: %s\n", tmp);
+		free(tmp);
+
+		printf("- Acting as echo server...\n");
 /*	ret =
 	    gnutls_write(sd, state, "hello client",
 			sizeof("hello client"));
@@ -130,37 +152,49 @@ int main()
 	    continue;
 	}
 */
-	i = 0;
-	for (;;) {
-	    bzero( buffer, MAX_BUF+1);
-	    ret = gnutls_read(sd, state, buffer, MAX_BUF);
-	    if (gnutls_is_fatal_error(ret) == 1) {
-		if (ret == GNUTLS_E_CLOSURE_ALERT_RECEIVED) {
-		    printf("\n- Peer has closed the GNUTLS connection\n");
-		    break;
-		} else {
-		    fprintf(stderr, "\n*** Received corrupted data(%d). Closing the connection.\n", ret);
-		    break;
+		i = 0;
+		for (;;) {
+			bzero(buffer, MAX_BUF + 1);
+			ret = gnutls_read(sd, state, buffer, MAX_BUF);
+			if (gnutls_is_fatal_error(ret) == 1) {
+				if (ret == GNUTLS_E_CLOSURE_ALERT_RECEIVED) {
+					printf
+					    ("\n- Peer has closed the GNUTLS connection\n");
+					break;
+				} else {
+					fprintf(stderr,
+						"\n*** Received corrupted data(%d). Closing the connection.\n",
+						ret);
+					break;
+				}
+
+			}
+
+			if (ret > 0)
+				gnutls_write(sd, state, buffer,
+					     strlen(buffer));
+			i++;
+#ifdef RENEGOTIATE
+			if (i == 10)
+				ret = gnutls_send_hello_request(sd, state);
+#endif
+			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
+					printf("* Received alert '%d'.\n",
+					       ret);
+			}
 		}
-
-	    }
-		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);
 	}
-	fprintf(stderr, "\n");
-	gnutls_close(sd, state);
-	close(sd);
-	gnutls_deinit( state);
-    }
-    close(listen_sd);
-    return 0;
+	close(listen_sd);
+	return 0;
 
 }