Skip to content

Commit d97700e

Browse files
committed
update wintun-go
1 parent fa36872 commit d97700e

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

Diff for: .run/go build vpnagent.go.exe.run.xml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<go_parameters value="-o vpnagent.exe" />
66
<sudo value="true" />
77
<kind value="FILE" />
8+
<package value="sslcon" />
89
<directory value="$PROJECT_DIR$" />
910
<filePath value="$PROJECT_DIR$/vpnagent.go" />
1011
<method v="2" />

Diff for: tun/tun_windows.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package tun
22

33
import (
4+
"context"
45
"errors"
56
"fmt"
67
"github.com/lysShub/wintun-go"
@@ -31,7 +32,7 @@ var (
3132
)
3233

3334
func init() {
34-
wintun.Load(wintun.DLL)
35+
wintun.MustLoad(wintun.DLL)
3536
}
3637

3738
func CreateTUN(ifname string, mtu int) (Device, error) {
@@ -60,12 +61,12 @@ func (tun *NativeTun) Read(buff []byte, offset int) (int, error) {
6061
}
6162

6263
for {
63-
packet, err := tun.wt.ReceivePacket()
64+
packet, err := tun.wt.Recv(context.Background())
6465
switch err {
6566
case nil:
6667
packetSize := len(packet)
6768
copy(buff[offset:], packet)
68-
tun.wt.ReleasePacket(packet)
69+
tun.wt.Release(packet)
6970
// tun.rate.update(uint64(packetSize))
7071
return packetSize, nil
7172
case windows.ERROR_HANDLE_EOF:
@@ -83,12 +84,12 @@ func (tun *NativeTun) Write(buff []byte, offset int) (int, error) {
8384
return 0, os.ErrClosed
8485
}
8586

86-
packetSize := uint32(len(buff) - offset)
87+
packetSize := len(buff) - offset
8788

88-
packet, err := tun.wt.AllocateSendPacket(packetSize)
89+
packet, err := tun.wt.Alloc(packetSize)
8990
if err == nil {
9091
copy(packet, buff[offset:])
91-
err = tun.wt.SendPacket(packet)
92+
err = tun.wt.Send(packet)
9293
if err != nil {
9394
return 0, err
9495
}

0 commit comments

Comments
 (0)