Dolda2000 GitWeb
/
ashd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
htparser: Fixed up duplex timeouts.
[ashd.git]
/
src
/
ssl-gnutls.c
diff --git
a/src/ssl-gnutls.c
b/src/ssl-gnutls.c
index
459556e
..
7aa1df0
100644
(file)
--- a/
src/ssl-gnutls.c
+++ b/
src/ssl-gnutls.c
@@
-34,6
+34,7
@@
#include <mtio.h>
#include <req.h>
#include <log.h>
#include <mtio.h>
#include <req.h>
#include <log.h>
+#include <bufio.h>
#include "htparser.h"
#include "htparser.h"
@@
-188,7
+189,7
@@
static int tlsblock(int fd, gnutls_session_t sess, time_t to)
return(block(fd, EV_READ, to));
}
return(block(fd, EV_READ, to));
}
-static ssize_t sslread(void *cookie,
char
*buf, size_t len)
+static ssize_t sslread(void *cookie,
void
*buf, size_t len)
{
struct sslconn *ssl = cookie;
ssize_t xf;
{
struct sslconn *ssl = cookie;
ssize_t xf;
@@
-217,7
+218,7
@@
static ssize_t sslread(void *cookie, char *buf, size_t len)
return(xf);
}
return(xf);
}
-static ssize_t sslwrite(void *cookie, const
char
*buf, size_t len)
+static ssize_t sslwrite(void *cookie, const
void
*buf, size_t len)
{
struct sslconn *ssl = cookie;
int ret;
{
struct sslconn *ssl = cookie;
int ret;
@@
-255,7
+256,7
@@
static int sslclose(void *cookie)
return(0);
}
return(0);
}
-static
cookie_io_functions_t
iofuns = {
+static
struct bufioops
iofuns = {
.read = sslread,
.write = sslwrite,
.close = sslclose,
.read = sslread,
.write = sslwrite,
.close = sslclose,
@@
-266,16
+267,12
@@
static int initreq(struct conn *conn, struct hthead *req)
struct sslconn *ssl = conn->pdata;
struct sockaddr_storage sa;
socklen_t salen;
struct sslconn *ssl = conn->pdata;
struct sockaddr_storage sa;
socklen_t salen;
- char nmbuf[256];
headappheader(req, "X-Ash-Address", formathaddress((struct sockaddr *)&ssl->name, sizeof(sa)));
headappheader(req, "X-Ash-Address", formathaddress((struct sockaddr *)&ssl->name, sizeof(sa)));
- if(ssl->name.ss_family == AF_INET) {
- headappheader(req, "X-Ash-Address", inet_ntop(AF_INET, &((struct sockaddr_in *)&ssl->name)->sin_addr, nmbuf, sizeof(nmbuf)));
+ if(ssl->name.ss_family == AF_INET)
headappheader(req, "X-Ash-Port", sprintf3("%i", ntohs(((struct sockaddr_in *)&ssl->name)->sin_port)));
headappheader(req, "X-Ash-Port", sprintf3("%i", ntohs(((struct sockaddr_in *)&ssl->name)->sin_port)));
- } else if(ssl->name.ss_family == AF_INET6) {
- headappheader(req, "X-Ash-Address", inet_ntop(AF_INET6, &((struct sockaddr_in6 *)&ssl->name)->sin6_addr, nmbuf, sizeof(nmbuf)));
+ else if(ssl->name.ss_family == AF_INET6)
headappheader(req, "X-Ash-Port", sprintf3("%i", ntohs(((struct sockaddr_in6 *)&ssl->name)->sin6_port)));
headappheader(req, "X-Ash-Port", sprintf3("%i", ntohs(((struct sockaddr_in6 *)&ssl->name)->sin6_port)));
- }
salen = sizeof(sa);
if(!getsockname(ssl->fd, (struct sockaddr *)&sa, &salen))
headappheader(req, "X-Ash-Server-Address", formathaddress((struct sockaddr *)&sa, sizeof(sa)));
salen = sizeof(sa);
if(!getsockname(ssl->fd, (struct sockaddr *)&sa, &salen))
headappheader(req, "X-Ash-Server-Address", formathaddress((struct sockaddr *)&sa, sizeof(sa)));
@@
-293,7
+290,6
@@
static void servessl(struct muth *muth, va_list args)
struct sslconn ssl;
gnutls_session_t sess;
int ret;
struct sslconn ssl;
gnutls_session_t sess;
int ret;
- FILE *in;
int setcreds(gnutls_session_t sess)
{
int setcreds(gnutls_session_t sess)
{
@@
-348,8
+344,7
@@
static void servessl(struct muth *muth, va_list args)
ssl.name = name;
ssl.sess = sess;
bufinit(ssl.in);
ssl.name = name;
ssl.sess = sess;
bufinit(ssl.in);
- in = fopencookie(&ssl, "r+", iofuns);
- serve(in, &conn);
+ serve(bioopen(&ssl, &iofuns), fd, &conn);
out:
gnutls_deinit(sess);
out:
gnutls_deinit(sess);
@@
-375,6
+370,8
@@
static void listenloop(struct muth *muth, va_list args)
if(ns < 0) {
if(errno == EAGAIN)
break;
if(ns < 0) {
if(errno == EAGAIN)
break;
+ if(errno == ECONNABORTED)
+ continue;
flog(LOG_ERR, "accept: %s", strerror(errno));
goto out;
}
flog(LOG_ERR, "accept: %s", strerror(errno));
goto out;
}