Author: metze Date: 2005-09-20 19:40:03 +0000 (Tue, 20 Sep 2005) New Revision: 10358
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10358 Log: fix some missing nbt_peer_socket cases metze Modified: branches/tmp/samba4-winsrepl/source/nbt_server/dgram/browse.c branches/tmp/samba4-winsrepl/source/nbt_server/dgram/netlogon.c branches/tmp/samba4-winsrepl/source/nbt_server/dgram/ntlogon.c Changeset: Modified: branches/tmp/samba4-winsrepl/source/nbt_server/dgram/browse.c =================================================================== --- branches/tmp/samba4-winsrepl/source/nbt_server/dgram/browse.c 2005-09-20 19:28:11 UTC (rev 10357) +++ branches/tmp/samba4-winsrepl/source/nbt_server/dgram/browse.c 2005-09-20 19:40:03 UTC (rev 10358) @@ -31,8 +31,8 @@ */ void nbtd_mailslot_browse_handler(struct dgram_mailslot_handler *dgmslot, struct nbt_dgram_packet *packet, - const char *src_address, int src_port) + struct nbt_peer_socket *src) { DEBUG(2,("Browse request on '%s' from %s:%d\n", - dgmslot->mailslot_name, src_address, src_port)); + dgmslot->mailslot_name, src->addr, src->port)); } Modified: branches/tmp/samba4-winsrepl/source/nbt_server/dgram/netlogon.c =================================================================== --- branches/tmp/samba4-winsrepl/source/nbt_server/dgram/netlogon.c 2005-09-20 19:28:11 UTC (rev 10357) +++ branches/tmp/samba4-winsrepl/source/nbt_server/dgram/netlogon.c 2005-09-20 19:40:03 UTC (rev 10358) @@ -32,7 +32,7 @@ */ static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot, struct nbt_dgram_packet *packet, - const char *src_address, int src_port, + const struct nbt_peer_socket *src, struct nbt_netlogon_packet *netlogon) { struct nbt_name *name = &packet->data.msg.dest_name; @@ -90,7 +90,7 @@ */ static void nbtd_netlogon_getdc2(struct dgram_mailslot_handler *dgmslot, struct nbt_dgram_packet *packet, - const char *src_address, int src_port, + const struct nbt_peer_socket *src, struct nbt_netlogon_packet *netlogon) { struct nbt_name *name = &packet->data.msg.dest_name; @@ -193,7 +193,7 @@ */ void nbtd_mailslot_netlogon_handler(struct dgram_mailslot_handler *dgmslot, struct nbt_dgram_packet *packet, - const char *src_address, int src_port) + const struct nbt_peer_socket *src) { NTSTATUS status = NT_STATUS_NO_MEMORY; struct nbtd_interface *iface = @@ -215,20 +215,20 @@ } DEBUG(2,("netlogon request to %s from %s:%d\n", - nbt_name_string(netlogon, name), src_address, src_port)); + nbt_name_string(netlogon, name), src->addr, src->port)); status = dgram_mailslot_netlogon_parse(dgmslot, netlogon, packet, netlogon); if (!NT_STATUS_IS_OK(status)) goto failed; switch (netlogon->command) { case NETLOGON_QUERY_FOR_PDC: - nbtd_netlogon_getdc(dgmslot, packet, src_address, src_port, netlogon); + nbtd_netlogon_getdc(dgmslot, packet, src, netlogon); break; case NETLOGON_QUERY_FOR_PDC2: - nbtd_netlogon_getdc2(dgmslot, packet, src_address, src_port, netlogon); + nbtd_netlogon_getdc2(dgmslot, packet, src, netlogon); break; default: DEBUG(2,("unknown netlogon op %d from %s:%d\n", - netlogon->command, src_address, src_port)); + netlogon->command, src->addr, src->port)); NDR_PRINT_DEBUG(nbt_netlogon_packet, netlogon); break; } @@ -238,6 +238,6 @@ failed: DEBUG(2,("nbtd netlogon handler failed from %s:%d - %s\n", - src_address, src_port, nt_errstr(status))); + src->addr, src->port, nt_errstr(status))); talloc_free(netlogon); } Modified: branches/tmp/samba4-winsrepl/source/nbt_server/dgram/ntlogon.c =================================================================== --- branches/tmp/samba4-winsrepl/source/nbt_server/dgram/ntlogon.c 2005-09-20 19:28:11 UTC (rev 10357) +++ branches/tmp/samba4-winsrepl/source/nbt_server/dgram/ntlogon.c 2005-09-20 19:40:03 UTC (rev 10358) @@ -31,8 +31,8 @@ reply to a SAM LOGON request */ static void nbtd_ntlogon_sam_logon(struct dgram_mailslot_handler *dgmslot, - struct nbt_dgram_packet *packet, - const char *src_address, int src_port, + struct nbt_dgram_packet *packet, + const struct nbt_peer_socket *src, struct nbt_ntlogon_packet *ntlogon) { struct nbt_name *name = &packet->data.msg.dest_name; @@ -68,8 +68,8 @@ handle incoming ntlogon mailslot requests */ void nbtd_mailslot_ntlogon_handler(struct dgram_mailslot_handler *dgmslot, - struct nbt_dgram_packet *packet, - const char *src_address, int src_port) + struct nbt_dgram_packet *packet, + const struct nbt_peer_socket *src) { NTSTATUS status = NT_STATUS_NO_MEMORY; struct nbtd_interface *iface = @@ -91,7 +91,7 @@ } DEBUG(2,("ntlogon request to %s from %s:%d\n", - nbt_name_string(ntlogon, name), src_address, src_port)); + nbt_name_string(ntlogon, name), src->addr, src->port)); status = dgram_mailslot_ntlogon_parse(dgmslot, ntlogon, packet, ntlogon); if (!NT_STATUS_IS_OK(status)) goto failed; @@ -99,11 +99,11 @@ switch (ntlogon->command) { case NTLOGON_SAM_LOGON: - nbtd_ntlogon_sam_logon(dgmslot, packet, src_address, src_port, ntlogon); + nbtd_ntlogon_sam_logon(dgmslot, packet, src, ntlogon); break; default: DEBUG(2,("unknown ntlogon op %d from %s:%d\n", - ntlogon->command, src_address, src_port)); + ntlogon->command, src->addr, src->port)); break; } @@ -112,6 +112,6 @@ failed: DEBUG(2,("nbtd ntlogon handler failed from %s:%d - %s\n", - src_address, src_port, nt_errstr(status))); + src->addr, src->port, nt_errstr(status))); talloc_free(ntlogon); }
