From ea468148c55ce56e0c106f7e98ed249f8ffb388c Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Fri, 15 Dec 2006 23:13:47 +0000
Subject: Add Jamie McClelland's cstream patches

---
 handlers/rdiff | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'handlers')

diff --git a/handlers/rdiff b/handlers/rdiff
index bdc1cbd..5561435 100644
--- a/handlers/rdiff
+++ b/handlers/rdiff
@@ -64,11 +64,19 @@ function check_consistency() {
 	fi
 }
 
+function check_cstream() {
+	local cstream=$1
+	if [ ! -x $cstream ]; then
+		fatal "Can't find your cstream binary (trying: $cstream). If you use bwlimit you must have cstream installed."
+	fi
+}
+
 ### GET CONFIG ###
 
 getconf options
 getconf testconnect yes
 getconf nicelevel 0
+getconf bwlimit
 
 setsection source
 getconf type; sourcetype=$type
@@ -167,6 +175,19 @@ if [ $test = 0 ]; then
 	fi
 fi
 
+# Add cstream 
+
+if [ ! -z $bwlimit ]; then
+	check_cstream $CSTREAM;
+	if [ "$desttype" = "remote" ]; then
+		RDIFFBACKUP="$RDIFFBACKUP --remote-schema 'cstream -t $bwlimit | ssh %s \''rdiff-backup --server\'''"
+	elif [ "$sourcetype" = "remote" ]; then
+		RDIFFBACKUP="$RDIFFBACKUP --remote-schema 'ssh %s \''rdiff-backup --server\'' | cstream -t $bwlimit'"
+	else
+		fatal "You specified a bandwidth limit but neither your source nor destination types are remote."
+	fi
+fi
+
 ### EXECUTE ###
 
 execstr="$RDIFFBACKUP $options --print-statistics "
-- 
cgit v1.2.3