add
This commit is contained in:
parent
120d949c59
commit
d3479c08a1
57
msg.pb.go
57
msg.pb.go
@ -25,16 +25,19 @@ type MyMsg_TYPE int32
|
||||
const (
|
||||
MyMsg_DATA MyMsg_TYPE = 0
|
||||
MyMsg_PING MyMsg_TYPE = 1
|
||||
MyMsg_MAGIC MyMsg_TYPE = 57005
|
||||
)
|
||||
|
||||
var MyMsg_TYPE_name = map[int32]string{
|
||||
0: "DATA",
|
||||
1: "PING",
|
||||
57005: "MAGIC",
|
||||
}
|
||||
|
||||
var MyMsg_TYPE_value = map[string]int32{
|
||||
"DATA": 0,
|
||||
"PING": 1,
|
||||
"MAGIC": 57005,
|
||||
}
|
||||
|
||||
func (x MyMsg_TYPE) String() string {
|
||||
@ -79,6 +82,7 @@ type MyMsg struct {
|
||||
Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
|
||||
Data []byte `protobuf:"bytes,4,opt,name=data,proto3" json:"data,omitempty"`
|
||||
Rproto int32 `protobuf:"varint,5,opt,name=rproto,proto3" json:"rproto,omitempty"`
|
||||
Magic int32 `protobuf:"varint,6,opt,name=magic,proto3" json:"magic,omitempty"`
|
||||
Key int32 `protobuf:"varint,7,opt,name=key,proto3" json:"key,omitempty"`
|
||||
Tcpmode int32 `protobuf:"varint,8,opt,name=tcpmode,proto3" json:"tcpmode,omitempty"`
|
||||
TcpmodeBuffersize int32 `protobuf:"varint,9,opt,name=tcpmode_buffersize,json=tcpmodeBuffersize,proto3" json:"tcpmode_buffersize,omitempty"`
|
||||
@ -149,6 +153,13 @@ func (m *MyMsg) GetRproto() int32 {
|
||||
return 0
|
||||
}
|
||||
|
||||
func (m *MyMsg) GetMagic() int32 {
|
||||
if m != nil {
|
||||
return m.Magic
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (m *MyMsg) GetKey() int32 {
|
||||
if m != nil {
|
||||
return m.Key
|
||||
@ -273,26 +284,28 @@ func init() {
|
||||
func init() { proto.RegisterFile("msg.proto", fileDescriptor_c06e4cca6c2cc899) }
|
||||
|
||||
var fileDescriptor_c06e4cca6c2cc899 = []byte{
|
||||
// 332 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x51, 0xcd, 0x4a, 0xc3, 0x40,
|
||||
0x10, 0x76, 0xf3, 0xd3, 0xa6, 0x63, 0x2d, 0x71, 0x45, 0x19, 0x7a, 0x0a, 0x01, 0xa1, 0x17, 0x3d,
|
||||
0xe8, 0x13, 0xb4, 0x5a, 0x45, 0xa4, 0x52, 0x97, 0x5e, 0xf4, 0x52, 0x52, 0xb3, 0x0d, 0x8b, 0x26,
|
||||
0x0d, 0xc9, 0x16, 0xad, 0x2f, 0xe5, 0x33, 0xf8, 0x66, 0xb2, 0xd3, 0x6d, 0xa0, 0x78, 0xda, 0xef,
|
||||
0x8f, 0x99, 0xe5, 0x1b, 0xe8, 0xe4, 0x75, 0x76, 0x59, 0x56, 0x2b, 0xbd, 0x8a, 0x7f, 0x1d, 0xf0,
|
||||
0x27, 0x9b, 0x49, 0x9d, 0xf1, 0x1e, 0x38, 0x2a, 0x45, 0x16, 0xb1, 0x41, 0x47, 0x38, 0x2a, 0xe5,
|
||||
0x1c, 0x3c, 0xbd, 0x29, 0x25, 0x3a, 0x11, 0x1b, 0xf8, 0x82, 0x30, 0x3f, 0x83, 0x96, 0x4e, 0xaa,
|
||||
0x4c, 0x6a, 0x74, 0x29, 0x67, 0x99, 0xc9, 0xa6, 0x89, 0x4e, 0xd0, 0x8b, 0xd8, 0xa0, 0x2b, 0x08,
|
||||
0x9b, 0x6c, 0x45, 0x3b, 0xd0, 0xa7, 0x09, 0x96, 0xf1, 0x10, 0xdc, 0x77, 0xb9, 0xc1, 0x36, 0x89,
|
||||
0x06, 0x72, 0x84, 0xb6, 0x7e, 0x2b, 0xf3, 0x55, 0x2a, 0x31, 0x20, 0x75, 0x47, 0xf9, 0x05, 0x70,
|
||||
0x0b, 0xe7, 0x8b, 0xf5, 0x72, 0x29, 0xab, 0x5a, 0x7d, 0x4b, 0xec, 0x50, 0xe8, 0xd8, 0x3a, 0xa3,
|
||||
0xc6, 0xe0, 0xe7, 0xd0, 0xdb, 0xc5, 0xf3, 0xe4, 0xeb, 0x53, 0x15, 0x08, 0x14, 0x3d, 0xb2, 0xea,
|
||||
0x84, 0x44, 0x7e, 0x05, 0xa7, 0xbb, 0x58, 0x25, 0x6b, 0x59, 0xa4, 0x73, 0xad, 0x72, 0x99, 0xd7,
|
||||
0x78, 0x48, 0xe9, 0x13, 0x6b, 0x0a, 0xf2, 0x66, 0x64, 0xc5, 0x7d, 0xf0, 0x66, 0x2f, 0xd3, 0x31,
|
||||
0x0f, 0xc0, 0xbb, 0x1d, 0xce, 0x86, 0xe1, 0x81, 0x41, 0xd3, 0x87, 0xa7, 0xfb, 0x90, 0xc5, 0x3f,
|
||||
0x0c, 0xfc, 0xbb, 0x2a, 0xc9, 0x65, 0xd3, 0x19, 0xdb, 0xef, 0x6c, 0xbb, 0x85, 0x9a, 0x0c, 0x84,
|
||||
0x65, 0xbc, 0x0f, 0x81, 0x79, 0xcd, 0x6a, 0x6a, 0xd3, 0x15, 0x0d, 0xb7, 0xb7, 0xf0, 0x68, 0x8a,
|
||||
0xbd, 0x05, 0xf5, 0xeb, 0xef, 0xf7, 0x6b, 0x5e, 0x95, 0x62, 0x2b, 0x72, 0x4d, 0xbf, 0x5b, 0x16,
|
||||
0xc7, 0xff, 0x7e, 0xda, 0x06, 0x57, 0x8c, 0x9f, 0x43, 0x66, 0xc0, 0xf0, 0xe6, 0x31, 0x74, 0x46,
|
||||
0xdd, 0x57, 0x28, 0x55, 0x91, 0xe9, 0x75, 0x51, 0xc8, 0x8f, 0x45, 0x8b, 0x0e, 0x73, 0xfd, 0x17,
|
||||
0x00, 0x00, 0xff, 0xff, 0x6c, 0xfe, 0x5f, 0xc5, 0x17, 0x02, 0x00, 0x00,
|
||||
// 357 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x51, 0xdb, 0x4e, 0xc2, 0x30,
|
||||
0x18, 0xb6, 0x3b, 0x31, 0x7e, 0x90, 0xcc, 0x7a, 0x48, 0xe3, 0xd5, 0xb2, 0xc4, 0xc8, 0x8d, 0x5e,
|
||||
0xe8, 0x13, 0x0c, 0x44, 0x42, 0xcc, 0x0c, 0x2e, 0xdc, 0xe8, 0x0d, 0x19, 0xac, 0x2c, 0x8d, 0x6e,
|
||||
0x2c, 0x5b, 0x89, 0xe2, 0x3b, 0x19, 0x9f, 0xc0, 0xb7, 0xf1, 0x41, 0x4c, 0x7f, 0x0a, 0x09, 0xf1,
|
||||
0xaa, 0xdf, 0x29, 0x6d, 0xf3, 0x7d, 0xd0, 0xcc, 0xeb, 0xec, 0xba, 0xac, 0x96, 0x72, 0x19, 0xfc,
|
||||
0x1a, 0x60, 0x47, 0xeb, 0xa8, 0xce, 0x68, 0x07, 0x0c, 0x91, 0x32, 0xe2, 0x93, 0x6e, 0x33, 0x36,
|
||||
0x44, 0x4a, 0x29, 0x58, 0x72, 0x5d, 0x72, 0x66, 0xf8, 0xa4, 0x6b, 0xc7, 0x88, 0xe9, 0x19, 0x38,
|
||||
0x32, 0xa9, 0x32, 0x2e, 0x99, 0x89, 0x39, 0xcd, 0x54, 0x36, 0x4d, 0x64, 0xc2, 0x2c, 0x9f, 0x74,
|
||||
0xdb, 0x31, 0x62, 0x95, 0xad, 0xf0, 0x0d, 0x66, 0xe3, 0x0d, 0x9a, 0xd1, 0x13, 0xb0, 0xf3, 0x24,
|
||||
0x13, 0x73, 0xe6, 0xa0, 0xbc, 0x21, 0xd4, 0x03, 0xf3, 0x95, 0xaf, 0x59, 0x03, 0x35, 0x05, 0x29,
|
||||
0x83, 0x86, 0x9c, 0x97, 0xf9, 0x32, 0xe5, 0xcc, 0x45, 0x75, 0x4b, 0xe9, 0x15, 0x50, 0x0d, 0xa7,
|
||||
0xb3, 0xd5, 0x62, 0xc1, 0xab, 0x5a, 0x7c, 0x72, 0xd6, 0xc4, 0xd0, 0x91, 0x76, 0x7a, 0x3b, 0x83,
|
||||
0x5e, 0x40, 0x67, 0x1b, 0xcf, 0x93, 0x8f, 0x77, 0x51, 0x30, 0xc0, 0xe8, 0xa1, 0x56, 0x23, 0x14,
|
||||
0xe9, 0x0d, 0x9c, 0x6e, 0x63, 0x15, 0xaf, 0x79, 0x91, 0x4e, 0xa5, 0xc8, 0x79, 0x5e, 0xb3, 0x16,
|
||||
0xa6, 0x8f, 0xb5, 0x19, 0xa3, 0x37, 0x41, 0x2b, 0xb8, 0x04, 0x6b, 0xf2, 0x3c, 0x1e, 0x50, 0x17,
|
||||
0xac, 0xbb, 0x70, 0x12, 0x7a, 0x07, 0x0a, 0x8d, 0x47, 0x8f, 0x43, 0x8f, 0xd0, 0x16, 0xd8, 0x51,
|
||||
0x38, 0x1c, 0xf5, 0xbd, 0xaf, 0x1f, 0x33, 0xf8, 0x26, 0x60, 0xdf, 0x57, 0x49, 0xce, 0x77, 0xb5,
|
||||
0x92, 0xfd, 0x5a, 0x37, 0x4f, 0x62, 0xd9, 0x6e, 0xac, 0x19, 0x3d, 0x07, 0x57, 0x9d, 0xea, 0x1f,
|
||||
0x58, 0xb8, 0x19, 0xef, 0xb8, 0x9e, 0xcb, 0xc2, 0x5b, 0xf4, 0x5c, 0x38, 0x81, 0xbd, 0x3f, 0x81,
|
||||
0x3a, 0x45, 0xca, 0x1c, 0xdf, 0x54, 0x13, 0x6c, 0x58, 0x10, 0xfc, 0xfb, 0x76, 0x03, 0xcc, 0x78,
|
||||
0xf0, 0xe4, 0x11, 0x05, 0xc2, 0xfe, 0x83, 0x67, 0xf4, 0xda, 0x2f, 0x50, 0x8a, 0x22, 0x93, 0xab,
|
||||
0xa2, 0xe0, 0x6f, 0x33, 0x07, 0xb7, 0xbb, 0xfd, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x51, 0xd5, 0x5a,
|
||||
0xaf, 0x3a, 0x02, 0x00, 0x00,
|
||||
}
|
||||
|
@ -1,9 +1,11 @@
|
||||
syntax = "proto3";
|
||||
option go_package = "pingtunnel";
|
||||
|
||||
message MyMsg {
|
||||
enum TYPE {
|
||||
DATA = 0;
|
||||
PING = 1;
|
||||
MAGIC = 0xdead;
|
||||
}
|
||||
|
||||
string id = 1;
|
||||
@ -11,6 +13,7 @@ message MyMsg {
|
||||
string target = 3;
|
||||
bytes data = 4;
|
||||
int32 rproto = 5;
|
||||
int32 magic = 6;
|
||||
int32 key = 7;
|
||||
int32 tcpmode = 8;
|
||||
int32 tcpmode_buffersize = 9;
|
||||
|
@ -31,6 +31,7 @@ func sendICMP(id int, sequence int, conn icmp.PacketConn, server *net.IPAddr, ta
|
||||
TcpmodeBuffersize: (int32)(tcpmode_buffer_size),
|
||||
TcpmodeMaxwin: (int32)(tcpmode_maxwin),
|
||||
TcpmodeResendTimems: (int32)(tcpmode_resend_time),
|
||||
Magic: (int32)(MyMsg_MAGIC),
|
||||
}
|
||||
|
||||
mb, err := proto.Marshal(m)
|
||||
@ -101,8 +102,13 @@ func recvICMP(conn icmp.PacketConn, recv chan<- *Packet) {
|
||||
continue
|
||||
}
|
||||
|
||||
if my.Magic == (int32)(MyMsg_MAGIC) {
|
||||
loggo.Debug("processPacket data invalid %s", my.Id)
|
||||
continue
|
||||
}
|
||||
|
||||
if my.Data == nil {
|
||||
loggo.Debug("processPacket data nil %s", my.Id)
|
||||
loggo.Error("processPacket data nil %s", my.Id)
|
||||
continue
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user