chunyu/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-06-13 21:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge protocols

Browse Source
This commit is contained in:
世界 2024-05-27 19:23:00 +08:00
parent 71e10439c8
commit b172745be0
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
5 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/sniff/bittorrent.go
View File

@ -8,7 +8,7 @@ import (
"os" "os"
"github.com/sagernet/sing-box/adapter" "github.com/sagernet/sing-box/adapter"
"github.com/sagernet/sing-box/constant" C "github.com/sagernet/sing-box/constant"
) )
const ( const (
@ -46,7 +46,7 @@ func BitTorrent(_ context.Context, reader io.Reader) (*adapter.InboundContext, e
} }
return &adapter.InboundContext{ return &adapter.InboundContext{
Protocol: constant.ProtocolBitTorrent, Protocol: C.ProtocolBitTorrent,
}, nil }, nil
} }
@ -87,7 +87,7 @@ func UTP(_ context.Context, packet []byte) (*adapter.InboundContext, error) {
} }
return &adapter.InboundContext{ return &adapter.InboundContext{
Protocol: constant.ProtocolUTP, Protocol: C.ProtocolBitTorrent,
}, nil }, nil
} }
@ -105,7 +105,7 @@ func UDPTracker(_ context.Context, packet []byte) (*adapter.InboundContext, erro
case len(packet) >= trackerScrapeMinSize && case len(packet) >= trackerScrapeMinSize &&
binary.BigEndian.Uint32(packet[8:12]) == trackerScrapeFlag: binary.BigEndian.Uint32(packet[8:12]) == trackerScrapeFlag:
return &adapter.InboundContext{ return &adapter.InboundContext{
Protocol: constant.ProtocolUDPTracker, Protocol: C.ProtocolBitTorrent,
}, nil }, nil
default: default:
return nil, os.ErrInvalid return nil, os.ErrInvalid

8
common/sniff/bittorrent_test.go
View File

@ -7,7 +7,7 @@ import (
"testing" "testing"
"github.com/sagernet/sing-box/common/sniff" "github.com/sagernet/sing-box/common/sniff"
"github.com/sagernet/sing-box/constant" C "github.com/sagernet/sing-box/constant"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
@ -26,7 +26,7 @@ func TestSniffBittorrent(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
metadata, err := sniff.BitTorrent(context.TODO(), bytes.NewReader(pkt)) metadata, err := sniff.BitTorrent(context.TODO(), bytes.NewReader(pkt))
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, constant.ProtocolBitTorrent, metadata.Protocol) require.Equal(t, C.ProtocolBitTorrent, metadata.Protocol)
} }
} }
@ -46,7 +46,7 @@ func TestSniffUTP(t *testing.T) {
metadata, err := sniff.UTP(context.TODO(), pkt) metadata, err := sniff.UTP(context.TODO(), pkt)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, constant.ProtocolUTP, metadata.Protocol) require.Equal(t, C.ProtocolBitTorrent, metadata.Protocol)
} }
} }
@ -76,6 +76,6 @@ func TestSniffUDPTracker(t *testing.T) {
metadata, err := sniff.UDPTracker(context.TODO(), pkt) metadata, err := sniff.UDPTracker(context.TODO(), pkt)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, constant.ProtocolUDPTracker, metadata.Protocol) require.Equal(t, C.ProtocolBitTorrent, metadata.Protocol)
} }
} }

2
constant/protocol.go
View File

@ -7,6 +7,4 @@ const (
ProtocolDNS = "dns" ProtocolDNS = "dns"
ProtocolSTUN = "stun" ProtocolSTUN = "stun"
ProtocolBitTorrent = "bittorrent" ProtocolBitTorrent = "bittorrent"
ProtocolUTP = "utp"
ProtocolUDPTracker = "udp-tracker"
) )

6
docs/configuration/route/sniff.md
View File

@ -3,12 +3,10 @@ If enabled in the inbound, the protocol and domain name (if present) of by the c
#### Supported Protocols #### Supported Protocols
| Network | Protocol | Domain Name | | Network | Protocol | Domain Name |
| :-----: | :---------: | :---------: | |:-------:|:-----------:|:-----------:|
| TCP | HTTP | Host | | TCP | HTTP | Host |
| TCP | TLS | Server Name | | TCP | TLS | Server Name |
| UDP | QUIC | Server Name | | UDP | QUIC | Server Name |
| UDP | STUN | / | | UDP | STUN | / |
| TCP/UDP | DNS | / | | TCP/UDP | DNS | / |
| TCP | BitTorrent | / | | TCP/UDP | BitTorrent | / |
| UDP | UTP/µTP | / |
| UDP | UDP Tracker | / |

8
docs/configuration/route/sniff.zh.md
View File

@ -2,13 +2,11 @@
#### 支持的协议 #### 支持的协议
| 网络 | 协议 | 域名 | | 网络 | 协议 | 域名 |
| :-----: | :---------: | :---------: | |:-------:|:-----------:|:-----------:|
| TCP | HTTP | Host | | TCP | HTTP | Host |
| TCP | TLS | Server Name | | TCP | TLS | Server Name |
| UDP | QUIC | Server Name | | UDP | QUIC | Server Name |
| UDP | STUN | / | | UDP | STUN | / |
| TCP/UDP | DNS | / | | TCP/UDP | DNS | / |
| TCP | BitTorrent | / | | TCP/UDP | BitTorrent | / |
| UDP | UTP/µTP | / |
| UDP | UDP Tracker | / |