udp: ignore refused errors

face/stream-transport.go

@@ -8,9 +8,10 @@ import (
 	enc "github.com/zjkmxy/go-ndn/pkg/encoding"
 )
 
-func readStreamTransport(
+func readTlvStream(
 	reader io.Reader,
-	frameCb func([]byte),
+	onFrame func([]byte),
+	ignoreError func(error) bool,
 ) error {
 	recvBuf := make([]byte, defn.MaxNDNPacketSize*32)
 	recvOff := 0
@@ -20,6 +21,9 @@ func readStreamTransport(
 		readSize, err := reader.Read(recvBuf[recvOff:])
 		recvOff += readSize
 		if err != nil {
+			if ignoreError != nil && ignoreError(err) {
+				continue
+			}
 			if errors.Is(err, io.EOF) {
 				return nil
 			}
@@ -46,7 +50,7 @@ func readStreamTransport(
 
 			if recvOff-tlvOff >= tlvSize {
 				// Packet was successfully received, send up to link service
-				frameCb(recvBuf[tlvOff : tlvOff+tlvSize])
+				onFrame(recvBuf[tlvOff : tlvOff+tlvSize])
 				tlvOff += tlvSize
 			} else if recvOff-tlvOff > defn.MaxNDNPacketSize {
 				// Invalid packet, something went wrong

face/unicast-tcp-transport.go

@@ -248,11 +248,11 @@ func (t *UnicastTCPTransport) runReceive() {
 		// The connection can be nil if the initial connection attempt
 		// failed for a persistent face. In that case we will reconnect.
 		if t.conn != nil {
-			err := readStreamTransport(t.conn, func(b []byte) {
+			err := readTlvStream(t.conn, func(b []byte) {
 				t.nInBytes += uint64(len(b))
 				*t.expirationTime = time.Now().Add(tcpLifetime)
 				t.linkService.handleIncomingFrame(b)
-			})
+			}, nil)
 			if err == nil {
 				break // EOF
 			}

face/unicast-udp-transport.go

@@ -12,6 +12,7 @@ import (
 	"fmt"
 	"net"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/named-data/YaNFD/core"
@@ -126,10 +127,14 @@ func (t *UnicastUDPTransport) sendFrame(frame []byte) {
 func (t *UnicastUDPTransport) runReceive() {
 	defer t.Close()
 
-	err := readStreamTransport(t.conn, func(b []byte) {
+	err := readTlvStream(t.conn, func(b []byte) {
 		t.nInBytes += uint64(len(b))
 		*t.expirationTime = time.Now().Add(udpLifetime)
 		t.linkService.handleIncomingFrame(b)
+	}, func(err error) bool {
+		// Ignore since UDP is a connectionless protocol
+		// This happens if the other side is not listening (ICMP)
+		return strings.Contains(err.Error(), "connection refused")
 	})
 	if err != nil {
 		core.LogWarn(t, "Unable to read from socket (", err, ") - Face DOWN")

face/unix-stream-transport.go

@@ -89,10 +89,10 @@ func (t *UnixStreamTransport) sendFrame(frame []byte) {
 func (t *UnixStreamTransport) runReceive() {
 	defer t.Close()
 
-	err := readStreamTransport(t.conn, func(b []byte) {
+	err := readTlvStream(t.conn, func(b []byte) {
 		t.nInBytes += uint64(len(b))
 		t.linkService.handleIncomingFrame(b)
-	})
+	}, nil)
 	if err != nil {
 		core.LogWarn(t, "Unable to read from socket (", err, ") - Face DOWN")
 	}