X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fplaintcp.c;h=cf46b29fd982925d3978d7bf90b3ab514ead8b05;hb=7595e3a4d77b7e498fa84e27d93cc9f680076561;hp=d1d596962b61182298047b4e9c12eb99df3c9257;hpb=46e6630278db9fb3b7aa7150d28fcd90993a5cc9;p=ashd.git

diff --git a/src/plaintcp.c b/src/plaintcp.c
index d1d5969..cf46b29 100644
--- a/src/plaintcp.c
+++ b/src/plaintcp.c
@@ -44,9 +44,10 @@ struct tcpport {
 struct tcpconn {
     struct sockaddr_storage name;
     struct tcpport *port;
+    int fd;
 };
 
-static int listensock4(int port)
+int listensock4(int port)
 {
     struct sockaddr_in name;
     int fd;
@@ -70,7 +71,7 @@ static int listensock4(int port)
     return(fd);
 }
 
-static int listensock6(int port)
+int listensock6(int port)
 {
     struct sockaddr_in6 name;
     int fd;
@@ -94,18 +95,48 @@ static int listensock6(int port)
     return(fd);
 }
 
+char *formathaddress(struct sockaddr *name, socklen_t namelen)
+{
+    static char buf[128];
+    struct sockaddr_in *v4;
+    struct sockaddr_in6 *v6;
+
+    switch(name->sa_family) {
+    case AF_INET:
+	v4 = (struct sockaddr_in *)name;
+	if(!inet_ntop(AF_INET, &v4->sin_addr, buf, sizeof(buf)))
+	    return(NULL);
+	return(buf);
+    case AF_INET6:
+	v6 = (struct sockaddr_in6 *)name;
+	if(IN6_IS_ADDR_V4MAPPED(&v6->sin6_addr)) {
+	    if(!inet_ntop(AF_INET, ((char *)&v6->sin6_addr) + 12, buf, sizeof(buf)))
+		return(NULL);
+	} else {
+	    if(!inet_ntop(AF_INET6, &v6->sin6_addr, buf, sizeof(buf)))
+		return(NULL);
+	}
+	return(buf);
+    default:
+	errno = EPFNOSUPPORT;
+	return(NULL);
+    }
+}
+
 static int initreq(struct conn *conn, struct hthead *req)
 {
     struct tcpconn *tcp = conn->pdata;
-    char nmbuf[256];
+    struct sockaddr_storage sa;
+    socklen_t salen;
     
-    if(tcp->name.ss_family == AF_INET) {
-	headappheader(req, "X-Ash-Address", inet_ntop(AF_INET, &((struct sockaddr_in *)&tcp->name)->sin_addr, nmbuf, sizeof(nmbuf)));
+    headappheader(req, "X-Ash-Address", formathaddress((struct sockaddr *)&tcp->name, sizeof(sa)));
+    if(tcp->name.ss_family == AF_INET)
 	headappheader(req, "X-Ash-Port", sprintf3("%i", ntohs(((struct sockaddr_in *)&tcp->name)->sin_port)));
-    } else if(tcp->name.ss_family == AF_INET6) {
-	headappheader(req, "X-Ash-Address", inet_ntop(AF_INET6, &((struct sockaddr_in6 *)&tcp->name)->sin6_addr, nmbuf, sizeof(nmbuf)));
+    else if(tcp->name.ss_family == AF_INET6)
 	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))
+	headappheader(req, "X-Ash-Server-Address", formathaddress((struct sockaddr *)&sa, sizeof(sa)));
     headappheader(req, "X-Ash-Server-Port", sprintf3("%i", tcp->port->sport));
     headappheader(req, "X-Ash-Protocol", "http");
     return(0);
@@ -125,6 +156,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);
@@ -163,7 +195,8 @@ void handleplain(int argc, char **argp, char **argv)
     for(i = 0; i < argc; i++) {
 	if(!strcmp(argp[i], "help")) {
 	    printf("plain handler parameters:\n");
-	    printf("\tport=TCP-PORT (default is 80)\n");
+	    printf("\tport=TCP-PORT   [80]\n");
+	    printf("\t\tThe TCP port to listen on.\n");
 	    exit(0);
 	} else if(!strcmp(argp[i], "port")) {
 	    port = atoi(argv[i]);
@@ -186,6 +219,9 @@ void handleplain(int argc, char **argp, char **argv)
 	    exit(1);
 	}
     } else {
-	mustart(listenloop, fd, port);
+	omalloc(tcp);
+	tcp->fd = fd;
+	tcp->sport = port;
+	mustart(listenloop, tcp);
     }
 }