/* This file is part of Pazpar2.
- Copyright (C) 2006-2010 Index Data
+ Copyright (C) 2006-2011 Index Data
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
#include <config.h>
#endif
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
#include <stdio.h>
#ifdef WIN32
#include <winsock.h>
#include <yaz/nmem.h>
#include <yaz/mutex.h>
+#include "ppmutex.h"
#include "session.h"
#include "http.h"
struct http_server
{
- struct http_buf *http_buf_freelist;
- struct http_channel *http_channel_freelist;
YAZ_MUTEX mutex;
int listener_socket;
int ref_count;
http_sessions_t http_sessions;
struct sockaddr_in *proxy_addr;
+ FILE *record_file;
};
struct http_channel_observer_s {
static struct http_buf *http_buf_create(http_server_t hs)
{
- struct http_buf *r = 0;
-
- yaz_mutex_enter(hs->mutex);
- if (hs->http_buf_freelist)
- {
- r = hs->http_buf_freelist;
- hs->http_buf_freelist = hs->http_buf_freelist->next;
- }
- yaz_mutex_leave(hs->mutex);
- if (!r)
- r = xmalloc(sizeof(struct http_buf));
+ struct http_buf *r = xmalloc(sizeof(*r));
r->offset = 0;
r->len = 0;
r->next = 0;
static void http_buf_destroy(http_server_t hs, struct http_buf *b)
{
- yaz_mutex_enter(hs->mutex);
- b->next = hs->http_buf_freelist;
- hs->http_buf_freelist = b;
- yaz_mutex_leave(hs->mutex);
+ xfree(b);
}
static void http_buf_destroy_queue(http_server_t hs, struct http_buf *b)
p->first_response = 1;
c->proxy = p;
// We will add EVENT_OUTPUT below
- p->iochan = iochan_create(sock, proxy_io, EVENT_INPUT);
+ p->iochan = iochan_create(sock, proxy_io, EVENT_INPUT, "http_proxy");
iochan_setdata(p->iochan, p);
iochan_add(ser->iochan_man, p->iochan);
static void http_io(IOCHAN i, int event)
{
struct http_channel *hc = iochan_getdata(i);
-
- switch (event)
+ while (event)
{
- int res, reqlen;
- struct http_buf *htbuf;
-
- case EVENT_INPUT:
+ if (event == EVENT_INPUT)
+ {
+ int res, reqlen;
+ struct http_buf *htbuf;
+
htbuf = http_buf_create(hc->http_server);
res = recv(iochan_getfd(i), htbuf->buf, HTTP_BUF_SIZE -1, 0);
if (res == -1 && errno == EAGAIN)
}
if (res <= 0)
{
+#if HAVE_SYS_TIME_H
+ if (hc->http_server->record_file)
+ {
+ struct timeval tv;
+ gettimeofday(&tv, 0);
+ fprintf(hc->http_server->record_file, "%lld %lld %lld 0\n",
+ (long long) tv.tv_sec, (long long) tv.tv_usec,
+ (long long) iochan_getfd(i));
+ }
+#endif
http_buf_destroy(hc->http_server, htbuf);
+ fflush(hc->http_server->record_file);
http_channel_destroy(i);
return;
}
return;
// we have a complete HTTP request
nmem_reset(hc->nmem);
+#if HAVE_SYS_TIME_H
+ if (hc->http_server->record_file)
+ {
+ struct timeval tv;
+ int sz = 0;
+ struct http_buf *hb;
+ for (hb = hc->iqueue; hb; hb = hb->next)
+ sz += hb->len;
+ gettimeofday(&tv, 0);
+ fprintf(hc->http_server->record_file, "%lld %lld %lld %d\n",
+ (long long) tv.tv_sec, (long long) tv.tv_usec,
+ (long long) iochan_getfd(i), sz);
+ for (hb = hc->iqueue; hb; hb = hb->next)
+ fwrite(hb->buf, 1, hb->len, hc->http_server->record_file);
+ }
+ #endif
if (!(hc->request = http_parse_request(hc, &hc->iqueue, reqlen)))
{
yaz_log(YLOG_WARN, "Failed to parse request");
http_command(hc);
}
}
- break;
- case EVENT_OUTPUT:
+ }
+ else if (event == EVENT_OUTPUT)
+ {
+ event = 0;
if (hc->oqueue)
{
struct http_buf *wb = hc->oqueue;
- res = send(iochan_getfd(hc->iochan), wb->buf + wb->offset, wb->len, 0);
+ int res;
+ res = send(iochan_getfd(hc->iochan),
+ wb->buf + wb->offset, wb->len, 0);
if (res <= 0)
{
yaz_log(YLOG_WARN|YLOG_ERRNO, "write");
wb->len -= res;
wb->offset += res;
}
- if (!hc->oqueue) {
+ if (!hc->oqueue)
+ {
if (!hc->keep_alive)
{
http_channel_destroy(i);
{
iochan_clearflag(i, EVENT_OUTPUT);
if (hc->iqueue)
- iochan_setevent(hc->iochan, EVENT_INPUT);
+ event = EVENT_INPUT;
}
}
}
-
if (!hc->oqueue && hc->proxy && !hc->proxy->iochan)
http_channel_destroy(i); // Server closed; we're done
- break;
- default:
+ }
+ else
+ {
yaz_log(YLOG_WARN, "Unexpected event on connection");
http_channel_destroy(i);
+ event = 0;
+ }
}
}
http_server = s->http_server; /* save it for destroy (decref) */
- yaz_mutex_enter(s->http_server->mutex);
- s->next = s->http_server->http_channel_freelist;
- s->http_server->http_channel_freelist = s;
- yaz_mutex_leave(s->http_server->mutex);
-
http_server_destroy(http_server);
#ifdef WIN32
close(iochan_getfd(i));
#endif
iochan_destroy(i);
+ nmem_destroy(s->nmem);
+ wrbuf_destroy(s->wrbuf);
+ xfree(s);
}
static struct http_channel *http_channel_create(http_server_t hs,
{
struct http_channel *r;
- yaz_mutex_enter(hs->mutex);
- r = hs->http_channel_freelist;
- if (r)
- hs->http_channel_freelist = r->next;
- yaz_mutex_leave(hs->mutex);
+ r = xmalloc(sizeof(struct http_channel));
+ r->nmem = nmem_create();
+ r->wrbuf = wrbuf_alloc();
- if (r)
- {
- nmem_reset(r->nmem);
- wrbuf_rewind(r->wrbuf);
- }
- else
- {
- r = xmalloc(sizeof(struct http_channel));
- r->nmem = nmem_create();
- r->wrbuf = wrbuf_alloc();
- }
http_server_incref(hs);
r->http_server = hs;
r->http_sessions = hs->http_sessions;
enable_nonblock(s);
yaz_log(YLOG_DEBUG, "New command connection");
- c = iochan_create(s, http_io, EVENT_INPUT | EVENT_EXCEPT);
+ c = iochan_create(s, http_io, EVENT_INPUT | EVENT_EXCEPT, "http_session_socket");
ch = http_channel_create(server->http_server, inet_ntoa(addr.sin_addr),
server);
}
/* Create a http-channel listener, syntax [host:]port */
-int http_init(const char *addr, struct conf_server *server)
+int http_init(const char *addr, struct conf_server *server,
+ const char *record_fname)
{
IOCHAN c;
int l;
int one = 1;
const char *pp;
short port;
+ FILE *record_file = 0;
yaz_log(YLOG_LOG, "HTTP listener %s", addr);
+
+ if (record_fname)
+ {
+ record_file = fopen(record_fname, "wb");
+ if (!record_file)
+ {
+ yaz_log(YLOG_FATAL|YLOG_ERRNO, "fopen %s", record_fname);
+ return 1;
+ }
+ }
+
memset(&myaddr, 0, sizeof myaddr);
myaddr.sin_family = AF_INET;
pp = strchr(addr, ':');
server->http_server = http_server_create();
+ server->http_server->record_file = record_file;
server->http_server->listener_socket = l;
- c = iochan_create(l, http_accept, EVENT_INPUT | EVENT_EXCEPT);
+ c = iochan_create(l, http_accept, EVENT_INPUT | EVENT_EXCEPT, "http_server");
iochan_setdata(c, server);
iochan_add(server->iochan_man, c);
hs->mutex = 0;
hs->proxy_addr = 0;
hs->ref_count = 1;
- hs->http_buf_freelist = 0;
- hs->http_channel_freelist = 0;
hs->http_sessions = 0;
+
+ hs->record_file = 0;
return hs;
}
{
int r;
- if (hs->mutex)
- {
- yaz_mutex_enter(hs->mutex);
- r = --(hs->ref_count);
- yaz_mutex_leave(hs->mutex);
- }
- else
- r = --(hs->ref_count);
+ yaz_mutex_enter(hs->mutex); /* OK: hs->mutex may be NULL */
+ r = --(hs->ref_count);
+ yaz_mutex_leave(hs->mutex);
if (r == 0)
{
- struct http_buf *b = hs->http_buf_freelist;
- struct http_channel *c = hs->http_channel_freelist;
- while (b)
- {
- struct http_buf *b_next = b->next;
- xfree(b);
- b = b_next;
- }
- while (c)
- {
- struct http_channel *c_next = c->next;
- nmem_destroy(c->nmem);
- wrbuf_destroy(c->wrbuf);
- xfree(c);
- c = c_next;
- }
http_sessions_destroy(hs->http_sessions);
xfree(hs->proxy_addr);
yaz_mutex_destroy(&hs->mutex);
+ if (hs->record_file)
+ fclose(hs->record_file);
xfree(hs);
}
}
assert(server);
assert(server->http_server->mutex == 0);
- yaz_mutex_create(&server->http_server->mutex);
+ pazpar2_mutex_create(&server->http_server->mutex, "http_server");
server->http_server->http_sessions = http_sessions_create();
}
projects / pazpar2-moved-to-github.git / blobdiff