r5275: - added support for NBT_OPCODE_MULTI_HOME_REG (opcode 0xf) for WINS name registrations

- fixed a bug in the send queue handling on timeouts

- added support for handling unexpected replies (replies to the wrong
  port) at the nbtsocket layer

- added separate layer 2 code for wins refresh and wins registration
(This used to be commit 2502b02898407e3262c09a5a4aa573c5f87b8f5f)

1 files changed, 30 insertions, 3 deletions

diff --git a/source4/libcli/nbt/libnbt.h b/source4/libcli/nbt/libnbt.h
index c126f59280..63711490fe 100644
--- a/source4/libcli/nbt/libnbt.h
+++ b/source4/libcli/nbt/libnbt.h
@@ -113,7 +113,13 @@ struct nbt_name_socket {
 				const char *, int );
 		void *private;
 	} incoming;
-	   
+
+	/* what to do with unexpected replies */
+	struct {
+		void (*handler)(struct nbt_name_socket *, struct nbt_name_packet *, 
+				const char *, int );
+		void *private;
+	} unexpected;
 };
 
 
@@ -161,6 +167,7 @@ struct nbt_name_register {
 		uint16_t nb_flags;
 		BOOL register_demand;
 		BOOL broadcast;
+		BOOL multi_homed;
 		uint32_t ttl;
 		int timeout; /* in seconds */
 		int retries;
@@ -184,9 +191,10 @@ struct nbt_name_register_bcast {
 	} in;
 };
 
-/* wins name refresh with multiple wins servers to try and multiple
+
+/* wins name register with multiple wins servers to try and multiple
    addresses to register */
-struct nbt_name_refresh_wins {
+struct nbt_name_register_wins {
 	struct {
 		struct nbt_name name;
 		const char **wins_servers;
@@ -201,6 +209,7 @@ struct nbt_name_refresh_wins {
 };
 
 
+
 /* a name refresh request */
 struct nbt_name_refresh {
 	struct {
@@ -220,3 +229,21 @@ struct nbt_name_refresh {
 		uint8_t rcode;
 	} out;
 };
+
+/* wins name refresh with multiple wins servers to try and multiple
+   addresses to register */
+struct nbt_name_refresh_wins {
+	struct {
+		struct nbt_name name;
+		const char **wins_servers;
+		const char **addresses;
+		uint16_t nb_flags;
+		uint32_t ttl;
+	} in;
+	struct {
+		const char *wins_server;
+		uint8_t rcode;
+	} out;
+};
+
+