projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Write a first HOWTO on how to create certificates. This is currently
[oweals/openssl.git]
/
apps
/
s_socket.c
diff --git
a/apps/s_socket.c
b/apps/s_socket.c
index 081b1a57d1745d7e0e57748b185ac75eac565405..9812e6d505d4791709fc2ba7b49d1707b97d2d53 100644
(file)
--- a/
apps/s_socket.c
+++ b/
apps/s_socket.c
@@
-209,9
+209,11
@@
static int init_client_ip(int *sock, unsigned char ip[4], int port)
s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
if (s == INVALID_SOCKET) { perror("socket"); return(0); }
s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
if (s == INVALID_SOCKET) { perror("socket"); return(0); }
+#ifndef MPE
i=0;
i=setsockopt(s,SOL_SOCKET,SO_KEEPALIVE,(char *)&i,sizeof(i));
if (i < 0) { perror("keepalive"); return(0); }
i=0;
i=setsockopt(s,SOL_SOCKET,SO_KEEPALIVE,(char *)&i,sizeof(i));
if (i < 0) { perror("keepalive"); return(0); }
+#endif
if (connect(s,(struct sockaddr *)&them,sizeof(them)) == -1)
{ close(s); perror("connect"); return(0); }
if (connect(s,(struct sockaddr *)&them,sizeof(them)) == -1)
{ close(s); perror("connect"); return(0); }
@@
-241,7
+243,7
@@
int do_server(int port, int *ret, int (*cb)(), char *context)
return(0);
}
i=(*cb)(name,sock, context);
return(0);
}
i=(*cb)(name,sock, context);
- if (name != NULL)
F
ree(name);
+ if (name != NULL)
OPENSSL_f
ree(name);
SHUTDOWN2(sock);
if (i < 0)
{
SHUTDOWN2(sock);
if (i < 0)
{
@@
-372,9
+374,9
@@
redoit:
}
else
{
}
else
{
- if ((*host=(char *)
M
alloc(strlen(h1->h_name)+1)) == NULL)
+ if ((*host=(char *)
OPENSSL_m
alloc(strlen(h1->h_name)+1)) == NULL)
{
{
- perror("
M
alloc");
+ perror("
OPENSSL_m
alloc");
return(0);
}
strcpy(*host,h1->h_name);
return(0);
}
strcpy(*host,h1->h_name);