-/* $Id: http.c,v 1.33 2007-06-04 14:44:22 adam Exp $
+/* $Id: http.c,v 1.36 2007-07-03 10:10:14 adam Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
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;
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
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;
}
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