resolver: try TCP on InvalidData errors

crates/proto/src/error.rs

@@ -381,6 +381,14 @@ impl ProtoError {
         matches!(*self.kind, ProtoErrorKind::NoConnections)
     }
 
+    /// Returns the `io::ErrorKind` if this is an IO error
+    pub fn io_kind(&self) -> Option<io::ErrorKind> {
+        match self.kind() {
+            ProtoErrorKind::Io(e) => Some(e.kind()),
+            _ => None,
+        }
+    }
+
     pub(crate) fn as_dyn(&self) -> &(dyn std::error::Error + 'static) {
         self
     }

crates/resolver/src/name_server/name_server_pool.rs

@@ -6,6 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 
 use std::cmp::Ordering;
+use std::io;
 use std::pin::Pin;
 use std::sync::Arc;
 use std::task::{Context, Poll};
@@ -263,9 +264,15 @@ where
                     debug!("truncated response received, retrying over TCP");
                     Ok(response)
                 }
-                Err(e) if opts.try_tcp_on_error || e.is_no_connections() => {
-                    debug!("error from UDP, retrying over TCP: {}", e);
-                    Err(e)
+                Err(e) if opts.try_tcp_on_error => {
+                    if e.is_no_connections()
+                        || matches!(e.io_kind(), Some(io::ErrorKind::InvalidData))
+                    {
+                        debug!("error from UDP, retrying over TCP: {e}");
+                        Err(e)
+                    } else {
+                        return Err(ProtoError::from(e));
+                    }
                 }
                 result => return result.map_err(ProtoError::from),
             };