diff options
| author | Stefan Metzmacher <metze@samba.org> | 2005-10-14 12:22:15 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:39:52 -0500 |
| commit | fccbbf354634b31c9c3cb2bca15843f13e3b77f9 (patch) | |
| tree | 6678adb19a88171fce5569d2183e212d08753aba /source4/nbt_server/defense.c | |
| parent | 0b0c38d899db75e6954af2618e7f063dbfc09fd6 (diff) | |
| download | samba-fccbbf354634b31c9c3cb2bca15843f13e3b77f9.tar.gz samba-fccbbf354634b31c9c3cb2bca15843f13e3b77f9.tar.bz2 samba-fccbbf354634b31c9c3cb2bca15843f13e3b77f9.zip | |
r10997: r11980@SERNOX (orig r10037): metze | 2005-09-05 14:21:40 +0200
add struct nbt_peer_socket and use it instead of passing const char *addr, uint16 port everyhwere
(tridge: can you review this please, (make test works)
metze
(This used to be commit a599d7a4ae881c94be2c2d908a398838549942bb)
Diffstat (limited to 'source4/nbt_server/defense.c')
| -rw-r--r-- | source4/nbt_server/defense.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/source4/nbt_server/defense.c b/source4/nbt_server/defense.c index 8d71b31c65..f8c73c6a3a 100644 --- a/source4/nbt_server/defense.c +++ b/source4/nbt_server/defense.c @@ -32,24 +32,24 @@ */ void nbtd_request_defense(struct nbt_name_socket *nbtsock, struct nbt_name_packet *packet, - const char *src_address, int src_port) + const struct nbt_peer_socket *src) { struct nbtd_iface_name *iname; struct nbt_name *name; struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private, struct nbtd_interface); - NBTD_ASSERT_PACKET(packet, src_address, packet->qdcount == 1); - NBTD_ASSERT_PACKET(packet, src_address, packet->arcount == 1); - NBTD_ASSERT_PACKET(packet, src_address, + NBTD_ASSERT_PACKET(packet, src->addr, packet->qdcount == 1); + NBTD_ASSERT_PACKET(packet, src->addr, packet->arcount == 1); + NBTD_ASSERT_PACKET(packet, src->addr, packet->questions[0].question_type == NBT_QTYPE_NETBIOS); - NBTD_ASSERT_PACKET(packet, src_address, + NBTD_ASSERT_PACKET(packet, src->addr, packet->questions[0].question_class == NBT_QCLASS_IP); - NBTD_ASSERT_PACKET(packet, src_address, + NBTD_ASSERT_PACKET(packet, src->addr, packet->additional[0].rr_type == NBT_QTYPE_NETBIOS); - NBTD_ASSERT_PACKET(packet, src_address, + NBTD_ASSERT_PACKET(packet, src->addr, packet->additional[0].rr_class == NBT_QCLASS_IP); - NBTD_ASSERT_PACKET(packet, src_address, + NBTD_ASSERT_PACKET(packet, src->addr, packet->additional[0].rdata.netbios.length == 6); /* see if we have the requested name on this interface */ @@ -60,10 +60,9 @@ void nbtd_request_defense(struct nbt_name_socket *nbtsock, !IS_GROUP_NAME(name, iname->nb_flags)) { DEBUG(2,("Defending name %s on %s against %s\n", nbt_name_string(packet, name), - iface->bcast_address, src_address)); - nbtd_name_registration_reply(nbtsock, packet, - src_address, src_port, NBT_RCODE_ACT); + iface->bcast_address, src->addr)); + nbtd_name_registration_reply(nbtsock, packet, src, NBT_RCODE_ACT); } else { - nbtd_winsserver_request(nbtsock, packet, src_address, src_port); + nbtd_winsserver_request(nbtsock, packet, src); } } |