update to mirage-flow 4.0.0 (val shutdown) API and tcpip 8.0.1 (val src) API

hannesm · hannesm · commit 8d0f4ca0e561 · 2024-03-27T21:19:48.000+01:00
diff --git a/mirage/utcp_mirage.ml b/mirage/utcp_mirage.ml
@@ -33,6 +33,10 @@ module Make (R : Mirage_random.S) (Mclock : Mirage_clock.MCLOCK) (Time : Mirage_
     let _, (dst, dst_port) = Utcp.peers flow in
     dst, dst_port
 
+  let src (_t, flow) =
+    let (src, src_port), _ = Utcp.peers flow in
+    src, src_port
+
   let output_ip t (src, dst, seg) =
     let size = Utcp.Segment.length seg in
     Log.debug (fun m -> m "output to %a: %a" Ipaddr.pp dst Utcp.Segment.pp seg);
@@ -122,6 +126,15 @@ module Make (R : Mirage_random.S) (Mclock : Mirage_clock.MCLOCK) (Time : Mirage_
       Log.err (fun m -> m "%a error in close: %s" Utcp.pp_flow flow msg);
       Lwt.return_unit
 
+  let shutdown (t, flow) mode =
+    match Utcp.shutdown t.tcp (now ()) flow mode with
+    | Ok (tcp, segs) ->
+      t.tcp <- tcp ;
+      output_ign t segs
+    | Error `Msg msg ->
+      Log.err (fun m -> m "%a error in shutdown: %s" Utcp.pp_flow flow msg);
+      Lwt.return_unit
+
   let write_nodelay flow buf = write flow buf
 
   let writev_nodelay flow bufs = write flow (Cstruct.concat bufs)
diff --git a/utcp.opam b/utcp.opam
@@ -23,7 +23,8 @@ depends: [
   "mirage-random" {>= "2.0.0"}
   "mirage-time" {>= "2.0.1"}
   "mirage-clock" {>= "3.1.0"}
-  "tcpip" {>= "7.0.0"}
+  "tcpip" {>= "8.0.1"}
+  "mirage-flow" {>= "4.0.0"}
   #for apps
   "cmdliner" {>= "1.1.0" & dev}
   "mirage-net-unix" {>= "2.8.0" & dev}
