/*
- * $Id: http.c,v 1.19 2007-03-31 20:06:18 marc Exp $
+ * $Id: http.c,v 1.21 2007-04-02 09:43:08 marc Exp $
*/
#include <stdio.h>
#endif
#include <netinet/in.h>
+#include <netdb.h>
#include <yaz/yaz-util.h>
#include <yaz/comstack.h>
-#include <netdb.h>
+#include <yaz/nmem.h>
#include "cconfig.h"
#include "util.h"
extern IOCHAN channel_list;
extern struct parameters global_parameters;
+//extern NMEM nmem;
// If this is set, we proxy normal HTTP requests
static struct sockaddr_in *proxy_addr = 0;
{
hp = rq->headers;
hp = http_header_append(c, hp,
- PACKAGE_NAME "-version", PACKAGE_VERSION);
+ "X-Pazpar2-Version", PACKAGE_VERSION);
hp = http_header_append(c, hp,
- PACKAGE_NAME "-server-host", ser->myurl);
+ "X-Pazpar2-Server-Host", ser->host);
sprintf(server_port, "%d", ser->port);
hp = http_header_append(c, hp,
- PACKAGE_NAME "-server-port", server_port);
+ "X-Pazpar2-Server-Port", server_port);
sprintf(server_via, "1.1 %s:%s (%s/%s)",
- ser->myurl, server_port, PACKAGE_NAME, PACKAGE_VERSION);
- hp = http_header_append(c, hp,
- "Via" , server_via);
- //hp = http_header_append(c, hp,"Client-ip",
- // c->iochan->addr_str);
- hp = http_header_append(c, hp,"X-Forwarded-For",
- c->iochan->addr_str);
+ ser->host, server_port, PACKAGE_NAME, PACKAGE_VERSION);
+ hp = http_header_append(c, hp, "Via" , server_via);
+ hp = http_header_append(c, hp,"X-Forwarded-For", c->iochan->addr_str);
}
requestbuf = http_serialize_request(rq);
yaz_log(YLOG_FATAL, "Unable to resolve '%s'", hostname);
exit(1);
}
+
memcpy(&myaddr.sin_addr.s_addr, he->h_addr_list[0], he->h_length);
port = atoi(pp + 1);
+
+ yaz_log(YLOG_LOG, "HTTP address %s:%d",
+ "" == he->h_addr_list[0] ? he->h_addr_list[0] : "127.0.0.1" ,
+ port);
+
}
else
{
+ //size_t len = 128;
+ //char h[len];
port = atoi(addr);
myaddr.sin_addr.s_addr = INADDR_ANY;
+
+#if 0
+ // get hostname from system - after deciding to bind to any
+ // IP address this box might have.
+ if (0 == gethostname(h, len)){
+ h[len - 1] = '\0';
+ global_parameters.server->host = nmem_strdup(nmem, h);
+ } else
+ yaz_log(YLOG_WARN, "Could not get host name");
+#endif
}
+
+
myaddr.sin_port = htons(port);
+
if (!(p = getprotobyname("tcp"))) {
abort();
}