Skip to content
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

Readded tracing and ARP fixes #96

Merged
merged 1 commit into from
Jan 11, 2015
Merged

Readded tracing and ARP fixes #96

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
* Readded tracing and ARP fixes which got accidentally reverted in the IPv6 merge.

2.2.1 (2014-12-20):
* Use `Bytes` instead of `String` to begin the `-safe-string` migration in OCaml 4.02.0 (#93).
* Remove dependency on `uint` to avoid the need for a C stub (#92).
Expand Down
41 changes: 17 additions & 24 deletions lib/arpv4.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,11 @@ module Make (Ethif : V1_LWT.ETHIF) = struct
}

(* TODO implement the full ARP state machine (pending, failed, timer thread, etc) *)
type entry =
| Incomplete of Macaddr.t Lwt_condition.t
| Verified of Macaddr.t

type t = {
ethif : Ethif.t;
cache: (Ipaddr.V4.t, entry) Hashtbl.t;
cache: (Ipaddr.V4.t, Macaddr.t Lwt.t) Hashtbl.t;
pending: (Ipaddr.V4.t, Macaddr.t Lwt.u) Hashtbl.t;
mutable bound_ips: Ipaddr.V4.t list;
}

Expand Down Expand Up @@ -64,14 +62,16 @@ module Make (Ethif : V1_LWT.ETHIF) = struct
Hashtbl.iter (fun ip entry ->
printf "%s -> %s\n%!"
(Ipaddr.V4.to_string ip)
(match entry with
| Incomplete _ -> "I"
| Verified mac -> sprintf "V(%s)" (Macaddr.to_string mac)
(match Lwt.state entry with
| Sleep -> "I"
| Return mac -> sprintf "V(%s)" (Macaddr.to_string mac)
| Fail ex -> Printexc.to_string ex
)
) t.cache

(* Input handler for an ARP packet, registered through attach() *)
let rec input t frame =
MProf.Trace.label "arpv4.input";
match get_arp_op frame with
|1 -> (* Request *)
(* Received ARP request, check if we can satisfy it from
Expand All @@ -93,12 +93,10 @@ module Make (Ethif : V1_LWT.ETHIF) = struct
printf "ARP: updating %s -> %s\n%!"
(Ipaddr.V4.to_string spa) (Macaddr.to_string sha);
(* If we have pending entry, notify the waiters that answer is ready *)
if Hashtbl.mem t.cache spa then begin
match Hashtbl.find t.cache spa with
|Incomplete cond -> Lwt_condition.broadcast cond sha
|_ -> ()
if Hashtbl.mem t.pending spa then begin
wakeup (Hashtbl.find t.pending spa) sha;
Hashtbl.remove t.pending spa;
end;
Hashtbl.replace t.cache spa (Verified sha);
return_unit
|n ->
printf "ARP: Unknown message %d ignored\n%!" n;
Expand Down Expand Up @@ -175,25 +173,20 @@ module Make (Ethif : V1_LWT.ETHIF) = struct
waiting for a response *)
let query t ip =
if Hashtbl.mem t.cache ip then (
match Hashtbl.find t.cache ip with
| Incomplete cond ->
(* printf "ARP query: %s -> [incomplete]\n%!" (Ipaddr.V4.to_string ip); *)
Lwt_condition.wait cond
| Verified mac ->
(* printf "ARP query: %s -> %s\n%!"
(Ipaddr.V4.to_string ip) (Macaddr.to_string mac); *)
return mac
Hashtbl.find t.cache ip
) else (
let cond = Lwt_condition.create () in
let response, waker = MProf.Trace.named_wait "ARP response" in
(* printf "ARP query: %s -> [probe]\n%!" (Ipaddr.V4.to_string ip); *)
Hashtbl.add t.cache ip (Incomplete cond);
Hashtbl.add t.cache ip response;
Hashtbl.add t.pending ip waker;
(* First request, so send a query packet *)
output_probe t ip >>= fun () ->
Lwt_condition.wait cond
response
)

let create ethif =
let cache = Hashtbl.create 7 in
let pending = Hashtbl.create 7 in
let bound_ips = [] in
{ ethif; cache; bound_ips }
{ ethif; cache; pending; bound_ips }
end