Make sendWithSocketClient() log and return error

pull/71/head
Eugene Kim 6 years ago
parent 6a114e86c5
commit 8d277fb796
  1. 15
      p2p/peer.go

@ -3,6 +3,7 @@ package p2p
import ( import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"io"
"log" "log"
"net" "net"
"runtime" "runtime"
@ -99,7 +100,7 @@ func ConstructP2pMessage(msgType byte, content []byte) []byte {
// SocketClient is to connect a socket given a port and send the given message. // SocketClient is to connect a socket given a port and send the given message.
// TODO(minhdoan, rj): need to check if a peer is reachable or not. // TODO(minhdoan, rj): need to check if a peer is reachable or not.
func sendWithSocketClient(ip, port string, message []byte) (res string) { func sendWithSocketClient(ip, port string, message []byte) (err error) {
//log.Printf("Sending message to ip %s and port %s\n", ip, port) //log.Printf("Sending message to ip %s and port %s\n", ip, port)
addr := net.JoinHostPort(ip, port) addr := net.JoinHostPort(ip, port)
conn, err := net.Dial("tcp", addr) conn, err := net.Dial("tcp", addr)
@ -110,7 +111,17 @@ func sendWithSocketClient(ip, port string, message []byte) (res string) {
} }
defer conn.Close() defer conn.Close()
conn.Write(message) nw, err := conn.Write(message)
if err != nil {
log.Printf("Write() to %s failed: %v", conn.RemoteAddr(), err)
return
}
if nw < len(message) {
log.Printf("short write to %s: %d < %d", conn.RemoteAddr(),
nw, len(message))
return io.ErrShortWrite
}
//log.Printf("Sent to ip %s and port %s: %s\n", ip, port, message) //log.Printf("Sent to ip %s and port %s: %s\n", ip, port, message)
// No ack (reply) message from the receiver for now. // No ack (reply) message from the receiver for now.

Loading…
Cancel
Save