lagertonne/nut
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Imported Upstream version 2.6.3

Browse source
This commit is contained in:
Arnaud Quette 2012-01-24 11:22:33 +01:00
parent 45043b58d0
commit fad6ced6f6
255 changed files with 11081 additions and 4629 deletions
Download patch file Download diff file Expand all files Collapse all files

18
server/ssl.c
View file

@ -38,19 +38,19 @@ static int ssl_initialized = 0;
#ifndef HAVE_SSL
/* stubs for non-ssl compiles */
void net_starttls(ctype_t *client, int numarg, const char **arg)
void net_starttls(nut_ctype_t *client, int numarg, const char **arg)
{
send_err(client, NUT_ERR_FEATURE_NOT_SUPPORTED);
return;
}
int ssl_write(ctype_t *client, const char *buf, size_t buflen)
int ssl_write(nut_ctype_t *client, const char *buf, size_t buflen)
{
upslogx(LOG_ERR, "ssl_write called but SSL wasn't compiled in");
return -1;
}
int ssl_read(ctype_t *client, char *buf, size_t buflen)
int ssl_read(nut_ctype_t *client, char *buf, size_t buflen)
{
upslogx(LOG_ERR, "ssl_read called but SSL wasn't compiled in");
return -1;
@ -61,7 +61,7 @@ void ssl_init(void)
ssl_initialized = 0; /* keep gcc quiet */
}
void ssl_finish(ctype_t *client)
void ssl_finish(nut_ctype_t *client)
{
if (client->ssl) {
upslogx(LOG_ERR, "ssl_finish found active SSL connection but SSL wasn't compiled in");
@ -83,7 +83,7 @@ static void ssl_debug(void)
}
}
void net_starttls(ctype_t *client, int numarg, const char **arg)
void net_starttls(nut_ctype_t *client, int numarg, const char **arg)
{
if (client->ssl) {
send_err(client, NUT_ERR_ALREADY_SSL_MODE);
@ -196,7 +196,7 @@ static int ssl_error(SSL *ssl, int ret)
return -1;
}
static int ssl_accept(ctype_t *client)
static int ssl_accept(nut_ctype_t *client)
{
int ret;
@ -218,7 +218,7 @@ static int ssl_accept(ctype_t *client)
return -1;
}
int ssl_read(ctype_t *client, char *buf, size_t buflen)
int ssl_read(nut_ctype_t *client, char *buf, size_t buflen)
{
int ret;
@ -237,7 +237,7 @@ int ssl_read(ctype_t *client, char *buf, size_t buflen)
return ret;
}
int ssl_write(ctype_t *client, const char *buf, size_t buflen)
int ssl_write(nut_ctype_t *client, const char *buf, size_t buflen)
{
int ret;
@ -248,7 +248,7 @@ int ssl_write(ctype_t *client, const char *buf, size_t buflen)
return ret;
}
void ssl_finish(ctype_t *client)
void ssl_finish(nut_ctype_t *client)
{
if (client->ssl) {
SSL_free(client->ssl);