o Use more appropriate names for the existing synchronization modes:

        o rename `persistent' mode to `alarm'
        o rename `nack' mode to `ftfw'
o Now default synchronization mode is ftfw instead of alarm

16 files changed, 6 insertions, 6 deletions

diff --git a/examples/sync/alarm/README b/examples/sync/alarm/README
new file mode 100644
index 0000000..dfd8474
--- /dev/null
+++ b/examples/sync/alarm/README
@@ -0,0 +1 @@
+This directory contains the files for the ALARM based protocol
diff --git a/examples/sync/persistent/node1/conntrackd.conf b/examples/sync/alarm/node1/conntrackd.conf
index a55608b..3004d07 100644
--- a/examples/sync/persistent/node1/conntrackd.conf
+++ b/examples/sync/alarm/node1/conntrackd.conf
@@ -2,7 +2,7 @@
 # Synchronizer settings
 #
 Sync {
-	Mode PERSISTENT {
+	Mode ALARM {
 		#
 		# If a conntrack entry is not modified in <= 15 seconds, then
 		# a message is broadcasted. This mechanism is used to
diff --git a/examples/sync/nack/node1/keepalived.conf b/examples/sync/alarm/node1/keepalived.conf
index f937467..f937467 100644
--- a/examples/sync/nack/node1/keepalived.conf
+++ b/examples/sync/alarm/node1/keepalived.conf
diff --git a/examples/sync/persistent/node2/conntrackd.conf b/examples/sync/alarm/node2/conntrackd.conf
index 32416d0..fb12130 100644
--- a/examples/sync/persistent/node2/conntrackd.conf
+++ b/examples/sync/alarm/node2/conntrackd.conf
@@ -2,7 +2,7 @@
 # Synchronizer settings
 #
 Sync {
-	Mode PERSISTENT {
+	Mode ALARM {
 		#
 		# If a conntrack entry is not modified in <= 15 seconds, then
 		# a message is broadcasted. This mechanism is used to
diff --git a/examples/sync/nack/node2/keepalived.conf b/examples/sync/alarm/node2/keepalived.conf
index f937467..f937467 100644
--- a/examples/sync/nack/node2/keepalived.conf
+++ b/examples/sync/alarm/node2/keepalived.conf
diff --git a/examples/sync/persistent/script_backup.sh b/examples/sync/alarm/script_backup.sh
index 8ea2ad8..8ea2ad8 100755
--- a/examples/sync/persistent/script_backup.sh
+++ b/examples/sync/alarm/script_backup.sh
diff --git a/examples/sync/persistent/script_master.sh b/examples/sync/alarm/script_master.sh
index 70c26c9..70c26c9 100755
--- a/examples/sync/persistent/script_master.sh
+++ b/examples/sync/alarm/script_master.sh
diff --git a/examples/sync/ftfw/README b/examples/sync/ftfw/README
new file mode 100644
index 0000000..a09db10
--- /dev/null
+++ b/examples/sync/ftfw/README
@@ -0,0 +1 @@
+This directory contains the files for the FT-FW based protocol
diff --git a/examples/sync/nack/node1/conntrackd.conf b/examples/sync/ftfw/node1/conntrackd.conf
index 4fc8f22..fadeb9d 100644
--- a/examples/sync/nack/node1/conntrackd.conf
+++ b/examples/sync/ftfw/node1/conntrackd.conf
@@ -2,7 +2,7 @@
 # Synchronizer settings
 #
 Sync {
-	Mode NACK {
+	Mode FTFW {
 		#
 		# Size of the buffer that hold destroy messages for 
 		# possible resends (in bytes)
diff --git a/examples/sync/persistent/node1/keepalived.conf b/examples/sync/ftfw/node1/keepalived.conf
index f937467..f937467 100644
--- a/examples/sync/persistent/node1/keepalived.conf
+++ b/examples/sync/ftfw/node1/keepalived.conf
diff --git a/examples/sync/nack/node2/conntrackd.conf b/examples/sync/ftfw/node2/conntrackd.conf
index 43ebd77..59ffc4f 100644
--- a/examples/sync/nack/node2/conntrackd.conf
+++ b/examples/sync/ftfw/node2/conntrackd.conf
@@ -2,7 +2,7 @@
 # Synchronizer settings
 #
 Sync {
-	Mode NACK {
+	Mode FTFW {
                 #
 		# Size of the buffer that hold destroy messages for 
 		# possible resends (in bytes)
diff --git a/examples/sync/persistent/node2/keepalived.conf b/examples/sync/ftfw/node2/keepalived.conf
index f937467..f937467 100644
--- a/examples/sync/persistent/node2/keepalived.conf
+++ b/examples/sync/ftfw/node2/keepalived.conf
diff --git a/examples/sync/nack/script_backup.sh b/examples/sync/ftfw/script_backup.sh
index 813e375..813e375 100755
--- a/examples/sync/nack/script_backup.sh
+++ b/examples/sync/ftfw/script_backup.sh
diff --git a/examples/sync/nack/script_master.sh b/examples/sync/ftfw/script_master.sh
index ff1dbc0..ff1dbc0 100755
--- a/examples/sync/nack/script_master.sh
+++ b/examples/sync/ftfw/script_master.sh
diff --git a/examples/sync/nack/README b/examples/sync/nack/README
deleted file mode 100644
index 66987f7..0000000
--- a/examples/sync/nack/README
+++ /dev/null
@@ -1 +0,0 @@
-This directory contains the files for the NACK based protocol
diff --git a/examples/sync/persistent/README b/examples/sync/persistent/README
deleted file mode 100644
index 36b5989..0000000
--- a/examples/sync/persistent/README
+++ /dev/null
@@ -1 +0,0 @@
-This directory contains the files for the PERSISTENT based protocol