complete send file binary

lschweiss-wustl · Sep 23, 2013 · 5f92467 · 5f92467
1 parent d8bc9e4
commit 5f92467
Show file tree

Hide file tree

Showing 32 changed files with 145 additions and 31 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -38,7 +38,7 @@ endif
 
 DIR = $(shell pwd)
 
-APP = udtcat  #test
+APP = udtcat  
 APPOUT = uc
 
 all: $(APP)

diff --git a/src/crypto.cpp b/src/crypto.cpp
@@ -2,7 +2,6 @@
 #include <openssl/crypto.h>
 
 
-
 #include <time.h>
 
 #include <limits.h>
@@ -70,7 +69,7 @@ static void threadid_func(CRYPTO_THREADID * id)
     CRYPTO_THREADID_set_numeric(id, THREAD_ID);
 }
 
-// Setups up the mutual exclusion for OpenSSL
+
 int THREAD_setup(void)
 {
     pris("Setting up threads");
@@ -206,15 +205,17 @@ int pass_to_enc_thread(pthread_t crypto_threads[N_CRYPTO_THREADS],
 
     pthread_join_disregard_ESRCH(crypto_threads[*curr_crypto_thread], *curr_crypto_thread);
 
-    // Initialize and set thread detached attribute
+    // ----------- [ Initialize and set thread detached attribute
     pthread_attr_t attr;
     pthread_attr_init(&attr);
     pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
 
+    // ----------- [ Setup thread
     e_args[*curr_crypto_thread].in = (uchar*) in;
     e_args[*curr_crypto_thread].len = len;
     e_args[*curr_crypto_thread].ctx = &c->ctx[*curr_crypto_thread];
 
+    // ----------- [ Spawn thread
     int ret = pthread_create(&crypto_threads[*curr_crypto_thread],
 			     &attr, crypto_update_thread, &e_args[*curr_crypto_thread]);
 

diff --git a/src/crypto.h b/src/crypto.h
@@ -18,16 +18,18 @@ and limitations under the License.
 #ifndef CRYPTO_H
 #define CRYPTO_H
 
-
-#define N_CRYPTO_THREADS 16
+#define N_CRYPTO_THREADS 8
 #define USE_CRYPTO 1
 
+
 #define PASSPHRASE_SIZE 32
 #define HEX_PASSPHRASE_SIZE 64
 #define EVP_ENCRYPT 1
 #define EVP_DECRYPT 0
 #define CTR_MODE 1
 
+
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -49,6 +51,8 @@ int THREAD_setup(void);
 int THREAD_cleanup(void);
 void *enrypt_threaded(void* _args);
 
+
+
 using namespace std;
 
 typedef unsigned char uchar;
@@ -60,14 +64,16 @@ class crypto
     unsigned char ivec[ 1024 ];
     int direction;
 
+
     int passphrase_size;
     int hex_passphrase_size;
-    public:
-
+ public:
+       
     // EVP stuff
     int thread_id;
     EVP_CIPHER_CTX ctx[N_CRYPTO_THREADS];
 
+
     crypto(int direc, int len, unsigned char* password, char *encryption_type)
     {
 
@@ -175,12 +181,14 @@ class crypto
 };
 
 
+
 typedef struct e_thread_args
 {
     uchar *in;
     int len;
     crypto *c;
     EVP_CIPHER_CTX *ctx;
+
 
 } e_thread_args;
 
@@ -194,5 +202,8 @@ int pass_to_enc_thread(pthread_t crypto_threads[N_CRYPTO_THREADS],
 		       char* in, int len, 
 		       crypto*c);
 
+
+
+
 #endif
 
diff --git a/src/sendfile b/src/sendfile
@@ -0,0 +1,102 @@
+#!/bin/bash
+function Usage(){
+cat <<-ENDOFMESSAGE
+
+$0 [options] ip source destination
+
+options:
+
+    -p --port   specify port to use [default: 9000]
+    -u --user   specify username for ssh connection [default: current user]
+    -h --help   display this message
+
+ENDOFMESSAGE
+    exit 1
+}
+
+function error(){
+    echo "$*"
+    exit 1
+}
+
+function argCheck(){
+    if [ $1 -eq 0 -o "${1:0:1}" = "-" ]; then
+        error "The ${opt} option requires an argument."
+    fi
+}
+
+function getOpts() {
+    port=9000
+    user=`whoami`
+    verbose=0
+    argv=()
+    while [ $# -gt 0 ]
+    do
+        opt=$1
+        shift
+        case ${opt} in
+            -p|--port)
+		argCheck $#
+                port="$1"
+                shift;;
+            -u|--user)
+		argCheck $#
+                user="$1"
+                shift;;
+            -h|--help)
+                Usage;;
+	    -v|--verbose)
+		verbose=1;;
+            *)
+                if [ "${opt:0:1}" = "-" ]; then
+                    error "${opt}: unknown option."
+                fi
+                argv+=(${opt});;
+        esac
+    done 
+}
+
+getOpts $*
+
+ip="${argv[0]}"
+src="${argv[1]}"
+dest="${argv[2]}"
+
+if [ "$ip" = "" ]; then
+    error "Please specify the ip address"
+fi
+if [ "$src" = "" ]; then
+    error "Please specify the source file"
+fi
+if [ "$dest" = "" ]; then
+    error "Please specify the destination file"
+fi
+
+if [ "$verbose" == 1 ]; then
+    cat <<-ENDOFMESSAGE
+ Transferring 
+     local file		: $src
+     remote dest	: $dest
+     host		: $user@$ip
+     port		: $port
+ 
+ENDOFMESSAGE
+fi
+
+
+# echo "ssh jmiller@localhost 'uc -l 9000 > /home/jmiller/test2 & echo \$!;'"
+
+if [ "$verbose" == 1 ]; then
+    echo "Sending... "
+fi
+
+./uc $ip $port < $src &
+ssh $user@$ip "uc -l $port > $dest"
+
+if [ "$verbose" == 1 ]; then
+    echo "Done."
+    fs=`du -h $src`
+    echo "Original file size   : $fs"
+    fs=`ssh $user@$ip "du -h $dest"`
+    echo "Transferred file size: $fs"
+fi
diff --git a/src/udtcat.cpp b/src/udtcat.cpp
@@ -35,7 +35,6 @@ void usage(){
 }
 
 void initialize_thread_args(thread_args *args){
-
     args->ip = NULL;
     args->port = NULL;
     args->blast = 0;
@@ -48,11 +47,11 @@ void initialize_thread_args(thread_args *args){
 
 int main(int argc, char *argv[]){
 
-
     int opt;
     enum {NONE, SERVER, CLIENT};
     int operation = CLIENT;
 
+    // ----------- [ Read in options
     while ((opt = getopt (argc, argv, "l")) != -1){
 	switch (opt){
 	case 'l':
@@ -68,6 +67,7 @@ int main(int argc, char *argv[]){
     thread_args args;
     initialize_thread_args(&args);
 
+    // ----------- [ Setup ip
     if (operation == CLIENT){
 	if (optind < argc){
 	    if (strcmp(argv[optind], "localhost")){
@@ -83,22 +83,23 @@ int main(int argc, char *argv[]){
 	}
     }
 
+    // ----------- [ Check port input
     if (optind < argc){
 	args.port = strdup(argv[optind++]);
     } else {
 	cerr << "error: Please specify port num." << endl;
 	exit(1);
     }
-
+
+    // ----------- [ Initialize crypto
     unsigned char* password = (unsigned char*) "12345";
     char* cipher = (char*) "aes-128";
-
     crypto enc(EVP_ENCRYPT, PASSPHRASE_SIZE, password, cipher);
     crypto dec(EVP_DECRYPT, PASSPHRASE_SIZE, password, cipher);
-
     args.enc = &enc;
     args.dec = &dec;
 
+    // ----------- [ Spawn correct process
     if (operation == SERVER){
 	run_server(&args);
 

diff --git a/src/udtcat_threads.cpp b/src/udtcat_threads.cpp
@@ -41,27 +41,26 @@ int n_recv_threads = 0;
 int last_printed = -1;
 pthread_mutex_t lock;
 
-/* 
- THINGS NEEDED IN APPLICATION TO RUN THE MT SUPPORTED CRYPTO:
-   pthread_t crypto_threads[N_THREADS];
-   e_thread_args * e_args;
-   crypto *c;
-   int* curr_crypto_thread;
-*/
+
+// ----------- [  Things needed in application to run the mt supported crypto
+// pthread_t crypto_threads[N_THREADS];
+// e_thread_args * e_args;
+// crypto *c;
+// int* curr_crypto_thread;
 
 void* recvdata(void * _args)
 {
 
-    // Handle socket
+    // ----------- [  Handle socket
     recv_args * args = (recv_args*)_args;
     UDTSOCKET recver = *args->usocket;
 
-    // Decryption locals
+    // ----------- [ Decryption locals
     int read_len;
-    e_thread_args e_args[N_CRYPTO_THREADS];
 
+    // ----------- [ Crypto variables
+    e_thread_args e_args[N_CRYPTO_THREADS];
     pthread_t decryption_threads[N_CRYPTO_THREADS];
-
     int decrypt_buf_len = BUFF_SIZE / N_CRYPTO_THREADS;
     int len, decrypt_cursor, buffer_cursor, curr_crypto_thread;
     decrypt_cursor = buffer_cursor = curr_crypto_thread = 0;
@@ -96,11 +95,11 @@ void* recvdata(void * _args)
 
 	    buffer_cursor += len;
 
-	    // This should never happen
+	    // ----------- [ This should never happen
 	    if (buffer_cursor > BUFF_SIZE)
 		uc_err("Decryption buffer overflow");
 
-	    // Decrypt what we've got
+	    // ----------- [ Decrypt what we've got
 	    while (decrypt_cursor+decrypt_buf_len <= buffer_cursor){
 		pass_to_enc_thread(decryption_threads, 
 				   e_args,
@@ -111,7 +110,7 @@ void* recvdata(void * _args)
 		decrypt_cursor += decrypt_buf_len;
 	    }
 
-	    // Write the decrypted buffer and reset
+	    // ----------- [ Write the decrypted buffer and reset
 	    if (decrypt_cursor >= BUFF_SIZE){
 		join_all_encryption_threads(decryption_threads);
 		write(fileno(stdout), decrypt_buffer, BUFF_SIZE);
@@ -206,7 +205,7 @@ void* senddata(void* _args)
 	    if (buffer_cursor > BUFF_SIZE)
 		uc_err("Encryption buffer overflow");
 
-	    // Encrypt data
+	    // ----------- [ Encrypt data
 	    while (encrypt_cursor+encrypt_buf_len <= buffer_cursor){
 		pass_to_enc_thread(encryption_threads, 
 				   e_args,
@@ -217,7 +216,7 @@ void* senddata(void* _args)
 		encrypt_cursor += encrypt_buf_len;
 	    }
 
-	    // If full buffer, then send to UDT
+	    // ----------- [ If full buffer, then send to UDT
 	    if (encrypt_cursor >= BUFF_SIZE){
 		join_all_encryption_threads(encryption_threads);
 		send_buf(client, encrypt_buffer, buffer_cursor, flags);
@@ -227,7 +226,7 @@ void* senddata(void* _args)
 
 	}
 
-	// Finish any remaining buffer data
+	// ----------- [ Finish any remaining buffer data
 	if (buffer_cursor > 0){
 	    join_all_encryption_threads(encryption_threads);
 	    crypto_update(encrypt_buffer+encrypt_cursor, buffer_cursor-encrypt_cursor, args->enc);

diff --git a/udt/app/appclient b/udt/app/appclient
diff --git a/udt/app/appclient.o b/udt/app/appclient.o
diff --git a/udt/app/appserver b/udt/app/appserver
diff --git a/udt/app/appserver.o b/udt/app/appserver.o
diff --git a/udt/app/recvfile b/udt/app/recvfile
diff --git a/udt/app/recvfile.o b/udt/app/recvfile.o
diff --git a/udt/app/sendfile b/udt/app/sendfile
diff --git a/udt/app/sendfile.o b/udt/app/sendfile.o
diff --git a/udt/app/test b/udt/app/test
diff --git a/udt/app/test.o b/udt/app/test.o
diff --git a/udt/src/Makefile b/udt/src/Makefile
@@ -8,7 +8,7 @@ ifndef arch
    arch = IA32
 endif
 
-CCFLAGS = -fPIC -Wall -Wextra -D$(os) -finline-functions -O3 -fno-strict-aliasing #-msse3
+CCFLAGS = -fPIC -Wall -Wextra -D$(os) -finline-functions -O3 -fno-strict-aliasing -lpthread  -DCUSTOM_CC #-msse3
 
 ifeq ($(arch), IA32)
    CCFLAGS += -DIA32

diff --git a/udt/src/api.o b/udt/src/api.o
diff --git a/udt/src/buffer.o b/udt/src/buffer.o
diff --git a/udt/src/cache.o b/udt/src/cache.o
diff --git a/udt/src/ccc.o b/udt/src/ccc.o
diff --git a/udt/src/channel.o b/udt/src/channel.o
diff --git a/udt/src/common.o b/udt/src/common.o
diff --git a/udt/src/core.o b/udt/src/core.o
diff --git a/udt/src/epoll.o b/udt/src/epoll.o
diff --git a/udt/src/libudt.a b/udt/src/libudt.a
diff --git a/udt/src/libudt.so b/udt/src/libudt.so
diff --git a/udt/src/list.o b/udt/src/list.o
diff --git a/udt/src/md5.o b/udt/src/md5.o
diff --git a/udt/src/packet.o b/udt/src/packet.o
diff --git a/udt/src/queue.o b/udt/src/queue.o
diff --git a/udt/src/window.o b/udt/src/window.o