Big change to make nmbd code more readable/understandable.

Main change is removal of find_name_search() confusion.
This has been replaced with find_name_on_subnet() which
makes it explicit what is being searched.

Also changed wins_subnet to be wins_client_subnet in
preparation for splitting the wins subnet into client
and server pieces.

This is a big nmbd change and I'd appreciate any
bug reports.

Specific changes follow :

asyncdns.c:
     Removed wins entry from add_netbios_entry(). This is now
     explicit in the subnet_record parameter.

interface.c:
     iface_bcast(), iface_nmask(), iface_ip() return the
     default interface if none can be found. Made this
     behavior explicit - some code in nmbd incorrectly
     depended upon this (reply_name_status() for instance).

nameannounce.c:
     find_name_search changes to find_name_on_subnet.

namebrowse.c:
     wins_subnet renamed to wins_client_subnet.

namedbname.c:
     find_name_search removed. find_name_on_subnet added.
     add_netbios_entry - wins parameter removed.

namedbsubnet.c:
     find_req_subnet removed - not explicit enough.

nameelect.c:
     wins_subnet renamed to wins_client_subnet.

namepacket.c:
     listening() simplified.

nameresp.c:
     wins_subnet renamed to wins_client_subnet.

nameserv.c:
     find_name_search moved to find_name_on_subnet.

nameserv.h:
     FIND_XXX  -> changed to FIND_SELF_NAME, FIND_ANY_NAME.

nameservreply.c:
     find_name_search moved to find_name_on_subnet.
     Debug entries changed.

nameservresp.c:
     wins_subnet renamed to wins_client_subnet.

namework.c:
     wins_subnet renamed to wins_client_subnet.

nmbd.c:
     wins parameter removed from add_netbios_entry.

nmbsync:
     wins_subnet renamed to wins_client_subnet.

proto.h: The usual.

server.c:
     remove accepted fd from fd_set.

Jeremy (jallison@whistle.com)
(This used to be commit 2c97b33fc0b5ef181dbf51a50cb61074935165bf)

1 files changed, 4 insertions, 7 deletions

diff --git a/source3/namepacket.c b/source3/namepacket.c
index 5b3f06f16d..626e50b788 100644
--- a/source3/namepacket.c
+++ b/source3/namepacket.c
@@ -319,13 +319,10 @@ void queue_packet(struct packet_struct *packet)
 static BOOL listening(struct packet_struct *p,struct nmb_name *n)
 {
   struct subnet_record *d;
-  struct name_record *n1;
+  struct name_record *n1 = NULL;
 
-  /* We explicitly don't search WINS here - this will be done
-     in find_name_search if it was a packet from a non-local subnet. */
-  d = find_subnet(p->ip);
-
-  n1 = find_name_search(&d,n,FIND_LOCAL|FIND_WINS|FIND_SELF,p->ip);
+  if((d = find_subnet_all(p->ip)) != NULL)
+    n1 = find_name_on_subnet(d, n, FIND_SELF_NAME);
 
   return (n1 != NULL);
 }
@@ -483,7 +480,7 @@ static void process_nmb(struct packet_struct *p)
   ******************************************************************/
 void run_packet_queue()
 {
-	struct packet_struct *p, *nextp;
+	struct packet_struct *p;
 
 	while ((p=packet_queue)) {
 		packet_queue = p->next;