-/*
- * $Id: http.c,v 1.21 2007-04-02 09:43:08 marc Exp $
+/* $Id: http.c,v 1.34 2007-06-15 19:35:17 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 <stdio.h>
#endif
#include <netinet/in.h>
+#include <arpa/inet.h>
#include <netdb.h>
#include <yaz/yaz-util.h>
#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;
-//extern NMEM nmem;
-
// If this is set, we proxy normal HTTP requests
static struct sockaddr_in *proxy_addr = 0;
static char proxy_url[256] = "";
static struct http_buf *http_buf_freelist = 0;
static struct http_channel *http_channel_freelist = 0;
+struct http_channel_observer_s {
+ void *data;
+ void (*destroy)(void *data, struct http_channel *chan);
+ struct http_channel_observer_s *next;
+ struct http_channel *chan;
+};
+
static struct http_buf *http_buf_create()
{
struct http_buf *r;
return r;
}
-struct http_request *http_parse_request(struct http_channel *c, struct http_buf **queue,
- int len)
+struct http_request *http_parse_request(struct http_channel *c,
+ struct http_buf **queue,
+ int len)
{
struct http_request *r = nmem_malloc(c->nmem, sizeof(*r));
char *p, *p2;
wrbuf_printf(c->wrbuf, "Content-length: %d\r\n", r->payload ?
(int) strlen(r->payload) : 0);
wrbuf_printf(c->wrbuf, "Content-type: text/xml\r\n");
+ if (1)
+ {
+ xmlDoc *doc = xmlParseMemory(r->payload, strlen(r->payload));
+ if (doc)
+ {
+ xmlFreeDoc(doc);
+ }
+ else
+ {
+ yaz_log(YLOG_WARN, "Sending non-wellformed "
+ "response (bug #1162");
+ yaz_log(YLOG_WARN, "payload: %s", r->payload);
+ }
+ }
}
wrbuf_puts(c->wrbuf, "\r\n");
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
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);
- }
-
+ 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);
http_destroy(i);
return;
}
- if (res > 0)
- {
- htbuf->buf[res] = '\0';
- htbuf->len = res;
- http_buf_enqueue(&hc->iqueue, htbuf);
- }
+ htbuf->buf[res] = '\0';
+ htbuf->len = res;
+ http_buf_enqueue(&hc->iqueue, htbuf);
if (hc->state == Http_Busy)
return;
}
}
+static void http_fire_observers(struct http_channel *c);
+static void http_destroy_observers(struct http_channel *c);
+
// Cleanup channel
static void http_destroy(IOCHAN i)
{
http_buf_destroy_queue(s->proxy->oqueue);
xfree(s->proxy);
}
+ http_buf_destroy_queue(s->iqueue);
+ http_buf_destroy_queue(s->oqueue);
+ http_fire_observers(s);
+ http_destroy_observers(s);
s->next = http_channel_freelist;
http_channel_freelist = s;
close(iochan_getfd(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;
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);
+ r->observers = 0;
return r;
}
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 */
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);
}
}
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();
}
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)
proxy_addr->sin_port = htons(port);
}
+static void http_fire_observers(struct http_channel *c)
+{
+ http_channel_observer_t p = c->observers;
+ while (p)
+ {
+ p->destroy(p->data, c);
+ p = p->next;
+ }
+}
+
+static void http_destroy_observers(struct http_channel *c)
+{
+ while (c->observers)
+ {
+ http_channel_observer_t obs = c->observers;
+ c->observers = obs->next;
+ xfree(obs);
+ }
+}
+
+http_channel_observer_t http_add_observer(struct http_channel *c, void *data,
+ http_channel_destroy_t des)
+{
+ http_channel_observer_t obs = xmalloc(sizeof(*obs));
+ obs->chan = c;
+ obs->data = data;
+ obs->destroy= des;
+ obs->next = c->observers;
+ c->observers = obs;
+ return obs;
+}
+
+void http_remove_observer(http_channel_observer_t obs)
+{
+ struct http_channel *c = obs->chan;
+ http_channel_observer_t found, *p = &c->observers;
+ while (*p != obs)
+ p = &(*p)->next;
+ found = *p;
+ assert(found);
+ *p = (*p)->next;
+ xfree(found);
+}
+
+struct http_channel *http_channel_observer_chan(http_channel_observer_t obs)
+{
+ return obs->chan;
+}
+
/*
* Local variables:
* c-basic-offset: 4