X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;ds=sidebyside;f=src%2Fhttp.c;h=9b9d4380f8144392dab8058d9ed79359bfed2d5c;hb=e0aefcd72918bb69b11a6a5c363ff37469fbb5b4;hp=de5657fba2a314ec305dae1baccec31fbbeebf00;hpb=eea404d31ae1550d4081a62623cd5289cb8ef29d;p=pazpar2-moved-to-github.git diff --git a/src/http.c b/src/http.c index de5657f..9b9d438 100644 --- a/src/http.c +++ b/src/http.c @@ -1,4 +1,4 @@ -/* $Id: http.c,v 1.24 2007-04-11 11:08:24 marc Exp $ +/* $Id: http.c,v 1.35 2007-06-26 13:01:07 adam Exp $ Copyright (c) 2006-2007, Index Data. This file is part of Pazpar2. @@ -56,10 +56,6 @@ static void proxy_io(IOCHAN i, int event); 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] = ""; @@ -67,6 +63,13 @@ static char myurl[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; @@ -354,8 +357,9 @@ struct http_response *http_parse_response_buf(struct http_channel *c, const char 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; @@ -417,6 +421,7 @@ struct http_request *http_parse_request(struct http_channel *c, struct http_buf 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; @@ -486,6 +491,20 @@ static struct http_buf *http_serialize_response(struct http_channel *c, 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"); @@ -612,8 +631,7 @@ static int http_proxy(struct http_request *rq) // 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 @@ -691,12 +709,9 @@ static void http_io(IOCHAN i, int event) 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; @@ -899,6 +914,9 @@ static void proxy_io(IOCHAN pi, int event) } } +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) { @@ -914,6 +932,10 @@ 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)); @@ -947,7 +969,8 @@ static struct http_channel *http_create(const char *addr) yaz_log(YLOG_WARN, "Invalid HTTP forward address"); exit(1); } - r->addr = nmem_strdup(r->nmem, addr); + strcpy(r->addr, addr); + r->observers = 0; return r; } @@ -981,8 +1004,7 @@ static void http_accept(IOCHAN i, int event) 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 */ @@ -1009,8 +1031,7 @@ 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); } @@ -1041,13 +1062,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, 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) @@ -1078,6 +1104,55 @@ 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