This is it ! The mega-merge of the JRA_NMBD_REWRITE branch

back into the main tree.
For the cvs logs of all the files starting nmbd_*.c, look
in the JRA_NMBD_REWRITE branch. That branch has now been
discontinued.
Jeremy.
(This used to be commit d80b0cb645f81d16734929a0b27a91c6650499bb)

1 files changed, 306 insertions, 176 deletions

diff --git a/source3/include/nameserv.h b/source3/include/nameserv.h
index 2a7bb29070..4b7216fef6 100644
--- a/source3/include/nameserv.h
+++ b/source3/include/nameserv.h
@@ -1,3 +1,5 @@
+#ifndef _NAMESERV_H_
+#define _NAMESERV_H_
 /* 
    Unix SMB/Netbios implementation.
    Version 1.9.
@@ -20,7 +22,7 @@
    
 */
 
-#define GET_TTL(ttl) ((ttl)?MIN(ttl,lp_max_ttl()):lp_max_ttl())
+#define PERMANENT_TTL 0
 
 /* NTAS uses 2, NT uses 1, WfWg uses 0 */
 #define MAINTAIN_LIST    2
@@ -29,17 +31,44 @@
 #define MAX_DGRAM_SIZE (576) /* tcp/ip datagram limit is 576 bytes */
 #define MIN_DGRAM_SIZE 12
 
-#define NMB_QUERY  0x20
-#define NMB_STATUS 0x21
+/*********************************************************
+ Types of reply packet.
+**********************************************************/
+
+enum netbios_reply_type_code { NMB_QUERY, NMB_STATUS, NMB_REG, NMB_REG_REFRESH,
+                               NMB_REL, NMB_WAIT_ACK, NMB_MULTIHOMED_REG,
+                               WINS_REG, WINS_QUERY };
+
+/* From rfc1002, 4.2.1.2 */
+/* Question types. */
+#define QUESTION_TYPE_NB_QUERY  0x20
+#define QUESTION_TYPE_NB_STATUS 0x21
+
+/* Question class */
+#define QUESTION_CLASS_IN  0x1
+
+/* Opcode definitions */
+#define NMB_NAME_QUERY_OPCODE       0x0
+#define NMB_NAME_REG_OPCODE         0x05 /* see rfc1002.txt 4.2.2,3,5,6,7,8 */
+#define NMB_NAME_RELEASE_OPCODE     0x06 /* see rfc1002.txt 4.2.9,10,11 */
+#define NMB_WACK_OPCODE             0x07 /* see rfc1002.txt 4.2.16 */
+/* Ambiguity in rfc1002 about which of these is correct. */
+/* WinNT uses 8 by default but can be made to use 9. */
+#define NMB_NAME_REFRESH_OPCODE_8   0x08 /* see rfc1002.txt 4.2.4 */
+#define NMB_NAME_REFRESH_OPCODE_9   0x09 /* see rfc1002.txt 4.2.4 */
+#define NMB_NAME_MULTIHOMED_REG_OPCODE 0x0F /* Invented by Microsoft. */
 
-#define NMB_REG         0x05 /* see rfc1002.txt 4.2.2,3,5,6,7,8 */
-#define NMB_REG_REFRESH 0x09 /* see rfc1002.txt 4.2.4 */
-#define NMB_REL         0x06 /* see rfc1002.txt 4.2.9,10,11 */
-#define NMB_WAIT_ACK    0x07 /* see rfc1002.txt 4.2.16 */
 /* XXXX what about all the other types?? 0x1, 0x2, 0x3, 0x4, 0x8? */
 
-#define FIND_ANY_NAME   0
-#define FIND_SELF_NAME  1
+/* Resource record types. rfc1002 4.2.1.3 */
+#define RR_TYPE_A                  0x1
+#define RR_TYPE_NS                 0x2
+#define RR_TYPE_NULL               0xA
+#define RR_TYPE_NB                0x20
+#define RR_TYPE_NBSTAT            0x21
+
+/* Resource record class. */
+#define RR_CLASS_IN                0x1
 
 /* NetBIOS flags */
 #define NB_GROUP  0x80
