From 0487eee93a06c8d4d1925660d6d14374c4039d86 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 11 Feb 2005 23:54:37 +0000 Subject: r5346: - a bit more preparation for the WINS server going in - more NBT packet asserts, to ensure that incoming requests have all the elements we depend on - open the WINS database at startup if we are configured as a WINS server - split out the nbtd server reply packet generation code so it can be shared by the WINS server - re-did the logic of what is answered by the WINS server and what by the B node server. It now always tries to answer by the B node, and only "recurses" to the WINS server for names that are not found. (This used to be commit 5613e6b8ad9b32639caf5055f793dbc4d0a2fc19) --- source4/nbt_server/defense.c | 75 ++++++++++---------------------------------- 1 file changed, 16 insertions(+), 59 deletions(-) (limited to 'source4/nbt_server/defense.c') diff --git a/source4/nbt_server/defense.c b/source4/nbt_server/defense.c index 86cf587235..bce72d805f 100644 --- a/source4/nbt_server/defense.c +++ b/source4/nbt_server/defense.c @@ -25,56 +25,6 @@ #include "system/network.h" #include "nbt_server/nbt_server.h" -/* - send a name defense reply -*/ -static void nbtd_name_defense_reply(struct nbt_name_socket *nbtsock, - struct nbt_name_packet *request_packet, - const char *src_address, int src_port, - struct nbt_name *name, uint32_t ttl, - uint16_t nb_flags, const char *address) -{ - struct nbt_name_packet *packet; - - packet = talloc_zero(nbtsock, struct nbt_name_packet); - if (packet == NULL) return; - - packet->name_trn_id = request_packet->name_trn_id; - packet->ancount = 1; - packet->operation = - NBT_FLAG_REPLY | - NBT_OPCODE_REGISTER | - NBT_FLAG_AUTHORITIVE | - NBT_FLAG_RECURSION_DESIRED | - NBT_FLAG_RECURSION_AVAIL | - NBT_RCODE_ACT; - - packet->answers = talloc_array(packet, struct nbt_res_rec, 1); - if (packet->answers == NULL) goto failed; - - packet->answers[0].name = *name; - packet->answers[0].rr_type = NBT_QTYPE_NETBIOS; - packet->answers[0].rr_class = NBT_QCLASS_IP; - packet->answers[0].ttl = ttl; - packet->answers[0].rdata.netbios.length = 6; - packet->answers[0].rdata.netbios.addresses = - talloc_array(packet->answers, - struct nbt_rdata_address, 1); - if (packet->answers[0].rdata.netbios.addresses == NULL) goto failed; - packet->answers[0].rdata.netbios.addresses[0].nb_flags = nb_flags; - packet->answers[0].rdata.netbios.addresses[0].ipaddr = - talloc_strdup(packet->answers, address); - if (packet->answers[0].rdata.netbios.addresses[0].ipaddr == NULL) goto failed; - - DEBUG(7,("Sending name defense reply for %s<%02x> at %s to %s:%d\n", - name->name, name->type, src_address, address, src_port)); - - nbt_name_reply_send(nbtsock, src_address, src_port, packet); - -failed: - talloc_free(packet); -} - /* defend our registered names against registration or name refresh @@ -89,12 +39,18 @@ void nbtd_request_defense(struct nbt_name_socket *nbtsock, struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private, struct nbtd_interface); - NBT_ASSERT_PACKET(packet, src_address, packet->qdcount == 1); - NBT_ASSERT_PACKET(packet, src_address, packet->arcount == 1); - NBT_ASSERT_PACKET(packet, src_address, - packet->questions[0].question_type == NBT_QTYPE_NETBIOS); - NBT_ASSERT_PACKET(packet, src_address, - packet->questions[0].question_class == NBT_QCLASS_IP); + NBTD_ASSERT_PACKET(packet, src_address, packet->qdcount == 1); + NBTD_ASSERT_PACKET(packet, src_address, packet->arcount == 1); + NBTD_ASSERT_PACKET(packet, src_address, + packet->questions[0].question_type == NBT_QTYPE_NETBIOS); + NBTD_ASSERT_PACKET(packet, src_address, + packet->questions[0].question_class == NBT_QCLASS_IP); + NBTD_ASSERT_PACKET(packet, src_address, + packet->additional[0].rr_type == NBT_QTYPE_NETBIOS); + NBTD_ASSERT_PACKET(packet, src_address, + packet->additional[0].rr_class == NBT_QCLASS_IP); + NBTD_ASSERT_PACKET(packet, src_address, + packet->additional[0].rdata.netbios.length == 6); /* see if we have the requested name on this interface */ name = &packet->questions[0].name; @@ -103,8 +59,9 @@ void nbtd_request_defense(struct nbt_name_socket *nbtsock, if (iname != NULL && !(iname->nb_flags & NBT_NM_GROUP)) { DEBUG(2,("Defending name %s<%02x> on %s against %s\n", name->name, name->type, iface->bcast_address, src_address)); - nbtd_name_defense_reply(nbtsock, packet, src_address, src_port, - &iname->name, iname->ttl, iname->nb_flags, - iface->ip_address); + nbtd_negative_name_registration_reply(nbtsock, packet, + src_address, src_port); + } else { + nbtd_winsserver_request(nbtsock, packet, src_address, src_port); } } -- cgit