diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-01-09 22:12:53 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:49:57 -0500 |
| commit | f55ea8bb3dca868e21663cd90eaea7a35cd7886c (patch) | |
| tree | 80aab2a3f10310e1946821603752cd407e435214 /source4/nbt_server/irpc.c | |
| parent | 806b3fdbc12b3284ab9872a4ecae3a7ee34ea171 (diff) | |
| download | samba-f55ea8bb3dca868e21663cd90eaea7a35cd7886c.tar.gz samba-f55ea8bb3dca868e21663cd90eaea7a35cd7886c.tar.bz2 samba-f55ea8bb3dca868e21663cd90eaea7a35cd7886c.zip | |
r12804: This patch reworks the Samba4 sockets layer to use a socket_address
structure that is more generic than just 'IP/port'.
It now passes make test, and has been reviewed and updated by
metze. (Thankyou *very* much).
This passes 'make test' as well as kerberos use (not currently in the
testsuite).
The original purpose of this patch was to have Samba able to pass a
socket address stucture from the BSD layer into the kerberos routines
and back again. It also removes nbt_peer_addr, which was being used
for a similar purpose.
It is a large change, but worthwhile I feel.
Andrew Bartlett
(This used to be commit 88198c4881d8620a37086f80e4da5a5b71c5bbb2)
Diffstat (limited to 'source4/nbt_server/irpc.c')
| -rw-r--r-- | source4/nbt_server/irpc.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source4/nbt_server/irpc.c b/source4/nbt_server/irpc.c index b3b168a8c0..8b9c4cfcaa 100644 --- a/source4/nbt_server/irpc.c +++ b/source4/nbt_server/irpc.c @@ -25,6 +25,7 @@ #include "smbd/service_task.h" #include "nbt_server/nbt_server.h" #include "nbt_server/wins/winsserver.h" +#include "lib/socket/socket.h" /* serve out the nbt statistics @@ -57,7 +58,7 @@ struct getdc_state { static void getdc_recv_ntlogon_reply(struct dgram_mailslot_handler *dgmslot, struct nbt_dgram_packet *packet, - const struct nbt_peer_socket *src) + struct socket_address *src) { struct getdc_state *s = talloc_get_type(dgmslot->private, struct getdc_state); @@ -120,7 +121,7 @@ static NTSTATUS nbtd_getdcname(struct irpc_message *msg, struct nbt_ntlogon_packet p; struct nbt_ntlogon_sam_logon *r; struct nbt_name src, dst; - struct nbt_peer_socket dest; + struct socket_address *dest; struct dgram_mailslot_handler *handler; NTSTATUS status = NT_STATUS_UNSUCCESSFUL; @@ -152,10 +153,12 @@ static NTSTATUS nbtd_getdcname(struct irpc_message *msg, make_nbt_name_client(&src, req->in.my_computername); make_nbt_name(&dst, req->in.domainname, 0x1c); - dest.addr = req->in.ip_address; - dest.port = 138; + dest = socket_address_from_strings(msg, iface->dgmsock->sock->backend_name, + req->in.ip_address, 138); + NT_STATUS_HAVE_NO_MEMORY(dest); + status = dgram_mailslot_ntlogon_send(iface->dgmsock, DGRAM_DIRECT_GROUP, - &dst, &dest, + &dst, dest, &src, &p); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("dgram_mailslot_ntlogon_send failed: %s\n", |