svn commit: samba r13111 - in branches/SAMBA_4_0/source/wrepl_server: .

[metze at samba.org]

Author: metze
Date: 2006-01-24 17:36:13 +0000 (Tue, 24 Jan 2006)
New Revision: 13111

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13111

Log:
w2k3 uses the naxVersion id for calculating the notification,
so we do now

metze
Modified:
   branches/SAMBA_4_0/source/wrepl_server/wrepl_out_push.c
   branches/SAMBA_4_0/source/wrepl_server/wrepl_server.h


Changeset:
Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_out_push.c
===================================================================
--- branches/SAMBA_4_0/source/wrepl_server/wrepl_out_push.c	2006-01-24 17:27:30 UTC (rev 13110)
+++ branches/SAMBA_4_0/source/wrepl_server/wrepl_out_push.c	2006-01-24 17:36:13 UTC (rev 13111)
@@ -96,16 +96,16 @@
 	return;
 }
 
-static uint32_t wreplsrv_calc_change_count(struct wreplsrv_partner *partner, uint64_t seqnumber)
+static uint32_t wreplsrv_calc_change_count(struct wreplsrv_partner *partner, uint64_t maxVersionID)
 {
 	uint64_t tmp_diff = UINT32_MAX;
 
 	/* catch an overflow */
-	if (partner->push.seqnumber > seqnumber) {
+	if (partner->push.maxVersionID > maxVersionID) {
 		goto done;
 	}
 
-	tmp_diff = seqnumber - partner->push.seqnumber;
+	tmp_diff = maxVersionID - partner->push.maxVersionID;
 
 	if (tmp_diff > UINT32_MAX) {
 		tmp_diff = UINT32_MAX;
@@ -113,7 +113,7 @@
 	}
 
 done:
-	partner->push.seqnumber = seqnumber;
+	partner->push.maxVersionID = maxVersionID;
 	return (uint32_t)(tmp_diff & UINT32_MAX);
 }
 
@@ -123,7 +123,7 @@
 	uint64_t seqnumber;
 	uint32_t change_count;
 
-	seqnumber = winsdb_get_seqnumber(service->wins_db);
+	seqnumber = winsdb_get_maxVersion(service->wins_db);
 
 	for (partner = service->partners; partner; partner = partner->next) {
 		/* if it's not a push partner, go to the next partner */

Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_server.h
===================================================================
--- branches/SAMBA_4_0/source/wrepl_server/wrepl_server.h	2006-01-24 17:27:30 UTC (rev 13110)
+++ branches/SAMBA_4_0/source/wrepl_server/wrepl_server.h	2006-01-24 17:36:13 UTC (rev 13111)
@@ -165,8 +165,8 @@
 		/* change count till push notification */
 		uint32_t change_count;
 
-		/* the last wins db seqnumber we know about */
-		uint64_t seqnumber;
+		/* the last wins db maxVersion have reported to the partner */
+		uint64_t maxVersionID;
 
 		/* we should use WREPL_REPL_INFORM* messages to this partner */
 		BOOL use_inform;