Skip to content

Commit 9b6141b

Browse files
committed
Wireguard dial with context
1 parent 416f2df commit 9b6141b

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

proxy/wireguard/bind.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,13 @@ func (bind *netBind) Close() error {
123123
type netBindClient struct {
124124
netBind
125125

126+
ctx context.Context
126127
dialer internet.Dialer
127128
reserved []byte
128129
}
129130

130131
func (bind *netBindClient) connectTo(endpoint *netEndpoint) error {
131-
c, err := bind.dialer.Dial(context.Background(), endpoint.dst)
132+
c, err := bind.dialer.Dial(bind.ctx, endpoint.dst)
132133
if err != nil {
133134
return err
134135
}

proxy/wireguard/client.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func New(ctx context.Context, conf *DeviceConfig) (*Handler, error) {
7676
}, nil
7777
}
7878

79-
func (h *Handler) processWireGuard(dialer internet.Dialer) (err error) {
79+
func (h *Handler) processWireGuard(ctx context.Context, dialer internet.Dialer) (err error) {
8080
h.wgLock.Lock()
8181
defer h.wgLock.Unlock()
8282

@@ -108,6 +108,7 @@ func (h *Handler) processWireGuard(dialer internet.Dialer) (err error) {
108108
},
109109
workers: int(h.conf.NumWorkers),
110110
},
111+
ctx: ctx,
111112
dialer: dialer,
112113
reserved: h.conf.Reserved,
113114
}
@@ -135,7 +136,7 @@ func (h *Handler) Process(ctx context.Context, link *transport.Link, dialer inte
135136
ob.Name = "wireguard"
136137
ob.CanSpliceCopy = 3
137138

138-
if err := h.processWireGuard(dialer); err != nil {
139+
if err := h.processWireGuard(ctx, dialer); err != nil {
139140
return err
140141
}
141142

0 commit comments

Comments
 (0)