/*
- * stat->num_hits = s->total_hits;
- * stat->num_records = s->total_records;
- * $Id: http_command.c,v 1.4 2006-11-27 19:44:26 quinn Exp $
+ * $Id: http_command.c,v 1.9 2006-12-17 13:42:47 quinn Exp $
*/
#include <stdio.h>
#include "http.h"
#include "http_command.h"
+extern struct parameters global_parameters;
+extern IOCHAN channel_list;
+
struct http_session {
+ IOCHAN timeout_iochan; // NOTE: This is NOT associated with a socket
struct session *psession;
- int session_id;
+ unsigned int session_id;
int timestamp;
struct http_session *next;
};
static struct http_session *session_list = 0;
+void http_session_destroy(struct http_session *s);
+
+static void session_timeout(IOCHAN i, int event)
+{
+ struct http_session *s = iochan_getdata(i);
+ http_session_destroy(s);
+}
+
struct http_session *http_session_create()
{
struct http_session *r = xmalloc(sizeof(*r));
r->timestamp = 0;
r->next = session_list;
session_list = r;
+ r->timeout_iochan = iochan_create(-1, session_timeout, 0);
+ iochan_setdata(r->timeout_iochan, r);
+ iochan_settimeout(r->timeout_iochan, global_parameters.session_timeout);
+ r->timeout_iochan->next = channel_list;
+ channel_list = r->timeout_iochan;
return r;
}
*p = (*p)->next;
break;
}
- session_destroy(s->psession);
+ iochan_destroy(s->timeout_iochan);
+ destroy_session(s->psession);
xfree(s);
}
strcpy(rs->code, code);
sprintf(tmp, "<error code=\"general\">%s</error>", txt);
rs->payload = nmem_strdup(c->nmem, tmp);
+ http_send_response(c);
}
-int make_sessionid()
+unsigned int make_sessionid()
{
struct timeval t;
- int res;
+ unsigned int res;
static int seq = 0;
seq++;
if (gettimeofday(&t, 0) < 0)
abort();
res = t.tv_sec;
- res = (res << 8) | (seq & 0xff);
+ res = ((res << 8) | (seq & 0xff)) & ((unsigned int) (1 << 31) - 1);
return res;
}
{
struct http_session *p;
char *session = http_argbyname(rq, "session");
- int id;
+ unsigned int id;
if (!session)
{
id = atoi(session);
for (p = session_list; p; p = p->next)
if (id == p->session_id)
+ {
+ iochan_activity(p->timeout_iochan);
return p;
+ }
error(rs, "417", "Session does not exist, or it has expired", 0);
return 0;
}
-static void cmd_exit(struct http_request *rq, struct http_response *rs)
+static void cmd_exit(struct http_channel *c)
{
yaz_log(YLOG_WARN, "exit");
exit(0);
}
-static void cmd_init(struct http_request *rq, struct http_response *rs)
+
+static void cmd_init(struct http_channel *c)
{
- int sesid;
+ unsigned int sesid;
char buf[1024];
struct http_session *s = http_session_create();
+ struct http_response *rs = c->response;
- // FIXME create a pazpar2 session
yaz_log(YLOG_DEBUG, "HTTP Session init");
sesid = make_sessionid();
s->session_id = sesid;
- sprintf(buf, "<init><status>OK</status><session>%d</session></init>", sesid);
- rs->payload = nmem_strdup(rq->channel->nmem, buf);
+ sprintf(buf, "<init><status>OK</status><session>%u</session></init>", sesid);
+ rs->payload = nmem_strdup(c->nmem, buf);
+ http_send_response(c);
}
-static void cmd_termlist(struct http_request *rq, struct http_response *rs)
+static void cmd_termlist(struct http_channel *c)
{
+ struct http_response *rs = c->response;
+ struct http_request *rq = c->request;
struct http_session *s = locate_session(rq, rs);
- struct http_channel *c = rq->channel;
struct termlist_score **p;
int len;
int i;
}
wrbuf_puts(c->wrbuf, "</termlist>");
rs->payload = nmem_strdup(rq->channel->nmem, wrbuf_buf(c->wrbuf));
+ http_send_response(c);
}
-static void cmd_bytarget(struct http_request *rq, struct http_response *rs)
+static void cmd_bytarget(struct http_channel *c)
{
+ struct http_response *rs = c->response;
+ struct http_request *rq = c->request;
struct http_session *s = locate_session(rq, rs);
- struct http_channel *c = rq->channel;
struct hitsbytarget *ht;
int count, i;
wrbuf_puts(c->wrbuf, "</bytarget>");
rs->payload = nmem_strdup(c->nmem, wrbuf_buf(c->wrbuf));
+ http_send_response(c);
}
-static void cmd_show(struct http_request *rq, struct http_response *rs)
+static void show_records(struct http_channel *c)
{
+ struct http_request *rq = c->request;
+ struct http_response *rs = c->response;
struct http_session *s = locate_session(rq, rs);
- struct http_channel *c = rq->channel;
struct record **rl;
char *start = http_argbyname(rq, "start");
char *num = http_argbyname(rq, "num");
wrbuf_puts(c->wrbuf, "</show>\n");
rs->payload = nmem_strdup(c->nmem, wrbuf_buf(c->wrbuf));
+ http_send_response(c);
}
-static void cmd_search(struct http_request *rq, struct http_response *rs)
+static void show_records_ready(void *data)
{
+ struct http_channel *c = (struct http_channel *) data;
+
+ show_records(c);
+}
+
+static void cmd_show(struct http_channel *c)
+{
+ struct http_request *rq = c->request;
+ struct http_response *rs = c->response;
+ struct http_session *s = locate_session(rq, rs);
+ char *block = http_argbyname(rq, "block");
+
+ if (!s)
+ return;
+
+ if (block)
+ {
+ if (!s->psession->reclist || !s->psession->reclist->num_records)
+ {
+ session_set_watch(s->psession, SESSION_WATCH_RECORDS, show_records_ready, c);
+ yaz_log(YLOG_DEBUG, "Blocking on cmd_show");
+ return;
+ }
+ }
+
+ show_records(c);
+}
+
+static void cmd_ping(struct http_channel *c)
+{
+ struct http_request *rq = c->request;
+ struct http_response *rs = c->response;
+ struct http_session *s = locate_session(rq, rs);
+ if (!s)
+ return;
+ rs->payload = "<ping><status>OK</status></ping>";
+ http_send_response(c);
+}
+
+static void cmd_search(struct http_channel *c)
+{
+ struct http_request *rq = c->request;
+ struct http_response *rs = c->response;
struct http_session *s = locate_session(rq, rs);
char *query = http_argbyname(rq, "query");
char *res;
return;
}
rs->payload = "<search><status>OK</status></search>";
+ http_send_response(c);
}
-static void cmd_stat(struct http_request *rq, struct http_response *rs)
+static void cmd_stat(struct http_channel *c)
{
+ struct http_request *rq = c->request;
+ struct http_response *rs = c->response;
struct http_session *s = locate_session(rq, rs);
- struct http_channel *c = rq->channel;
struct statistics stat;
if (!s)
wrbuf_puts(c->wrbuf, "<stat>");
wrbuf_printf(c->wrbuf, "<hits>%d</hits>\n", stat.num_hits);
wrbuf_printf(c->wrbuf, "<records>%d</records>\n", stat.num_records);
+ wrbuf_printf(c->wrbuf, "<clients>%d</clients>\n", stat.num_clients);
wrbuf_printf(c->wrbuf, "<unconnected>%d</unconnected>\n", stat.num_no_connection);
wrbuf_printf(c->wrbuf, "<connecting>%d</connecting>\n", stat.num_connecting);
wrbuf_printf(c->wrbuf, "<initializing>%d</initializing>\n", stat.num_initializing);
wrbuf_printf(c->wrbuf, "<error>%d</error>\n", stat.num_error);
wrbuf_puts(c->wrbuf, "</stat>");
rs->payload = nmem_strdup(c->nmem, wrbuf_buf(c->wrbuf));
+ http_send_response(c);
}
-static void cmd_load(struct http_request *rq, struct http_response *rs)
-{
- struct http_session *s = locate_session(rq, rs);
- char *fn = http_argbyname(rq, "name");
-
- if (!s)
- return;
- if (!fn)
- {
- error(rs, "417", "Must suppply name", 0);
- return;
- }
- if (load_targets(s->psession, fn) < 0)
- error(rs, "417", "Failed to find targets", "Possibly wrong filename");
- else
- rs->payload = "<load><status>OK</status></load>";
-}
struct {
char *name;
- void (*fun)(struct http_request *rq, struct http_response *rs);
+ void (*fun)(struct http_channel *c);
} commands[] = {
{ "init", cmd_init },
{ "stat", cmd_stat },
- { "load", cmd_load },
{ "bytarget", cmd_bytarget },
{ "show", cmd_show },
{ "search", cmd_search },
{ "termlist", cmd_termlist },
{ "exit", cmd_exit },
+ { "ping", cmd_ping },
{0,0}
};
-struct http_response *http_command(struct http_request *rq)
+void http_command(struct http_channel *c)
{
- char *command = http_argbyname(rq, "command");
- struct http_channel *c = rq->channel;
+ char *command = http_argbyname(c->request, "command");
struct http_response *rs = http_create_response(c);
int i;
+ c->response = rs;
if (!command)
{
error(rs, "417", "Must supply command", 0);
- return rs;
+ return;
}
for (i = 0; commands[i].name; i++)
if (!strcmp(commands[i].name, command))
{
- (*commands[i].fun)(rq, rs);
+ (*commands[i].fun)(c);
break;
}
if (!commands[i].name)
error(rs, "417", "Unknown command", 0);
- return rs;
+ return;
}
/*
projects / pazpar2-moved-to-github.git / blobdiff