process_incoming_udp_packets_dns_over_tcp

src/tun2proxy.rs

@@ -482,14 +482,13 @@ impl<'a> TunToProxy<'a> {
         Ok(connection_info)
     }
 
-    fn process_incoming_udp_packets(
+    fn process_incoming_udp_packets_dns_over_tcp(
         &mut self,
         manager: &Rc<dyn ConnectionManager>,
         info: &ConnectionInfo,
         origin_dst: SocketAddr,
         payload: &[u8],
     ) -> Result<()> {
-        if self.options.dns_over_tcp && origin_dst.port() == DNS_PORT {
         _ = dns::parse_data_to_dns_message(payload, false)?;
 
         if !self.connection_map.contains_key(info) {
@@ -524,9 +523,16 @@ impl<'a> TunToProxy<'a> {
             state.udp_over_tcp_data_cache.push_back(buf);
         }
 
-            return Ok(());
+        Ok(())
     }
 
+    fn process_incoming_udp_packets(
+        &mut self,
+        manager: &Rc<dyn ConnectionManager>,
+        info: &ConnectionInfo,
+        origin_dst: SocketAddr,
+        payload: &[u8],
+    ) -> Result<()> {
         if !self.connection_map.contains_key(info) {
             log::info!("UDP associate session {} ({})", info, origin_dst);
             let tcp_proxy_handler = manager.new_tcp_proxy(info, true)?;
@@ -617,8 +623,13 @@ impl<'a> TunToProxy<'a> {
                     self.send_udp_packet_to_client(origin_dst, connection_info.src, response.as_slice())?;
                 } else {
                     // Another UDP packet
+                    if self.options.dns_over_tcp && origin_dst.port() == DNS_PORT {
+                        let info = &connection_info;
+                        self.process_incoming_udp_packets_dns_over_tcp(&manager, info, origin_dst, payload)?;
+                    } else {
                         self.process_incoming_udp_packets(&manager, &connection_info, origin_dst, payload)?;
                     }
+                }
             } else {
                 log::warn!("Unsupported protocol: {} ({})", connection_info, origin_dst);
             }