Add bindings for query stack.

diff --git a/Makefile b/Makefile
index d9505a983c124fc18c63e2fadf108bbaecf8a7f3..47f34c0da3be3dde0f8ce4af518881503e1ee073 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,6 @@ objs = src/posix.o \
           src/settings.o \
           src/log.o \
           src/client.o \
-          src/redirect.o \
           src/gen_config.o \
           src/repl.o \
           src/linestack_file.o \
@@ -81,6 +80,7 @@ libirc_objs = \
           $(libircdir)/line.o \
           $(libircdir)/isupport.o \
           $(libircdir)/connection.o \
+          $(libircdir)/redirect.o \
           $(libircdir)/url.o \
           $(libircdir)/util.o \
           $(libircdir)/listener.o \
@@ -93,6 +93,7 @@ libirc_headers = \
                  $(libircdir)/isupport.h \
                  $(libircdir)/irc.h \
                  $(libircdir)/connection.h \
+                 $(libircdir)/redirect.h \
                  $(libircdir)/url.h \
                  $(libircdir)/listener.h \
                  $(libircdir)/util.h

diff --git a/src/redirect.c b/libirc/redirect.c
similarity index 100%
rename from src/redirect.c
rename to libirc/redirect.c

diff --git a/src/redirect.h b/libirc/redirect.h
similarity index 100%
rename from src/redirect.h
rename to libirc/redirect.h

diff --git a/python/irc.c b/python/irc.c
index 024bcf0c94b1656d6b780205ec9bc28a0c64f1af..e1d98a9b749f344332faa6b9125068a2c99d4e35 100644 (file)
--- a/python/irc.c
+++ b/python/irc.c
@@ -20,6 +20,8 @@
 #include <Python.h>
 #include <stdbool.h>
 #include "ctrlproxy.h"
+#include "redirect.h"
+
 
 const char *get_my_hostname() { return NULL; /* FIXME */ }
 void log_global(enum log_level ll, const char *fmt, ...) { /* FIXME */}
@@ -1183,6 +1185,101 @@ static const struct irc_client_callbacks py_client_callbacks = {
     .welcome = py_welcome_client
 };
 
+typedef struct {
+    PyObject_HEAD
+    struct query_stack *stack;
+} PyQueryStackObject;
+
+static PyObject *py_query_stack_record(PyQueryStackObject *self, PyObject *args)
+{
+    PyObject *py_network, *py_client, *py_line;
+    struct irc_line *line;
+    struct irc_network *network;
+    struct irc_client *client;
+
+    if (!PyArg_ParseTuple(args, "OOO", &py_network, &py_client, &py_line))
+        return NULL;
+
+    line = PyObject_AsLine(py_line);
+    if (line == NULL)
+        return NULL;
+
+    if (PyObject_TypeCheck(py_network, &PyNetworkType)) {
+        PyErr_SetNone(PyExc_TypeError);
+        return NULL;
+    }
+
+    if (PyObject_TypeCheck(py_client, &PyClientType)) {
+        PyErr_SetNone(PyExc_TypeError);
+        return NULL;
+    }
+
+    network = ((PyNetworkObject *)py_network)->network;
+    client = ((PyClientObject *)py_client)->client;
+
+    redirect_record(&self->stack, network, client, line);
+
+    Py_RETURN_NONE;
+}
+
+static PyObject *py_query_stack_redirect(PyQueryStackObject *self, PyObject *args)
+{
+    PyObject *py_network, *py_line;
+    struct irc_line *line;
+    struct irc_network *network;
+
+    if (!PyArg_ParseTuple(args, "OO", &py_network, &py_line))
+        return NULL;
+
+    line = PyObject_AsLine(py_line);
+    if (line == NULL)
+        return NULL;
+
+    if (PyObject_TypeCheck(py_network, &PyNetworkStateType)) {
+        PyErr_SetNone(PyExc_TypeError);
+        return NULL;
+    }
+
+    network = ((PyNetworkObject *)py_network)->network;
+
+    return PyBool_FromLong(redirect_response(&self->stack, network, line));
+}
+
+static PyMethodDef py_query_stack_methods[] = {
+    { "record", (PyCFunction)py_query_stack_record, METH_VARARGS, NULL },
+    { "response", (PyCFunction)py_query_stack_redirect, METH_VARARGS, NULL },
+    { NULL }
+};
+
+static int py_query_stack_dealloc(PyQueryStackObject *self)
+{
+    redirect_clear(&self->stack);
+    PyObject_Del(self);
+    return 0;
+}
+
+static PyObject *py_query_stack_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
+{
+    PyQueryStackObject *self = (PyQueryStackObject *)type->tp_alloc(type, 0);
+    if (self == NULL) {
+        PyErr_NoMemory();
+        return NULL;
+    }
+
+    self->stack = NULL;
+
+    return (PyObject *)self;
+}
+
+PyTypeObject PyQueryStackType = {
+    .tp_name = "QueryStack",
+    .tp_flags = Py_TPFLAGS_DEFAULT,
+    .tp_new = py_query_stack_new,
+    .tp_methods = py_query_stack_methods,
+    .tp_basicsize = sizeof(PyQueryStackObject),
+    .tp_dealloc = (destructor)py_query_stack_dealloc,
+};
+
 static PyMethodDef irc_methods[] = { 
     { NULL }
 };
@@ -1221,6 +1318,9 @@ void initirc(void)
     if (PyType_Ready(&PyGListIterType) < 0)
         return;
 
+    if (PyType_Ready(&PyQueryStackType) < 0)
+        return;
+
     m = Py_InitModule3("irc", irc_methods, 
                        "Simple IRC protocol module for Python.");
     if (m == NULL)
@@ -1240,5 +1340,7 @@ void initirc(void)
     PyModule_AddObject(m, "Client", (PyObject *)&PyClientType);
     Py_INCREF(&PyNetworkType);
     PyModule_AddObject(m, "Network", (PyObject *)&PyNetworkType);
+    Py_INCREF(&PyQueryStackType);
+    PyModule_AddObject(m, "QueryStack", (PyObject *)&PyQueryStackType);
 }