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

diff --git a/python/htp.c b/python/htp.c
index 0405809..2daeddf 100644
--- a/python/htp.c
+++ b/python/htp.c
@@ -19,8 +19,8 @@
 #include <Python.h>
 #include <errno.h>
 
-#include <utils.h>
-#include <proc.h>
+#include <ashd/utils.h>
+#include <ashd/proc.h>
 
 static PyObject *p_recvfd(PyObject *self, PyObject *args)
 {
@@ -32,20 +32,30 @@ static PyObject *p_recvfd(PyObject *self, PyObject *args)
     fd = 0;
     if(!PyArg_ParseTuple(args, "|i", &fd))
 	return(NULL);
-    if((ret = recvfd(fd, &data, &dlen)) < 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", PyString_FromStringAndSize(data, dlen), ret);
-    free(data);
-    return(ro);
 }
 
 static PyObject *p_sendfd(PyObject *self, PyObject *args)
 {
-    int sock, fd;
+    int sock, fd, ret;
     PyObject *data;
     
     if(!PyArg_ParseTuple(args, "iiO", &sock, &fd, &data))
@@ -54,11 +64,21 @@ static PyObject *p_sendfd(PyObject *self, PyObject *args)
 	PyErr_SetString(PyExc_TypeError, "datagram must be a string");
 	return(NULL);
     }
-    if(sendfd(sock, fd, PyString_AsString(data), PyString_Size(data)) < 0) {
-	PyErr_SetFromErrno(PyExc_OSError);
-	return(NULL);
+    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;
     }
-    Py_RETURN_NONE;
 }
 
 static PyMethodDef methods[] = {