From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Mon, 6 Sep 2010 01:48:34 +0000 (+0200)
Subject: htparser: Pass the server's local IP address.
X-Git-Tag: 0.1~17
X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=commitdiff_plain;h=6b84641acd8e4ed45817d1c8ab5ff520e8ba2af1

htparser: Pass the server's local IP address.
---

diff --git a/src/plaintcp.c b/src/plaintcp.c
index 00b6f3c..9bfb9bc 100644
--- a/src/plaintcp.c
+++ b/src/plaintcp.c
@@ -44,6 +44,7 @@ struct tcpport {
 struct tcpconn {
     struct sockaddr_storage name;
     struct tcpport *port;
+    int fd;
 };
 
 int listensock4(int port)
@@ -97,6 +98,8 @@ int listensock6(int port)
 static int initreq(struct conn *conn, struct hthead *req)
 {
     struct tcpconn *tcp = conn->pdata;
+    struct sockaddr_storage sa;
+    socklen_t salen;
     char nmbuf[256];
     
     if(tcp->name.ss_family == AF_INET) {
@@ -106,6 +109,13 @@ static int initreq(struct conn *conn, struct hthead *req)
 	headappheader(req, "X-Ash-Address", inet_ntop(AF_INET6, &((struct sockaddr_in6 *)&tcp->name)->sin6_addr, nmbuf, sizeof(nmbuf)));
 	headappheader(req, "X-Ash-Port", sprintf3("%i", ntohs(((struct sockaddr_in6 *)&tcp->name)->sin6_port)));
     }
+    salen = sizeof(sa);
+    if(!getsockname(tcp->fd, (struct sockaddr *)&sa, &salen)) {
+	if(sa.ss_family == AF_INET)
+	    headappheader(req, "X-Ash-Server-Address", inet_ntop(AF_INET, &((struct sockaddr_in *)&sa)->sin_addr, nmbuf, sizeof(nmbuf)));
+	else if(sa.ss_family == AF_INET6)
+	    headappheader(req, "X-Ash-Server-Address", inet_ntop(AF_INET6, &((struct sockaddr_in6 *)&sa)->sin6_addr, nmbuf, sizeof(nmbuf)));
+    }
     headappheader(req, "X-Ash-Server-Port", sprintf3("%i", tcp->port->sport));
     headappheader(req, "X-Ash-Protocol", "http");
     return(0);
@@ -125,6 +135,7 @@ void servetcp(struct muth *muth, va_list args)
     in = mtstdopen(fd, 1, 60, "r+");
     conn.pdata = &tcp;
     conn.initreq = initreq;
+    tcp.fd = fd;
     tcp.name = name;
     tcp.port = stcp;
     serve(in, &conn);
diff --git a/src/ssl-gnutls.c b/src/ssl-gnutls.c
index bad5f4a..992818a 100644
--- a/src/ssl-gnutls.c
+++ b/src/ssl-gnutls.c
@@ -137,6 +137,8 @@ static cookie_io_functions_t iofuns = {
 static int initreq(struct conn *conn, struct hthead *req)
 {
     struct sslconn *ssl = conn->pdata;
+    struct sockaddr_storage sa;
+    socklen_t salen;
     char nmbuf[256];
     
     if(ssl->name.ss_family == AF_INET) {
@@ -146,6 +148,13 @@ static int initreq(struct conn *conn, struct hthead *req)
 	headappheader(req, "X-Ash-Address", inet_ntop(AF_INET6, &((struct sockaddr_in6 *)&ssl->name)->sin6_addr, nmbuf, sizeof(nmbuf)));
 	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)) {
+	if(sa.ss_family == AF_INET)
+	    headappheader(req, "X-Ash-Server-Address", inet_ntop(AF_INET, &((struct sockaddr_in *)&sa)->sin_addr, nmbuf, sizeof(nmbuf)));
+	else if(sa.ss_family == AF_INET6)
+	    headappheader(req, "X-Ash-Server-Address", inet_ntop(AF_INET6, &((struct sockaddr_in6 *)&sa)->sin6_addr, nmbuf, sizeof(nmbuf)));
+    }
     headappheader(req, "X-Ash-Server-Port", sprintf3("%i", ssl->port->sport));
     headappheader(req, "X-Ash-Protocol", "https");
     return(0);