diff --git a/src/assets/dependency/iperf/deb/iperf_2.0.13+dfsg1-1build1_amd64.deb b/src/assets/dependency/iperf/deb/iperf_2.0.13+dfsg1-1build1_amd64.deb deleted file mode 100644 index 323ae584..00000000 Binary files a/src/assets/dependency/iperf/deb/iperf_2.0.13+dfsg1-1build1_amd64.deb and /dev/null differ diff --git a/src/assets/dependency/iperf/rpm/iperf-2.1.6-2.el8.aarch64.rpm b/src/assets/dependency/iperf/rpm/iperf-2.1.6-2.el8.aarch64.rpm deleted file mode 100644 index ec6b9314..00000000 Binary files a/src/assets/dependency/iperf/rpm/iperf-2.1.6-2.el8.aarch64.rpm and /dev/null differ diff --git a/src/assets/dependency/iperf/rpm/iperf3-3.6-6.ky10.aarch64.rpm b/src/assets/dependency/iperf/rpm/iperf3-3.6-6.ky10.aarch64.rpm deleted file mode 100644 index b5d5a4a5..00000000 Binary files a/src/assets/dependency/iperf/rpm/iperf3-3.6-6.ky10.aarch64.rpm and /dev/null differ diff --git a/src/assets/dependency/iperf3/deb/iperf3_3.1.3-1_amd64.deb b/src/assets/dependency/iperf3/deb/iperf3_3.1.3-1_amd64.deb deleted file mode 100644 index 0c687e31..00000000 Binary files a/src/assets/dependency/iperf3/deb/iperf3_3.1.3-1_amd64.deb and /dev/null differ diff --git a/src/assets/dependency/iperf3/deb/libiperf0_3.1.3-1_amd64.deb b/src/assets/dependency/iperf3/deb/libiperf0_3.1.3-1_amd64.deb deleted file mode 100644 index c81f6622..00000000 Binary files a/src/assets/dependency/iperf3/deb/libiperf0_3.1.3-1_amd64.deb and /dev/null differ diff --git a/src/assets/dependency/iperf3/deb/libsctp1_1.0.19+dfsg-1build1_amd64.deb b/src/assets/dependency/iperf3/deb/libsctp1_1.0.19+dfsg-1build1_amd64.deb deleted file mode 100644 index 03c3947e..00000000 Binary files a/src/assets/dependency/iperf3/deb/libsctp1_1.0.19+dfsg-1build1_amd64.deb and /dev/null differ diff --git a/src/assets/dependency/iperf3/rpm/iperf3-3.6-6.ky10.aarch64.rpm b/src/assets/dependency/iperf3/rpm/iperf3-3.6-6.ky10.aarch64.rpm deleted file mode 100644 index b5d5a4a5..00000000 Binary files a/src/assets/dependency/iperf3/rpm/iperf3-3.6-6.ky10.aarch64.rpm and /dev/null differ diff --git a/src/assets/dependency/iperf3/rpm/iperf3-help-3.6-6.ky10.noarch.rpm b/src/assets/dependency/iperf3/rpm/iperf3-help-3.6-6.ky10.noarch.rpm deleted file mode 100644 index 78a425f8..00000000 Binary files a/src/assets/dependency/iperf3/rpm/iperf3-help-3.6-6.ky10.noarch.rpm and /dev/null differ diff --git a/src/framework/socket/tcp_client.go b/src/framework/socket/tcp_client.go deleted file mode 100644 index 05935f29..00000000 --- a/src/framework/socket/tcp_client.go +++ /dev/null @@ -1,96 +0,0 @@ -package socket - -import ( - "bytes" - "fmt" - "net" - "strings" - "time" -) - -// ConnTCP 连接TCP客户端 -type ConnTCP struct { - Addr string `json:"addr"` // 主机地址 - Port int64 `json:"port"` // 端口 - - DialTimeOut time.Duration `json:"dialTimeOut"` // 连接超时断开 - - Client *net.Conn `json:"client"` - LastResult string `json:"lastResult"` // 记最后一次发送消息的结果 -} - -// New 创建TCP客户端 -func (c *ConnTCP) New() (*ConnTCP, error) { - // IPV6地址协议 - proto := "tcp" - if strings.Contains(c.Addr, ":") { - proto = "tcp6" - c.Addr = fmt.Sprintf("[%s]", c.Addr) - } - address := net.JoinHostPort(c.Addr, fmt.Sprint(c.Port)) - - // 默认等待5s - if c.DialTimeOut == 0 { - c.DialTimeOut = 5 * time.Second - } - - // 连接到服务端 - client, err := net.DialTimeout(proto, address, c.DialTimeOut) - if err != nil { - return nil, err - } - - c.Client = &client - return c, nil -} - -// Close 关闭当前TCP客户端 -func (c *ConnTCP) Close() { - if c.Client != nil { - (*c.Client).Close() - } -} - -// Send 发送消息 -func (c *ConnTCP) Send(msg []byte, timer time.Duration) (string, error) { - if c.Client == nil { - return "", fmt.Errorf("tcp client not connected") - } - conn := *c.Client - - // 写入信息 - if len(msg) > 0 { - if _, err := conn.Write(msg); err != nil { - return "", err - } - } - - var buf bytes.Buffer - defer buf.Reset() - - tmp := make([]byte, 1024) - for { - select { - case <-time.After(timer): - c.LastResult = buf.String() - return c.LastResult, fmt.Errorf("timeout") - default: - // 读取命令消息 - n, err := conn.Read(tmp) - if n == 0 || err != nil { - tmp = nil - break - } - - tmpStr := string(tmp[:n]) - buf.WriteString(tmpStr) - - // 是否有终止符 - if strings.HasSuffix(tmpStr, ">") || strings.HasSuffix(tmpStr, "> ") || strings.HasSuffix(tmpStr, "# ") { - tmp = nil - c.LastResult = buf.String() - return c.LastResult, nil - } - } - } -} diff --git a/src/framework/socket/tcp_server.go b/src/framework/socket/tcp_server.go deleted file mode 100644 index 755b41c3..00000000 --- a/src/framework/socket/tcp_server.go +++ /dev/null @@ -1,83 +0,0 @@ -package socket - -import ( - "fmt" - "net" - "strings" - - "be.ems/src/framework/logger" -) - -// SocketTCP TCP服务端 -type SocketTCP struct { - Addr string `json:"addr"` // 主机地址 - Port int64 `json:"port"` // 端口 - Listener *net.TCPListener `json:"listener"` - StopChan chan struct{} `json:"stop"` // 停止信号 -} - -// New 创建TCP服务端 -func (s *SocketTCP) New() (*SocketTCP, error) { - // IPV6地址协议 - proto := "tcp" - if strings.Contains(s.Addr, ":") { - proto = "tcp6" - s.Addr = fmt.Sprintf("[%s]", s.Addr) - } - address := fmt.Sprintf("%s:%d", s.Addr, s.Port) - - // 解析 TCP 地址 - tcpAddr, err := net.ResolveTCPAddr(proto, address) - if err != nil { - return nil, err - } - - // 监听 TCP 地址 - listener, err := net.ListenTCP(proto, tcpAddr) - if err != nil { - return nil, err - } - - s.Listener = listener - s.StopChan = make(chan struct{}, 1) - return s, nil -} - -// Close 关闭当前TCP服务端 -func (s *SocketTCP) Close() { - if s.Listener != nil { - s.StopChan <- struct{}{} - (*s.Listener).Close() - } -} - -// Resolve 处理消息 -func (s *SocketTCP) Resolve(callback func(conn *net.Conn, err error)) { - if s.Listener == nil { - callback(nil, fmt.Errorf("tcp service not created")) - return - } - - defer func() { - if err := recover(); err != nil { - callback(nil, fmt.Errorf("tcp service panic err")) - } - }() - - listener := *s.Listener - for { - select { - case <-s.StopChan: - callback(nil, fmt.Errorf("udp service stop")) - return - default: - conn, err := listener.Accept() - if err != nil { - logger.Errorf("Error accepting connection: %v ", err) - continue - } - defer conn.Close() - callback(&conn, nil) - } - } -} diff --git a/src/framework/socket/udp_client.go b/src/framework/socket/udp_client.go deleted file mode 100644 index 9c77aade..00000000 --- a/src/framework/socket/udp_client.go +++ /dev/null @@ -1,96 +0,0 @@ -package socket - -import ( - "bytes" - "fmt" - "net" - "strings" - "time" -) - -// ConnUDP 连接UDP客户端 -type ConnUDP struct { - Addr string `json:"addr"` // 主机地址 - Port int64 `json:"port"` // 端口 - - DialTimeOut time.Duration `json:"dialTimeOut"` // 连接超时断开 - - Client *net.Conn `json:"client"` - LastResult string `json:"lastResult"` // 记最后一次发送消息的结果 -} - -// New 创建UDP客户端 -func (c *ConnUDP) New() (*ConnUDP, error) { - // IPV6地址协议 - proto := "udp" - if strings.Contains(c.Addr, ":") { - proto = "udp6" - c.Addr = fmt.Sprintf("[%s]", c.Addr) - } - address := net.JoinHostPort(c.Addr, fmt.Sprint(c.Port)) - - // 默认等待5s - if c.DialTimeOut == 0 { - c.DialTimeOut = 5 * time.Second - } - - // 连接到服务端 - client, err := net.DialTimeout(proto, address, c.DialTimeOut) - if err != nil { - return nil, err - } - - c.Client = &client - return c, nil -} - -// Close 关闭当前UDP客户端 -func (c *ConnUDP) Close() { - if c.Client != nil { - (*c.Client).Close() - } -} - -// Send 发送消息 -func (c *ConnUDP) Send(msg []byte, ms int) (string, error) { - if c.Client == nil { - return "", fmt.Errorf("udp client not connected") - } - conn := *c.Client - - // 写入信息 - if len(msg) > 0 { - if _, err := conn.Write(msg); err != nil { - return "", err - } - } - - var buf bytes.Buffer - defer buf.Reset() - - tmp := make([]byte, 1024) - for { - select { - case <-time.After(time.Duration(time.Duration(ms).Milliseconds())): - c.LastResult = buf.String() - return c.LastResult, fmt.Errorf("timeout") - default: - // 读取命令消息 - n, err := conn.Read(tmp) - if n == 0 || err != nil { - tmp = nil - break - } - - tmpStr := string(tmp[:n]) - buf.WriteString(tmpStr) - - // 是否有终止符 - if strings.HasSuffix(tmpStr, ">") || strings.HasSuffix(tmpStr, "> ") || strings.HasSuffix(tmpStr, "# ") { - tmp = nil - c.LastResult = buf.String() - return c.LastResult, nil - } - } - } -} diff --git a/src/framework/socket/udp_server.go b/src/framework/socket/udp_server.go deleted file mode 100644 index 1c9f8eaa..00000000 --- a/src/framework/socket/udp_server.go +++ /dev/null @@ -1,74 +0,0 @@ -package socket - -import ( - "fmt" - "net" - "strings" -) - -// SocketUDP UDP服务端 -type SocketUDP struct { - Addr string `json:"addr"` // 主机地址 - Port int64 `json:"port"` // 端口 - Conn *net.UDPConn `json:"conn"` - StopChan chan struct{} `json:"stop"` // 停止信号 -} - -// New 创建UDP服务端 -func (s *SocketUDP) New() (*SocketUDP, error) { - // IPV6地址协议 - proto := "udp" - if strings.Contains(s.Addr, ":") { - proto = "udp6" - s.Addr = fmt.Sprintf("[%s]", s.Addr) - } - address := fmt.Sprintf("%s:%d", s.Addr, s.Port) - - // 解析 UDP 地址 - udpAddr, err := net.ResolveUDPAddr(proto, address) - if err != nil { - return nil, err - } - - // 监听 UDP 地址 - conn, err := net.ListenUDP("udp", udpAddr) - if err != nil { - return nil, err - } - - s.Conn = conn - s.StopChan = make(chan struct{}, 1) - return s, nil -} - -// CloseService 关闭当前UDP服务端 -func (s *SocketUDP) Close() { - if s.Conn != nil { - s.StopChan <- struct{}{} - (*s.Conn).Close() - } -} - -// Resolve 处理消息 -func (s *SocketUDP) Resolve(callback func(*net.UDPConn, error)) { - if s.Conn == nil { - callback(nil, fmt.Errorf("udp service not created")) - return - } - - defer func() { - if err := recover(); err != nil { - callback(nil, fmt.Errorf("udp service panic err")) - } - }() - - for { - select { - case <-s.StopChan: - callback(nil, fmt.Errorf("udp service not created")) - return - default: - callback(s.Conn, nil) - } - } -}