Fix 'PIF.get_primary_address' in IPv6

IPv6 is stored as an array of '<ipv6>/<mask>' So 'PIF.get_primary_address' should return only the 1st part Signed-off-by: Benjamin Reis <[email protected]>
xcp-ng · Feb 14, 2024 · a89b06e · a89b06e
1 parent 75c28b3
commit a89b06e
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/ocaml/xapi/xapi_pif_helpers.ml b/ocaml/xapi/xapi_pif_helpers.ml
@@ -261,4 +261,11 @@ let get_primary_address ~__context ~pif =
     match Db.PIF.get_IP ~__context ~self:pif with "" -> None | ip -> Some ip
   )
   | `IPv6 ->
-      List.nth_opt (Db.PIF.get_IPv6 ~__context ~self:pif) 0
+      match Db.PIF.get_IPv6 ~__context ~self:pif with
+      | [] | [""] -> None
+      |  ipv6 :: _ -> (
+        (* The CIDR is also stored in the IPv6 field of a PIF. *)
+        match (String.split_on_char '/' ipv6) with
+        | hd :: _ -> Some hd
+        | _ -> None
+      )