diff --git a/main/distro/all/all.go b/main/distro/all/all.go index e22016362..7c6a7686b 100644 --- a/main/distro/all/all.go +++ b/main/distro/all/all.go @@ -27,4 +27,5 @@ import ( _ "v2ray.com/core/transport/internet/headers/noop" _ "v2ray.com/core/transport/internet/headers/srtp" _ "v2ray.com/core/transport/internet/headers/utp" + _ "v2ray.com/core/transport/internet/headers/wechat" ) diff --git a/tools/conf/transport_authenticators.go b/tools/conf/transport_authenticators.go index b8b4ff6d7..c96c2b4d2 100644 --- a/tools/conf/transport_authenticators.go +++ b/tools/conf/transport_authenticators.go @@ -7,6 +7,7 @@ import ( "v2ray.com/core/transport/internet/headers/noop" "v2ray.com/core/transport/internet/headers/srtp" "v2ray.com/core/transport/internet/headers/utp" + "v2ray.com/core/transport/internet/headers/wechat" ) type NoOpAuthenticator struct{} @@ -33,6 +34,12 @@ func (UTPAuthenticator) Build() (*serial.TypedMessage, error) { return serial.ToTypedMessage(new(utp.Config)), nil } +type WechatVideoAuthenticator struct{} + +func (WechatVideoAuthenticator) Build() (*serial.TypedMessage, error) { + return serial.ToTypedMessage(new(wechat.VideoConfig)), nil +} + type HTTPAuthenticatorRequest struct { Version string `json:"version"` Method string `json:"method"` diff --git a/tools/conf/transport_internet.go b/tools/conf/transport_internet.go index b34f469ab..3daddf278 100644 --- a/tools/conf/transport_internet.go +++ b/tools/conf/transport_internet.go @@ -17,9 +17,10 @@ import ( var ( kcpHeaderLoader = NewJSONConfigLoader(ConfigCreatorCache{ - "none": func() interface{} { return new(NoOpAuthenticator) }, - "srtp": func() interface{} { return new(SRTPAuthenticator) }, - "utp": func() interface{} { return new(UTPAuthenticator) }, + "none": func() interface{} { return new(NoOpAuthenticator) }, + "srtp": func() interface{} { return new(SRTPAuthenticator) }, + "utp": func() interface{} { return new(UTPAuthenticator) }, + "wechat-video": func() interface{} { return new(WechatVideoAuthenticator) }, }, "type", "") tcpHeaderLoader = NewJSONConfigLoader(ConfigCreatorCache{ diff --git a/transport/internet/headers/wechat/config.pb.go b/transport/internet/headers/wechat/config.pb.go new file mode 100644 index 000000000..17f8df933 --- /dev/null +++ b/transport/internet/headers/wechat/config.pb.go @@ -0,0 +1,47 @@ +package wechat + +import proto "github.com/golang/protobuf/proto" +import fmt "fmt" +import math "math" + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package + +type VideoConfig struct { +} + +func (m *VideoConfig) Reset() { *m = VideoConfig{} } +func (m *VideoConfig) String() string { return proto.CompactTextString(m) } +func (*VideoConfig) ProtoMessage() {} +func (*VideoConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } + +func init() { + proto.RegisterType((*VideoConfig)(nil), "v2ray.core.transport.internet.headers.wechat.VideoConfig") +} + +func init() { + proto.RegisterFile("v2ray.com/core/transport/internet/headers/wechat/config.proto", fileDescriptor0) +} + +var fileDescriptor0 = []byte{ + // 169 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xb2, 0x2d, 0x33, 0x2a, 0x4a, + 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x29, 0x4a, 0xcc, 0x2b, + 0x2e, 0xc8, 0x2f, 0x2a, 0xd1, 0xcf, 0xcc, 0x2b, 0x49, 0x2d, 0xca, 0x4b, 0x2d, 0xd1, 0xcf, 0x48, + 0x4d, 0x4c, 0x49, 0x2d, 0x2a, 0xd6, 0x2f, 0x4f, 0x4d, 0xce, 0x48, 0x2c, 0xd1, 0x4f, 0xce, 0xcf, + 0x4b, 0xcb, 0x4c, 0xd7, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xd2, 0x81, 0x69, 0x2f, 0x4a, 0xd5, + 0x83, 0x6b, 0xd5, 0x83, 0x69, 0xd5, 0x83, 0x6a, 0xd5, 0x83, 0x68, 0x55, 0xe2, 0xe5, 0xe2, 0x0e, + 0xcb, 0x4c, 0x49, 0xcd, 0x77, 0x06, 0x1b, 0xe1, 0x54, 0xc6, 0x65, 0x90, 0x9c, 0x9f, 0xab, 0x47, + 0x8a, 0x11, 0x4e, 0xdc, 0x10, 0xbd, 0x01, 0x20, 0xdb, 0xa3, 0xd8, 0x20, 0x82, 0xab, 0x98, 0x74, + 0xc2, 0x8c, 0x82, 0x12, 0x2b, 0xf5, 0x9c, 0x41, 0x66, 0x84, 0xc0, 0xcd, 0xf0, 0x84, 0x99, 0xe1, + 0x01, 0x35, 0x23, 0x1c, 0xac, 0x3c, 0x89, 0x0d, 0xec, 0x76, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x9b, 0x6a, 0x0f, 0x19, 0xfc, 0x00, 0x00, 0x00, +} diff --git a/transport/internet/headers/wechat/config.proto b/transport/internet/headers/wechat/config.proto new file mode 100644 index 000000000..819f3e678 --- /dev/null +++ b/transport/internet/headers/wechat/config.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +package v2ray.core.transport.internet.headers.wechat; +option csharp_namespace = "V2Ray.Core.Transport.Internet.Headers.Wechat"; +option go_package = "wechat"; +option java_package = "com.v2ray.core.transport.internet.headers.wechat"; +option java_outer_classname = "ConfigProto"; + +message VideoConfig { +} \ No newline at end of file diff --git a/transport/internet/headers/wechat/wechat.go b/transport/internet/headers/wechat/wechat.go new file mode 100644 index 000000000..0b1542b91 --- /dev/null +++ b/transport/internet/headers/wechat/wechat.go @@ -0,0 +1,36 @@ +package wechat + +import ( + "v2ray.com/core/common" + "v2ray.com/core/common/dice" + "v2ray.com/core/common/serial" + "v2ray.com/core/transport/internet" +) + +type VideoChat struct { + sn int +} + +func (vc *VideoChat) Size() int { + return 13 +} + +func (vc *VideoChat) Write(b []byte) (int, error) { + vc.sn++ + b = append(b[:0], 0xa1, 0x08) + b = serial.IntToBytes(vc.sn, b) + b = append(b, 0x10, 0x11, 0x18, 0x30, 0x22, 0x30) + return 13, nil +} + +type VideoChatFactory struct{} + +func (VideoChatFactory) Create(rawSettings interface{}) internet.PacketHeader { + return &VideoChat{ + sn: dice.Roll(65535), + } +} + +func init() { + common.Must(internet.RegisterPacketHeader(serial.GetMessageType(new(VideoConfig)), VideoChatFactory{})) +} diff --git a/transport/internet/headers/wechat/wechat_test.go b/transport/internet/headers/wechat/wechat_test.go new file mode 100644 index 000000000..5bdaa04fc --- /dev/null +++ b/transport/internet/headers/wechat/wechat_test.go @@ -0,0 +1,20 @@ +package wechat_test + +import ( + "testing" + + "v2ray.com/core/common/buf" + "v2ray.com/core/testing/assert" + . "v2ray.com/core/transport/internet/headers/wechat" +) + +func TestUTPWrite(t *testing.T) { + assert := assert.On(t) + + video := VideoChat{} + + payload := buf.NewLocal(2048) + payload.AppendSupplier(video.Write) + + assert.Int(payload.Len()).Equals(video.Size()) +}