From 57337895143152585303e72d25a907118efa0b99 Mon Sep 17 00:00:00 2001
From: Jake Hillion <jake@hillion.co.uk>
Date: Mon, 28 Dec 2020 11:41:31 +0000
Subject: [PATCH] prep samples simplification

---
 Preparation/Samples/main.cpp | 17 +----------------
 Preparation/Samples/main.go  |  9 +--------
 import-code.sh               |  4 +++-
 3 files changed, 5 insertions(+), 25 deletions(-)
 mode change 100644 => 100755 import-code.sh

diff --git a/Preparation/Samples/main.cpp b/Preparation/Samples/main.cpp
index c0ad1b4..896d6f9 100644
--- a/Preparation/Samples/main.cpp
+++ b/Preparation/Samples/main.cpp
@@ -1,19 +1,4 @@
-#include <iostream>
-
-#include <cstring>
-#include <fcntl.h>
-
-#include <linux/if.h>
-#include <linux/if_tun.h>
-#include <zconf.h>
-
-#include <sys/ioctl.h>
-#include <thread>
-#include <csignal>
-#include <queue>
-#include <mutex>
-#include <condition_variable>
-#include <sstream>
+#include...
 
 struct Packet {
     size_t len;
diff --git a/Preparation/Samples/main.go b/Preparation/Samples/main.go
index bbd64ec..d5757f1 100644
--- a/Preparation/Samples/main.go
+++ b/Preparation/Samples/main.go
@@ -8,8 +8,6 @@ import (
 	"syscall"
 )
 
-var PacketOverhead = 0
-
 type Packet struct {
 	Data []byte
 }
@@ -23,7 +21,7 @@ func main() {
 	inboundPackets := make(chan Packet, 128)
 
 	go func() {
-		bufferSize := 1500 - PacketOverhead
+		bufferSize := 1500
 		buffer := make([]byte, bufferSize)
 
 		for {
@@ -53,9 +51,4 @@ func main() {
 			}
 		}()
 	}
-
-	signals := make(chan os.Signal)
-	signal.Notify(signals, syscall.SIGTERM, syscall.SIGINT)
-
-	<-signals
 }
diff --git a/import-code.sh b/import-code.sh
old mode 100644
new mode 100755
index fa97cc4..5616c10
--- a/import-code.sh
+++ b/import-code.sh
@@ -6,7 +6,9 @@ rm /home/jake/repos/dissertation/4-dissertation/Preparation/Samples/* || true
 rm /home/jake/repos/dissertation/4-dissertation/Implementation/Samples/* || true
 
 # Copy code samples for preparation
-cp /home/jake/repos/dissertation/1-language-tests/cpp/main.cpp /home/jake/repos/dissertation/4-dissertation/Preparation/Samples/
+printf "#include...\\n" > /home/jake/repos/dissertation/4-dissertation/Preparation/Samples/main.cpp
+tail -n +17 /home/jake/repos/dissertation/1-language-tests/cpp/main.cpp >> /home/jake/repos/dissertation/4-dissertation/Preparation/Samples/main.cpp
+
 cp /home/jake/repos/dissertation/1-language-tests/go/main.go /home/jake/repos/dissertation/4-dissertation/Preparation/Samples/
 cp /home/jake/repos/dissertation/1-language-tests/rust/src/main.rs /home/jake/repos/dissertation/4-dissertation/Preparation/Samples/