Bugfix

Basically, this code was completely fucked.

Author: arjunguha

async/Async_OpenFlow.mli

@@ -156,12 +156,6 @@ module Chunk : sig
     val client_version : t -> Client_id.t -> int
     val client_next_xid : t -> Client_id.t -> int32
 
-    val send_txn
-      :  t
-      -> Client_id.t
-      -> m
-      -> [ `Sent of Message.t Deferred.t | `Drop of exn ] Deferred.t
-
     val handshake : int -> (t, e, h) Stage.t
   end
 

async/Async_OpenFlow0x01.ml

@@ -222,7 +222,7 @@ module Controller = struct
 
   let barrier t sw_id =
     send_txn_with t sw_id M.BarrierRequest (function
-      | M.BarrierReply -> Result.Ok ()
+      | `Result (hdr, _) -> Result.Ok () (* assume it is a barrier reply *)
       | _              -> assert false)
 
   let aggregate_stats ?(pattern=C.match_all) (t:t) sw_id =
@@ -233,7 +233,10 @@ module Controller = struct
       ; sr_out_port = None }
     in
     send_txn_with t sw_id (M.StatsRequestMsg msg) (function
-      | M.StatsReplyMsg (AggregateFlowRep r) -> Result.Ok r
+      | `Result (hdr, body) ->
+         (match M.parse hdr (Cstruct.to_string body) with
+          | (_, M.StatsReplyMsg (AggregateFlowRep r)) -> Result.Ok r
+          | _ -> assert false)
       | _                                    -> assert false)
 
   let individual_stats ?(pattern=C.match_all) (t:t) sw_id =
@@ -244,6 +247,9 @@ module Controller = struct
       ; sr_out_port = None }
     in
     send_txn_with t sw_id (M.StatsRequestMsg msg) (function
-      | M.StatsReplyMsg (IndividualFlowRep r) -> Result.Ok r
-      | _                                     -> assert false)
+      | `Result (hdr, body) ->
+        (match M.parse hdr (Cstruct.to_string body) with
+         | (_, M.StatsReplyMsg (IndividualFlowRep r)) -> Result.Ok r
+         | _ -> assert false)
+      | _ -> assert false)
 end

async/Async_OpenFlow0x04.ml

@@ -255,7 +255,10 @@ module Controller = struct
 
   let barrier t sw_id =
     send_txn_with t sw_id M.BarrierRequest (function
-      | M.BarrierReply -> Result.Ok ()
+      | `Result (hdr, body) ->
+       (match M.parse hdr (Cstruct.to_string body) with
+        | (_, M.BarrierReply) -> Result.Ok ()
+        | _ -> assert false)
       | _              -> assert false)
 
 end

async/Async_OpenFlowChunk.ml

@@ -3,7 +3,7 @@ open Core.Std
 module Platform = Async_OpenFlow_Platform
 module Header = OpenFlow_Header
 
-module Message : Platform.Message 
+module Message : Platform.Message
   with type t = (Header.t * Cstruct.t) = struct
 
   type t = (Header.t * Cstruct.t) sexp_opaque with sexp
@@ -73,7 +73,7 @@ module Controller = struct
       let ivar = ref None in
       if not (xid = 0l) then
         XidTbl.change t.txns xid (function
-          | None    -> let ivar = ref (Some(Ivar.create ())) in !ivar
+          | None    -> ivar := Some (Ivar.create ()); !ivar
           | Some(_) -> None);
       match !ivar with
       | Some(ivar) -> ivar
@@ -252,7 +252,7 @@ module Controller = struct
       | `Sent x -> Handler.activity t c_id; `Sent x
       | `Drop x -> `Drop x
 
-  let send_txn t c_id m =
+  let send_txn t c_id (m : Message.t) =
     let conn = Client_id.Table.find_exn t.clients c_id in
     let ivar = Conn.add_txn conn m in
     send t c_id m