svn commit: samba r26309 - in branches/SAMBA_4_0: .
source/libcli/nbt source/libcli/resolve
source/nbt_server/wins source/torture/nbt source/utils
jelmer at samba.org
jelmer at samba.org
Thu Dec 6 16:26:59 GMT 2007
Author: jelmer
Date: 2007-12-06 16:26:56 +0000 (Thu, 06 Dec 2007)
New Revision: 26309
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26309
Log:
Move specification of port higher up the all stack.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/libcli/nbt/libnbt.h
branches/SAMBA_4_0/source/libcli/nbt/namequery.c
branches/SAMBA_4_0/source/libcli/resolve/nbtlist.c
branches/SAMBA_4_0/source/nbt_server/wins/winswack.c
branches/SAMBA_4_0/source/torture/nbt/query.c
branches/SAMBA_4_0/source/torture/nbt/wins.c
branches/SAMBA_4_0/source/torture/nbt/winsbench.c
branches/SAMBA_4_0/source/utils/nmblookup.c
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/libcli/nbt/libnbt.h
===================================================================
--- branches/SAMBA_4_0/source/libcli/nbt/libnbt.h 2007-12-06 16:01:15 UTC (rev 26308)
+++ branches/SAMBA_4_0/source/libcli/nbt/libnbt.h 2007-12-06 16:26:56 UTC (rev 26309)
@@ -128,6 +128,7 @@
struct {
struct nbt_name name;
const char *dest_addr;
+ uint16_t dest_port;
bool broadcast;
bool wins_lookup;
int timeout; /* in seconds */
Modified: branches/SAMBA_4_0/source/libcli/nbt/namequery.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/nbt/namequery.c 2007-12-06 16:01:15 UTC (rev 26308)
+++ branches/SAMBA_4_0/source/libcli/nbt/namequery.c 2007-12-06 16:26:56 UTC (rev 26309)
@@ -54,7 +54,7 @@
packet->questions[0].question_class = NBT_QCLASS_IP;
dest = socket_address_from_strings(packet, nbtsock->sock->backend_name,
- io->in.dest_addr, lp_nbt_port(global_loadparm));
+ io->in.dest_addr, io->in.dest_port);
if (dest == NULL) goto failed;
req = nbt_name_request_send(nbtsock, dest, packet,
io->in.timeout, io->in.retries, false);
Modified: branches/SAMBA_4_0/source/libcli/resolve/nbtlist.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/resolve/nbtlist.c 2007-12-06 16:01:15 UTC (rev 26308)
+++ branches/SAMBA_4_0/source/libcli/resolve/nbtlist.c 2007-12-06 16:26:56 UTC (rev 26309)
@@ -151,6 +151,7 @@
for (i=0;i<state->num_queries;i++) {
state->io_queries[i].in.name = state->name;
state->io_queries[i].in.dest_addr = talloc_strdup(state->io_queries, address_list[i]);
+ state->io_queries[i].in.dest_port = lp_nbt_port(global_loadparm);
if (composite_nomem(state->io_queries[i].in.dest_addr, c)) return c;
state->io_queries[i].in.broadcast = broadcast;
Modified: branches/SAMBA_4_0/source/nbt_server/wins/winswack.c
===================================================================
--- branches/SAMBA_4_0/source/nbt_server/wins/winswack.c 2007-12-06 16:01:15 UTC (rev 26308)
+++ branches/SAMBA_4_0/source/nbt_server/wins/winswack.c 2007-12-06 16:26:56 UTC (rev 26309)
@@ -26,6 +26,7 @@
#include "nbt_server/wins/winsserver.h"
#include "system/time.h"
#include "libcli/composite/composite.h"
+#include "param/param.h"
struct wins_challenge_state {
struct wins_challenge_io *io;
@@ -46,6 +47,7 @@
if (state->current_address < state->io->in.num_addresses) {
struct nbtd_interface *iface;
+ state->query.in.dest_port = lp_nbt_port(global_loadparm);
state->query.in.dest_addr = state->io->in.addresses[state->current_address];
iface = nbtd_find_request_iface(state->io->in.nbtd_server, state->query.in.dest_addr, true);
@@ -103,6 +105,7 @@
/* setup a name query to the first address */
state->query.in.name = *state->io->in.name;
+ state->query.in.dest_port = lp_nbt_port(global_loadparm);
state->query.in.dest_addr = state->io->in.addresses[state->current_address];
state->query.in.broadcast = false;
state->query.in.wins_lookup = true;
Modified: branches/SAMBA_4_0/source/torture/nbt/query.c
===================================================================
--- branches/SAMBA_4_0/source/torture/nbt/query.c 2007-12-06 16:01:15 UTC (rev 26308)
+++ branches/SAMBA_4_0/source/torture/nbt/query.c 2007-12-06 16:26:56 UTC (rev 26309)
@@ -24,6 +24,7 @@
#include "libcli/resolve/resolve.h"
#include "torture/torture.h"
#include "torture/nbt/proto.h"
+#include "param/param.h"
struct result_struct {
int num_pass;
@@ -61,6 +62,7 @@
io.in.name = name;
io.in.dest_addr = address;
+ io.in.dest_port = lp_nbt_port(global_loadparm);
io.in.broadcast = false;
io.in.wins_lookup = false;
io.in.timeout = 1;
Modified: branches/SAMBA_4_0/source/torture/nbt/wins.c
===================================================================
--- branches/SAMBA_4_0/source/torture/nbt/wins.c 2007-12-06 16:01:15 UTC (rev 26308)
+++ branches/SAMBA_4_0/source/torture/nbt/wins.c 2007-12-06 16:26:56 UTC (rev 26309)
@@ -27,6 +27,7 @@
#include "librpc/gen_ndr/ndr_nbt.h"
#include "torture/torture.h"
#include "torture/nbt/proto.h"
+#include "param/param.h"
#define CHECK_VALUE(tctx, v, correct) \
torture_assert_int_equal(tctx, v, correct, "Incorrect value")
@@ -113,6 +114,7 @@
torture_comment(tctx, "query the name to make sure its there\n");
query.in.name = *name;
query.in.dest_addr = address;
+ query.in.dest_port = lp_nbt_port(tctx->lp_ctx);
query.in.broadcast = false;
query.in.wins_lookup = true;
query.in.timeout = 3;
Modified: branches/SAMBA_4_0/source/torture/nbt/winsbench.c
===================================================================
--- branches/SAMBA_4_0/source/torture/nbt/winsbench.c 2007-12-06 16:01:15 UTC (rev 26308)
+++ branches/SAMBA_4_0/source/torture/nbt/winsbench.c 2007-12-06 16:26:56 UTC (rev 26309)
@@ -27,6 +27,7 @@
#include "lib/socket/netif.h"
#include "torture/torture.h"
#include "torture/nbt/proto.h"
+#include "param/param.h"
struct wins_state {
int num_names;
@@ -184,6 +185,7 @@
io.in.name = generate_name(tmp_ctx, idx);
io.in.dest_addr = state->wins_server;
+ io.in.dest_port = lp_nbt_port(global_loadparm);
io.in.broadcast = false;
io.in.wins_lookup = true;
io.in.timeout = 2;
Modified: branches/SAMBA_4_0/source/utils/nmblookup.c
===================================================================
--- branches/SAMBA_4_0/source/utils/nmblookup.c 2007-12-06 16:01:15 UTC (rev 26308)
+++ branches/SAMBA_4_0/source/utils/nmblookup.c 2007-12-06 16:26:56 UTC (rev 26309)
@@ -29,6 +29,7 @@
#include "lib/socket/netif.h"
#include "librpc/gen_ndr/nbt.h"
#include "libcli/nbt/libnbt.h"
+#include "param/param.h"
/* command line options */
static struct {
@@ -142,6 +143,7 @@
/* do a single node query */
static NTSTATUS do_node_query(struct nbt_name_socket *nbtsock,
const char *addr,
+ uint16_t port,
const char *node_name,
enum nbt_name_type node_type,
bool broadcast)
@@ -154,6 +156,7 @@
io.in.name.type = node_type;
io.in.name.scope = NULL;
io.in.dest_addr = addr;
+ io.in.dest_port = port;
io.in.broadcast = broadcast;
io.in.wins_lookup = options.wins_lookup;
io.in.timeout = 1;
@@ -232,15 +235,18 @@
}
if (options.broadcast_address) {
- status = do_node_query(nbtsock, options.broadcast_address, node_name, node_type, true);
+ status = do_node_query(nbtsock, options.broadcast_address, lp_nbt_port(global_loadparm),
+ node_name, node_type, true);
} else if (options.unicast_address) {
- status = do_node_query(nbtsock, options.unicast_address, node_name, node_type, false);
+ status = do_node_query(nbtsock, options.unicast_address,
+ lp_nbt_port(global_loadparm), node_name, node_type, false);
} else {
int i, num_interfaces = iface_count();
for (i=0;i<num_interfaces;i++) {
const char *bcast = iface_n_bcast(i);
if (bcast == NULL) continue;
- status = do_node_query(nbtsock, bcast, node_name, node_type, true);
+ status = do_node_query(nbtsock, bcast, lp_nbt_port(global_loadparm),
+ node_name, node_type, true);
if (NT_STATUS_IS_OK(status)) break;
}
}
More information about the samba-cvs
mailing list