Skip to content

Report IPv4 addresses as well as IPV6 addresses. #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 7, 2013
Merged

Report IPv4 addresses as well as IPV6 addresses. #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions networkd/network_monitor_thread.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 *)
Expand Down