Added/updated convience scripts.

data/getData.sh

@@ -1,8 +1,31 @@
-#!/bin/sh
+#!/bin/bash
 
 readonly SERVER="tf2.csc.calpoly.io"
 readonly DIR=$(dirname $0)
+readonly KEY="$HOME/.ssh/keylog_rsa"
+readonly USER="keylog"
+
+sync() {
+    if which rsync &> /dev/null; then
+        rsync --progress --delete -vr -e 'ssh -i ~/.ssh/keylog_rsa -lkeylog' \
+              $USER@$SERVER:$1 $DIR/$2
+    elif which scp &> /dev/null; then
+        scp -vri $KEY $USER@$SERVER:$1 $DIR/$2
+    else
+        echo "Cannot copy data.  Please install rsync or scp." 1>&2
+        exit 1
+    fi
+}
+
+if which rsync &> /dev/null; then
+    readonly RCP=(rsync -r -e "'ssh -i ~/.ssh/keylog_rsa -lkeylog'")
+elif which scp &> /dev/null; then
+    readonly RCP="scp -ri $KEY"
+else
+    echo "Cannot copy data.  Please install rsync or scp." 1>&2
+    exit 1
+fi
 
 mkdir -p $DIR/keylogs $DIR/packets
-scp -ri ~/.ssh/keylog_rsa keylog@$SERVER:~/data/* $DIR/keylogs/
-scp -ri ~/.ssh/keylog_rsa keylog@$SERVER:/var/log/tcpdump/*.pcap $DIR/packets
+sync '~/data/*' keylogs/
+sync '/var/log/tcpdump/*.pcap' packets

data/split-flows.sh

@@ -6,6 +6,7 @@ readonly PCAP_DIR="$BASE_DIR/packets/"
 readonly PCAPS="$PCAP_DIR/*.pcap"
 readonly SEPERATOR="$BASE_DIR/../src/flow-seperator/flow-seperator"
 
+mkdir "$FLOW_DIR"
 cd "$FLOW_DIR"
 "$SEPERATOR" $PCAPS
 cd -