Fix include paths to new location of libutil.

[bbaumbach/samba-autobuild/.git] / source4 / nbt_server / defense.c

diff --git a/source4/nbt_server/defense.c b/source4/nbt_server/defense.c
index bce72d805f6fdea5f5accec90cd8f87df5e1beb0..fbe22aa781bb7568efbc5506bb4553ef726b20a5 100644 (file)
--- a/source4/nbt_server/defense.c
+++ b/source4/nbt_server/defense.c
@@ -7,7 +7,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,14 +16,16 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
-#include "dlinklist.h"
+#include "../lib/util/dlinklist.h"
 #include "system/network.h"
 #include "nbt_server/nbt_server.h"
+#include "nbt_server/wins/winsserver.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
+#include "lib/socket/socket.h"
 
 
 /*
@@ -32,36 +34,46 @@
 */
 void nbtd_request_defense(struct nbt_name_socket *nbtsock, 
                          struct nbt_name_packet *packet, 
-                         const char *src_address, int src_port)
+                         struct socket_address *src)
 {
        struct nbtd_iface_name *iname;
        struct nbt_name *name;
-       struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private, 
+       struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
                                                       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, 
+       /*
+        * if the packet comes from one of our interfaces
+        * it must be our winsclient trying to reach the winsserver
+        */
+       if (nbtd_self_packet(nbtsock, packet, src)) {
+               nbtd_winsserver_request(nbtsock, packet, src);
+               return;
+       }
+
+       NBTD_ASSERT_PACKET(packet, src, packet->qdcount == 1);
+       NBTD_ASSERT_PACKET(packet, src, packet->arcount == 1);
+       NBTD_ASSERT_PACKET(packet, src, 
                           packet->questions[0].question_type == NBT_QTYPE_NETBIOS);
-       NBTD_ASSERT_PACKET(packet, src_address, 
+       NBTD_ASSERT_PACKET(packet, src, 
                           packet->questions[0].question_class == NBT_QCLASS_IP);
-       NBTD_ASSERT_PACKET(packet, src_address, 
+       NBTD_ASSERT_PACKET(packet, src, 
                          packet->additional[0].rr_type == NBT_QTYPE_NETBIOS);
-       NBTD_ASSERT_PACKET(packet, src_address, 
+       NBTD_ASSERT_PACKET(packet, src, 
                          packet->additional[0].rr_class == NBT_QCLASS_IP);
-       NBTD_ASSERT_PACKET(packet, src_address, 
+       NBTD_ASSERT_PACKET(packet, src, 
                          packet->additional[0].rdata.netbios.length == 6);
 
        /* see if we have the requested name on this interface */
        name = &packet->questions[0].name;
 
        iname = nbtd_find_iname(iface, name, NBT_NM_ACTIVE);
-       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_negative_name_registration_reply(nbtsock, packet, 
-                                                     src_address, src_port);
+       if (iname != NULL && 
+           !(name->type == NBT_NAME_LOGON || iname->nb_flags & NBT_NM_GROUP)) {
+               DEBUG(2,("Defending name %s on %s against %s\n",
+                        nbt_name_string(packet, name), 
+                        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);
        }
 }