-/* $Id: http.c,v 1.26 2007-04-15 00:35:57 quinn Exp $
+/* $Id: http.c,v 1.37 2007-09-19 09:49:22 adam Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
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] = "";
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;
char *buf = tmp;
if (len > 4096)
+ {
+ yaz_log(YLOG_WARN, "http_parse_request len > 4096 (%d)", len);
return 0;
+ }
if (http_buf_read(queue, buf, len) < len)
+ {
+ yaz_log(YLOG_WARN, "http_buf_read < len 4096 (%d)", len);
return 0;
-
+ }
r->search = "";
r->channel = c;
r->arguments = 0;
a = nmem_malloc(c->nmem, sizeof(struct http_argument));
*(equal++) = '\0';
a->name = nmem_strdup(c->nmem, p2);
+ urldecode(a->name, a->name);
urldecode(equal, equal);
a->value = nmem_strdup(c->nmem, equal);
a->next = r->arguments;
{
buf += 5;
if (!(p = strstr(buf, "\r\n")))
+ {
+ yaz_log(YLOG_WARN, "Did not see \\r\\n (1)");
return 0;
+ }
*(p++) = '\0';
p++;
strcpy(r->http_version, buf);
while (*buf)
{
if (!(p = strstr(buf, "\r\n")))
+ {
+ yaz_log(YLOG_WARN, "Did not see \\r\\n (2)");
return 0;
+ }
if (p == buf)
break;
else
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");
// We will add EVENT_OUTPUT below
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
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));
exit(1);
}
strcpy(r->addr, addr);
+ r->observers = 0;
return r;
}
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);
}
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
{
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, http_accept, EVENT_INPUT | EVENT_EXCEPT);
- c->next = channel_list;
- channel_list = c;
+ 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