sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

pymessaging: Use the server_id IDL structure rather than a tuple

Browse Source 
This will make it easier to pass this structure in and out.  The tuple is still
accepted as input.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2012-10-29 15:33:59 +11:00
parent 3b4ef03097
commit 76b7348299
4 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
librpc/wscript_build
View File

@ -559,6 +559,11 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_SCERPC',
public_deps='dcerpc-binding NDR_SCERPC'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_SERVER_ID',
source='gen_ndr/ndr_server_id_c.c',
public_deps='dcerpc-binding NDR_SERVER_ID'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_NTSVCS',
source='gen_ndr/ndr_ntsvcs_c.c',
public_deps='dcerpc-binding ndr-standard'

25
source4/lib/messaging/pymessaging.c
View File

@ -26,12 +26,14 @@
#include "librpc/rpc/pyrpc_util.h"
#include "librpc/ndr/libndr.h"
#include "lib/messaging/messaging.h"
#include "lib/messaging/irpc.h"
#include "lib/events/events.h"
#include "cluster/cluster.h"
#include "param/param.h"
#include "param/pyparam.h"
#include "librpc/rpc/dcerpc.h"
#include "librpc/gen_ndr/server_id.h"
#include <pytalloc.h>
void initmessaging(void);
@ -40,10 +42,14 @@ extern PyTypeObject imessaging_Type;
static bool server_id_from_py(PyObject *object, struct server_id *server_id)
{
if (!PyTuple_Check(object)) {
PyErr_SetString(PyExc_ValueError, "Expected tuple");
return false;
}
if (!py_check_dcerpc_type(object, "server_id", "server_id")) {
PyErr_SetString(PyExc_ValueError, "Expected tuple or server_id");
return false;
}
*server_id = *pytalloc_get_type(object, struct server_id);
return true;
}
if (PyTuple_Size(object) == 3) {
return PyArg_ParseTuple(object, "iii", &server_id->pid, &server_id->task_id, &server_id->vnn);
} else {
@ -228,10 +234,19 @@ static PyMethodDef py_imessaging_methods[] = {
static PyObject *py_imessaging_server_id(PyObject *obj, void *closure)
{
imessaging_Object *iface = (imessaging_Object *)obj;
PyObject *py_server_id;
struct server_id server_id = imessaging_get_server_id(iface->msg_ctx);
struct server_id *p_server_id = talloc(NULL, struct server_id);
if (!p_server_id) {
PyErr_NoMemory();
return NULL;
}
*p_server_id = server_id;
return Py_BuildValue("(iii)", server_id.pid, server_id.task_id,
server_id.vnn);
py_server_id = py_return_ndr_struct("samba.dcerpc.server_id", "server_id", p_server_id, p_server_id);
talloc_unlink(NULL, p_server_id);
return py_server_id;
}
static PyGetSetDef py_imessaging_getset[] = {

6
source4/librpc/wscript_build
View File

@ -296,6 +296,12 @@ bld.SAMBA_PYTHON('python_irpc',
realname='samba/dcerpc/irpc.so'
)
bld.SAMBA_PYTHON('python_server_id',
source='../../librpc/gen_ndr/py_server_id.c',
deps='RPC_NDR_SERVER_ID pytalloc-util pyrpc_util',
realname='samba/dcerpc/server_id.so'
)
bld.SAMBA_PYTHON('python_winbind',
source='gen_ndr/py_winbind.c',
deps='RPC_NDR_WINBIND pytalloc-util pyrpc_util python_netlogon',

4
source4/scripting/python/samba/tests/messaging.py
View File

@ -21,6 +21,7 @@
from samba.messaging import Messaging
from samba.tests import TestCase
from samba.dcerpc.server_id import server_id
class MessagingTests(TestCase):
@ -36,8 +37,7 @@ class MessagingTests(TestCase):
def test_assign_server_id(self):
x = self.get_context()
self.assertTrue(isinstance(x.server_id, tuple))
self.assertEquals(3, len(x.server_id))
self.assertTrue(isinstance(x.server_id, server_id))
def test_ping_speed(self):
server_ctx = self.get_context((0, 1))