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

r26380: Specify port number higher up the call stack.

Browse Source 
(This used to be commit 77273e250c)
This commit is contained in:
Jelmer Vernooij 2007-12-10 18:41:41 +01:00 committed by Stefan Metzmacher
parent 7f0e8252e7
commit 237059838c
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source4/libcli/nbt/libnbt.h
View File

@ -215,6 +215,7 @@ struct nbt_name_refresh {
struct {
struct nbt_name name;
const char *dest_addr;
uint16_t dest_port;
const char *address;
uint16_t nb_flags;
bool broadcast;

6
source4/libcli/nbt/namerefresh.c
View File

@ -69,7 +69,7 @@ struct nbt_name_request *nbt_name_refresh_send(struct nbt_name_socket *nbtsock,
dest = socket_address_from_strings(nbtsock,
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);
@ -174,6 +174,7 @@ static void name_refresh_wins_handler(struct nbt_name_request *req)
goto done;
}
state->io->in.dest_addr = state->wins_servers[0];
state->io->in.dest_port = lp_nbt_port(global_loadparm);
state->io->in.address = state->addresses[0];
state->req = nbt_name_refresh_send(state->nbtsock, state->io);
if (state->req == NULL) {
@ -212,7 +213,7 @@ done:
}
}
/*
/**
the async send call for a multi-server WINS refresh
*/
struct composite_context *nbt_name_refresh_wins_send(struct nbt_name_socket *nbtsock,
@ -240,6 +241,7 @@ struct composite_context *nbt_name_refresh_wins_send(struct nbt_name_socket *nbt
state->io->in.name = io->in.name;
state->io->in.dest_addr = state->wins_servers[0];
state->io->in.dest_port = lp_nbt_port(global_loadparm);
state->io->in.address = io->in.addresses[0];
state->io->in.nb_flags = io->in.nb_flags;
state->io->in.broadcast = false;

2
source4/torture/nbt/register.c
View File

@ -26,6 +26,7 @@
#include "lib/socket/netif.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")
@ -132,6 +133,7 @@ static bool nbt_refresh_own(struct torture_context *tctx)
io.in.name = name;
io.in.dest_addr = address;
io.in.dest_port = lp_nbt_port(tctx->lp_ctx);
io.in.address = myaddress;
io.in.nb_flags = NBT_NODE_B | NBT_NM_ACTIVE;
io.in.broadcast = false;