X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=apps%2Fs_socket.c;h=a04b990540c94750a28bfb1f50fa720c0212b6dd;hp=57474753993d5334f8b8d737561fc06467e1f437;hb=b362ccab5c1d52086f19d29a32f4acc11073b86b;hpb=dc53a037b0ce091f2ade0d067ce9e88dd1c2ca21

diff --git a/apps/s_socket.c b/apps/s_socket.c
index 5747475399..a04b990540 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -96,7 +96,8 @@ static struct hostent *GetHostByName(char *name);
 static void ssl_sock_cleanup(void);
 #endif
 static int ssl_sock_init(void);
-static int init_client_ip(int *sock,unsigned char ip[4], int port, int type);
+static int init_client_ip(int *sock, const unsigned char ip[4], int port,
+			  int type);
 static int init_server(int *sock, int port, int type);
 static int init_server_long(int *sock, int port,char *ip, int type);
 static int do_accept(int acc_sock, int *sock, char **host);
@@ -232,14 +233,14 @@ int init_client(int *sock, char *host, int port, int type)
 	{
 	unsigned char ip[4];
 
+	ip[0] = ip[1] = ip[2] = ip[3] = 0;
 	if (!host_ip(host,&(ip[0])))
-		{
-		return(0);
-		}
-	return(init_client_ip(sock,ip,port,type));
+		return 0;
+	return init_client_ip(sock,ip,port,type);
 	}
 
-static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
+static int init_client_ip(int *sock, const unsigned char ip[4], int port,
+			  int type)
 	{
 	unsigned long addr;
 	struct sockaddr_in them;
@@ -279,7 +280,7 @@ static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
 	return(1);
 	}
 
-int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context)
+int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, int stype, unsigned char *context), unsigned char *context, int naccept)
 	{
 	int sock;
 	char *name = NULL;
@@ -297,7 +298,11 @@ int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, uns
   		{
 		if (type==SOCK_STREAM)
 			{
+#ifdef OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL
+			if (do_accept(accept_socket,&sock,NULL) == 0)
+#else
 			if (do_accept(accept_socket,&sock,&name) == 0)
+#endif
 				{
 				SHUTDOWN(accept_socket);
 				return(0);
@@ -305,11 +310,13 @@ int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, uns
 			}
 		else
 			sock = accept_socket;
-		i=(*cb)(name,sock, context);
+		i=(*cb)(name,sock, type, context);
 		if (name != NULL) OPENSSL_free(name);
 		if (type==SOCK_STREAM)
 			SHUTDOWN2(sock);
-		if (i < 0)
+		if (naccept != -1)
+			naccept--;
+		if (i < 0 || naccept == 0)
 			{
 			SHUTDOWN2(accept_socket);
 			return(i);