port

llarp/quic/client.cpp

@@ -44,7 +44,7 @@ namespace llarp::quic
     // to try: set ports to 0
     Path path{
         Address{SockAddr{"::1"sv, huint16_t{0}}, std::nullopt},
-        Address{SockAddr{"::1"sv, huint16_t{port}}, std::move(remote)}};
+        Address{SockAddr{"::1"sv, huint16_t{pseudo_port}}, std::move(remote)}};
 
     log::debug(logcat, "Connecting to {} with addr_variant {}", path.remote, *path.remote.endpoint);
     log::debug(logcat, "pseudo_port = {}, port = {} at {}", pseudo_port, port, __LINE__);

llarp/quic/endpoint.cpp

@@ -56,17 +56,14 @@ namespace llarp::quic
   //    revisit this during libQUICinet
   // Endpoint::receive_packet(const SockAddr& src, uint8_t ecn, bstring_view data)
   void
-  Endpoint::receive_packet(Address remote, uint8_t ecn, bstring_view data, uint16_t remote_port)
+  Endpoint::receive_packet(Address remote, uint8_t ecn, bstring_view data)
   {
     // ngtcp2 wants a local address but we don't necessarily have something so just set it to
     // IPv4 or IPv6 "unspecified" address (0.0.0.0 or ::)
     // SockAddr local = src.isIPv6() ? SockAddr{in6addr_any} : SockAddr{nuint32_t{INADDR_ANY}};
 
-    // to try: set remote port to 0
-    remote_port = 0;
-
     Packet pkt{
-        Path{Address{SockAddr{"::1"sv, huint16_t{remote_port}}, std::nullopt}, remote},
+        Path{Address{SockAddr{"::1"sv, huint16_t{0}}, std::nullopt}, remote},
         data,
         ngtcp2_pkt_info{.ecn = ecn}};
 

llarp/quic/endpoint.hpp

@@ -43,7 +43,7 @@ namespace llarp::quic
     /// address based on the convo tag.  The port is not used.
     /// \param ecn - the packet ecn parameter
     void
-    receive_packet(Address addr, uint8_t ecn, bstring_view data, uint16_t remote_port);
+    receive_packet(Address addr, uint8_t ecn, bstring_view data);
 
     /// Returns a shared pointer to the uvw loop.
     std::shared_ptr<uvw::Loop>

llarp/quic/tunnel.cpp

@@ -757,7 +757,7 @@ namespace llarp::quic
 
     // to try: set port to 0
     //remote_port = huint16_t{0};
-    pseudo_port = 0;
+    //pseudo_port = 0;
 
     auto remote_addr = Address{SockAddr{"::1"sv, remote_port}, std::move(remote)};
     log::debug(
@@ -767,6 +767,6 @@ namespace llarp::quic
         remote_addr.port(),
         *remote_addr.endpoint,
         __LINE__);
-    ep->receive_packet(std::move(remote_addr), ecn, data, pseudo_port);
+    ep->receive_packet(std::move(remote_addr), ecn, data);
   }
 }  // namespace llarp::quic