@@ -47,206 +76,299 @@
 #define NB_ACTIVE 0x04
 #define NB_CONFL  0x08
 #define NB_DEREG  0x10
-#define NB_BFLAG  0x00 /* broadcast node type */
-#define NB_PFLAG  0x20 /* point-to-point node type */
-#define NB_MFLAG  0x40 /* mixed bcast & p-p node type */
-#define NB_HFLAG  0x60 /* microsoft 'hybrid' node type */
-#define NB_FLGMSK 0x60
+#define NB_BFLAG  0x00 /* Broadcast node type. */
+#define NB_PFLAG  0x20 /* Point-to-point node type. */
+#define NB_MFLAG  0x40 /* Mixed bcast & p-p node type. */
+#define NB_HFLAG  0x60 /* Microsoft 'hybrid' node type. */
+#define NB_NODETYPEMASK 0x60
+/* Mask applied to outgoing NetBIOS flags. */
+#define NB_FLGMSK 0xE0
+
+/* NetBIOS flag identifier. */
+#define NAME_GROUP(p)     ((p)->nb_flags & NB_GROUP)
+#define NAME_BFLAG(p)     (((p)->nb_flags & NB_NODETYPEMASK) == NB_BFLAG)
+#define NAME_PFLAG(p)     (((p)->nb_flags & NB_NODETYPEMASK) == NB_PFLAG)
+#define NAME_MFLAG(p)     (((p)->nb_flags & NB_NODETYPEMASK) == NB_MFLAG)
+#define NAME_HFLAG(p)     (((p)->nb_flags & NB_NODETYPEMASK) == NB_HFLAG)
+
+/* Samba name state for a name in a namelist. */
+#define NAME_IS_ACTIVE(p) ((p)->nb_flags & NB_ACTIVE)
+#define NAME_IN_CONFLICT(p)  ((p)->nb_flags & NB_CONFL)
+#define NAME_IS_DEREGISTERING(p)     ((p)->nb_flags & NB_DEREG)
+
+/* Error codes for NetBIOS requests. */
+#define FMT_ERR   0x1       /* Packet format error. */
+#define SRV_ERR   0x2       /* Internal server error. */
+#define NAM_ERR   0x3       /* Name does not exist. */
+#define IMP_ERR   0x4       /* Request not implemented. */
+#define RFS_ERR   0x5       /* Request refused. */
+#define ACT_ERR   0x6       /* Active error - name owned by another host. */
+#define CFT_ERR   0x7       /* Name in conflict error. */
 
 #define REFRESH_TIME (15*60)
 #define NAME_POLL_REFRESH_TIME (5*60)
 #define NAME_POLL_INTERVAL 15
 
-/* NetBIOS flag identifier */
-#define NAME_PERMANENT(p) ((p) & NB_PERM)
-#define NAME_ACTIVE(p)    ((p) & NB_ACTIVE)
-#define NAME_CONFLICT(p)  ((p) & NB_CONFL)
-#define NAME_DEREG(p)     ((p) & NB_DEREG)
-#define NAME_GROUP(p)     ((p) & NB_GROUP)
-
-#define NAME_BFLAG(p)     (((p) & NB_FLGMSK) == NB_BFLAG)
-#define NAME_PFLAG(p)     (((p) & NB_FLGMSK) == NB_PFLAG)
-#define NAME_MFLAG(p)     (((p) & NB_FLGMSK) == NB_MFLAG)
-#define NAME_HFLAG(p)     (((p) & NB_FLGMSK) == NB_HFLAG)
-
-/* server type identifiers */
-#define AM_MASTER(work) (work->ServerType & SV_TYPE_MASTER_BROWSER)
-#define AM_BACKUP(work) (work->ServerType & SV_TYPE_BACKUP_BROWSER)
-#define AM_DOMMST(work) (work->ServerType & SV_TYPE_DOMAIN_MASTER)
-#define AM_DOMMEM(work) (work->ServerType & SV_TYPE_DOMAIN_MEMBER)
-
-/* microsoft browser NetBIOS name */
+/* Workgroup state identifiers. */
+#define AM_POTENTIAL_MASTER_BROWSER(work) ((work)->mst_state == MST_POTENTIAL)
+#define AM_LOCAL_MASTER_BROWSER(work) ((work)->mst_state == MST_BROWSER)
+#define AM_DOMAIN_MASTER_BROWSER(work) ((work)->dom_state == DOMAIN_MST)
+#define AM_DOMAIN_MEMBER(work) ((work)->log_state == LOGON_SRV)
+
+/* Microsoft browser NetBIOS name. */
 #define MSBROWSE "\001\002__MSBROWSE__\002"
 
