#include "netdb.h"
#endif
-static struct hostent *GetHostByName(char *name);
+static struct hostent *GetHostByName(const char *name);
#if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
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);
-static int host_ip(char *str, unsigned char ip[4]);
+static int host_ip(const char *str, unsigned char ip[4]);
#ifdef OPENSSL_SYS_WIN16
#define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
return(1);
}
-int init_client(int *sock, char *host, int port, int type)
+int init_client(int *sock, const 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;
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;
{
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);
}
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);
if (ret == INVALID_SOCKET)
{
#if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
+ int i;
i=WSAGetLastError();
BIO_printf(bio_err,"accept error %d\n",i);
#else
return(0);
}
-static int host_ip(char *str, unsigned char ip[4])
+static int host_ip(const char *str, unsigned char ip[4])
{
unsigned int in[4];
int i;
return(0);
}
-int extract_port(char *str, short *port_ptr)
+int extract_port(const char *str, short *port_ptr)
{
int i;
struct servent *s;
static unsigned long ghbn_hits=0L;
static unsigned long ghbn_miss=0L;
-static struct hostent *GetHostByName(char *name)
+static struct hostent *GetHostByName(const char *name)
{
struct hostent *ret;
int i,lowi=0;