JakeHillion/dissertation-2-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge develop into master #21

Merged
JakeHillion merged 149 commits from develop into master 2021-05-12 00:22:59 +01:00
Conversation 0 Commits 149 Files Changed 37 +5 -1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6f72047caf - Show all commits

6
tun/tun.go
View File

@ -52,7 +52,11 @@ func (t *SourceSink) Source() (proxy.Packet, error) {
var good, bad float64
func (t *SourceSink) Sink(packet proxy.Packet) error {
_, err := t.tun.Write(packet.Contents(), 4)
// make space for tun header
content := make([]byte, len(packet.Contents())+4)
copy(content[4:], packet.Contents())
_, err := t.tun.Write(content, 4)
if err != nil {
switch err.(type) {
case *os.PathError: