[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha4-38-gdcdfee6

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  dcdfee611ccc0ae798e3eea2cfdf3c7642dc5677 (commit)
       via  1e6bfb1aa7eba1b92ee4bfb318ba843752a993a9 (commit)
      from  c014ffabc65c30a6b83c8f9f9f9a80bb79333f59 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit dcdfee611ccc0ae798e3eea2cfdf3c7642dc5677
Merge: 1e6bfb1aa7eba1b92ee4bfb318ba843752a993a9 c014ffabc65c30a6b83c8f9f9f9a80bb79333f59
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Jun 5 22:03:17 2008 +0200

    Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test

commit 1e6bfb1aa7eba1b92ee4bfb318ba843752a993a9
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Jun 5 22:02:41 2008 +0200

    Add convenience function for creating nbt sockets in torture.

-----------------------------------------------------------------------

Summary of changes:
 source/torture/nbt/nbt.c      |    5 +++++
 source/torture/nbt/query.c    |    3 +--
 source/torture/nbt/register.c |    6 ++----
 source/torture/nbt/wins.c     |    2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/torture/nbt/nbt.c b/source/torture/nbt/nbt.c
index 4222618..7d35fc8 100644
--- a/source/torture/nbt/nbt.c
+++ b/source/torture/nbt/nbt.c
@@ -25,6 +25,11 @@
 #include "libcli/resolve/resolve.h"
 #include "param/param.h"
 
+struct nbt_name_socket *torture_init_nbt_socket(struct torture_context *tctx)
+{
+	return nbt_name_socket_init(tctx, tctx->ev, lp_iconv_convenience(tctx->lp_ctx));
+}
+
 bool torture_nbt_get_name(struct torture_context *tctx, 
 			  struct nbt_name *name, 
 			  const char **address)
diff --git a/source/torture/nbt/query.c b/source/torture/nbt/query.c
index 3f3a15c..80027a1 100644
--- a/source/torture/nbt/query.c
+++ b/source/torture/nbt/query.c
@@ -47,8 +47,7 @@ static void increment_handler(struct nbt_name_request *req)
 */
 static bool bench_namequery(struct torture_context *tctx)
 {
-	struct nbt_name_socket *nbtsock = nbt_name_socket_init(tctx, tctx->ev,
-							       lp_iconv_convenience(tctx->lp_ctx));
+	struct nbt_name_socket *nbtsock = torture_init_nbt_socket(tctx);
 	int num_sent=0;
 	struct result_struct *result;
 	struct nbt_name_query io;
diff --git a/source/torture/nbt/register.c b/source/torture/nbt/register.c
index a8681f8..8ddea40 100644
--- a/source/torture/nbt/register.c
+++ b/source/torture/nbt/register.c
@@ -44,8 +44,7 @@ static bool nbt_register_own(struct torture_context *tctx)
 {
 	struct nbt_name_register io;
 	NTSTATUS status;
-	struct nbt_name_socket *nbtsock = nbt_name_socket_init(tctx, tctx->ev,
-							       lp_iconv_convenience(tctx->lp_ctx));
+	struct nbt_name_socket *nbtsock = torture_init_nbt_socket(tctx);
 	struct socket_address *socket_address;
 	struct nbt_name name;
 	const char *address;
@@ -114,8 +113,7 @@ static bool nbt_refresh_own(struct torture_context *tctx)
 {
 	struct nbt_name_refresh io;
 	NTSTATUS status;
-	struct nbt_name_socket *nbtsock = nbt_name_socket_init(tctx, tctx->ev,
-							       lp_iconv_convenience(tctx->lp_ctx));
+	struct nbt_name_socket *nbtsock = torture_init_nbt_socket(tctx);
 	const char *myaddress;
 	struct socket_address *socket_address;
 	struct nbt_name name;
diff --git a/source/torture/nbt/wins.c b/source/torture/nbt/wins.c
index ae20de6..ad9a97f 100644
--- a/source/torture/nbt/wins.c
+++ b/source/torture/nbt/wins.c
@@ -53,7 +53,7 @@ static bool nbt_test_wins_name(struct torture_context *tctx, const char *address
 	struct nbt_name_refresh_wins refresh;
 	struct nbt_name_release release;
 	NTSTATUS status;
-	struct nbt_name_socket *nbtsock = nbt_name_socket_init(tctx, tctx->ev, lp_iconv_convenience(tctx->lp_ctx));
+	struct nbt_name_socket *nbtsock = torture_init_nbt_socket(tctx);
 	const char *myaddress;
 	struct socket_address *socket_address;
 	struct interface *ifaces;


-- 
Samba Shared Repository