struct nbt_name called, calling;
const char *server_name;
- calling.name = lp_netbios_name();
- calling.type = NBT_NAME_CLIENT;
- calling.scope = NULL;
+ make_nbt_name_client(&calling, lp_netbios_name());
nbt_choose_called_name(NULL, &called, desthost, name_type);
state->transport = smbcli_transport_init(state->sock, state, True);
NT_STATUS_HAVE_NO_MEMORY(state->transport);
- calling.name = cli_credentials_get_workstation(io->in.credentials);
- calling.type = NBT_NAME_CLIENT;
- calling.scope = NULL;
+ make_nbt_name_client(&calling, cli_credentials_get_workstation(io->in.credentials));
nbt_choose_called_name(state, &called, io->in.called_name, NBT_NAME_SERVER);
c->event_ctx = talloc_reference(c, state->sock->event.ctx);
c->private = state;
- name.name = io->in.dest_host;
- name.type = NBT_NAME_SERVER;
- name.scope = NULL;
+ make_nbt_name_server(&name, io->in.dest_host);
state->creq = resolve_name_send(&name, c->event_ctx);
if (state->creq == NULL) goto failed;
return status;
}
- myname.name = lp_netbios_name();
- myname.type = NBT_NAME_CLIENT;
- myname.scope = NULL;
+ make_nbt_name_client(&myname, lp_netbios_name());
status = dgram_mailslot_send(dgmsock, DGRAM_DIRECT_UNIQUE,
mailslot_name,
return status;
}
- myname.name = lp_netbios_name();
- myname.type = NBT_NAME_CLIENT;
- myname.scope = NULL;
+ make_nbt_name_client(&myname, lp_netbios_name());
status = dgram_mailslot_send(dgmsock, DGRAM_DIRECT_UNIQUE,
mailslot_name,
struct composite_context *c = resolve_name_send(name, NULL);
return resolve_name_recv(c, mem_ctx, reply_addr);
}
+
+/* Initialise a struct nbt_name with a NULL scope */
+
+void make_nbt_name(struct nbt_name *nbt, const char *name, int type)
+{
+ nbt->name = name;
+ nbt->scope = NULL;
+ nbt->type = type;
+}
+
+/* Initialise a struct nbt_name with a NBT_NAME_CLIENT (0x00) name */
+
+void make_nbt_name_client(struct nbt_name *nbt, const char *name)
+{
+ make_nbt_name(nbt, name, NBT_NAME_CLIENT);
+}
+
+/* Initialise a struct nbt_name with a NBT_NAME_SERVER (0x20) name */
+
+void make_nbt_name_server(struct nbt_name *nbt, const char *name)
+{
+ make_nbt_name(nbt, name, NBT_NAME_SERVER);
+}
}
if (len < 17) {
- name->name = talloc_strndup(mem_ctx, namebuf, len);
- name->type = NBT_NAME_CLIENT;
- name->scope = NULL;
+ make_nbt_name_client(name, talloc_strndup(mem_ctx, namebuf, len));
return NT_STATUS_OK;
}
return NT_STATUS_OK;
}
- name.name = r->generic.in.domain_name;
- name.type = NBT_NAME_PDC;
- name.scope = NULL;
+ make_nbt_name(&name, r->generic.in.domain_name, NBT_NAME_PDC);
status = resolve_name(&name, mem_ctx, &address);
if (!NT_STATUS_IS_OK(status)) {
NTSTATUS status;
BOOL ret = True;
- name.name = lp_parm_string(-1, "torture", "host");
- name.type = NBT_NAME_SERVER;
- name.scope = NULL;
+ make_nbt_name_server(&name, lp_parm_string(-1, "torture", "host"));
/* do an initial name resolution to find its IP */
status = resolve_name(&name, mem_ctx, &address);
logon.req.pdc.lmnt_token = 0xFFFF;
logon.req.pdc.lm20_token = 0xFFFF;
- myname.name = TEST_NAME;
- myname.type = NBT_NAME_CLIENT;
- myname.scope = NULL;
+ make_nbt_name_client(&myname, TEST_NAME);
status = dgram_mailslot_netlogon_send(dgmsock, &name, address,
0, &myname, &logon);
logon.req.pdc2.lmnt_token = 0xFFFF;
logon.req.pdc2.lm20_token = 0xFFFF;
- myname.name = TEST_NAME;
- myname.type = NBT_NAME_CLIENT;
- myname.scope = NULL;
+ make_nbt_name_client(&myname, TEST_NAME);
status = dgram_mailslot_netlogon_send(dgmsock, &name, address,
0, &myname, &logon);
logon.req.logon.lmnt_token = 0xFFFF;
logon.req.logon.lm20_token = 0xFFFF;
-
- myname.name = TEST_NAME;
- myname.type = NBT_NAME_CLIENT;
- myname.scope = NULL;
+ make_nbt_name_client(&myname, TEST_NAME);
status = dgram_mailslot_ntlogon_send(dgmsock, &name, address,
0, &myname, &logon);
NTSTATUS status;
BOOL ret = True;
- name.name = lp_parm_string(-1, "torture", "host");
- name.type = NBT_NAME_SERVER;
- name.scope = NULL;
+ make_nbt_name_server(&name, lp_parm_string(-1, "torture", "host"));
/* do an initial name resolution to find its IP */
status = resolve_name(&name, mem_ctx, &address);
NTSTATUS status;
BOOL ret = True;
- name.name = strupper_talloc(mem_ctx, lp_parm_string(-1, "torture", "host"));
- name.type = NBT_NAME_SERVER;
- name.scope = NULL;
+ make_nbt_name_server(&name, strupper_talloc(mem_ctx, lp_parm_string(-1, "torture", "host")));
/* do an initial name resolution to find its IP */
status = resolve_name(&name, mem_ctx, &address);
NTSTATUS status;
BOOL ret = True;
- name.name = lp_parm_string(-1, "torture", "host");
- name.type = NBT_NAME_SERVER;
- name.scope = NULL;
+ make_nbt_name_server(&name, lp_parm_string(-1, "torture", "host"));
/* do an initial name resolution to find its IP */
status = resolve_name(&name, mem_ctx, &address);
NTSTATUS status;
BOOL ret = True;
- name.name = lp_parm_string(-1, "torture", "host");
- name.type = NBT_NAME_SERVER;
- name.scope = NULL;
+ make_nbt_name_server(&name, lp_parm_string(-1, "torture", "host"));
/* do an initial name resolution to find its IP */
status = resolve_name(&name, mem_ctx, &address);
NTSTATUS status;
BOOL ret = True;
- name.name = lp_parm_string(-1, "torture", "host");
- name.type = NBT_NAME_SERVER;
- name.scope = NULL;
+ make_nbt_name_server(&name, lp_parm_string(-1, "torture", "host"));
/* do an initial name resolution to find its IP */
status = resolve_name(&name, mem_ctx, &address);
struct nbt_name called;
/* send a NBT session request, if applicable */
- calling.name = my_name;
- calling.type = NBT_NAME_CLIENT;
- calling.scope = NULL;
+ make_nbt_name_client(&calling, my_name);
nbt_choose_called_name(transport, &called, dest_host, NBT_NAME_SERVER);
struct smbcli_state *cli;
const char *host = lp_parm_string(-1, "torture", "host");
- calling.name = lp_netbios_name();
- calling.type = NBT_NAME_CLIENT;
- calling.scope = NULL;
+ make_nbt_name_client(&calling, lp_netbios_name());
nbt_choose_called_name(NULL, &called, host, NBT_NAME_SERVER);