From 08723e595510cf95704a0105d8f5beddf0079249 Mon Sep 17 00:00:00 2001 From: David Scott Date: Fri, 7 Jun 2013 10:36:06 +0000 Subject: [PATCH] Report IPv4 addresses as well as IPV6 addresses. Original patch for xen-api by Rob Hoes. Signed-off-by: Rob Hoes Signed-off-by: David Scott --- networkd/network_monitor_thread.ml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/networkd/network_monitor_thread.ml b/networkd/network_monitor_thread.ml index 17ec7693c..61862a1cb 100644 --- a/networkd/network_monitor_thread.ml +++ b/networkd/network_monitor_thread.ml @@ -249,15 +249,14 @@ let signal_networking_change () = let ip_watcher () = let cmd = Network_utils.iproute2 in - (* Only monitor IPv6 addresses at the moment *) - let args = ["-6"; "monitor"; "address"] in + let args = ["monitor"; "address"] in let readme, writeme = Unix.pipe () in Mutex.execute watcher_m (fun () -> watcher_pid := Some (Forkhelpers.safe_close_and_exec ~env:(Unix.environment ()) None (Some writeme) None [] cmd args) ); Unix.close writeme; let in_channel = Unix.in_channel_of_descr readme in - debug "Started IPv6 watcher thread"; + debug "Started IP watcher thread"; let rec loop () = let line = input_line in_channel in (* Do not send events for link-local IPv6 addresses *)