forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor to use bufReader.ReadBytes when accepting incoming messages from the connection socket

Browse source
This commit is contained in:
Tim Williams 2018-07-27 14:03:15 -04:00
parent 4833f428e5
commit 8cc8da8ea5
1 changed files with 45 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
shyftRingWalletConn/app.go
View file

@ -3,7 +3,8 @@ package main
//@NOTE SHYFT main func for api, sets up router and spins up a server //@NOTE SHYFT main func for api, sets up router and spins up a server
//to run server 'go run shyftRingWalletConn/*.go' //to run server 'go run shyftRingWalletConn/*.go'
import ( import (
"bytes" //"bytes"
"bufio"
"fmt" "fmt"
"github.com/ShyftNetwork/go-empyrean/common/hexutil" "github.com/ShyftNetwork/go-empyrean/common/hexutil"
"github.com/ShyftNetwork/go-empyrean/crypto" "github.com/ShyftNetwork/go-empyrean/crypto"
@ -16,6 +17,7 @@ const (
CONN_HOST = "localhost" CONN_HOST = "localhost"
CONN_PORT = "3333" CONN_PORT = "3333"
CONN_TYPE = "tcp" CONN_TYPE = "tcp"
NEW_LINE_BYTE = 0x0a
) )
var testAddrHex = "14791697260E4c9A71f18484C9f997B308e59325" var testAddrHex = "14791697260E4c9A71f18484C9f997B308e59325"
@ -50,19 +52,17 @@ func main() {
// Handles incoming requests. // Handles incoming requests.
func handleRequest(conn net.Conn) { func handleRequest(conn net.Conn) {
// Make a buffer to hold incoming data.
// Read the incoming connection into the buffer.
go func() { go func() {
buf := make([]byte, 1024)
msgBuf := make([]byte, 0)
var prevMsg []byte var prevMsg []byte
var addressOfClient []byte var addressOfClient []byte
var signatureFromClient []byte var signatureFromClient []byte
var msgFromClient []byte var msgFromClient []byte
bufReader := bufio.NewReader(conn)
for { for {
msg, err := conn.Read(buf) msg, err := bufReader.ReadBytes(NEW_LINE_BYTE)
if err == io.EOF { if err == io.EOF {
fmt.Println("END OF FILE, CLOSING CONNECTION") fmt.Println("END OF FILE, CLOSING CONNECTION")
conn.Close() conn.Close()
@ -74,28 +74,23 @@ func handleRequest(conn net.Conn) {
break break
} }
msgBuf = append(msgBuf, buf[:msg]...) msg = msg[:len(msg)-1] // remove trailing new line byte
index := bytes.IndexByte(msgBuf, 0x0a)
for index != -1 { // similar to shift in bash
newMsg := msgBuf[:index]
rest := msgBuf[(index + 1):len(msgBuf)]
msgBuf = rest
index = bytes.IndexByte(msgBuf, 0x0a)
if prevMsg != nil { if prevMsg != nil {
s := string(prevMsg[:]) s := string(prevMsg[:])
if s == "-- ADDRESS --" { if s == "-- ADDRESS --" {
addressOfClient = newMsg addressOfClient = msg
} }
if s == "-- SIGNATURE --" { if s == "-- SIGNATURE --" {
signatureFromClient = newMsg signatureFromClient = msg
} }
if s == "-- MESSAGE --" { if s == "-- MESSAGE --" {
msgFromClient = newMsg msgFromClient = msg
} }
prevMsg = nil prevMsg = nil
} else { } else {
prevMsg = newMsg prevMsg = msg
}
} }
if addressOfClient != nil && signatureFromClient != nil && msgFromClient != nil { if addressOfClient != nil && signatureFromClient != nil && msgFromClient != nil {
@ -122,7 +117,7 @@ func handleRequest(conn net.Conn) {
} }
} }
}() }()
go func() {
key, _ := crypto.HexToECDSA(testPrivHex) key, _ := crypto.HexToECDSA(testPrivHex)
f_msg := "Hello World" f_msg := "Hello World"
@ -144,5 +139,5 @@ func handleRequest(conn net.Conn) {
conn.Write([]byte("\n")) conn.Write([]byte("\n"))
conn.Write(new_sig) conn.Write(new_sig)
conn.Write([]byte("\n")) conn.Write([]byte("\n"))
}()
} }