complete refactor to udpipe

src/udpipe.cpp

@@ -0,0 +1,198 @@
+/*****************************************************************************
+Copyright 2013 Laboratory for Advanced Computing at the University of Chicago
+
+This file is part of udpipe
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions
+and limitations under the License.
+*****************************************************************************/
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include <string.h>
+#include <getopt.h>
+#include <iostream>
+
+#include "udpipe.h"
+#include "udpipe_server.h"
+#include "udpipe_client.h"
+
+using std::cerr;
+using std::endl;
+
+void usage(){
+    fprintf(stderr, "usage: udpipe [udpipe options] host port\n");
+    fprintf(stderr, "options:\n");
+    // fprintf(stderr, "\t\t%s %s\t%s\n", "", "", "");
+
+    exit(1);
+}
+
+void initialize_thread_args(thread_args *args){
+    args->ip = NULL;
+    args->port = NULL;
+    args->blast = 0;
+    args->blast_rate = 1000;
+    args->udt_buff = BUFF_SIZE;
+    args->udp_buff = BUFF_SIZE;
+    args->mss = 8400;
+    args->use_crypto = 0;
+    args->verbose = 0;
+    args->n_crypto_threads = 1;
+    args->print_speed = 0;
+}
+
+int main(int argc, char *argv[]){
+
+    int opt;
+    enum {NONE, SERVER, CLIENT};
+    int operation = CLIENT;
+
+    thread_args args;
+    initialize_thread_args(&args);
+    int use_crypto = 0;
+    char* path_to_key = NULL;
+    char* key = NULL;
+    int n_crypto_threads = 1;
+
+    // ----------- [ Read in options
+    while ((opt = getopt (argc, argv, "hvsn:lp:f:")) != -1){
+	switch (opt){
+
+	case 's':
+	    args.print_speed = 1;
+	    break; 
+
+	case 'l':
+	    operation = SERVER;
+	    break;
+
+	case 'v':
+	    args.verbose = 1;
+	    break;
+
+	case 'n':
+	    args.use_crypto = 1;
+	    use_crypto  = 1; 
+	    n_crypto_threads = atoi(optarg);
+	    break;
+
+	case 'p':
+	    args.use_crypto = 1;
+	    use_crypto = 1;
+	    key = strdup(optarg);
+	    break;
+
+	case 'f':
+	    args.use_crypto = 1;
+	    use_crypto = 1;
+	    path_to_key = strdup(optarg);
+	    break;
+
+	case 'h':
+	    usage();
+	    break;
+
+	default:
+	    fprintf(stderr, "Unknown command line arg. -h for help.\n");
+	    usage();
+	    exit(1);
+
+	}
+    }
+
+    if (use_crypto && (path_to_key && key)){
+	fprintf(stderr, "error: Please specify either key or key file, not both.\n");
+	exit(1);
+    }
+
+    if (path_to_key){
+	FILE*key_file = fopen(path_to_key, "r");
+	if (!key_file){
+	    fprintf(stderr, "key file: %s.\n", strerror(errno));
+	    exit(1);
+	}
+
+	fseek(key_file, 0, SEEK_END); 
+	long size = ftell(key_file);
+	fseek(key_file, 0, SEEK_SET); 
+	key = (char*)malloc(size);
+	fread(key, 1, size, key_file);
+
+    }
+
+    // if (!use_crypto && key){
+    // 	fprintf(stderr, "warning: You've specified a key, but you don't have encryption turned on.\nProceeding without encryption.\n");
+    // }    
+
+    if (use_crypto && !key){
+	fprintf(stderr, "Please either: \n (1) %s\n (2) %s\n (3) %s\n",
+		"include key in cli [-p key]",
+		"read on in from file [-f /path/to/key/file]",
+		"choose not to use encryption, remove [-n]");
+	exit(1);
+    }
+
+    // Setup host
+    if (operation == CLIENT){
+	if (optind < argc){
+	    args.ip = strdup(argv[optind++]);
+	} else {
+	    cerr << "error: Please specify server host." << endl;
+	    exit(1);
+	}
+    }
+
+    // Check port input
+    if (optind < argc){
+	args.port = strdup(argv[optind++]);
+    } else {
+	cerr << "error: Please specify port num." << endl;
+	exit(1);
+    }
+
+    // Initialize crypto
+    if (use_crypto){
+
+	char* cipher = (char*) "aes-128";
+	crypto enc(EVP_ENCRYPT, PASSPHRASE_SIZE, (unsigned char*)key, cipher, n_crypto_threads);
+	crypto dec(EVP_DECRYPT, PASSPHRASE_SIZE, (unsigned char*)key, cipher, n_crypto_threads);
+	args.enc = &enc;
+	args.dec = &dec;
+
+	args.n_crypto_threads = n_crypto_threads;
+
+    } else {
+
+	args.enc = NULL;
+	args.dec = NULL;
+
+    }
+
+    if (key)
+	memset(key, 0, strlen(key));
+
+    // ----------- [ Spawn correct process
+    if (operation == SERVER){
+	run_server(&args);
+
+    } else if (operation == CLIENT){
+	run_client(&args);
+
+    } else {
+	cerr << "Operation type not known" << endl;
+
+    }
+
+
+
+}

src/udpipe.h

@@ -0,0 +1,60 @@
+/*****************************************************************************
+Copyright 2013 Laboratory for Advanced Computing at the University of Chicago
+
+This file is part of udr/udt
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions
+and limitations under the License.
+*****************************************************************************/
+
+#include <unistd.h>
+#include <cstdlib>
+#include <cstring>
+#include <netdb.h>
+#include <iostream>
+#include <udt.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "cc.h"
+#include "udpipe_threads.h"
+#include "crypto.h"
+
+/* #define BUFF_SIZE 327680 */
+#define BUFF_SIZE 67108864
+
+typedef struct rs_args{
+    UDTSOCKET*usocket;
+    crypto *c;
+    int use_crypto;
+    int verbose;
+    int n_crypto_threads; 
+
+} rs_args;
+
+typedef struct thread_args{
+    crypto *enc;
+    crypto *dec;
+    char *ip;
+    char *port;
+    int blast;
+    int blast_rate;
+    size_t udt_buff;
+    size_t udp_buff;
+    int mss;
+    int use_crypto;
+    int verbose;
+    int n_crypto_threads;
+    int print_speed; 
+} thread_args;
+
+void* send_buf_threaded(void*_args);