diff --git a/evaluation/demonstration/client b/evaluation/demonstration/client index fb6abc464486bf24d3df1f95a91dd4ba5768733c..08ce6278643fc761a40bb77e561dd554975c1675 100755 Binary files a/evaluation/demonstration/client and b/evaluation/demonstration/client differ diff --git a/evaluation/demonstration/client.c b/evaluation/demonstration/client.c index d59df01828703c3a63d1711b267ef840a46c6393..94e0d82e12400446b39cfc341018cd5cba2cd308 100644 --- a/evaluation/demonstration/client.c +++ b/evaluation/demonstration/client.c @@ -1,5 +1,3 @@ -#define DEBUG - #include #include #include @@ -354,7 +352,7 @@ int main(const int iArgC, char *papsArgV[]) exit(-1); } int iBytesSent=SSL_write(tConfig.pSSL, text->valuestring, strlen(text->valuestring)); - printf ("[CLIENT DEBUG] Sent %d bytes { %s }\n", iBytesSent, text->valuestring); + printf ("[CLIENT] Sent %d bytes { %s }\n", iBytesSent, text->valuestring); } cJSON_Delete(json); diff --git a/evaluation/demonstration/demo1_simple_middlebox/run_demo.sh b/evaluation/demonstration/demo1_simple_middlebox/run_demo.sh index 718eeb68197252dff0d596f03fe6170532828d04..19e067d59b1a3a2feb555ec19b28da3d86a45d43 100755 --- a/evaluation/demonstration/demo1_simple_middlebox/run_demo.sh +++ b/evaluation/demonstration/demo1_simple_middlebox/run_demo.sh @@ -1,13 +1,13 @@ echo "Starting Middlebox" ../middlebox 8423 127.0.0.1:8423 simpleMiddlebox & - mboxpid=$(pidof ../mcmbox) + mboxpid=$(pidof middlebox) sleep .3 echo "Starting Server" ../server ./simpleEchoScript.sh & - serverpid=$(pidof ../mcserver) + serverpid=$(pidof server) sleep .3 diff --git a/evaluation/demonstration/demo2_multiple_contexts/pythonHandlerScript.sh b/evaluation/demonstration/demo2_multiple_contexts/pythonHandlerScript.sh index 3ee608b304b9a5b317fb54649d4c2d4e7b3f4d9b..c9eb29b68534e5d43509f6dd0edbb188a58c277e 100755 --- a/evaluation/demonstration/demo2_multiple_contexts/pythonHandlerScript.sh +++ b/evaluation/demonstration/demo2_multiple_contexts/pythonHandlerScript.sh @@ -1 +1 @@ -python processRequest.py $1 \ No newline at end of file +python3 processRequest.py $1 diff --git a/evaluation/demonstration/demo2_multiple_contexts/run_demo.sh b/evaluation/demonstration/demo2_multiple_contexts/run_demo.sh index 7b3ed86aae7b02b9f2954ad0606637d619ef7e5d..8445eaa9dbb919f92849c07cdd7620ba3f3b2ae3 100755 --- a/evaluation/demonstration/demo2_multiple_contexts/run_demo.sh +++ b/evaluation/demonstration/demo2_multiple_contexts/run_demo.sh @@ -1,13 +1,13 @@ echo "Starting Middlebox" ../middlebox 8423 127.0.0.1:8423 webMiddlebox & - mboxpid=$(pidof ../mcmbox) + mboxpid=$(pidof middlebox) sleep .3 echo "Starting Server" ../server ./pythonHandlerScript.sh & - serverpid=$(pidof ../mcserver) + serverpid=$(pidof server) sleep .3 diff --git a/evaluation/demonstration/demo3_no_reencryption/run_demo.sh b/evaluation/demonstration/demo3_no_reencryption/run_demo.sh index 9bbdcc207d746c58a0d3bffcdd1642f4e9567053..ee69f067576645eba0adaf5ac6924ffedff73f0a 100755 --- a/evaluation/demonstration/demo3_no_reencryption/run_demo.sh +++ b/evaluation/demonstration/demo3_no_reencryption/run_demo.sh @@ -2,13 +2,13 @@ echo "Starting Middlebox" ../middlebox 8423 127.0.0.1:8423 simpleMiddlebox & -mboxpid=$(pidof ../mcmbox) +mboxpid=$(pidof middlebox) #sleep .3 echo "Starting Server" ../server ./simpleEchoScript.sh & -serverpid=$(pidof ../mcserver) +serverpid=$(pidof server) #sleep .3 diff --git a/evaluation/demonstration/demo3_no_reencryption/run_demo_reencrypt.sh b/evaluation/demonstration/demo3_no_reencryption/run_demo_reencrypt.sh index b7bd438f102f09e8ab82638828f09a64ce9c4183..3dad30f10612e59a4d4708a1798c72c5b130d781 100755 --- a/evaluation/demonstration/demo3_no_reencryption/run_demo_reencrypt.sh +++ b/evaluation/demonstration/demo3_no_reencryption/run_demo_reencrypt.sh @@ -2,13 +2,13 @@ echo "Starting Middlebox" ../middlebox 8423 127.0.0.1:8423 simpleMiddlebox ./replacementScript.sh & -mboxpid=$(pidof ../mcmbox) +mboxpid=$(pidof middlebox) #sleep .3 echo "Starting Server" ../server ./simpleEchoScript.sh & -serverpid=$(pidof ../mcserver) +serverpid=$(pidof server) #sleep .3 diff --git a/evaluation/demonstration/demo3_no_reencryption/run_single_demo.sh b/evaluation/demonstration/demo3_no_reencryption/run_single_demo.sh index 0270c1ad3a2a1d5830eed40807cbde308cedb330..50cd1b288d31d887df8cf01242e918e993d74c8b 100755 --- a/evaluation/demonstration/demo3_no_reencryption/run_single_demo.sh +++ b/evaluation/demonstration/demo3_no_reencryption/run_single_demo.sh @@ -4,13 +4,13 @@ sudo tcpdump -i lo -w client_to_mbox.pcap port 8423 & echo "Starting Middlebox" ../middlebox 8423 127.0.0.1:8423 simpleMiddlebox & -mboxpid=$(pidof ../mcmbox) +mboxpid=$(pidof middlebox) #sleep .3 echo "Starting Server" ../server ./simpleEchoScript.sh & -serverpid=$(pidof ../mcserver) +serverpid=$(pidof server) #sleep .3 diff --git a/evaluation/demonstration/inputData.json b/evaluation/demonstration/inputData.json new file mode 100644 index 0000000000000000000000000000000000000000..31588156420acd29e28bc641d939cb597f3cdb15 --- /dev/null +++ b/evaluation/demonstration/inputData.json @@ -0,0 +1,20 @@ +{ + "contexts" : + [ + "Context A" + ], + "middleboxes" : + [ + { + "url" : "127.0.0.1:8423", + "readAccess": [], + "writeAccess": [] + } + ], + "slicedData" : [ + { + "slice" : 0, + "data" : "Just testing!" + } + ] +} diff --git a/evaluation/demonstration/middlebox b/evaluation/demonstration/middlebox index da3f03d053ddcfa4d6b6f8219d5a0c1a6fa24092..74c08604c15ef69f2912a5e5a447124487c75e37 100755 Binary files a/evaluation/demonstration/middlebox and b/evaluation/demonstration/middlebox differ diff --git a/evaluation/demonstration/middlebox.c b/evaluation/demonstration/middlebox.c index 110cd5af572385a671c6d53be74026f331f6a920..2c96a46b1701c8c3a09e8a9400e4eb3e54f076dd 100644 --- a/evaluation/demonstration/middlebox.c +++ b/evaluation/demonstration/middlebox.c @@ -1,5 +1,3 @@ -#define DEBUG - #include "common.h" #include #include @@ -302,11 +300,11 @@ int handle_previous_hop_data(SSL* prev_ssl, SSL* next_ssl) status = SSL_get_error(prev_ssl, r); if (status == SSL_ERROR_ZERO_RETURN || status != SSL_ERROR_NONE) { - printf ("[MBOX ERROR PREVHOP] Error code %ld\n", status); + //printf ("[MBOX ERROR PREVHOP] Error code %ld\n", status); ERR_print_errors_fp(stdout); char tempBuf[100]; ERR_error_string(status, tempBuf); - printf("[MBOX ERROR PREVHOP] Connection with previous hop closed, exiting previous hop handler (error %s)\n", tempBuf); + printf("[MBOX PREVHOP] Connection with previous hop closed, exiting previous hop handler (SSL reason %s)\n", tempBuf); break; } else if (status != SSL_ERROR_NONE) @@ -379,7 +377,7 @@ int handle_next_hop_data(SSL* prev_ssl, SSL* next_ssl) status = SSL_get_error(next_ssl, r); if (status == SSL_ERROR_ZERO_RETURN || status != SSL_ERROR_NONE) { - printf("[MBOX ERROR NEXTHOP] Connection with next hop closed, exiting next hop handler and also closing previous hop connection\n"); + printf("[MBOX NEXTHOP] Connection with next hop closed, exiting next hop handler and also closing previous hop connection\n"); break; } else if (status != SSL_ERROR_NONE) @@ -474,7 +472,7 @@ int main(int argc, char **argv) if (argc < 4) { - printf ("Usage: mcmbox port proxy-address midlebox-id [command handler...]\n"); + printf ("Usage: middlebox port proxy-address midlebox-id [command handler...]\n"); exit(0); } port = atoi(argv[1]); diff --git a/evaluation/demonstration/quickrun.sh b/evaluation/demonstration/quickrun.sh new file mode 100755 index 0000000000000000000000000000000000000000..abe3c87c453b0d1b961e688e0ba3b8127135ee21 --- /dev/null +++ b/evaluation/demonstration/quickrun.sh @@ -0,0 +1,20 @@ + + echo "Starting Middlebox" + ./middlebox 8423 127.0.0.1:8423 simpleMiddlebox & + mboxpid=$(pidof ./middlebox) + + sleep .3 + + echo "Starting Server" + ./server & + serverpid=$(pidof ./server) + + sleep .3 + + echo "Starting Client" + ./client + + echo "Cleaning up" + kill $mboxpid + kill $serverpid + diff --git a/evaluation/demonstration/server b/evaluation/demonstration/server index 071b9badd400f948a0cca73582d7397efcc7a082..32fd7f747ed48a14e44939ac1671e803d94c00d0 100755 Binary files a/evaluation/demonstration/server and b/evaluation/demonstration/server differ