Buriburizaemon/V2bX
1
0
Fork 0
mirror of https://github.com/wyx2685/V2bX.git synced 2026-02-04 04:30:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

update singbox

Browse Source
This commit is contained in:
Yuzuki616
2023-10-26 14:06:43 +09:00
parent 7f5b0893f9
commit f928b4f8f3
17 changed files with 186 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/sing/hook.go
View File

@@ -6,21 +6,20 @@ import (
"net"
"sync"
"github.com/inazumav/sing-box/common/urltest"
"github.com/sagernet/sing-box/common/urltest"
"github.com/InazumaV/V2bX/common/rate"
"github.com/InazumaV/V2bX/limiter"
"github.com/InazumaV/V2bX/common/counter"
"github.com/inazumav/sing-box/adapter"
"github.com/inazumav/sing-box/log"
"github.com/sagernet/sing-box/adapter"
"github.com/sagernet/sing-box/log"
N "github.com/sagernet/sing/common/network"
)
type HookServer struct {
EnableConnClear bool
logger log.Logger
counter sync.Map
connClears sync.Map
}
@@ -56,10 +55,9 @@ func (h *HookServer) ModeList() []string {
return nil
}
func NewHookServer(logger log.Logger, enableClear bool) *HookServer {
func NewHookServer(enableClear bool) *HookServer {
return &HookServer{
EnableConnClear: enableClear,
logger: logger,
counter: sync.Map{},
connClears: sync.Map{},
}
@@ -81,25 +79,25 @@ func (h *HookServer) RoutedConnection(_ context.Context, conn net.Conn, m adapte
t := &Tracker{}
l, err := limiter.GetLimiter(m.Inbound)
if err != nil {
h.logger.Warn("get limiter for ", m.Inbound, " error: ", err)
log.Warn("get limiter for ", m.Inbound, " error: ", err)
return conn, t
}
if l.CheckDomainRule(m.Domain) {
conn.Close()
h.logger.Error("[", m.Inbound, "] ",
log.Error("[", m.Inbound, "] ",
"Limited ", m.User, " access to ", m.Domain, " by domain rule")
return conn, t
}
if l.CheckProtocolRule(m.Protocol) {
conn.Close()
h.logger.Error("[", m.Inbound, "] ",
log.Error("[", m.Inbound, "] ",
"Limited ", m.User, " use ", m.Domain, " by protocol rule")
return conn, t
}
ip := m.Source.Addr.String()
if b, r := l.CheckLimit(m.User, ip, true); r {
conn.Close()
h.logger.Error("[", m.Inbound, "] ", "Limited ", m.User, " by ip or conn")
log.Error("[", m.Inbound, "] ", "Limited ", m.User, " by ip or conn")
return conn, t
} else if b != nil {
conn = rate.NewConnRateLimiter(conn, b)
@@ -135,25 +133,25 @@ func (h *HookServer) RoutedPacketConnection(_ context.Context, conn N.PacketConn
t := &Tracker{}
l, err := limiter.GetLimiter(m.Inbound)
if err != nil {
h.logger.Warn("get limiter for ", m.Inbound, " error: ", err)
log.Warn("get limiter for ", m.Inbound, " error: ", err)
return conn, t
}
if l.CheckDomainRule(m.Domain) {
conn.Close()
h.logger.Error("[", m.Inbound, "] ",
log.Error("[", m.Inbound, "] ",
"Limited ", m.User, " access to ", m.Domain, " by domain rule")
return conn, t
}
if l.CheckProtocolRule(m.Protocol) {
conn.Close()
h.logger.Error("[", m.Inbound, "] ",
log.Error("[", m.Inbound, "] ",
"Limited ", m.User, " use ", m.Domain, " by protocol rule")
return conn, t
}
ip := m.Source.Addr.String()
if b, r := l.CheckLimit(m.User, ip, true); r {
conn.Close()
h.logger.Error("[", m.Inbound, "] ", "Limited ", m.User, " by ip or conn")
log.Error("[", m.Inbound, "] ", "Limited ", m.User, " by ip or conn")
return conn, t
} else if b != nil {
conn = rate.NewPacketConnCounter(conn, b)