mirror of
https://github.com/shtorm-7/sing-box-extended.git
synced 2026-07-09 17:47:19 +03:00
Compare commits
98 Commits
v1.12.0-be
...
renovate/m
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3190141613 | ||
|
|
0613431623 | ||
|
|
95aa5d05b7 | ||
|
|
0ccfb8ad96 | ||
|
|
86fe2aee98 | ||
|
|
1b2cce77f1 | ||
|
|
4b1a283bbf | ||
|
|
f91cbc0e42 | ||
|
|
7d1b88e1cd | ||
|
|
a4ad775fb7 | ||
|
|
88bfc6fd77 | ||
|
|
cd8501736d | ||
|
|
cc05b89b59 | ||
|
|
f8bfe56458 | ||
|
|
f9942b7c50 | ||
|
|
41915a6621 | ||
|
|
2d6894f28a | ||
|
|
93ceb33780 | ||
|
|
f643e35d00 | ||
|
|
cbcc4f4cfb | ||
|
|
feab546659 | ||
|
|
5a3be48d7b | ||
|
|
ef2f170364 | ||
|
|
5022d9a924 | ||
|
|
50d61c09cf | ||
|
|
bcc703310e | ||
|
|
a6c448e145 | ||
|
|
11105eb553 | ||
|
|
18e240e5b3 | ||
|
|
03bb284370 | ||
|
|
bc63aa2254 | ||
|
|
abbe2f7eaf | ||
|
|
33d576a018 | ||
|
|
38e34c7719 | ||
|
|
03d086c32e | ||
|
|
52de97edf1 | ||
|
|
0e68b1a29e | ||
|
|
6b43758d8e | ||
|
|
9957ab6e8b | ||
|
|
36aef228bf | ||
|
|
82ba228c39 | ||
|
|
7acc036c6e | ||
|
|
78439340cf | ||
|
|
7fd99aa515 | ||
|
|
5d30bfabae | ||
|
|
c29d56699f | ||
|
|
5c4518e6a4 | ||
|
|
58bf4c1e85 | ||
|
|
49d8408fdf | ||
|
|
01cbc4810a | ||
|
|
d9b5ca3e82 | ||
|
|
6c2b4dce4a | ||
|
|
daeb14bdd2 | ||
|
|
7d7aa4a328 | ||
|
|
f0f0b658f7 | ||
|
|
de2546f572 | ||
|
|
fcb8171ff5 | ||
|
|
a53c6a906f | ||
|
|
8637c536c8 | ||
|
|
db7a0c6092 | ||
|
|
87d287dd56 | ||
|
|
ee65df4dfc | ||
|
|
f9f5a0c724 | ||
|
|
96e81b6e76 | ||
|
|
883bea6628 | ||
|
|
62b98fcc4c | ||
|
|
c0d7198ac2 | ||
|
|
da1cdcb784 | ||
|
|
cd284a4368 | ||
|
|
33e9d719f8 | ||
|
|
f0a3ba5bc8 | ||
|
|
b96a6b595e | ||
|
|
be29171106 | ||
|
|
c66b32c859 | ||
|
|
984ebbb288 | ||
|
|
c5929cf948 | ||
|
|
be45dd2716 | ||
|
|
a20f525048 | ||
|
|
31ebe2f39f | ||
|
|
61b9da2f1a | ||
|
|
f5c738ea9d | ||
|
|
ebc783b580 | ||
|
|
a5b6dff812 | ||
|
|
cc4e90c861 | ||
|
|
2abce0959a | ||
|
|
a98cb0fd84 | ||
|
|
7b96406592 | ||
|
|
4fea063b6f | ||
|
|
1672d5a84a | ||
|
|
4a1b69c1d4 | ||
|
|
e2c1ff3a11 | ||
|
|
37dd8fa692 | ||
|
|
29b6a75f16 | ||
|
|
7575746f72 | ||
|
|
f35a58b7ee | ||
|
|
4aacdade73 | ||
|
|
bc5eb1e1a5 | ||
|
|
995267a042 |
2
.github/workflows/lint.yml
vendored
2
.github/workflows/lint.yml
vendored
@@ -30,7 +30,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
go-version: ^1.24.3
|
go-version: ^1.24.3
|
||||||
- name: golangci-lint
|
- name: golangci-lint
|
||||||
uses: golangci/golangci-lint-action@v6
|
uses: golangci/golangci-lint-action@v8
|
||||||
with:
|
with:
|
||||||
version: latest
|
version: latest
|
||||||
args: --timeout=30m
|
args: --timeout=30m
|
||||||
|
|||||||
5
Makefile
5
Makefile
@@ -1,11 +1,10 @@
|
|||||||
NAME = sing-box
|
NAME = sing-box
|
||||||
COMMIT = $(shell git rev-parse --short HEAD)
|
COMMIT = $(shell git rev-parse --short HEAD)
|
||||||
TAGS ?= with_gvisor,with_dhcp,with_wireguard,with_clash_api,with_quic,with_utls,with_tailscale
|
TAGS ?= with_gvisor,with_quic,with_dhcp,with_wireguard,with_utls,with_acme,with_clash_api,with_tailscale
|
||||||
TAGS_TEST ?= with_gvisor,with_quic,with_wireguard,with_grpc,with_utls
|
|
||||||
|
|
||||||
GOHOSTOS = $(shell go env GOHOSTOS)
|
GOHOSTOS = $(shell go env GOHOSTOS)
|
||||||
GOHOSTARCH = $(shell go env GOHOSTARCH)
|
GOHOSTARCH = $(shell go env GOHOSTARCH)
|
||||||
VERSION=$(shell CGO_ENABLED=0 GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) go run ./cmd/internal/read_tag)
|
VERSION=$(shell CGO_ENABLED=0 GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) go run github.com/sagernet/sing-box/cmd/internal/read_tag@latest)
|
||||||
|
|
||||||
PARAMS = -v -trimpath -ldflags "-X 'github.com/sagernet/sing-box/constant.Version=$(VERSION)' -s -w -buildid="
|
PARAMS = -v -trimpath -ldflags "-X 'github.com/sagernet/sing-box/constant.Version=$(VERSION)' -s -w -buildid="
|
||||||
MAIN_PARAMS = $(PARAMS) -tags "$(TAGS)"
|
MAIN_PARAMS = $(PARAMS) -tags "$(TAGS)"
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/sagernet/sing-box"
|
|
||||||
"github.com/sagernet/sing-box/experimental/deprecated"
|
"github.com/sagernet/sing-box/experimental/deprecated"
|
||||||
"github.com/sagernet/sing-box/include"
|
"github.com/sagernet/sing-box/include"
|
||||||
"github.com/sagernet/sing-box/log"
|
"github.com/sagernet/sing-box/log"
|
||||||
@@ -68,6 +67,5 @@ func preRun(cmd *cobra.Command, args []string) {
|
|||||||
if len(configPaths) == 0 && len(configDirectories) == 0 {
|
if len(configPaths) == 0 && len(configDirectories) == 0 {
|
||||||
configPaths = append(configPaths, "config.json")
|
configPaths = append(configPaths, "config.json")
|
||||||
}
|
}
|
||||||
globalCtx = service.ContextWith(globalCtx, deprecated.NewStderrManager(log.StdLogger()))
|
globalCtx = include.Context(service.ContextWith(globalCtx, deprecated.NewStderrManager(log.StdLogger())))
|
||||||
globalCtx = box.Context(globalCtx, include.InboundRegistry(), include.OutboundRegistry(), include.EndpointRegistry(), include.DNSTransportRegistry(), include.ServiceRegistry())
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,10 @@
|
|||||||
icon: material/alert-decagram
|
icon: material/alert-decagram
|
||||||
---
|
---
|
||||||
|
|
||||||
|
#### 1.12.0-beta.18
|
||||||
|
|
||||||
|
* Fixes and improvements
|
||||||
|
|
||||||
#### 1.12.0-beta.17
|
#### 1.12.0-beta.17
|
||||||
|
|
||||||
* Update quic-go to v0.52.0
|
* Update quic-go to v0.52.0
|
||||||
|
|||||||
4
go.sum
4
go.sum
@@ -165,8 +165,6 @@ github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZN
|
|||||||
github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
|
github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
|
||||||
github.com/sagernet/nftables v0.3.0-beta.4 h1:kbULlAwAC3jvdGAC1P5Fa3GSxVwQJibNenDW2zaXr8I=
|
github.com/sagernet/nftables v0.3.0-beta.4 h1:kbULlAwAC3jvdGAC1P5Fa3GSxVwQJibNenDW2zaXr8I=
|
||||||
github.com/sagernet/nftables v0.3.0-beta.4/go.mod h1:OQXAjvjNGGFxaTgVCSTRIhYB5/llyVDeapVoENYBDS8=
|
github.com/sagernet/nftables v0.3.0-beta.4/go.mod h1:OQXAjvjNGGFxaTgVCSTRIhYB5/llyVDeapVoENYBDS8=
|
||||||
github.com/sagernet/quic-go v0.51.0-beta.5 h1:/mME3sJvQ8k/JKP0oC/9XoWrm0znO7hWXviB5yiipJY=
|
|
||||||
github.com/sagernet/quic-go v0.51.0-beta.5/go.mod h1:OV+V5kEBb8kJS7k29MzDu6oj9GyMc7HA07sE1tedxz4=
|
|
||||||
github.com/sagernet/quic-go v0.52.0-beta.1 h1:hWkojLg64zjV+MJOvJU/kOeWndm3tiEfBLx5foisszs=
|
github.com/sagernet/quic-go v0.52.0-beta.1 h1:hWkojLg64zjV+MJOvJU/kOeWndm3tiEfBLx5foisszs=
|
||||||
github.com/sagernet/quic-go v0.52.0-beta.1/go.mod h1:OV+V5kEBb8kJS7k29MzDu6oj9GyMc7HA07sE1tedxz4=
|
github.com/sagernet/quic-go v0.52.0-beta.1/go.mod h1:OV+V5kEBb8kJS7k29MzDu6oj9GyMc7HA07sE1tedxz4=
|
||||||
github.com/sagernet/sing v0.6.9/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
|
github.com/sagernet/sing v0.6.9/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
|
||||||
@@ -174,8 +172,6 @@ github.com/sagernet/sing v0.6.11-0.20250521033217-30d675ea099b h1:ZjTCYPb5f7aHdf
|
|||||||
github.com/sagernet/sing v0.6.11-0.20250521033217-30d675ea099b/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
|
github.com/sagernet/sing v0.6.11-0.20250521033217-30d675ea099b/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
|
||||||
github.com/sagernet/sing-mux v0.3.2 h1:meZVFiiStvHThb/trcpAkCrmtJOuItG5Dzl1RRP5/NE=
|
github.com/sagernet/sing-mux v0.3.2 h1:meZVFiiStvHThb/trcpAkCrmtJOuItG5Dzl1RRP5/NE=
|
||||||
github.com/sagernet/sing-mux v0.3.2/go.mod h1:pht8iFY4c9Xltj7rhVd208npkNaeCxzyXCgulDPLUDA=
|
github.com/sagernet/sing-mux v0.3.2/go.mod h1:pht8iFY4c9Xltj7rhVd208npkNaeCxzyXCgulDPLUDA=
|
||||||
github.com/sagernet/sing-quic v0.4.1-0.20250511050139-d459f561c9c3 h1:1J+s1yyZ8+YAYaClI+az8YuFgV9NGXUUCZnriKmos6w=
|
|
||||||
github.com/sagernet/sing-quic v0.4.1-0.20250511050139-d459f561c9c3/go.mod h1:Mv7CdSyLepmqoLT8rd88Qn3QMv5AbsgjEm3DvEhDVNE=
|
|
||||||
github.com/sagernet/sing-quic v0.5.0-beta.1 h1:nC0i/s8LhlZB8ev6laZCXF/uiwAE4kRdT4PcDdE4rI4=
|
github.com/sagernet/sing-quic v0.5.0-beta.1 h1:nC0i/s8LhlZB8ev6laZCXF/uiwAE4kRdT4PcDdE4rI4=
|
||||||
github.com/sagernet/sing-quic v0.5.0-beta.1/go.mod h1:SAv/qdeDN+75msGG5U5ZIwG+3Ua50jVIKNrRSY8pkx0=
|
github.com/sagernet/sing-quic v0.5.0-beta.1/go.mod h1:SAv/qdeDN+75msGG5U5ZIwG+3Ua50jVIKNrRSY8pkx0=
|
||||||
github.com/sagernet/sing-shadowsocks v0.2.7 h1:zaopR1tbHEw5Nk6FAkM05wCslV6ahVegEZaKMv9ipx8=
|
github.com/sagernet/sing-shadowsocks v0.2.7 h1:zaopR1tbHEw5Nk6FAkM05wCslV6ahVegEZaKMv9ipx8=
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package include
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
|
"github.com/sagernet/sing-box"
|
||||||
"github.com/sagernet/sing-box/adapter"
|
"github.com/sagernet/sing-box/adapter"
|
||||||
"github.com/sagernet/sing-box/adapter/endpoint"
|
"github.com/sagernet/sing-box/adapter/endpoint"
|
||||||
"github.com/sagernet/sing-box/adapter/inbound"
|
"github.com/sagernet/sing-box/adapter/inbound"
|
||||||
@@ -39,6 +40,10 @@ import (
|
|||||||
E "github.com/sagernet/sing/common/exceptions"
|
E "github.com/sagernet/sing/common/exceptions"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func Context(ctx context.Context) context.Context {
|
||||||
|
return box.Context(ctx, InboundRegistry(), OutboundRegistry(), EndpointRegistry(), DNSTransportRegistry(), ServiceRegistry())
|
||||||
|
}
|
||||||
|
|
||||||
func InboundRegistry() *inbound.Registry {
|
func InboundRegistry() *inbound.Registry {
|
||||||
registry := inbound.NewRegistry()
|
registry := inbound.NewRegistry()
|
||||||
|
|
||||||
|
|||||||
@@ -221,6 +221,14 @@ func (t *Endpoint) Start(stage adapter.StartStage) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ipStack := t.server.ExportNetstack().ExportIPStack()
|
ipStack := t.server.ExportNetstack().ExportIPStack()
|
||||||
|
gErr := ipStack.SetSpoofing(tun.DefaultNIC, true)
|
||||||
|
if gErr != nil {
|
||||||
|
return gonet.TranslateNetstackError(gErr)
|
||||||
|
}
|
||||||
|
gErr = ipStack.SetPromiscuousMode(tun.DefaultNIC, true)
|
||||||
|
if gErr != nil {
|
||||||
|
return gonet.TranslateNetstackError(gErr)
|
||||||
|
}
|
||||||
ipStack.SetTransportProtocolHandler(tcp.ProtocolNumber, tun.NewTCPForwarder(t.ctx, ipStack, t).HandlePacket)
|
ipStack.SetTransportProtocolHandler(tcp.ProtocolNumber, tun.NewTCPForwarder(t.ctx, ipStack, t).HandlePacket)
|
||||||
udpForwarder := tun.NewUDPForwarder(t.ctx, ipStack, t, t.udpTimeout)
|
udpForwarder := tun.NewUDPForwarder(t.ctx, ipStack, t, t.udpTimeout)
|
||||||
ipStack.SetTransportProtocolHandler(udp.ProtocolNumber, udpForwarder.HandlePacket)
|
ipStack.SetTransportProtocolHandler(udp.ProtocolNumber, udpForwarder.HandlePacket)
|
||||||
|
|||||||
@@ -172,8 +172,6 @@ func (r *Router) RoutePacketConnectionEx(ctx context.Context, conn N.PacketConn,
|
|||||||
} else {
|
} else {
|
||||||
r.logger.ErrorContext(ctx, err)
|
r.logger.ErrorContext(ctx, err)
|
||||||
}
|
}
|
||||||
} else if onClose != nil {
|
|
||||||
onClose(nil)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ func NewService(ctx context.Context, logger log.ContextLogger, tag string, optio
|
|||||||
for i, entry := range options.Servers.Entries() {
|
for i, entry := range options.Servers.Entries() {
|
||||||
inbound, loaded := inboundManager.Get(entry.Value)
|
inbound, loaded := inboundManager.Get(entry.Value)
|
||||||
if !loaded {
|
if !loaded {
|
||||||
return nil, E.New("parse SSM server[", i, "]: inbound ", entry.Value, "not found")
|
return nil, E.New("parse SSM server[", i, "]: inbound ", entry.Value, " not found")
|
||||||
}
|
}
|
||||||
managedServer, isManaged := inbound.(adapter.ManagedSSMServer)
|
managedServer, isManaged := inbound.(adapter.ManagedSSMServer)
|
||||||
if !isManaged {
|
if !isManaged {
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ func (m *UserManager) Add(username string, password string) error {
|
|||||||
m.access.Lock()
|
m.access.Lock()
|
||||||
defer m.access.Unlock()
|
defer m.access.Unlock()
|
||||||
if _, found := m.usersMap[username]; found {
|
if _, found := m.usersMap[username]; found {
|
||||||
return E.New("user", username, "already exists")
|
return E.New("user ", username, " already exists")
|
||||||
}
|
}
|
||||||
m.usersMap[username] = password
|
m.usersMap[username] = password
|
||||||
return m.postUpdate()
|
return m.postUpdate()
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ func TestMain(m *testing.M) {
|
|||||||
var globalCtx context.Context
|
var globalCtx context.Context
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
globalCtx = box.Context(context.Background(), include.InboundRegistry(), include.OutboundRegistry(), include.EndpointRegistry(), include.DNSTransportRegistry(), include.ServiceRegistry())
|
globalCtx = include.Context(context.Background())
|
||||||
}
|
}
|
||||||
|
|
||||||
func startInstance(t *testing.T, options option.Options) *box.Box {
|
func startInstance(t *testing.T, options option.Options) *box.Box {
|
||||||
|
|||||||
Reference in New Issue
Block a user