TCP|UDP 客户端数据转发支持更新 帧长设置支持

README.md

@@ -10,10 +10,10 @@
 * [x] 双向编码转换
 * [x] 活动端口探测
 * [x] 数据日志保存
-* [ ] 自动断帧设置
+* [x] Hex断帧设置
+* [x] UDP数据转发
+* [x] TCP数据转发
 * [ ] 文件接收发送
-* [ ] UDP数据转发
-* [ ] TCP数据转发
 
 ## 运行示例
 

command.go

@@ -18,7 +18,7 @@ var commands []Command
 
 func cmdhelp() {
 	var page = 0
-	fmt.Printf(">-------Help(%v)-------<\n", page)
+	strout(out, config.outputCode, fmt.Sprintf(">-------Help(%v)-------<\n", page))
 	for i := 0; i < len(commands); i++ {
 		strout(out, config.outputCode, fmt.Sprintf(" %-10v --%v\n", commands[i].name, commands[i].description))
 	}
@@ -27,12 +27,12 @@ func cmdexit() {
 	os.Exit(0)
 }
 func cmdargs() {
-	fmt.Printf(">-------Args(%v)-------<\n", len(args)-1)
-	fmt.Printf("%q\n", args[1:])
+	strout(out, config.outputCode, fmt.Sprintf(">-------Args(%v)-------<\n", len(args)-1))
+	strout(out, config.outputCode, fmt.Sprintf("%q\n", args[1:]))
 }
 func cmdhex() {
-	fmt.Printf(">-----Hex Send-----<\n")
-	fmt.Printf("%q\n", args[1:])
+	strout(out, config.outputCode, fmt.Sprintf(">-----Hex Send-----<\n"))
+	strout(out, config.outputCode, fmt.Sprintf("%q\n", args[1:]))
 	s := strings.Join(args[1:], "")
 	b, err := hex.DecodeString(s)
 	if err != nil {

config.go

@@ -17,6 +17,7 @@ type Config struct {
 	enableLog   bool
 	logFilePath string
 	forWard     int
+	frameSize   int
 	address     string
 }
 type FoeWardMode int
@@ -25,30 +26,58 @@ const (
 	NOT FoeWardMode = iota
 	TCPS
 	TCPC
-	UDPS
 	UDPC
 )
 
 var config Config
 
-func setForWard() (conn net.Conn) {
+func setForWardClient() (conn net.Conn) {
 	switch FoeWardMode(config.forWard) {
-	case TCPS:
-
 	case TCPC:
 		conn, err = net.Dial("tcp", config.address)
 		if err != nil {
 			log.Fatal(err)
 		}
-	case UDPS:
-
 	case UDPC:
 		conn, err = net.Dial("udp", config.address)
 		if err != nil {
 			log.Fatal(err)
 		}
+
 	default:
 		panic("未知模式设置")
 	}
 	return conn
 }
+func setForWardServer() {
+	switch FoeWardMode(config.forWard) {
+	case TCPS:
+		listen, err := net.Listen("tcp", config.address)
+		if err != nil {
+			log.Fatal(err)
+		}
+		for {
+			conn, err := listen.Accept() // 监听客户端的连接请求
+			if err != nil {
+				log.Println("Accept() failed, err: ", err)
+				continue
+			}
+			go process(conn) // 启动一个goroutine来处理客户端的连接请求
+		}
+	default:
+		panic("未知模式设置")
+	}
+}
+func process(conn net.Conn) {
+	defer conn.Close() // 关闭连接
+	//reader := bufio.NewReader(serialPort)
+	outs = append(outs, conn)
+	defer func() {
+		for i, w := range outs {
+			if w == conn {
+				outs = append(outs[:i], outs[i+1:]...)
+			}
+		}
+	}()
+	input(conn)
+}

flag.go

@@ -38,10 +38,11 @@ var (
 	endStr      = Flag{ptrVal{string: &config.endStr}, "e", "end", Val{string: "\n"}, "终端换行符"}
 	enableLog   = Flag{ptrVal{bool: &config.enableLog}, "l", "log", Val{bool: false}, "是否启用日志保存"}
 	logFilePath = Flag{ptrVal{string: &config.logFilePath}, "P", "Path", Val{string: "./Log.txt"}, "日志保存路径"}
-	forWard     = Flag{ptrVal{int: &config.forWard}, "f", "forward", Val{int: 0}, "转发模式(0: 无 1:TCP-S 2:TCP-C 3:UDP-S 4:UDP-C)"}
+	forWard     = Flag{ptrVal{int: &config.forWard}, "f", "forward", Val{int: 0}, "转发模式(0: 无 1:TCP-S 2:TCP-C 3:UDP-C)"}
 	address     = Flag{ptrVal{string: &config.address}, "a", "address", Val{string: "127.0.0.1:12345"}, "转发服务地址"}
+	frameSize   = Flag{ptrVal{int: &config.forWard}, "F", "Frame", Val{int: 16}, "帧大小"}
 	parityBit   = Flag{ptrVal{int: &config.parityBit}, "v", "verify", Val{int: 0}, "奇偶校验(0:无校验、1:奇校验、2:偶校验、3:1校验、4:0校验)"}
-	flags       = []Flag{portName, baudRate, dataBits, stopBits, outputCode, inputCode, endStr, enableLog, logFilePath, forWard, address, parityBit}
+	flags       = []Flag{portName, baudRate, dataBits, stopBits, outputCode, inputCode, endStr, enableLog, logFilePath, forWard, frameSize, address, parityBit}
 )
 
 type ValType int

main.go

@@ -8,6 +8,7 @@ import (
 	"go.bug.st/serial"
 	"io"
 	"log"
+	"net"
 	"os"
 	"strings"
 )
@@ -23,6 +24,7 @@ var (
 	out  io.Writer = os.Stdout
 	ins            = []io.Reader{os.Stdin}
 	outs           = []io.Writer{os.Stdout}
+	outn           = 1
 )
 
 func checkPortAvailability(name string) ([]string, error) {
@@ -55,7 +57,8 @@ func init() {
 func input(in io.Reader) {
 	input := bufio.NewScanner(in)
 	var ok = false
-	for input.Scan() {
+	for {
+		input.Scan()
 		ok = false
 		args = strings.Split(input.Text(), " ")
 		for _, cmd := range commands {
@@ -74,7 +77,7 @@ func input(in io.Reader) {
 				log.Fatal(err)
 			}
 		}
-		err := serialPort.Drain()
+		err = serialPort.Drain()
 		if err != nil {
 			log.Fatal(err)
 		}
@@ -88,15 +91,15 @@ func strout(out io.Writer, cs, str string) {
 	}
 }
 
-func output(out io.Writer) {
+func output() {
 	if strings.Compare(config.inputCode, "hex") == 0 {
 		b := make([]byte, 16)
-		r, _ := io.LimitReader(serialPort, 16).Read(b)
+		r, _ := io.LimitReader(serialPort, int64(config.frameSize)).Read(b)
 		if r != 0 {
 			strout(out, config.outputCode, fmt.Sprintf("% X %q \n", b, b))
 		}
 	} else {
-		err = charsetconv.ConvertWith(serialPort, charsetconv.Charset(config.inputCode), out, charsetconv.Charset(config.outputCode), false)
+		err = charsetconv.ConvertWith(io.LimitReader(serialPort, int64(config.frameSize*4)), charsetconv.Charset(config.inputCode), out, charsetconv.Charset(config.outputCode), false)
 	}
 	if err != nil {
 		log.Fatal(err)
@@ -123,21 +126,30 @@ func main() {
 	defer func(port serial.Port) {
 		err := port.Close()
 		if err != nil {
+			log.Fatal(err)
 		}
 	}(serialPort)
 
 	if FoeWardMode(config.forWard) != NOT {
-		conn := setForWard()
-		ins = append(ins, conn)
-		outs = append(outs, conn)
-		defer conn.Close()
+		if FoeWardMode(config.forWard) == TCPC || FoeWardMode(config.forWard) == UDPC {
+			conn := setForWardClient()
+			ins = append(ins, conn)
+			outs = append(outs, conn)
+			defer func(conn net.Conn) {
+				err := conn.Close()
+				if err != nil {
+					log.Fatal(err)
+				}
+			}(conn)
+		} else {
+			go setForWardServer()
+		}
 	}
-
-	if len(ins) != 1 {
-		in = io.MultiReader(ins...)
+	if len(ins) != 0 {
+		for _, reader := range ins {
+			go input(reader)
+		}
 	}
-	go input(in)
-
 	if config.enableLog {
 		f, err := os.OpenFile(config.logFilePath, os.O_RDWR|os.O_APPEND|os.O_CREATE, 0666)
 		if err != nil {
@@ -145,10 +157,11 @@ func main() {
 		}
 		outs = append(outs, f)
 	}
-	if len(outs) != 1 {
-		out = io.MultiWriter(outs...)
-	}
 	for {
-		output(out)
+		if len(outs) != outn {
+			outn = len(outs)
+			out = io.MultiWriter(outs...)
+		}
+		output()
 	}
 }