Merge pull request #158 from psafont/upd-481

Backport CP-22034 to lcm branch

Author: lindig

_oasis

@@ -28,8 +28,6 @@ Library networklibs
     xcp-inventory,
     xcp.network,
     systemd
-  CSources:           link_stubs.c, netdev.h
-  CCOpt:              -Wno-unused-function -g -ggdb
 
 Executable xcp_networkd
   CompiledObject:     best

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 6789724751e66864fb1299d08f339eb0)
+# DO NOT EDIT (digest: d8db50fca5387e7a03bd4ad989bde930)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
@@ -18,23 +18,13 @@ true: annot, bin_annot
 "profiling/profiling.cmxs": use_profiling
 # Library networklibs
 "lib/networklibs.cmxs": use_networklibs
-<lib/*.ml{,i,y}>: oasis_library_networklibs_ccopt
-"lib/link_stubs.c": oasis_library_networklibs_ccopt
-<lib/networklibs.{cma,cmxa}>: use_libnetworklibs_stubs
 <lib/*.ml{,i,y}>: pkg_forkexec
 <lib/*.ml{,i,y}>: pkg_rpclib
 <lib/*.ml{,i,y}>: pkg_stdext
 <lib/*.ml{,i,y}>: pkg_systemd
 <lib/*.ml{,i,y}>: pkg_threads
 <lib/*.ml{,i,y}>: pkg_xcp-inventory
 <lib/*.ml{,i,y}>: pkg_xcp.network
-"lib/link_stubs.c": pkg_forkexec
-"lib/link_stubs.c": pkg_rpclib
-"lib/link_stubs.c": pkg_stdext
-"lib/link_stubs.c": pkg_systemd
-"lib/link_stubs.c": pkg_threads
-"lib/link_stubs.c": pkg_xcp-inventory
-"lib/link_stubs.c": pkg_xcp.network
 # Executable xcp_networkd
 <networkd/networkd.{native,byte}>: pkg_forkexec
 <networkd/networkd.{native,byte}>: pkg_netlink
@@ -139,4 +129,3 @@ true: annot, bin_annot
 <test/*.ml{,i,y}>: pkg_xcp.network
 <test/*.ml{,i,y}>: use_networklibs
 # OASIS_STOP
-

lib/link_stubs.c

@@ -179,6 +179,18 @@ module Sysfs = struct
 	let get_all_bridges () =
 		let ifaces = list () in
 		List.filter (fun name -> Sys.file_exists (getpath name "bridge")) ifaces
+
+	(** Returns (speed, duplex) for a given network interface: int megabits/s, Duplex.
+	 *  The units of speed are specified in pif_record in xen-api/xapi/records.ml.
+	 *  Note: these data are present in sysfs from kernel 2.6.33. *)
+	let get_status name =
+		let speed = getpath name "speed"
+		|> (fun p -> try (read_one_line p |> int_of_string) with _ -> 0)
+		in
+		let duplex = getpath name "duplex"
+		|> (fun p -> try read_one_line p |> duplex_of_string with _ -> Duplex_unknown)
+		in (speed, duplex)
+
 end
 
 module Ip = struct
@@ -1090,37 +1102,3 @@ module Ethtool = struct
 		if options <> [] then
 			ignore (call ~log:true ("-K" :: name :: (List.concat (List.map (fun (k, v) -> [k; v]) options))))
 end
-
-module Bindings = struct
-	let control_socket () =
-		try
-			Unix.socket Unix.PF_INET Unix.SOCK_DGRAM 0
-		with
-		exn ->
-			try
-				Unix.socket Unix.PF_UNIX Unix.SOCK_DGRAM 0
-			with
-			exn ->
-				Unix.socket Unix.PF_INET6 Unix.SOCK_DGRAM 0
-
-	let with_fd f =
-		let fd = control_socket () in
-		let r = begin try
-			f fd
-		with
-		exn ->
-			Unix.close fd;
-			raise exn
-		end in
-		Unix.close fd;
-		r
-
-	external _get_status : Unix.file_descr -> string -> int * duplex = "stub_link_get_status"
-
-	(** Returns speed and duplex for a given network interface.
-	 *  Note: from kernel 2.6.33, this information is also present in sysfs. *)
-	let get_status name =
-		try
-			with_fd (fun fd -> _get_status fd name)
-		with _ -> raise (Read_error "stub_link_get_status")
-end