From 9aa67f3eaa2a87bf7896136656e0c37cb24e09c3 Mon Sep 17 00:00:00 2001
From: Mark Seaborn <mrs@mythic-beasts.com>
Date: Wed, 29 Apr 2009 21:52:44 +0100
Subject: [PATCH] Add Python extension module, wrapping imc_sendmsg() and
 imc_recvmsg()

Change imcplugin demo to demonstrate running Python
---
 imcplugin/demo.py              |  8 +++++
 imcplugin/hello.html           |  7 ++++-
 python_extension/python-nacl.c | 70 ++++++++++++++++++++++++++++++++++++++++++
 python_extension/setup.py      |  5 +++
 4 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 imcplugin/demo.py
 create mode 100644 python_extension/python-nacl.c
 create mode 100644 python_extension/setup.py

diff --git a/imcplugin/demo.py b/imcplugin/demo.py
new file mode 100644
index 00000000..1b865f67
--- /dev/null
+++ b/imcplugin/demo.py
@@ -0,0 +1,8 @@
+
+print "Hello from Python"
+
+import nacl
+
+fd = 3
+nacl.imc_sendmsg(fd, "Python to Javascript")
+print repr(nacl.imc_recvmsg(fd))
diff --git a/imcplugin/hello.html b/imcplugin/hello.html
index 168be309..d528b0a6 100644
--- a/imcplugin/hello.html
+++ b/imcplugin/hello.html
@@ -5,7 +5,7 @@ Testing glibc...
 
 <script type="text/javascript">
 var prefix_dir = "../install-stubout";
-var args = ["--library-path", "/lib", "../glibc/hellow-dyn"];
+var args = ["--library-path", "/lib", "../../../Python-2.6.1/python", "demo.py"];
 var plugin;
 var proc;
 
@@ -16,6 +16,7 @@ function receive(message) {
     }
     else {
         dump("unrecognised message: " + message + "\n");
+        proc.send("Reply to unrecognised message", []);
     }
 }
 
@@ -27,6 +28,10 @@ files = [
     "/lib/libutil.so.1",
     "/lib/libm.so.6",
     "../glibc/hellow-dyn",
+    "../../../Python-2.6.1/python",
+    "demo.py",
+    "nacl.so",
+    "./nacl.so",
     ];
 function have_file(filename) {
     for(var i = 0; i < files.length; i++)
diff --git a/python_extension/python-nacl.c b/python_extension/python-nacl.c
new file mode 100644
index 00000000..7bd1d456
--- /dev/null
+++ b/python_extension/python-nacl.c
@@ -0,0 +1,70 @@
+
+#include <Python.h>
+
+#include "../glibc/sysdeps/nacl/nacl_syscalls.h"
+
+/* TODO: get these from libnacl rather than hardcoding them */
+static int (*imc_sendmsg)(int fd, const struct NaClImcMsgHdr *msg, int flags) = 
+  NACL_SYSCALL_ADDR(NACL_sys_imc_sendmsg);
+static int (*imc_recvmsg)(int fd, struct NaClImcMsgHdr *msg, int flags) = 
+  NACL_SYSCALL_ADDR(NACL_sys_imc_recvmsg);
+
+
+static PyObject *py_imc_sendmsg(PyObject *self, PyObject *args)
+{
+  int fd;
+  char *data;
+  int data_size;
+  struct NaClImcMsgIoVec iov;
+  struct NaClImcMsgHdr msg;
+
+  if(!PyArg_ParseTuple(args, "is#", &fd, &data, &data_size))
+    return NULL;
+  iov.base = data;
+  iov.length = data_size;
+  msg.iov = &iov;
+  msg.iov_length = 1;
+  msg.descv = NULL;
+  msg.desc_length = 0;
+  imc_sendmsg(fd, &msg, 0);
+  Py_INCREF(Py_None);
+  return Py_None;
+}
+
+static PyObject *py_imc_recvmsg(PyObject *self, PyObject *args)
+{
+  int fd;
+  char buffer[1024];
+  struct NaClImcMsgIoVec iov;
+  struct NaClImcMsgHdr msg;
+  int result;
+
+  if(!PyArg_ParseTuple(args, "i", &fd))
+    return NULL;
+  iov.base = buffer;
+  iov.length = sizeof(buffer);
+  msg.iov = &iov;
+  msg.iov_length = 1;
+  msg.descv = NULL;
+  msg.desc_length = 0;
+  result = imc_recvmsg(fd, &msg, 0);
+  if(result >= 0)
+    return PyString_FromStringAndSize(buffer, result);
+  else {
+    Py_INCREF(Py_None);
+    return Py_None;
+  }
+}
+
+static PyMethodDef module_methods[] = {
+  { "imc_sendmsg", py_imc_sendmsg, METH_VARARGS,
+    "NaCl imc_sendmsg() syscall: sends a message" },
+  { "imc_recvmsg", py_imc_recvmsg, METH_VARARGS,
+    "NaCl imc_recvmsg() syscall: receives a message" },
+  { NULL, NULL, 0, NULL }  /* Sentinel */
+};
+
+void initnacl(void)
+{
+  Py_InitModule3("nacl", module_methods, "NaCl syscall wrappers");
+}
diff --git a/python_extension/setup.py b/python_extension/setup.py
new file mode 100644
index 00000000..fd62af25
--- /dev/null
+++ b/python_extension/setup.py
@@ -0,0 +1,5 @@
+
+from distutils.core import setup, Extension
+
+setup(name="nacl",
+      ext_modules=[Extension("nacl", sources=["python-nacl.c"])])
-- 
2.11.4.GIT