-/* mail slots */
+/* Mail slots. */
 #define BROWSE_MAILSLOT    "\\MAILSLOT\\BROWSE"
 #define NET_LOGON_MAILSLOT "\\MAILSLOT\\NET\\NETLOGON"
 #define NT_LOGON_MAILSLOT  "\\MAILSLOT\\NET\\NTLOGON"
 
-enum name_source {STATUS_QUERY, LMHOSTS, REGISTER, SELF, DNS, DNSFAIL};
+/* Samba definitions for find_name_on_subnet(). */
+#define FIND_ANY_NAME   0
+#define FIND_SELF_NAME  1
+
+/*
+ * The different name types that can be in namelists.
+ *
+ * SELF_NAME should only be on the broadcast and unicast subnets.
+ * LMHOSTS_NAME should only be in the remote_broadcast_subnet.
+ * REGISTER_NAME, DNS_NAME, DNSFAIL_NAME should only be in the wins_server_subnet.
+ * WINS_PROXY_NAME should only be on the broadcast subnets.
+ * PERMANENT_NAME can be on all subnets except remote_broadcast_subnet.
+ *
+ */
+
+enum name_source {LMHOSTS_NAME, REGISTER_NAME, SELF_NAME, DNS_NAME, 
+                  DNSFAIL_NAME, PERMANENT_NAME, WINS_PROXY_NAME};
 enum node_type {B_NODE=0, P_NODE=1, M_NODE=2, NBDD_NODE=3};
 enum packet_type {NMB_PACKET, DGRAM_PACKET};
 
 enum master_state
 {
-   MST_POTENTIAL,
-   MST_BACK,
-   MST_MSB,
-   MST_BROWSER
+  MST_NONE,
+  MST_POTENTIAL,
+  MST_BACKUP,
+  MST_MSB,
+  MST_BROWSER,
+  MST_UNBECOMING_MASTER
 };
 
 enum domain_state
 {
-   DOMAIN_NONE,
-   DOMAIN_WAIT,
-   DOMAIN_MST
+  DOMAIN_NONE,
+  DOMAIN_WAIT,
+  DOMAIN_MST
 };
 
 enum logon_state
 {
-   LOGON_NONE,
-   LOGON_WAIT,
-   LOGON_SRV
-};
-
-enum state_type
-{
-	NAME_STATUS_DOM_SRV_CHK,
-	NAME_STATUS_SRV_CHK,
-	NAME_REGISTER_CHALLENGE,
-	NAME_REGISTER,
-	NAME_RELEASE,
-	NAME_QUERY_CONFIRM,
-	NAME_QUERY_SYNC_LOCAL,
-	NAME_QUERY_SYNC_REMOTE,
-	NAME_QUERY_DOM_SRV_CHK,
-	NAME_QUERY_SRV_CHK,
-	NAME_QUERY_FIND_MST,
-	NAME_QUERY_MST_CHK,
-	NAME_QUERY_DOMAIN
+  LOGON_NONE,
+  LOGON_WAIT,
+  LOGON_SRV
 };
 
-/* a netbios name structure */
+/* A netbios name structure. */
 struct nmb_name {
   char name[17];
   char scope[64];
-  int name_type;
+  unsigned int name_type;
 };
 
