diff options
| author | Stefan Metzmacher <metze@samba.org> | 2005-01-31 17:16:45 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:27 -0500 |
| commit | ca3f70256ac0430e2db846d0293a7750a6d3ef6b (patch) | |
| tree | e5b29b99c6164bb2a077b8b608c9b4966bcbb55d /source4/libcli | |
| parent | 3b6fb593144290d5bf97d601ae99708880ff781f (diff) | |
| download | samba-ca3f70256ac0430e2db846d0293a7750a6d3ef6b.tar.gz samba-ca3f70256ac0430e2db846d0293a7750a6d3ef6b.tar.bz2 samba-ca3f70256ac0430e2db846d0293a7750a6d3ef6b.zip | |
r5145: define struct ipv4_addr in misc.idl,
so we can use it in nbt.idl and
get a nicer debug output
metze
(This used to be commit abacbc9192646f6f3c720758ab65889b82b9ae7b)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/nbt/namequery.c | 2 | ||||
| -rw-r--r-- | source4/libcli/nbt/namerefresh.c | 4 | ||||
| -rw-r--r-- | source4/libcli/nbt/nameregister.c | 4 | ||||
| -rw-r--r-- | source4/libcli/nbt/nbtsocket.c | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/source4/libcli/nbt/namequery.c b/source4/libcli/nbt/namequery.c index 36fbfc8dd0..d77482fc2b 100644 --- a/source4/libcli/nbt/namequery.c +++ b/source4/libcli/nbt/namequery.c @@ -102,7 +102,7 @@ NTSTATUS nbt_name_query_recv(struct nbt_name_request *req, } for (i=0;i<io->out.num_addrs;i++) { - in.s_addr = htonl(packet->answers[0].rdata.netbios.addresses[i].ipaddr); + in.s_addr = htonl(packet->answers[0].rdata.netbios.addresses[i].ipaddr.addr); addr = inet_ntoa(in); if (addr == NULL) { talloc_free(req); diff --git a/source4/libcli/nbt/namerefresh.c b/source4/libcli/nbt/namerefresh.c index 47fcae4f7c..c121d9c920 100644 --- a/source4/libcli/nbt/namerefresh.c +++ b/source4/libcli/nbt/namerefresh.c @@ -64,7 +64,7 @@ struct nbt_name_request *nbt_name_refresh_send(struct nbt_name_socket *nbtsock, struct nbt_rdata_address, 1); if (packet->additional[0].rdata.netbios.addresses == NULL) goto failed; packet->additional[0].rdata.netbios.addresses[0].nb_flags = io->in.nb_flags; - packet->additional[0].rdata.netbios.addresses[0].ipaddr = htonl(inet_addr(io->in.address)); + packet->additional[0].rdata.netbios.addresses[0].ipaddr.addr = htonl(inet_addr(io->in.address)); req = nbt_name_request_send(nbtsock, io->in.dest_addr, lp_nbt_port(), packet, timeval_current_ofs(io->in.timeout, 0), False); @@ -112,7 +112,7 @@ NTSTATUS nbt_name_refresh_recv(struct nbt_name_request *req, talloc_free(req); return NT_STATUS_INVALID_NETWORK_RESPONSE; } - in.s_addr = htonl(packet->answers[0].rdata.netbios.addresses[0].ipaddr); + in.s_addr = htonl(packet->answers[0].rdata.netbios.addresses[0].ipaddr.addr); addr = inet_ntoa(in); if (addr == NULL) { talloc_free(req); diff --git a/source4/libcli/nbt/nameregister.c b/source4/libcli/nbt/nameregister.c index 7e0134c283..7bed37cf78 100644 --- a/source4/libcli/nbt/nameregister.c +++ b/source4/libcli/nbt/nameregister.c @@ -67,7 +67,7 @@ struct nbt_name_request *nbt_name_register_send(struct nbt_name_socket *nbtsock, struct nbt_rdata_address, 1); if (packet->additional[0].rdata.netbios.addresses == NULL) goto failed; packet->additional[0].rdata.netbios.addresses[0].nb_flags = io->in.nb_flags; - packet->additional[0].rdata.netbios.addresses[0].ipaddr = htonl(inet_addr(io->in.address)); + packet->additional[0].rdata.netbios.addresses[0].ipaddr.addr = htonl(inet_addr(io->in.address)); req = nbt_name_request_send(nbtsock, io->in.dest_addr, lp_nbt_port(), packet, timeval_current_ofs(io->in.timeout, 0), False); @@ -115,7 +115,7 @@ NTSTATUS nbt_name_register_recv(struct nbt_name_request *req, talloc_free(req); return NT_STATUS_INVALID_NETWORK_RESPONSE; } - in.s_addr = htonl(packet->answers[0].rdata.netbios.addresses[0].ipaddr); + in.s_addr = htonl(packet->answers[0].rdata.netbios.addresses[0].ipaddr.addr); addr = inet_ntoa(in); if (addr == NULL) { talloc_free(req); diff --git a/source4/libcli/nbt/nbtsocket.c b/source4/libcli/nbt/nbtsocket.c index 3f16bf6921..3d1397e019 100644 --- a/source4/libcli/nbt/nbtsocket.c +++ b/source4/libcli/nbt/nbtsocket.c @@ -390,6 +390,10 @@ NTSTATUS nbt_name_reply_send(struct nbt_name_socket *nbtsock, talloc_set_destructor(req, nbt_name_request_destructor); + if (DEBUGLVL(10)) { + NDR_PRINT_DEBUG(nbt_name_packet, request); + } + status = ndr_push_struct_blob(&req->encoded, req, request, (ndr_push_flags_fn_t)ndr_push_nbt_name_packet); if (!NT_STATUS_IS_OK(status)) { |