git commit -m "refactor(service): revert dynamic IPv6 override and restore early peer check in StreamHandler"

Author: NNdroid

application_gateway_test.go

@@ -951,6 +951,7 @@ func TestGatewayServeAsVPNGatewayPropagatesViaStatus(t *testing.T) {
 // the same peer must let SetGatewayPeer succeed again and resume packet flow.
 // HandleReadPackets must not panic on packets sent during the gap.
 func TestGatewayRebindOnPeerReadd(t *testing.T) {
+	skipIfVPNGatewayUnsupported(t)
 	ts := NewTestSuite(t)
 	client, exitNode, _ := setupGatewayPeers(ts)
 

service/auth_status.go

@@ -215,7 +215,7 @@ func (s *AuthStatus) processPeerStatusInfo(peerID string, peerInfo protocol.Peer
 		if peer.Alias == "" {
 			peer.Alias = s.conf.GenUniqPeerAliasUnlocked(peer.Name, peer.Alias)
 		}
-		if peerInfo.IPv6Addr != "" && peer.IPAddrV6 != peerInfo.IPv6Addr {
+		if peerInfo.IPv6Addr != "" && peer.IPAddrV6 == "" {
 			peer.IPAddrV6 = peerInfo.IPv6Addr
 		}
 		peer.AllowedUsingAsExitNode = peerInfo.AllowUsingAsExitNode

service/tunnel.go

@@ -114,12 +114,19 @@ func (t *Tunnel) SetDNSHandler(dnsIP net.IP, h DNSPacketHandler) {
 }
 
 func (t *Tunnel) StreamHandler(stream network.Stream) {
-	peerID := stream.Conn().RemotePeer()
-
 	defer func() {
 		_ = stream.Close()
 	}()
 
+	peerID := stream.Conn().RemotePeer()
+	t.peersLock.RLock()
+	_, ok := t.peerIDToPeer[peerID]
+	t.peersLock.RUnlock()
+	if !ok {
+		t.logger.Infof("Unknown peer %s tried to tunnel packet", peerID)
+		return
+	}
+
 	wrappedStream := &io.LimitedReader{}
 	for {
 		packet := t.device.GetTempPacket()
@@ -144,9 +151,8 @@ func (t *Tunnel) StreamHandler(stream network.Stream) {
 		t.peersLock.RLock()
 		vpnPeer, ok := t.peerIDToPeer[peerID]
 		if !ok {
-			t.peersLock.RUnlock()
-			t.logger.Infof("Unknown peer %s tried to tunnel packet", peerID)
 			t.device.PutTempPacket(packet)
+			t.peersLock.RUnlock()
 			return
 		}