-/* a netbios flags + ip address structure */
-/* this is used for multi-homed systems and for internet group names */
-struct nmb_ip
-{
-  struct in_addr ip; /* ip address of host that owns this name */
-  uint16 nb_flags;      /* netbios flags */
-};
-
-/* this is the structure used for the local netbios name list */
+/* This is the structure used for the local netbios name list. */
 struct name_record
 {
   struct name_record *next;
   struct name_record *prev;
 
-  struct nmb_name name;    /* the netbios name */
-  struct nmb_ip *ip_flgs;  /* the ip + flags */
-  int num_ips;             /* number of ip+flags entries */
+  struct subnet_record *subnet;
 
-  enum name_source source; /* where the name came from */
+  struct nmb_name name;    /* The netbios name. */
+  uint16 nb_flags;         /* Netbios flags. */
+  int num_ips;             /* Number of ip entries. */
+  struct in_addr *ip;      /* The ip list for this name. */
 
-  time_t death_time; /* time record must be removed (do not remove if 0) */
-  time_t refresh_time; /* time record should be refreshed */
+  enum name_source source; /* Where the name came from. */
+
+  time_t death_time; /* The time the record must be removed (do not remove if 0). */
+  time_t refresh_time; /* The time the record should be refreshed. */
 };
 
 struct subnet_record;
 
-/* browse and backup server cache for synchronising browse list */
+/* Browser cache for synchronising browse lists. */
 struct browse_cache_record
 {
-	struct browse_cache_record *next;
-	struct browse_cache_record *prev;
-
-	pstring name;
-	int type;
-	pstring group;
-	struct in_addr ip;
-	time_t sync_time;
-	BOOL synced;
-	BOOL local;
-        struct subnet_record *subnet;
+  struct browse_cache_record *next;
+  struct browse_cache_record *prev;
+
+  pstring lmb_name;
+  pstring work_group;
+  struct in_addr ip;
+  time_t sync_time;
+  time_t death_time; /* The time the record must be removed. */
 };
 
-/* this is used to hold the list of servers in my domain, and is */
-/* contained within lists of domains */
+/* This is used to hold the list of servers in my domain, and is
+   contained within lists of domains. */
+
 struct server_record
 {
   struct server_record *next;
   struct server_record *prev;
 
+  struct subnet_record *subnet;
+
   struct server_info_struct serv;
   time_t death_time;  
 };
 
-/* a workgroup structure. it contains a list of servers */
+/* A workgroup structure. It contains a list of servers. */
 struct work_record
 {
   struct work_record *next;
   struct work_record *prev;
 
+  struct subnet_record *subnet;
+
   struct server_record *serverlist;
 
-  /* stage of development from non-local-master up to local-master browser */
+  /* Stage of development from non-local-master up to local-master browser. */
   enum master_state mst_state;
 
-  /* stage of development from non-domain-master to domain master browser */
+  /* Stage of development from non-domain-master to domain-master browser. */
   enum domain_state dom_state;
 
-  /* stage of development from non-logon-server to logon server */
+  /* Stage of development from non-logon-server to logon server. */
   enum logon_state log_state;
 
-  /* work group info */
+  /* Work group info. */
   fstring work_group;
-  int     token;        /* used when communicating with backup browsers */
-  int     ServerType;
+  int     token;        /* Used when communicating with backup browsers. */
+  fstring local_master_browser_name;      /* Current local master browser. */
 
-  /* announce info */
+  /* Announce info. */
   time_t lastannounce_time;
   int announce_interval;
   BOOL    needannounce;
 
+  /* Timeout time for this workgroup. 0 means permanent. */
+  time_t death_time;  
 
-  /* election info */
+  /* Election info */
   BOOL    RunningElection;
   BOOL    needelection;
   int     ElectionCount;
   uint32  ElectionCriterion;
+
+  /* Domain master browser info. Used for efficient syncs. */
+  struct nmb_name dmb_name;
+  struct in_addr dmb_addr;
 };
 
