Commit cae6d77a authored by powelld's avatar powelld
Browse files

Merge https://forge.etsi.org/gerrit/a/CYBER.MSP-OpenSSL

parents 9ba69184 4f2d73b8

evaluation/demonstration/client

−3.1 MiB (2.11 MiB)

File changed.

No diff preview for this file type.

View original file
View changed file

evaluation/demonstration/client.c

+1 −3
Original line number Original line Diff line number Diff line 
#define DEBUG



#include <pthread.h>

#include <pthread.h>

#include <assert.h>

#include <assert.h>

#include <getopt.h>

#include <getopt.h>
@@ -354,7 +352,7 @@ int main(const int iArgC, char *papsArgV[]) 
			exit(-1);

			exit(-1);

		}

		}

		int iBytesSent=SSL_write(tConfig.pSSL, text->valuestring, strlen(text->valuestring));

		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);

	cJSON_Delete(json);

evaluation/demonstration/demo1_simple_middlebox/run_demo.sh

+2 −2
Original line number Original line Diff line number Diff line 




    echo "Starting Middlebox"

    echo "Starting Middlebox"

    ../middlebox 8423 127.0.0.1:8423 simpleMiddlebox &

    ../middlebox 8423 127.0.0.1:8423 simpleMiddlebox &

    mboxpid=$(pidof ../mcmbox)

    mboxpid=$(pidof middlebox)





    sleep .3

    sleep .3





    echo "Starting Server"

    echo "Starting Server"

    ../server ./simpleEchoScript.sh &

    ../server ./simpleEchoScript.sh &

    serverpid=$(pidof ../mcserver)

    serverpid=$(pidof server)





    sleep .3

    sleep .3

evaluation/demonstration/demo2_multiple_contexts/pythonHandlerScript.sh

+1 −1
Original line number Original line Diff line number Diff line 
python processRequest.py $1
 
python3 processRequest.py $1
 
 No newline at end of file

evaluation/demonstration/demo2_multiple_contexts/run_demo.sh

+2 −2
Original line number Original line Diff line number Diff line 




    echo "Starting Middlebox"

    echo "Starting Middlebox"

    ../middlebox 8423 127.0.0.1:8423 webMiddlebox &

    ../middlebox 8423 127.0.0.1:8423 webMiddlebox &

    mboxpid=$(pidof ../mcmbox)

    mboxpid=$(pidof middlebox)





    sleep .3

    sleep .3





    echo "Starting Server"

    echo "Starting Server"

    ../server ./pythonHandlerScript.sh &

    ../server ./pythonHandlerScript.sh &

    serverpid=$(pidof ../mcserver)

    serverpid=$(pidof server)





    sleep .3

    sleep .3