tools.go_stun
2021-02-25
Parent:102fbdab34d8
4:12d8f041fbdf tip Browse Files
* Делаем вывод удобоваримым для windows . Мелкий рефакторинг
1.1 --- a/main.go Sat Apr 25 18:12:41 2020 +0300 1.2 +++ b/main.go Thu Feb 25 23:36:40 2021 +0300 1.3 @@ -93,6 +93,7 @@ 1.4 func handler(conn net.Conn) { 1.5 _s_tm := time.Now() 1.6 remoteAddr := conn.RemoteAddr().String() 1.7 + res := "" 1.8 1.9 defer func() { 1.10 var err error 1.11 @@ -115,25 +116,19 @@ 1.12 addr_last := len(addr_spit) - 1 1.13 addr := strings.Join(addr_spit[:addr_last], ":") 1.14 1.15 - var dns string 1.16 dns_names, err := net.LookupAddr(strings.Trim(addr, "[] ")) 1.17 if err != nil { 1.18 log_warn("Fail to resolve dns name for %s: %v", remoteAddr, err) 1.19 } else { 1.20 for _, dns_name := range dns_names { 1.21 - dns += "Name: " + dns_name + "\n" 1.22 + res += fmt.Sprintf("Name: %s\r\n", dns_name) 1.23 } 1.24 } 1.25 - addr = "IP: " + addr + "\n" 1.26 - port := "Port: " + addr_spit[addr_last] + "\n" 1.27 + res += fmt.Sprintf("IP: %s\r\n", addr) 1.28 + res += fmt.Sprintf("Port: %s\r\n", addr_spit[addr_last]) 1.29 + res += "\n" 1.30 1.31 - if _, err := conn.Write([]byte(addr)); err != nil { 1.32 - panic(err.Error()) 1.33 - } 1.34 - if _, err := conn.Write([]byte(dns)); err != nil { 1.35 - panic(err.Error()) 1.36 - } 1.37 - if _, err := conn.Write([]byte(port)); err != nil { 1.38 + if _, err := conn.Write([]byte(res)); err != nil { 1.39 panic(err.Error()) 1.40 } 1.41 }