-/* initiated name queries recorded in this list to track any responses... */
-/* sadly, we need to group everything together. i suppose that if this
-   gets unwieldy, then a union ought to be considered. oh for c++... */
+/* typedefs needed to define copy & free functions for userdata. */
+struct userdata_struct;
+
+typedef struct userdata_struct * (*userdata_copy_fn)(struct userdata_struct *);
+typedef void (*userdata_free_fn)(struct userdata_struct *);
+
+/* Structure to define any userdata passed around. */
+
+struct userdata_struct {
+  userdata_copy_fn copy_fn;
+  userdata_free_fn free_fn;
+  unsigned int userdata_len;
+  char data[1];
+};
+
+struct response_record;
+struct packet_struct;
+struct res_rec;
+
+/* typedef to define the function called when this response packet comes in. */
+typedef void (*response_function)(struct subnet_record *, struct response_record *,
+                                  struct packet_struct *);
+
+/* typedef to define the function called when this response record times out. */
+typedef void (*timeout_response_function)(struct subnet_record *,
+                                          struct response_record *);
+
+/* typedef to define the function called when the request that caused this
+   response record to be created is successful. */
+typedef void (*success_function)(struct subnet_record *, struct userdata_struct *, ...);
+
+/* typedef to define the function called when the request that caused this
+   response record to be created is unsuccessful. */
+typedef void (*fail_function)(struct subnet_record *, struct response_record *, ...);
+
+/* List of typedefs for success and fail functions of the different query
+   types. Used to catch any compile time prototype errors. */
+
+typedef void (*register_name_success_function)( struct subnet_record *,
+                                                struct userdata_struct *,
+                                                struct nmb_name *,
+                                                uint16,
+                                                int,
+                                                struct in_addr);
+typedef void (*register_name_fail_function)( struct subnet_record *,
+                                             struct response_record *,
+                                             struct nmb_name *);
+
+typedef void (*release_name_success_function)( struct subnet_record *,
+                                               struct userdata_struct *, 
+                                               struct nmb_name *,
+                                               struct in_addr);
+typedef void (*release_name_fail_function)( struct subnet_record *,
+                                            struct response_record *, 
+                                            struct nmb_name *);
+
+typedef void (*refresh_name_success_function)( struct subnet_record *,
+                                               struct userdata_struct *, 
+                                               struct nmb_name *,
+                                               uint16,
+                                               int,
+                                               struct in_addr);
+typedef void (*refresh_name_fail_function)( struct subnet_record *,
+                                            struct response_record *,
+                                            struct nmb_name *);
+
+typedef void (*query_name_success_function)( struct subnet_record *,
+                                             struct userdata_struct *,
+                                             struct nmb_name *,
+                                             struct in_addr,
+                                             struct res_rec *answers);
+
+typedef void (*query_name_fail_function)( struct subnet_record *,
+                                          struct response_record *,    
+                                          struct nmb_name *,
+                                          int);  
+
+typedef void (*node_status_success_function)( struct subnet_record *,
+                                              struct userdata_struct *,
+                                              struct res_rec *,
+                                              struct in_addr);
+typedef void (*node_status_fail_function)( struct subnet_record *,
+                                           struct response_record *);
+
+/* Initiated name queries are recorded in this list to track any responses. */
+
 struct response_record
 {
   struct response_record *next;
   struct response_record *prev;
 
   uint16 response_id;
-  enum state_type state;
 
-  int fd;
-  int quest_type;
-  struct nmb_name name;
-  int nb_flags;
-  time_t ttl;
+  /* Callbacks for packets received or not. */ 
+  response_function resp_fn;
+  timeout_response_function timeout_fn;
 
-  int server_type;
-  fstring my_name;
-  fstring my_comment;
+  /* Callbacks for the request succeeding or not. */
+  success_function success_fn;
+  fail_function fail_fn;
+ 
+  struct packet_struct *packet;
 
-  BOOL bcast;
-  BOOL recurse;
-  struct in_addr send_ip;
-  struct in_addr reply_to_ip;
-  int reply_id;
+  struct userdata_struct *userdata;
 
   int num_msgs;
 
@@ -255,37 +377,35 @@ struct response_record
   int    repeat_count;
 };
 
