r15391: Wrap up the nbt_name_query() function as a bit of an experiment. It

seemed to work quite well and this technique might be good for
generating an interface to use for automated testing.

Tested by doing a nbt lookup against smbd.
(This used to be commit 11150b3140c91459f17c767adf07a54524338c18)

3 files changed, 143 insertions, 1 deletions

diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index f3e9be7f63..46f3336fd1 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -56,6 +56,11 @@ OBJ_FILES = \
 PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT LIBCLI_COMPOSITE LIBEVENTS \
 	NDR_SECURITY samba-socket
 
+[LIBRARY::swig_libcli_nbt]
+LIBRARY_REALNAME = swig/_libcli_nbt.$(SHLIBEXT)
+OBJ_FILES = swig/libcli_nbt_wrap.o
+PUBLIC_DEPENDENCIES = LIBCLI_NBT DYNCONFIG LIBSAMBA-CONFIG
+
 [SUBSYSTEM::LIBCLI_DGRAM]
 OBJ_FILES = \
 	dgram/dgramsocket.o \
diff --git a/source4/libcli/swig/libcli_nbt.i b/source4/libcli/swig/libcli_nbt.i
new file mode 100644
index 0000000000..54fbf56839
--- /dev/null
+++ b/source4/libcli/swig/libcli_nbt.i
@@ -0,0 +1,136 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   Swig interface to libcli_nbt library.
+
+   Copyright (C) 2006 Tim Potter <tpot@samba.org>
+
+     ** NOTE! The following LGPL license applies to the tdb
+     ** library. This does NOT imply that all of Samba is released
+     ** under the LGPL
+   
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+%module libcli_nbt
+
+%{
+
+#include "includes.h"
+#include "lib/talloc/talloc.h"
+#include "lib/events/events.h"
+#include "libcli/nbt/libnbt.h"
+
+/* Undo strcpy safety macro as it's used by swig )-: */
+
+#undef strcpy
+
+%}
+
+%apply bool { BOOL };
+%apply int { uint8_t };
+%apply int { int8_t };
+%apply unsigned int { uint16_t };
+%apply int { int16_t };
+
+%typemap(in) uint32_t {
+	if (PyLong_Check($input))
+		$1 = PyLong_AsUnsignedLong($input);
+	else if (PyInt_Check($input))
+		$1 = PyInt_AsLong($input);
+	else {
+		PyErr_SetString(PyExc_TypeError,"Expected a long or an int");
+		return NULL;
+	}
+}
+
+%typemap(out) uint32_t {
+	$result = PyLong_FromUnsignedLong($1);
+}
+
+%apply unsigned long long { uint64_t };
+%apply long long { int64_t };
+
+%typemap(in) NTSTATUS {
+        if (PyLong_Check($input))
+                $1 = NT_STATUS(PyLong_AsUnsignedLong($input));
+        else if (PyInt_Check($input))
+                $1 = NT_STATUS(PyInt_AsLong($input));
+        else {
+                PyErr_SetString(PyExc_TypeError, "Expected a long or an int");
+                return NULL;
+        }
+}
+
+%typemap(out) NTSTATUS {
+        $result = PyLong_FromUnsignedLong(NT_STATUS_V($1));
+}
+
+TALLOC_CTX *talloc_init(char *name);
+int talloc_free(TALLOC_CTX *ptr);
+
+/* Function prototypes */
+
+struct event_context *event_context_init(TALLOC_CTX *mem_ctx);
+
+struct nbt_name_socket *nbt_name_socket_init(TALLOC_CTX *mem_ctx, 
+					     struct event_context *event_ctx);
+
+enum nbt_name_type {
+	NBT_NAME_CLIENT=0x00,
+	NBT_NAME_MS=0x01,
+	NBT_NAME_USER=0x03,
+	NBT_NAME_SERVER=0x20,
+	NBT_NAME_PDC=0x1B,
+	NBT_NAME_LOGON=0x1C,
+	NBT_NAME_MASTER=0x1D,
+	NBT_NAME_BROWSER=0x1E
+};
+
+struct nbt_name {
+	const char *name;
+	const char *scope;
+	enum nbt_name_type type;
+};
+
+%rename(data_in) in;
+%rename(data_out) out;
+
+struct nbt_name_query {
+	struct {
+		struct nbt_name name;
+		const char *dest_addr;
+		BOOL broadcast;
+		BOOL wins_lookup;
+		int timeout; /* in seconds */
+		int retries;
+	} in;
+	struct {
+		const char *reply_from;
+		struct nbt_name name;
+		int16_t num_addrs;
+		const char **reply_addrs;
+	} out;
+};
+
+%include "carrays.i"
+%array_functions(char *, char_ptr_array);
+
+%rename(do_nbt_name_query) nbt_name_query;
+
+NTSTATUS nbt_name_query(struct nbt_name_socket *nbtsock, 
+			TALLOC_CTX *mem_ctx, struct nbt_name_query *io);
+
+void lp_load(void);
diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
index 282758de52..6c62d3ded8 100644
--- a/source4/scripting/swig/config.mk
+++ b/source4/scripting/swig/config.mk
@@ -8,7 +8,8 @@ OBJ_FILES = dcerpc_wrap.o
 #######################
 
 # Swig extensions
-swig: lib/tdb/swig/_tdb.$(SHLIBEXT) lib/ldb/swig/_ldb.$(SHLIBEXT)
+swig: lib/tdb/swig/_tdb.$(SHLIBEXT) lib/ldb/swig/_ldb.$(SHLIBEXT) \
+	libcli/swig/_libcli_nbt.$(SHLIBEXT)
 
 .SUFFIXES: _wrap.c .i