X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhttp.c;h=a327cf32558efba6e925482c119daf7ef99c9b94;hb=d716fe118643f845b127b5a12be8b6a08d735a82;hp=533df30c5561a6c970fcb3c87ee7cfc18bcf594b;hpb=19e8783985686ff7d094da7d843131deea4ced1b;p=pazpar2-moved-to-github.git diff --git a/src/http.c b/src/http.c index 533df30..a327cf3 100644 --- a/src/http.c +++ b/src/http.c @@ -1,5 +1,5 @@ /* - * $Id: http.c,v 1.13 2007-03-27 13:41:23 marc Exp $ + * $Id: http.c,v 1.21 2007-04-02 09:43:08 marc Exp $ */ #include @@ -14,16 +14,18 @@ #include #include #include +#include #if HAVE_CONFIG_H #include #endif #include +#include #include #include -#include +#include #include "cconfig.h" #include "util.h" @@ -37,8 +39,11 @@ static struct http_channel *http_create(void); static void http_destroy(IOCHAN i); extern IOCHAN channel_list; +extern struct parameters global_parameters; +//extern NMEM nmem; -static struct sockaddr_in *proxy_addr = 0; // If this is set, we proxy normal HTTP requests +// If this is set, we proxy normal HTTP requests +static struct sockaddr_in *proxy_addr = 0; static char proxy_url[256] = ""; static char myurl[256] = ""; static struct http_buf *http_buf_freelist = 0; @@ -516,17 +521,27 @@ struct http_header * http_header_append(struct http_channel *ch, const char *name, const char *value) { - struct http_header *hpnew = nmem_malloc(ch->nmem, sizeof *hpnew); + struct http_header *hpnew = 0; + + if (!hp | !ch) + return 0; while (hp && hp->next) hp = hp->next; - hpnew->name = nmem_strdup(ch->nmem, name); - hpnew->value = nmem_strdup(ch->nmem, value); - hpnew->next = 0; - hp->next = hpnew; - hp = hp->next; - return hpnew; + if(name && strlen(name)&& value && strlen(value)){ + hpnew = nmem_malloc(ch->nmem, sizeof *hpnew); + hpnew->name = nmem_strdup(ch->nmem, name); + hpnew->value = nmem_strdup(ch->nmem, value); + + hpnew->next = 0; + hp->next = hpnew; + hp = hp->next; + + return hpnew; + } + + return hp; } @@ -537,8 +552,9 @@ static int http_proxy(struct http_request *rq) struct http_proxy *p = c->proxy; struct http_header *hp; struct http_buf *requestbuf; - //struct conf_server *ser = global_parameters.server; - + char server_via[128] = ""; + char server_port[16] = ""; + struct conf_server *ser = global_parameters.server; if (!p) // This is a new connection. Create a proxy channel { @@ -576,13 +592,13 @@ static int http_proxy(struct http_request *rq) p->first_response = 1; c->proxy = p; // We will add EVENT_OUTPUT below - p->iochan = iochan_create(sock, proxy_io, EVENT_INPUT); + p->iochan = iochan_create(sock, 0, proxy_io, EVENT_INPUT); iochan_setdata(p->iochan, p); p->iochan->next = channel_list; channel_list = p->iochan; } - // Modify Host: header + // Do _not_ modify Host: header, just checking it's existence for (hp = rq->headers; hp; hp = hp->next) if (!strcmp(hp->name, "Host")) break; @@ -591,16 +607,22 @@ static int http_proxy(struct http_request *rq) yaz_log(YLOG_WARN, "Failed to find Host header in proxy"); return -1; } - hp->value = nmem_strdup(c->nmem, proxy_url); - - // Add new header about paraz2 version, host, remote client address, etc. - - hp = rq->headers; - hp = http_header_append(c, hp, PACKAGE_NAME "-version", PACKAGE_VERSION); - //hp = http_header_append(c, hp, PACKAGE_NAME "-server-host", ser->host); - //hp = http_header_append(c, hp, PACKAGE_NAME "-server-port", ser->port); - //hp = http_header_append(c, hp, PACKAGE_NAME "-remote-host", "blabla"); - //hp = http_header_append(c, hp, PACKAGE_NAME "-remote-port", "blabla"); + + // Add new header about paraz2 version, host, remote client address, etc. + { + hp = rq->headers; + hp = http_header_append(c, hp, + "X-Pazpar2-Version", PACKAGE_VERSION); + hp = http_header_append(c, hp, + "X-Pazpar2-Server-Host", ser->host); + sprintf(server_port, "%d", ser->port); + hp = http_header_append(c, hp, + "X-Pazpar2-Server-Port", server_port); + sprintf(server_via, "1.1 %s:%s (%s/%s)", + 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); http_buf_enqueue(&p->oqueue, requestbuf); @@ -736,6 +758,7 @@ static void http_io(IOCHAN i, int event) } } +#ifdef GAGA // If this hostname contains our proxy host as a prefix, replace with myurl static char *sub_hostname(struct http_channel *c, char *buf) { @@ -752,6 +775,7 @@ static char *sub_hostname(struct http_channel *c, char *buf) } return buf; } +#endif // Handles I/O on a client connection to a backend web server (proxy mode) static void proxy_io(IOCHAN pi, int event) @@ -789,6 +813,7 @@ static void proxy_io(IOCHAN pi, int event) htbuf->buf[res] = '\0'; htbuf->offset = 0; htbuf->len = res; +#ifdef GAGA if (pc->first_response) // Check if this is a redirect { int len; @@ -814,6 +839,7 @@ static void proxy_io(IOCHAN pi, int event) } pc->first_response = 0; } +#endif // Write any remaining payload if (htbuf->len - htbuf->offset > 0) http_buf_enqueue(&hc->oqueue, htbuf); @@ -925,7 +951,7 @@ static void http_accept(IOCHAN i, int event) yaz_log(YLOG_FATAL|YLOG_ERRNO, "fcntl2"); yaz_log(YLOG_DEBUG, "New command connection"); - c = iochan_create(s, http_io, EVENT_INPUT | EVENT_EXCEPT); + c = iochan_create(s, &addr, http_io, EVENT_INPUT | EVENT_EXCEPT); ch = http_create(); ch->iochan = c; @@ -946,7 +972,7 @@ void http_init(const char *addr) const char *pp; int port; - yaz_log(YLOG_LOG, "HTTP listener is %s", addr); + yaz_log(YLOG_LOG, "HTTP listener %s", addr); memset(&myaddr, 0, sizeof myaddr); myaddr.sin_family = AF_INET; @@ -964,16 +990,37 @@ void http_init(const char *addr) 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(); } @@ -988,7 +1035,7 @@ void http_init(const char *addr) if (listen(l, SOMAXCONN) < 0) yaz_log(YLOG_FATAL|YLOG_ERRNO, "listen"); - c = iochan_create(l, http_accept, EVENT_INPUT | EVENT_EXCEPT); + c = iochan_create(l, &myaddr, http_accept, EVENT_INPUT | EVENT_EXCEPT); c->next = channel_list; channel_list = c; } @@ -1003,6 +1050,7 @@ void http_set_proxyaddr(char *host, char *base_url) strcpy(proxy_url, host); p = strchr(host, ':'); yaz_log(YLOG_DEBUG, "Proxying for %s", host); + yaz_log(YLOG_LOG, "HTTP backend %s", proxy_url); if (p) { port = atoi(p + 1); *p = '\0';