-/* a subnet structure. it contains a list of workgroups and netbios names*/
-
-/* note that a subnet of 255.255.255.255 contains all the WINS netbios names.
-   all communication from such nodes are on a non-broadcast basis: they
-   are point-to-point (P nodes) or mixed point-to-point and broadcast
-   (M nodes). M nodes use point-to-point as a preference, and will use
-   broadcasting for certain activities, or will resort to broadcasting as a
-   last resort, if the WINS server fails (users of wfwg will notice that their
-   machine often freezes for 30 seconds at a time intermittently, if the WINS
-   server is down).
+/* A subnet structure. It contains a list of workgroups and netbios names. */
 
+/*
    B nodes will have their own, totally separate subnet record, with their
-   own netbios name set. these do NOT interact with other subnet records'
-   netbios names, INCLUDING the WINS one (with an ip "address", so called,
-   of 255.255.255.255)
-
-   there is a separate response list for each subnet record. in the case of
-   the 255.255.255.255 subnet record (WINS), the WINS server will be able to
-   use this to poll (infrequently!) each of its entries, to ensure that the
-   names are still in use.
-   XXXX this polling is a planned feature for a really over-cautious WINS server 
+   own netbios name set. These do NOT interact with other subnet records'
+   netbios names.
 */
 
+enum subnet_type {
+  NORMAL_SUBNET              = 0,  /* Subnet listed in interfaces list. */
+  UNICAST_SUBNET             = 1,  /* Subnet for unicast packets. */
+  REMOTE_BROADCAST_SUBNET    = 2,  /* Subnet for remote broadcasts. */
+  WINS_SERVER_SUBNET         = 3   /* Only created if we are a WINS server. */
+};
+
 struct subnet_record
 {
   struct subnet_record *next;
   struct subnet_record *prev;
 
-  struct work_record *workgrouplist; /* list of workgroups */
-  struct name_record *namelist;      /* list of netbios names */
-  struct response_record *responselist; /* list of responses expected */
+  char  *subnet_name;      /* For Debug identification. */
+  enum subnet_type type;   /* To catagorize the subnet. */
+
+  struct work_record *workgrouplist; /* List of workgroups. */
+  struct name_record *namelist;      /* List of netbios names. */
+  struct response_record *responselist; /* List of responses expected. */
+
+  BOOL namelist_changed;
+  BOOL work_changed;
 
   struct in_addr bcast_ip;
   struct in_addr mask_ip;
@@ -294,7 +414,7 @@ struct subnet_record
   int dgram_sock;             /* socket to listen for unicast 138. */
 };
 
