#include "htparser.h"
+struct tcpport {
+ int fd;
+ int sport;
+};
+
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;
return(fd);
}
-static int listensock6(int port)
+int listensock6(int port)
{
struct sockaddr_in6 name;
int fd;
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) {
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);
}
{
vavar(int, fd);
vavar(struct sockaddr_storage, name);
+ vavar(struct tcpport *, stcp);
FILE *in;
- struct conn *conn;
- struct tcpconn *tcp;
+ struct conn conn;
+ struct tcpconn tcp;
+ memset(&conn, 0, sizeof(conn));
+ memset(&tcp, 0, sizeof(tcp));
in = mtstdopen(fd, 1, 60, "r+");
- omalloc(conn);
- conn->pdata = omalloc(tcp);
- conn->initreq = initreq;
- tcp->name = name;
-
- serve(in, conn);
-
- free(tcp);
- free(conn);
+ conn.pdata = &tcp;
+ conn.initreq = initreq;
+ tcp.fd = fd;
+ tcp.name = name;
+ tcp.port = stcp;
+ serve(in, &conn);
}
static void listenloop(struct muth *muth, va_list args)
{
- vavar(int, ss);
+ vavar(struct tcpport *, tcp);
int ns;
struct sockaddr_storage name;
socklen_t namelen;
while(1) {
namelen = sizeof(name);
- block(ss, EV_READ, 0);
- ns = accept(ss, (struct sockaddr *)&name, &namelen);
+ block(tcp->fd, EV_READ, 0);
+ ns = accept(tcp->fd, (struct sockaddr *)&name, &namelen);
if(ns < 0) {
flog(LOG_ERR, "accept: %s", strerror(errno));
goto out;
}
- mustart(servetcp, ns, name);
+ mustart(servetcp, ns, name, tcp);
}
out:
- close(ss);
+ close(tcp->fd);
+ free(tcp);
}
void handleplain(int argc, char **argp, char **argv)
{
int port, fd;
int i;
+ struct tcpport *tcp;
port = 80;
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]);
flog(LOG_ERR, "could not listen on IPv6 (port %i): %s", port, strerror(errno));
exit(1);
}
- mustart(listenloop, fd);
+ omalloc(tcp);
+ tcp->fd = fd;
+ tcp->sport = port;
+ mustart(listenloop, tcp);
if((fd = listensock4(port)) < 0) {
if(errno != EADDRINUSE) {
flog(LOG_ERR, "could not listen on IPv4 (port %i): %s", port, strerror(errno));
exit(1);
}
} else {
- mustart(listenloop, fd);
+ omalloc(tcp);
+ tcp->fd = fd;
+ tcp->sport = port;
+ mustart(listenloop, tcp);
}
}