EnumDev/enit
1
0
Fork 0
mirror of https://github.com/EnumeratedDev/enit.git synced 2026-09-16 02:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow reading data of any size through socket

Browse Source
This commit is contained in:
EnumDev
2025-11-09 19:33:32 +02:00
parent 285ede0e9a
commit 7f37da2091
2 changed files with 68 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ectl/main.go
+42 -42
View File
@@ -1,6 +1,7 @@
package main
import (
"bytes"
"encoding/json"
"flag"
"fmt"
@@ -80,24 +81,22 @@ func main() {
log.Fatalf("Could not write JSON data to socket! Error: %s\n", err)
}
// Create a buffer for incoming data.
buf := make([]byte, 4096)
// Read data from the connection.
n, err := conn.Read(buf)
data, err := readAllConn(conn)
if err != nil {
log.Fatalf("Could not read data from socket! Error: %s\n", err)
return
}
// Print json data if flag is set
if *printJson {
fmt.Println(string(buf[:n]))
fmt.Println(string(data))
return
}
// Decoode JSON data
var returnedJsonData map[string]any
err = json.Unmarshal(buf[:n], &returnedJsonData)
err = json.Unmarshal(data, &returnedJsonData)
if err != nil {
log.Fatalf("Could not decode JSON data from connection!")
}
@@ -138,27 +137,22 @@ func main() {
log.Fatalf("Could not write JSON data to socket! Error: %s\n", err)
}
// Create a buffer for incoming data.
buf := make([]byte, 4096)
// Read data from the connection.
n, err := conn.Read(buf)
if err == io.EOF {
return
}
data, err := readAllConn(conn)
if err != nil {
log.Fatalf("Could not read data from socket! Error: %s\n", err)
return
}
// Print json data if flag is set
if *printJson {
fmt.Println(string(buf[:n]))
fmt.Println(string(data))
return
}
// Decoode JSON data
var returnedJsonData map[string]any
err = json.Unmarshal(buf[:n], &returnedJsonData)
err = json.Unmarshal(data, &returnedJsonData)
if err != nil {
log.Fatalf("Could not decode JSON data from connection!")
}
@@ -214,27 +208,22 @@ func main() {
log.Fatalf("Could not write JSON data to socket! Error: %s\n", err)
}
// Create a buffer for incoming data.
buf := make([]byte, 4096)
// Read data from the connection.
n, err := conn.Read(buf)
if err == io.EOF {
return
}
data, err := readAllConn(conn)
if err != nil {
log.Fatalf("Could not read data from socket! Error: %s\n", err)
return
}
// Print json data if flag is set
if *printJson {
fmt.Println(string(buf[:n]))
fmt.Println(string(data))
return
}
// Decoode JSON data
var returnedJsonData map[string]any
err = json.Unmarshal(buf[:n], &returnedJsonData)
err = json.Unmarshal(data, &returnedJsonData)
if err != nil {
log.Fatalf("Could not decode JSON data from connection!")
}
@@ -275,27 +264,22 @@ func main() {
log.Fatalf("Could not write JSON data to socket! Error: %s\n", err)
}
// Create a buffer for incoming data.
buf := make([]byte, 4096)
// Read data from the connection.
n, err := conn.Read(buf)
if err == io.EOF {
return
}
data, err := readAllConn(conn)
if err != nil {
log.Fatalf("Could not read data from socket! Error: %s\n", err)
return
}
// Print json data if flag is set
if *printJson {
fmt.Println(string(buf[:n]))
fmt.Println(string(data))
return
}
// Decoode JSON data
var returnedJsonData map[string]any
err = json.Unmarshal(buf[:n], &returnedJsonData)
err = json.Unmarshal(data, &returnedJsonData)
if err != nil {
log.Fatalf("Could not decode JSON data from connection!")
}
@@ -342,27 +326,22 @@ func main() {
log.Fatalf("Could not write JSON data to socket! Error: %s\n", err)
}
// Create a buffer for incoming data.
buf := make([]byte, 4096)
// Read data from the connection.
n, err := conn.Read(buf)
if err == io.EOF {
return
}
data, err := readAllConn(conn)
if err != nil {
log.Fatalf("Could not read data from socket! Error: %s\n", err)
return
}
// Print json data if flag is set
if *printJson {
fmt.Println(string(buf[:n]))
fmt.Println(string(data))
return
}
// Decoode JSON data
var returnedJsonData map[string]any
err = json.Unmarshal(buf[:n], &returnedJsonData)
err = json.Unmarshal(data, &returnedJsonData)
if err != nil {
log.Fatalf("Could not decode JSON data from connection!")
}
@@ -430,3 +409,24 @@ func dialSocket() {
log.Fatalf("Failed to set write deadline! Error: %s\n", err)
}
}
func readAllConn(conn net.Conn) ([]byte, error) {
var buf bytes.Buffer
for {
dataChunk := make([]byte, 1024)
n, err := conn.Read(dataChunk)
if err != nil && err != io.EOF {
return nil, err
}
buf.Write(dataChunk[:n])
if n < 1024 {
break
}
}
return buf.Bytes(), nil
}