diff options
Diffstat (limited to 'apps/s_apps.h')
| -rw-r--r-- | apps/s_apps.h | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/apps/s_apps.h b/apps/s_apps.h index 9339b41609..e9b6f40288 100644 --- a/apps/s_apps.h +++ b/apps/s_apps.h @@ -146,20 +146,14 @@ typedef fd_mask fd_set; # define FD_ZERO(p) memset((p), 0, sizeof(*(p))) #endif -#define PORT 4433 -#define PORT_STR "4433" +#define PORT "4433" #define PROTOCOL "tcp" -int do_server(int port, int type, int *ret, - int (*cb) (char *hostname, int s, int stype, +int do_server(int *accept_sock, const char *host, const char *port, + int family, int type, + int (*cb) (const char *hostname, int s, int stype, unsigned char *context), unsigned char *context, int naccept); -#ifndef NO_SYS_UN_H -int do_server_unix(const char *path, int *ret, - int (*cb) (char *hostname, int s, int stype, - unsigned char *context), unsigned char *context, - int naccept); -#endif #ifdef HEADER_X509_H int verify_callback(int ok, X509_STORE_CTX *ctx); #endif @@ -172,14 +166,9 @@ int ssl_print_point_formats(BIO *out, SSL *s); int ssl_print_curves(BIO *out, SSL *s, int noshared); #endif int ssl_print_tmp_key(BIO *out, SSL *s); -int init_client(int *sock, const char *server, int port, int type); -#ifndef NO_SYS_UN_H -int init_client_unix(int *sock, const char *server); -#endif +int init_client(int *sock, const char *host, const char *port, + int family, int type); int should_retry(int i); -int extract_port(const char *str, unsigned short *port_ptr); -int extract_host_port(char *str, char **host_ptr, unsigned char *ip, - unsigned short *p); long bio_dump_callback(BIO *bio, int cmd, const char *argp, int argi, long argl, long ret); |