lots of changes to nmbd

lkcl
(This used to be commit 45d3b2644733333c657c48a69719fec72881f7df)

3 files changed, 20 insertions, 6 deletions

diff --git a/source3/include/nameserv.h b/source3/include/nameserv.h
index de5e492644..b634250c81 100644
--- a/source3/include/nameserv.h
+++ b/source3/include/nameserv.h
@@ -85,7 +85,17 @@
 enum name_source {STATUS_QUERY, LMHOSTS, REGISTER, SELF, DNS, DNSFAIL};
 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_NONE, MST_WON, MST_MSB, MST_BROWSER, MST_DOMAIN };
+enum master_state
+{
+   MST_NONE,
+   MST_WON,
+   MST_MSB,
+   MST_BROWSER,
+   MST_DOMAIN_NONE,
+   MST_DOMAIN_MEM,
+   MST_DOMAIN_TST,
+   MST_DOMAIN
+};
 
 enum state_type
 {
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 2286b93a6d..e7225a7271 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -256,7 +256,7 @@ BOOL ms_browser_name(char *name, int type);
 void remove_name(struct subnet_record *d, struct name_record *n);
 struct name_record *find_name(struct name_record *n,
 			struct nmb_name *name,
-			int search, struct in_addr ip);
+			int search);
 struct name_record *find_name_search(struct subnet_record **d,
 			struct nmb_name *name,
 			int search, struct in_addr ip);
@@ -286,6 +286,7 @@ struct response_record *find_response_record(struct subnet_record **d,
 				uint16 id);
 void remove_old_servers(struct work_record *work, time_t t,
 					BOOL remove_all);
+struct server_record *find_server(struct work_record *work, char *name);
 struct server_record *add_server_entry(struct subnet_record *d, 
 				       struct work_record *work,
 				       char *name,int servertype, 
@@ -320,12 +321,13 @@ void run_elections(void);
 void process_election(struct packet_struct *p,char *buf);
 BOOL check_elections(void);
 void process_logon_packet(struct packet_struct *p,char *buf,int len);
+void debug_browse_data(char *outbuf, int len);
 void initiate_netbios_packet(uint16 *id,
 				int fd,int quest_type,char *name,int name_type,
 			    int nb_flags,BOOL bcast,BOOL recurse,
 			    struct in_addr to_ip);
 void reply_netbios_packet(struct packet_struct *p1,int trn_id,
-				int rcode,int opcode, BOOL recurse,
+				int rcode, int rcv_code, int opcode, BOOL recurse,
 				struct nmb_name *rr_name,int rr_type,int rr_class,int ttl,
 				char *data,int len);
 void queue_packet(struct packet_struct *packet);
@@ -357,11 +359,12 @@ void add_my_names(void);
 void remove_my_names();
 void refresh_my_names(time_t t);
 void query_refresh_names(void);
-void add_name_respond(struct subnet_record *d, int fd, uint16 response_id,
+void add_name_respond(struct subnet_record *d, int fd, struct in_addr from_ip,
+				uint16 response_id,
 				struct nmb_name *name,
 				int nb_flags, int ttl, struct in_addr register_ip,
 				BOOL new_owner, struct in_addr reply_to_ip);
-void send_name_response(int fd,
+void send_name_response(int fd, struct in_addr from_ip,
 				int name_trn_id, int opcode, BOOL success, BOOL recurse,
 				struct nmb_name *reply_name, int nb_flags, int ttl,
 				struct in_addr ip);
@@ -369,6 +372,7 @@ void reply_name_release(struct packet_struct *p);
 void reply_name_reg(struct packet_struct *p);
 void reply_name_status(struct packet_struct *p);
 void reply_name_query(struct packet_struct *p);
+void debug_state_type(int state);
 void response_netbios_packet(struct packet_struct *p);
 void reset_server(char *name, int state, struct in_addr ip);
 void tell_become_backup(void);
diff --git a/source3/include/version.h b/source3/include/version.h
index 964411164d..7bde637b18 100644
--- a/source3/include/version.h
+++ b/source3/include/version.h
@@ -1 +1 @@
-#define VERSION "1.9.16alpha10"
+#define VERSION "1.9.16a10"