diff --git a/netcard.go b/netcard.go index 1becbf7..829ed6f 100644 --- a/netcard.go +++ b/netcard.go @@ -102,10 +102,13 @@ func NewNetTunnel() *NetTunnel { switch frame.Ethertype() { case ethernet.ARP: log.Printf("bytes len: %d type(arp): % x", len(rbuf), frame.Ethertype()) // 数据长度 + arp := ARP(frame) + log.Println(arp.IPv4Source(), arp.Source(), arp.IPv4Destination(), arp.Destination()) SwapBytes(frame, 0, frame, 6, 6) binary.BigEndian.PutUint16(frame[20:22], 2) SwapBytes(frame, 22, frame, 32, 10) + nt.ifce.Write(frame) //TODO: 解析arp 回应arp @@ -152,7 +155,7 @@ func NewNetTunnel() *NetTunnel { payload := frame.Payload() log.Println(frame.Source(), net.IP(payload[12:16]).To4(), binary.BigEndian.Uint16(payload[20:22]), frame.Destination(), net.IP(payload[16:20]).To4(), binary.BigEndian.Uint16(payload[22:24])) - _, err := nt.ifce.Write(payload) + _, err := nt.ifce.Write(frame) if err != nil { log.Println(err) } diff --git a/netcard_old.go b/netcard_old.go deleted file mode 100644 index 69ddff6..0000000 --- a/netcard_old.go +++ /dev/null @@ -1,291 +0,0 @@ -package main - -import ( - "bytes" - "context" - "crypto/md5" - "encoding/binary" - "encoding/gob" - "fmt" - "log" - "net" - "os/exec" - gen "slimming/proto/gen" - "strings" - "sync" - "sync/atomic" - "time" - - "github.com/klauspost/compress/zstd" - "github.com/songgao/packets/ethernet" - "github.com/songgao/water" - "github.com/songgao/water/waterutil" - "google.golang.org/grpc" - "google.golang.org/grpc/credentials/insecure" -) - -type ExchangeBuffer_OLD struct { - BytesArray [][]byte -} - -type NetCard_OLD struct { - FrameChan chan []byte - ifce *water.Interface - server *RPCServer_OLD - - clientMap map[string]*RPCClient_OLD - - lock sync.Mutex -} - -func (nc *NetCard_OLD) Lock(do func()) { - nc.lock.Lock() - defer nc.lock.Unlock() - do() -} - -type RPCClient_OLD struct { - FrameChan chan *ExchangeBuffer_OLD - conn *grpc.ClientConn -} - -func (cli *RPCClient_OLD) connect(realAddr string) { - log.Println("rpcclient connect", realAddr) - // defer log.Println("rpcclient exit") - - conn, err := grpc.Dial(realAddr, - grpc.WithTransportCredentials(insecure.NewCredentials()), - ) - if err != nil { - log.Printf("did not connect: %v", err) - return - } - - cli.conn = conn - go cli.run() - time.Sleep(time.Millisecond) -} - -func (cli *RPCClient_OLD) run() { - defer log.Println("rpcclient exit") - defer func() { - if err := recover(); err != nil { - log.Println("recover") - cli.conn = nil - } - }() - - cliService := gen.NewFrameServiceClient(cli.conn) - stream, err := cliService.SendFrames(context.Background()) - if err != nil { - log.Panic(err) - } - - buf := bytes.NewBuffer(nil) - for { - // Contact the server and print out its response. - - buf.Reset() - - // encode gob - enc := gob.NewEncoder(buf) - cliBuffer := <-cli.FrameChan - - log.Printf("send to target %s source bytes: %d", waterutil.IPv4Destination(cliBuffer.BytesArray[0]), len(cliBuffer.BytesArray[0])) - err := enc.Encode(cliBuffer.BytesArray) - if err != nil { - log.Panic(err) - } - - // zstd compress - zenc, err := zstd.NewWriter(buf) - if err != nil { - log.Panic(err) - } - err = zenc.Flush() - if err != nil { - log.Println(err) - } - - // 发到对面的网卡 - err = stream.Send(&gen.Request{ - Frames: buf.Bytes(), - }) - - if err != nil { - log.Panic(err) - } - } -} - -func (nc *NetCard_OLD) Run() { - go nc.runRead() - go nc.runWrite() - // go nc.cli.run() - time.Sleep(time.Second) - - cmdstr := fmt.Sprintf("ip addr add %s dev stun", config.Network.Self.Virt) - log.Println(cmdstr) - cmd := strings.Split(cmdstr, " ") - err := exec.Command(cmd[0], cmd[1:]...).Run() - if err != nil { - log.Panic(err) - } - - cmdstr = "ip link set dev stun up" - cmd = strings.Split(cmdstr, " ") - err = exec.Command(cmd[0], cmd[1:]...).Run() - if err != nil { - log.Panic(err) - } - nc.server.run() -} - -func NewNetCard_OLD() *NetCard_OLD { - - config := water.Config{ - DeviceType: water.TUN, - PlatformSpecificParams: water.PlatformSpecificParams{ - Name: "stun", - }, - } - - ifce, err := water.New(config) - if err != nil { - log.Panic(err) - } - - nc := &NetCard_OLD{ - FrameChan: make(chan []byte, 3000), - ifce: ifce, - clientMap: map[string]*RPCClient_OLD{}, - } - nc.server = newRPCServer_OLD(nc) - return nc -} - -func (nc *NetCard_OLD) runRead() { - log.Println("start netcard read") - - var ifce *water.Interface = nc.ifce - - for { - - var bytesMap map[string]*ExchangeBuffer_OLD = make(map[string]*ExchangeBuffer_OLD) - - var ok bool - var isLoop int32 = 1 - - // 20 微秒后停止收集数据 - go func() { - var after = time.NewTimer(time.Millisecond * 20) - <-after.C - atomic.StoreInt32(&isLoop, 0) - }() - - for atomic.LoadInt32(&isLoop) > 0 { - var rframe ethernet.Frame - rframe.Resize(1500) - n, err := ifce.Read([]byte(rframe)) - if err != nil { - log.Fatal(err) - } - rframe = rframe[:n] - - if !waterutil.IsIPv4(rframe) || waterutil.IPv4Source(rframe).Equal(net.IPv4(0, 0, 0, 0)) { - continue - } - - var realAddr string = "" - config.Lock(func() { - if realAddr, ok = config.IPv4Nodes[binary.LittleEndian.Uint32([]byte(waterutil.IPv4Destination(rframe)))]; !ok { - return - } - }) - - if realAddr == "" { - log.Printf("%s is not exists", waterutil.IPv4Destination(rframe)) - continue - } - - // log.Printf("Payload: % x\n", rframe.Payload()) - - log.Printf("Ethertype: % x %v realAddr %s\n", rframe.Ethertype(), waterutil.IsIPv4(rframe), realAddr) - log.Printf("Src %s Dst: %s\n", waterutil.IPv4Source(rframe), waterutil.IPv4Destination(rframe)) - - var buffer *ExchangeBuffer_OLD - if buffer, ok = bytesMap[realAddr]; !ok { - buffer = &ExchangeBuffer_OLD{BytesArray: make([][]byte, 0, 1000)} - bytesMap[realAddr] = buffer - } - - h := md5.New() - h.Write([]byte(rframe)) - log.Printf("%x", h.Sum(nil)) - buffer.BytesArray = append(buffer.BytesArray, []byte(rframe)) - } - - for dst, buffer := range bytesMap { - - var cli *RPCClient_OLD - if cli, ok = nc.clientMap[dst]; !ok { - cli = &RPCClient_OLD{FrameChan: make(chan *ExchangeBuffer_OLD)} - nc.clientMap[dst] = cli - } - - if cli.conn == nil { - cli.connect(dst) - } else { - cli.FrameChan <- buffer // 网卡数据 发到对方 - } - - } - - // 写到grpc服务 - - // log.Printf("Dst: %s\n", rframe.Destination()[0:4]) - // log.Printf("Src: %s\n", rframe.Source()[0:4]) - // log.Printf("Ethertype: % x\n", rframe.Ethertype()) - // log.Printf("Payload: % x\n", rframe.Payload()) - - } -} - -func (nc *NetCard_OLD) runWrite() { - var ifce *water.Interface = nc.ifce - var err error - - for wframe := range nc.FrameChan { - - log.Printf("get wframes bytes len: %d", len(wframe)) - var buf = bytes.NewBuffer(wframe) - - var zdec *zstd.Decoder - zdec, err = zstd.NewReader(buf) - if err != nil { - log.Panic(err) - } - zdec.Close() - - dec := gob.NewDecoder(buf) - var bufs [][]byte - err = dec.Decode(&bufs) - if err != nil { - log.Panic(err) - } - - for _, buf := range bufs { - h := md5.New() - h.Write(buf) - - log.Printf("get wframes decode len: %d, write buf hash: %x", len(buf), h.Sum(nil)) - log.Printf("get decode frames decode source: %s dst: %s", waterutil.IPv4Source(buf), waterutil.IPv4Destination(buf)) - _, err := ifce.Write(buf) - if err != nil { - log.Panic(err) - } - } - - } - -} diff --git a/proto/gen/frame.pb.go b/proto/gen/frame.pb.go index 415cae3..64066c2 100644 --- a/proto/gen/frame.pb.go +++ b/proto/gen/frame.pb.go @@ -26,17 +26,16 @@ const ( ) // 请求 -type Request struct { +type RequestFrames struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Type int32 `protobuf:"varint,1,opt,name=Type,proto3" json:"Type,omitempty"` Frames []byte `protobuf:"bytes,2,opt,name=Frames,proto3" json:"Frames,omitempty"` } -func (x *Request) Reset() { - *x = Request{} +func (x *RequestFrames) Reset() { + *x = RequestFrames{} if protoimpl.UnsafeEnabled { mi := &file_proto_frame_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -44,13 +43,13 @@ func (x *Request) Reset() { } } -func (x *Request) String() string { +func (x *RequestFrames) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Request) ProtoMessage() {} +func (*RequestFrames) ProtoMessage() {} -func (x *Request) ProtoReflect() protoreflect.Message { +func (x *RequestFrames) ProtoReflect() protoreflect.Message { mi := &file_proto_frame_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -62,19 +61,12 @@ func (x *Request) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Request.ProtoReflect.Descriptor instead. -func (*Request) Descriptor() ([]byte, []int) { +// Deprecated: Use RequestFrames.ProtoReflect.Descriptor instead. +func (*RequestFrames) Descriptor() ([]byte, []int) { return file_proto_frame_proto_rawDescGZIP(), []int{0} } -func (x *Request) GetType() int32 { - if x != nil { - return x.Type - } - return 0 -} - -func (x *Request) GetFrames() []byte { +func (x *RequestFrames) GetFrames() []byte { if x != nil { return x.Frames } @@ -145,26 +137,88 @@ func (x *Response) GetData() []byte { return nil } +// 请求 +type RequestMacIP struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + IP []byte `protobuf:"bytes,1,opt,name=IP,proto3" json:"IP,omitempty"` + MAC []byte `protobuf:"bytes,2,opt,name=MAC,proto3" json:"MAC,omitempty"` +} + +func (x *RequestMacIP) Reset() { + *x = RequestMacIP{} + if protoimpl.UnsafeEnabled { + mi := &file_proto_frame_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *RequestMacIP) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*RequestMacIP) ProtoMessage() {} + +func (x *RequestMacIP) ProtoReflect() protoreflect.Message { + mi := &file_proto_frame_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use RequestMacIP.ProtoReflect.Descriptor instead. +func (*RequestMacIP) Descriptor() ([]byte, []int) { + return file_proto_frame_proto_rawDescGZIP(), []int{2} +} + +func (x *RequestMacIP) GetIP() []byte { + if x != nil { + return x.IP + } + return nil +} + +func (x *RequestMacIP) GetMAC() []byte { + if x != nil { + return x.MAC + } + return nil +} + var File_proto_frame_proto protoreflect.FileDescriptor var file_proto_frame_proto_rawDesc = []byte{ 0x0a, 0x11, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x05, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x35, 0x0a, 0x07, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x12, 0x12, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, - 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x22, 0x4c, 0x0a, 0x08, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, - 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x4d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x32, 0x3f, 0x0a, 0x0c, 0x46, 0x72, - 0x61, 0x6d, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x2f, 0x0a, 0x0a, 0x53, 0x65, - 0x6e, 0x64, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x0e, 0x2e, 0x66, 0x72, 0x61, 0x6d, 0x65, - 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0f, 0x2e, 0x66, 0x72, 0x61, 0x6d, 0x65, - 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x28, 0x01, 0x42, 0x0b, 0x5a, 0x09, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x27, 0x0a, 0x0d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x22, 0x4c, + 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x43, 0x6f, + 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, + 0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22, 0x30, 0x0a, 0x0c, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x61, 0x63, 0x49, 0x50, 0x12, 0x0e, 0x0a, 0x02, + 0x49, 0x50, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x02, 0x49, 0x50, 0x12, 0x10, 0x0a, 0x03, + 0x4d, 0x41, 0x43, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, 0x4d, 0x41, 0x43, 0x32, 0x78, + 0x0a, 0x0c, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x35, + 0x0a, 0x0a, 0x53, 0x65, 0x6e, 0x64, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x14, 0x2e, 0x66, + 0x72, 0x61, 0x6d, 0x65, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x46, 0x72, 0x61, 0x6d, + 0x65, 0x73, 0x1a, 0x0f, 0x2e, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x28, 0x01, 0x12, 0x31, 0x0a, 0x09, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x61, 0x63, + 0x49, 0x50, 0x12, 0x13, 0x2e, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x4d, 0x61, 0x63, 0x49, 0x50, 0x1a, 0x0f, 0x2e, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x2e, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x0b, 0x5a, 0x09, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -179,16 +233,19 @@ func file_proto_frame_proto_rawDescGZIP() []byte { return file_proto_frame_proto_rawDescData } -var file_proto_frame_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_proto_frame_proto_msgTypes = make([]protoimpl.MessageInfo, 3) var file_proto_frame_proto_goTypes = []interface{}{ - (*Request)(nil), // 0: frame.Request - (*Response)(nil), // 1: frame.Response + (*RequestFrames)(nil), // 0: frame.RequestFrames + (*Response)(nil), // 1: frame.Response + (*RequestMacIP)(nil), // 2: frame.RequestMacIP } var file_proto_frame_proto_depIdxs = []int32{ - 0, // 0: frame.FrameService.SendFrames:input_type -> frame.Request - 1, // 1: frame.FrameService.SendFrames:output_type -> frame.Response - 1, // [1:2] is the sub-list for method output_type - 0, // [0:1] is the sub-list for method input_type + 0, // 0: frame.FrameService.SendFrames:input_type -> frame.RequestFrames + 2, // 1: frame.FrameService.SendMacIP:input_type -> frame.RequestMacIP + 1, // 2: frame.FrameService.SendFrames:output_type -> frame.Response + 1, // 3: frame.FrameService.SendMacIP:output_type -> frame.Response + 2, // [2:4] is the sub-list for method output_type + 0, // [0:2] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name 0, // [0:0] is the sub-list for extension extendee 0, // [0:0] is the sub-list for field type_name @@ -201,7 +258,7 @@ func file_proto_frame_proto_init() { } if !protoimpl.UnsafeEnabled { file_proto_frame_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Request); i { + switch v := v.(*RequestFrames); i { case 0: return &v.state case 1: @@ -224,6 +281,18 @@ func file_proto_frame_proto_init() { return nil } } + file_proto_frame_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*RequestMacIP); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -231,7 +300,7 @@ func file_proto_frame_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_proto_frame_proto_rawDesc, NumEnums: 0, - NumMessages: 2, + NumMessages: 3, NumExtensions: 0, NumServices: 1, }, @@ -258,6 +327,7 @@ const _ = grpc.SupportPackageIsVersion6 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type FrameServiceClient interface { SendFrames(ctx context.Context, opts ...grpc.CallOption) (FrameService_SendFramesClient, error) + SendMacIP(ctx context.Context, in *RequestMacIP, opts ...grpc.CallOption) (*Response, error) } type frameServiceClient struct { @@ -278,7 +348,7 @@ func (c *frameServiceClient) SendFrames(ctx context.Context, opts ...grpc.CallOp } type FrameService_SendFramesClient interface { - Send(*Request) error + Send(*RequestFrames) error CloseAndRecv() (*Response, error) grpc.ClientStream } @@ -287,7 +357,7 @@ type frameServiceSendFramesClient struct { grpc.ClientStream } -func (x *frameServiceSendFramesClient) Send(m *Request) error { +func (x *frameServiceSendFramesClient) Send(m *RequestFrames) error { return x.ClientStream.SendMsg(m) } @@ -302,9 +372,19 @@ func (x *frameServiceSendFramesClient) CloseAndRecv() (*Response, error) { return m, nil } +func (c *frameServiceClient) SendMacIP(ctx context.Context, in *RequestMacIP, opts ...grpc.CallOption) (*Response, error) { + out := new(Response) + err := c.cc.Invoke(ctx, "/frame.FrameService/SendMacIP", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // FrameServiceServer is the server API for FrameService service. type FrameServiceServer interface { SendFrames(FrameService_SendFramesServer) error + SendMacIP(context.Context, *RequestMacIP) (*Response, error) } // UnimplementedFrameServiceServer can be embedded to have forward compatible implementations. @@ -314,6 +394,9 @@ type UnimplementedFrameServiceServer struct { func (*UnimplementedFrameServiceServer) SendFrames(FrameService_SendFramesServer) error { return status.Errorf(codes.Unimplemented, "method SendFrames not implemented") } +func (*UnimplementedFrameServiceServer) SendMacIP(context.Context, *RequestMacIP) (*Response, error) { + return nil, status.Errorf(codes.Unimplemented, "method SendMacIP not implemented") +} func RegisterFrameServiceServer(s *grpc.Server, srv FrameServiceServer) { s.RegisterService(&_FrameService_serviceDesc, srv) @@ -325,7 +408,7 @@ func _FrameService_SendFrames_Handler(srv interface{}, stream grpc.ServerStream) type FrameService_SendFramesServer interface { SendAndClose(*Response) error - Recv() (*Request, error) + Recv() (*RequestFrames, error) grpc.ServerStream } @@ -337,18 +420,41 @@ func (x *frameServiceSendFramesServer) SendAndClose(m *Response) error { return x.ServerStream.SendMsg(m) } -func (x *frameServiceSendFramesServer) Recv() (*Request, error) { - m := new(Request) +func (x *frameServiceSendFramesServer) Recv() (*RequestFrames, error) { + m := new(RequestFrames) if err := x.ServerStream.RecvMsg(m); err != nil { return nil, err } return m, nil } +func _FrameService_SendMacIP_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(RequestMacIP) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(FrameServiceServer).SendMacIP(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/frame.FrameService/SendMacIP", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(FrameServiceServer).SendMacIP(ctx, req.(*RequestMacIP)) + } + return interceptor(ctx, in, info, handler) +} + var _FrameService_serviceDesc = grpc.ServiceDesc{ ServiceName: "frame.FrameService", HandlerType: (*FrameServiceServer)(nil), - Methods: []grpc.MethodDesc{}, + Methods: []grpc.MethodDesc{ + { + MethodName: "SendMacIP", + Handler: _FrameService_SendMacIP_Handler, + }, + }, Streams: []grpc.StreamDesc{ { StreamName: "SendFrames", diff --git a/rpc_client.go b/rpc_client.go index 2511015..aff8c8c 100644 --- a/rpc_client.go +++ b/rpc_client.go @@ -100,7 +100,7 @@ func (cli *RPCClient) run() { frames = nil // 发到对面的网卡 - err = stream.Send(&gen.Request{ + err = stream.Send(&gen.RequestFrames{ Frames: buf.Bytes(), }) diff --git a/rpc_old.go b/rpc_old.go deleted file mode 100644 index 7dca012..0000000 --- a/rpc_old.go +++ /dev/null @@ -1,56 +0,0 @@ -package main - -import ( - "log" - "net" - gen "slimming/proto/gen" - - "google.golang.org/grpc" -) - -type RPCServer_OLD struct { - gen.UnimplementedFrameServiceServer - netCard *NetCard_OLD -} - -var () - -func newRPCServer_OLD(netCard *NetCard_OLD) *RPCServer_OLD { - return &RPCServer_OLD{netCard: netCard} -} - -func (rpc *RPCServer_OLD) run() { - - lis, err := net.Listen("tcp", config.Network.Self.Real) - if err != nil { - log.Fatalf("failed to listen: %v", err) - } - s := grpc.NewServer() - gen.RegisterFrameServiceServer(s, rpc) - log.Printf("server listening at %v", lis.Addr()) - - if err := s.Serve(lis); err != nil { - log.Fatalf("failed to serve: %v", err) - } -} - -// SayHello implements helloworld.GreeterServer -func (s *RPCServer_OLD) SendFrames(stream gen.FrameService_SendFramesServer) error { - log.Printf("Start: %v", stream) - - for { - request, err := stream.Recv() - if err != nil { - log.Panic(err) - } - log.Printf("request: %v", len(request.Frames)) - s.netCard.FrameChan <- request.GetFrames() // 接受数据 广播到网卡上 - } - - // err := stream.SendAndClose(&gen.Response{Code: 0}) - // if err != nil { - // log.Panic(err) - // } - - return nil -} diff --git a/utils.go b/utils.go index e83ae33..53302df 100644 --- a/utils.go +++ b/utils.go @@ -2,9 +2,11 @@ package main import ( "bytes" + "encoding/binary" "encoding/gob" "io" "log" + "net" "github.com/klauspost/compress/zstd" "github.com/songgao/water/waterutil" @@ -61,3 +63,25 @@ func SwapBytes(frame1 []byte, start1 int, frame2 []byte, start2 int, size int) { copy(frame1[start1:start1+size], frame2[start2:start2+size]) copy(frame2[start2:start2+size], temp) } + +type ARP []byte + +func (arp ARP) Destination() net.HardwareAddr { + return net.HardwareAddr(arp[:6]) +} + +func (arp ARP) Source() net.HardwareAddr { + return net.HardwareAddr(arp[6:12]) +} + +func (arp ARP) Op() uint16 { + return binary.BigEndian.Uint16(arp[20:22]) +} + +func (arp ARP) IPv4Source() net.IP { + return net.IP(arp[28:32]) +} + +func (arp ARP) IPv4Destination() net.IP { + return net.IP(arp[38:42]) +}