-/* a resource record */
+/* A resource record. */
 struct res_rec {
   struct nmb_name rr_name;
   int rr_type;
@@ -304,7 +424,7 @@ struct res_rec {
   char rdata[MAX_DGRAM_SIZE];
 };
 
-/* define a nmb packet. */
+/* An nmb packet. */
 struct nmb_packet
 {
   struct {
@@ -337,7 +457,8 @@ struct nmb_packet
 };
 
 
-/* a datagram - this normally contains SMB data in the data[] array */
+/* A datagram - this normally contains SMB data in the data[] array. */
+
 struct dgram_packet {
   struct {
     int msg_type;
@@ -358,32 +479,35 @@ struct dgram_packet {
   char data[MAX_DGRAM_SIZE];
 };
 
-/* define a structure used to queue packets. this will be a linked
- list of nmb packets */
+/* Define a structure used to queue packets. This will be a linked
+ list of nmb packets. */
+
 struct packet_struct
 {
-	struct packet_struct *next;
-	struct packet_struct *prev;
-	BOOL locked;
-	struct in_addr ip;
-	int port;
-	int fd;
-	time_t timestamp;
-	enum packet_type packet_type;
-	union {
-		struct nmb_packet nmb;
-		struct dgram_packet dgram;
-	} packet;
+  struct packet_struct *next;
+  struct packet_struct *prev;
+  BOOL locked;
+  struct in_addr ip;
+  int port;
+  int fd;
+  time_t timestamp;
+  enum packet_type packet_type;
+  union {
+    struct nmb_packet nmb;
+    struct dgram_packet dgram;
+  } packet;
 };
 
 /* NETLOGON opcodes */
-#define QUERYFORPDC	7 /* Query for PDC */
-#define QUERYFORPDC_R	12 /* Response to Query for PDC */
+
+#define QUERYFORPDC	 7 /* Query for PDC. */
+#define QUERYFORPDC_R	12 /* Response to Query for PDC. */
 #define SAMLOGON	18
 #define SAMLOGON_R	19
 
 
-/* ids for netbios packet types */
+/* Ids for netbios packet types. */
+
 #define ANN_HostAnnouncement         1
 #define ANN_AnnouncementRequest      2
 #define ANN_Election                 8
@@ -396,42 +520,48 @@ struct packet_struct
 #define ANN_LocalMasterAnnouncement 15
 
 
-/* broadcast packet announcement intervals, in minutes */
+/* Broadcast packet announcement intervals, in minutes. */
 
-/* attempt to add domain logon and domain master names */
+/* Attempt to add domain logon and domain master names. */
 #define CHECK_TIME_ADD_DOM_NAMES 5 
 
-/* search for master browsers of workgroups samba knows about, 
-   except default */
+/* Search for master browsers of workgroups samba knows about, 
+   except default. */
 #define CHECK_TIME_MST_BROWSE       5 
 
-/* request backup browser announcements from other servers */
+/* Request backup browser announcements from other servers. */
 #define CHECK_TIME_ANNOUNCE_BACKUP 15
 
-/* request host announcements from other servers: min and max of interval */
+/* Request host announcements from other servers: min and max of interval. */
 #define CHECK_TIME_MIN_HOST_ANNCE   3
 #define CHECK_TIME_MAX_HOST_ANNCE  12
 
-/* announce as master to WINS server and any Primary Domain Controllers */
+/* Announce as master to WINS server and any Primary Domain Controllers. */
 #define CHECK_TIME_MST_ANNOUNCE    15
 
-/* do all remote announcements this often */
+/* Time between syncs from domain master browser to local master browsers. */
+#define CHECK_TIME_DMB_TO_LMB_SYNC    15
+
+/* Do all remote announcements this often. */
 #define REMOTE_ANNOUNCE_INTERVAL 180
 
-/* Types of machine we can announce as */
+/* Types of machine we can announce as. */
 #define ANNOUNCE_AS_NT 1
 #define ANNOUNCE_AS_WIN95 2
 #define ANNOUNCE_AS_WFW 3
 
 /* Macro's to enumerate subnets either with or without
-   the WINS subnet. */
+   the UNICAST subnet. */
 
 extern struct subnet_record *subnetlist;
-extern struct subnet_record *wins_client_subnet;
+extern struct subnet_record *unicast_subnet;
+extern struct subnet_record *wins_server_subnet;
+extern struct subnet_record *remote_broadcast_subnet;
 
 #define FIRST_SUBNET subnetlist
-#define NEXT_SUBNET_EXCLUDING_WINS(x) ((x)->next)
-#define NEXT_SUBNET_INCLUDING_WINS(x) ( ((x) == wins_client_subnet) ? NULL : \
-                                        (((x)->next == NULL) ? wins_client_subnet : \
-                                         (x)->next))
+#define NEXT_SUBNET_EXCLUDING_UNICAST(x) ((x)->next)
+#define NEXT_SUBNET_INCLUDING_UNICAST(x) (get_next_subnet_maybe_unicast((x)))
 
+/* To be removed. */
+enum state_type { TEST };
+#endif /* _NAMESERV_H_ */