Merge pull request #1472 from openziti/fix-udp-addresses

Report correct local/remote addresses for intercepted UDP conns. Fixes #1471
openziti · May 9, 2023 · fa4a1a1 · fa4a1a1
2 parents 116fa37 + ec994e5
commit fa4a1a1
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/tunnel/udp_vconn/conn.go b/tunnel/udp_vconn/conn.go
@@ -53,14 +53,6 @@ func (conn *udpConn) Accept(buffer mempool.PooledBuffer) {
 	}
 }
 
-func (conn *udpConn) Network() string {
-	return "ziti"
-}
-
-func (conn *udpConn) String() string {
-	return conn.service
-}
-
 func (conn *udpConn) markUsed() {
 	conn.lastUse.Store(time.Now())
 }
@@ -174,11 +166,11 @@ func (conn *udpConn) Close() error {
 }
 
 func (conn *udpConn) LocalAddr() net.Addr {
-	return conn.srcAddr
+	return conn.writeConn.LocalAddr()
 }
 
 func (conn *udpConn) RemoteAddr() net.Addr {
-	return conn
+	return conn.srcAddr
 }
 
 func (conn *udpConn) SetDeadline(time.Time) error {