X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=python%2Fhtp.c;h=2daeddfe2115cd1069da41f58275ac2577877a42;hp=ec4ebabce26d0ebe36f008c7e87f27a0aea4bd82;hb=HEAD;hpb=5fc5488205264fd1e202bd45b83f701971526847

diff --git a/python/htp.c b/python/htp.c
index ec4ebab..2daeddf 100644
--- a/python/htp.c
+++ b/python/htp.c
@@ -32,36 +32,53 @@ static PyObject *p_recvfd(PyObject *self, PyObject *args)
     fd = 0;
     if(!PyArg_ParseTuple(args, "|i", &fd))
 	return(NULL);
-    Py_BEGIN_ALLOW_THREADS;
-    ret = recvfd(fd, &data, &dlen);
-    Py_END_ALLOW_THREADS;
-    if(ret < 0) {
-	if(errno == 0)
-	    return(Py_BuildValue("OO", Py_None, Py_None));
-	PyErr_SetFromErrno(PyExc_OSError);
-	return(NULL);
+    while(1) {
+	Py_BEGIN_ALLOW_THREADS;
+	ret = recvfd(fd, &data, &dlen);
+	Py_END_ALLOW_THREADS;
+	if(ret < 0) {
+	    if(errno == 0)
+		return(Py_BuildValue("OO", Py_None, Py_None));
+	    if(errno == EINTR) {
+		if(PyErr_CheckSignals())
+		    return(NULL);
+		continue;
+	    }
+	    PyErr_SetFromErrno(PyExc_OSError);
+	    return(NULL);
+	}
+	ro = Py_BuildValue("Ni", PyString_FromStringAndSize(data, dlen), ret);
+	free(data);
+	return(ro);
     }
-    ro = Py_BuildValue("Ni", PyBytes_FromStringAndSize(data, dlen), ret);
-    free(data);
-    return(ro);
 }
 
 static PyObject *p_sendfd(PyObject *self, PyObject *args)
 {
     int sock, fd, ret;
-    Py_buffer data;
+    PyObject *data;
     
-    if(!PyArg_ParseTuple(args, "iiy*", &sock, &fd, &data))
+    if(!PyArg_ParseTuple(args, "iiO", &sock, &fd, &data))
 	return(NULL);
-    Py_BEGIN_ALLOW_THREADS;
-    ret = sendfd(sock, fd, data.buf, data.len);
-    Py_END_ALLOW_THREADS;
-    PyBuffer_Release(&data);
-    if(ret < 0) {
-	PyErr_SetFromErrno(PyExc_OSError);
+    if(!PyString_Check(data)) {
+	PyErr_SetString(PyExc_TypeError, "datagram must be a string");
 	return(NULL);
     }
-    Py_RETURN_NONE;
+    while(1) {
+	Py_BEGIN_ALLOW_THREADS;
+	ret = sendfd(sock, fd, PyString_AsString(data), PyString_Size(data));
+	Py_END_ALLOW_THREADS;
+	if(ret < 0) {
+	    if(errno == EINTR) {
+		if(PyErr_CheckSignals())
+		    return(NULL);
+		continue;
+	    }
+	    PyErr_SetFromErrno(PyExc_OSError);
+	    return(NULL);
+	}
+	Py_RETURN_NONE;
+    }
 }
 
 static PyMethodDef methods[] = {
@@ -70,14 +87,7 @@ static PyMethodDef methods[] = {
     {NULL, NULL, 0, NULL}
 };
 
-static struct PyModuleDef module = {
-    PyModuleDef_HEAD_INIT,
-    .m_name = "htlib",
-    .m_size = -1,
-    .m_methods = methods,
-};
-
-PyMODINIT_FUNC PyInit_htlib(void)
+PyMODINIT_FUNC inithtlib(void)
 {
-    return(PyModule_Create(&module));
+    Py_InitModule("ashd.htlib", methods);
 }