Merge pull request #527 from hannesm/unix-stack

hannesm · web-flow · commit 09c00977ea83 · 2025-04-11T11:15:41.000+02:00
unix: avoid spurious warnings when the fd is scheduled to be closed anyways
diff --git a/examples/unikernel/config.ml b/examples/unikernel/config.ml
@@ -1,4 +1,4 @@
-(* mirage >= 4.6.0 & < 4.7.0 *)
+(* mirage >= 4.6.0 & < 4.10.0 *)
 
 open Mirage
 
diff --git a/src/stack-unix/tcpv4v6_socket.ml b/src/stack-unix/tcpv4v6_socket.ml
@@ -178,15 +178,17 @@ let listen t ~port ?keepalive callback =
                      Lwt.catch
                        (fun () -> callback afd)
                        (fun exn ->
-                          Log.warn (fun m -> m "error %s in callback" (Printexc.to_string exn)) ;
+                          Log.warn (fun m -> m "tcp error on port %u in callback %s" port (Printexc.to_string exn)) ;
                           close afd));
                 `Continue)
               (function
                 | Unix.Unix_error (Unix.EBADF, _, _) ->
-                  Log.warn (fun m -> m "error bad file descriptor in accept") ;
+                  (match Hashtbl.find_opt t.listen_sockets port with
+                   | None -> ()
+                   | Some _ -> Log.warn (fun m -> m "tcp error bad file descriptor in accept on port %u" port)) ;
                   Lwt.return `Stop
                 | exn ->
-                  Log.warn (fun m -> m "error %s in accept" (Printexc.to_string exn)) ;
+                  Log.warn (fun m -> m "tcp error on port %u in accept: %s" port (Printexc.to_string exn)) ;
                   Lwt.return `Continue) >>= function
             | `Continue -> loop ()
             | `Stop -> Lwt.return_unit
diff --git a/src/stack-unix/udpv4v6_socket.ml b/src/stack-unix/udpv4v6_socket.ml
@@ -190,22 +190,19 @@ let listen t ~port callback =
                            | Some v4 -> Ipaddr.V4 v4
                          in
                          let dst = Ipaddr.(V6 V6.unspecified) in (* TODO *)
-                         let buf =
-                           (* Use Cstruct.sub_copy once it exists in a
-                              reasonably mature cstruct release *)
-                           let b = Cstruct.create_unsafe len in
-                           Cstruct.blit buf 0 b 0 len;
-                           b
-                         in
+                         let buf = Cstruct.sub_copy buf 0 len in
                          callback ~src ~dst ~src_port buf
                        | _ -> Lwt.return_unit) >|= fun () ->
                       `Continue)
                     (function
                       | Unix.Unix_error (Unix.EBADF, _, _) ->
-                        Log.warn (fun m -> m "error bad file descriptor in accept") ;
+                        (match Hashtbl.find_opt t.listen_fds port with
+                         | None -> ()
+                         | Some _ ->
+                           Log.info (fun m -> m "udp error bad file descriptor in accept on port %u" port)) ;
                         Lwt.return `Stop
                       | exn ->
-                        Log.warn (fun m -> m "exception %s in recvfrom" (Printexc.to_string exn)) ;
+                        Log.warn (fun m -> m "udp exception on port %u in recvfrom: %s" port (Printexc.to_string exn)) ;
                         Lwt.return `Continue) >>= function
                   | `Continue -> loop ()
                   | `Stop -> Lwt.return_unit
diff --git a/tcpip.opam b/tcpip.opam
@@ -27,7 +27,7 @@ depends: [
   "dune" {>= "2.7.0"}
   "bisect_ppx" {dev & >= "2.5.0"}
   "ocaml" {>= "4.08.0"}
-  "cstruct" {>= "6.0.0"}
+  "cstruct" {>= "6.2.0"}
   "cstruct-lwt"
   "mirage-net" {>= "3.0.0"}
   "mirage-mtime" {>= "4.0.0"}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-(* mirage >= 4.6.0 & < 4.7.0 *)`
	`1`	`+(* mirage >= 4.6.0 & < 4.10.0 *)`
`2`	`2`
`3`	`3`	`open Mirage`
`4`	`4`