X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp.c;h=e46d2ae3442cec2ac05607290dcb08b283187bd2;hb=1075dbdd4d718fa6e8a2652e9f59d01fc150e0dc;hp=61d3fd9ec4279235c2d1ea6e91e7fccecb84cde5;hpb=c7b8fb38d1cd3568301aabac00c5627bd6f510ca;p=pazpar2-moved-to-github.git diff --git a/src/http.c b/src/http.c index 61d3fd9..e46d2ae 100644 --- a/src/http.c +++ b/src/http.c @@ -1,5 +1,22 @@ -/* - * $Id: http.c,v 1.19 2007-03-31 20:06:18 marc Exp $ +/* $Id: http.c,v 1.31 2007-05-15 08:51:49 adam Exp $ + Copyright (c) 2006-2007, Index Data. + +This file is part of Pazpar2. + +Pazpar2 is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Pazpar2; see the file LICENSE. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. */ #include @@ -21,10 +38,12 @@ #endif #include +#include +#include #include #include -#include +#include #include "cconfig.h" #include "util.h" @@ -34,12 +53,9 @@ #include "http_command.h" static void proxy_io(IOCHAN i, int event); -static struct http_channel *http_create(void); +static struct http_channel *http_create(const char *addr); static void http_destroy(IOCHAN i); -extern IOCHAN channel_list; -extern struct parameters global_parameters; - // If this is set, we proxy normal HTTP requests static struct sockaddr_in *proxy_addr = 0; static char proxy_url[256] = ""; @@ -590,10 +606,9 @@ 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, 0, proxy_io, EVENT_INPUT); + p->iochan = iochan_create(sock, proxy_io, EVENT_INPUT); iochan_setdata(p->iochan, p); - p->iochan->next = channel_list; - channel_list = p->iochan; + pazpar2_add_channel(p->iochan); } // Do _not_ modify Host: header, just checking it's existence @@ -610,22 +625,18 @@ static int http_proxy(struct http_request *rq) { 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->addr); + } + requestbuf = http_serialize_request(rq); http_buf_enqueue(&p->oqueue, requestbuf); iochan_setflag(p->iochan, EVENT_OUTPUT); @@ -904,7 +915,7 @@ static void http_destroy(IOCHAN i) iochan_destroy(i); } -static struct http_channel *http_create(void) +static struct http_channel *http_create(const char *addr) { struct http_channel *r = http_channel_freelist; @@ -926,6 +937,12 @@ static struct http_channel *http_create(void) r->state = Http_Idle; r->request = 0; r->response = 0; + if (!addr) + { + yaz_log(YLOG_WARN, "Invalid HTTP forward address"); + exit(1); + } + strcpy(r->addr, addr); return r; } @@ -953,14 +970,13 @@ 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, &addr, http_io, EVENT_INPUT | EVENT_EXCEPT); - - ch = http_create(); + c = iochan_create(s, http_io, EVENT_INPUT | EVENT_EXCEPT); + + ch = http_create(inet_ntoa(addr.sin_addr)); ch->iochan = c; iochan_setdata(c, ch); - c->next = channel_list; - channel_list = c; + pazpar2_add_channel(c); } /* Create a http-channel listener, syntax [host:]port */ @@ -987,19 +1003,25 @@ void http_init(const char *addr) strncpy(hostname, addr, len); hostname[len] = '\0'; - if (!(he = gethostbyname(hostname))) - { + if (!(he = gethostbyname(hostname))){ 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 { port = atoi(addr); myaddr.sin_addr.s_addr = INADDR_ANY; } + myaddr.sin_port = htons(port); if (!(p = getprotobyname("tcp"))) { @@ -1012,13 +1034,18 @@ void http_init(const char *addr) abort(); if (bind(l, (struct sockaddr *) &myaddr, sizeof myaddr) < 0) + { yaz_log(YLOG_FATAL|YLOG_ERRNO, "bind"); + exit(1); + } if (listen(l, SOMAXCONN) < 0) + { yaz_log(YLOG_FATAL|YLOG_ERRNO, "listen"); + exit(1); + } - c = iochan_create(l, &myaddr, http_accept, EVENT_INPUT | EVENT_EXCEPT); - c->next = channel_list; - channel_list = c; + c = iochan_create(l, http_accept, EVENT_INPUT | EVENT_EXCEPT); + pazpar2_add_channel(c); } void http_set_proxyaddr(char *host, char *base_url)