Merge branch 'master' into multi

Conflicts:
	setup.ml

Author: seliopou

_oasis

@@ -1,7 +1,7 @@
 OASISFormat: 0.3
 OCamlVersion:     >= 4.01.0
 Name:        openflow
-Version:     0.6.0
+Version:     0.6.2
 Synopsis:    Serialization library for OpenFlow
 Authors:     https://github.com/frenetic-lang/ocaml-openflow/contributors
 License:     LGPL

async/Async_OpenFlow.mli

@@ -7,6 +7,13 @@ module Log : sig
 
   include Log.Global_intf
 
+  val of_lazy
+    :  ?level:[ `Debug | `Info | `Error ]
+    -> ?time:Time.t
+    -> ?tags:(string * string) list
+    -> string Lazy.t
+    -> unit
+
   val make_filtered_output : (string * string) list ->
     Log.Output.t
 

async/Async_OpenFlow_Log.ml

@@ -46,6 +46,7 @@ let stderr : Log.Output.t =
 
 let log = lazy (Log.create ~level:`Info ~output:[stderr])
 
+let level () = Log.level (Lazy.force log)
 let set_level = Log.set_level (Lazy.force log)
 
 let set_output outputs = current_outputs := outputs;
@@ -56,24 +57,33 @@ let add_output outputs =
   current_outputs := outputs;
   set_output outputs
 
-let raw ?(tags=[]) fmt = Log.raw (Lazy.force log) ~tags fmt
+let raw ?time ?(tags=[]) fmt = Log.raw (Lazy.force log) ?time ~tags fmt
 
-let info ?(tags=[]) fmt = Log.info (Lazy.force log) ~tags fmt
+let info ?time ?(tags=[]) fmt = Log.info (Lazy.force log) ?time ~tags fmt
 
-let error ?(tags=[]) fmt = Log.error (Lazy.force log) ~tags fmt
+let error ?time ?(tags=[]) fmt = Log.error (Lazy.force log) ?time ~tags fmt
 
-let debug ?(tags=[]) fmt = Log.debug (Lazy.force log) ~tags fmt
+let debug ?time ?(tags=[]) fmt = Log.debug (Lazy.force log) ?time ~tags fmt
 
 let flushed () =
   Log.flushed (Lazy.force log)
 
-let printf ?(tags=[]) ?(level=`Debug) fmt =
+let printf ?(level=`Debug) ?time ?(tags=[]) fmt =
   Log.printf (Lazy.force log) ~tags ~level fmt
 
-let of_lazy ?(tags=[]) ?(level=`Debug) lazy_str =
-  Log.of_lazy (Lazy.force log) ~tags ~level lazy_str
+let of_lazy ?(level=`Debug) ?time ?(tags=[]) lazy_str =
+  (* As of core/async.111.25.00, `Log.of_lazy` is no longer part of that
+   * package's public API. In 111.28.00, the `Log.level` call was added,
+   * allowing users of the package to implement `of_lazy` without having to
+   * manage the log level manually.
+   * *)
+  if level = Log.level (Lazy.force log) then
+    Log.printf (Lazy.force log) ~tags ~level "%s" (Lazy.force lazy_str)
 
-let sexp ?(tags=[]) ?(level=`Debug) msg =
-    Log.sexp (Lazy.force log) ~tags ~level msg
+let sexp ?(level=`Debug) ?time ?(tags=[]) msg =
+  Log.sexp (Lazy.force log) ~tags ~level msg
+
+let string ?(level=`Debug) ?time ?(tags=[]) str =
+  Log.string (Lazy.force log) ~tags ~level str
 
 let message = Log.message (Lazy.force log)

lib/META

@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: 70d46b868aee1843635d9d187dfc1041)
-version = "0.6.0"
+# DO NOT EDIT (digest: 03c6aa4eb5311c099a1fb8ca2157a81f)
+version = "0.6.2"
 description = "Serialization library for OpenFlow"
 requires =
 "str cstruct cstruct.syntax packet core sexplib.syntax sexplib threads"
@@ -10,7 +10,7 @@ archive(native) = "openflow.cmxa"
 archive(native, plugin) = "openflow.cmxs"
 exists_if = "openflow.cma"
 package "quickcheck" (
- version = "0.6.0"
+ version = "0.6.2"
  description = "Serialization library for OpenFlow"
  requires = "quickcheck openflow packet.quickcheck"
  archive(byte) = "quickcheck.cma"
@@ -21,7 +21,7 @@ package "quickcheck" (
 )
 
 package "async" (
- version = "0.6.0"
+ version = "0.6.2"
  description = "Serialization library for OpenFlow"
  requires = "async openflow cstruct.async threads sexplib.syntax sexplib"
  archive(byte) = "async.cma"

lib/SDN_OpenFlow0x01.ml

@@ -2,7 +2,6 @@ module AL = SDN_Types
 module Core = OpenFlow0x01_Core
 module Msg = OpenFlow0x01.Message
 
-
 exception Invalid_port of int32
 
 let from_portId (pport_id : AL.portId) : Core.portId =
@@ -48,13 +47,23 @@ let from_pattern (pat : AL.Pattern.t) : Core.pattern =
       | None -> None)
   ; Core.dlVlanPcp = pat.AL.Pattern.dlVlanPcp
   ; Core.nwSrc = (match pat.AL.Pattern.nwSrc with
-    | None   -> None
-    | Some (p,m) -> let mo = if m = 32l then None else Some m in
-      Some { Core.m_value = p; Core.m_mask = mo })
+    | None -> None
+    | Some (p,m) ->
+       let mo =
+         if m = 32l then
+           None
+         else
+           Some (Int32.sub 32l m) in
+       Some { Core.m_value = p; Core.m_mask = mo })
   ; Core.nwDst = (match pat.AL.Pattern.nwDst with
-    | None   -> None
-    | Some (p,m) -> let mo = if m = 32l then None else Some m in
-      Some { Core.m_value = p; Core.m_mask = mo })
+    | None -> None
+    | Some (p,m) ->
+       let mo =
+         if m = 32l then
+           None
+         else
+           Some (Int32.sub 32l m) in
+       Some { Core.m_value = p; Core.m_mask = mo })
   ; Core.nwProto = pat.AL.Pattern.nwProto
   ; Core.nwTos = None
   ; Core.tpSrc = pat.AL.Pattern.tpSrc
@@ -82,11 +91,11 @@ module Common = HighLevelSwitch_common.Make (struct
       | AL.All ->
         (Mod.none, Output AllPorts)
       | AL.Physical pport_id ->
-        let pport_id = from_portId pport_id in
-        if Some pport_id = inPort then
-          (Mod.none, Output InPort)
-        else
-          (Mod.none, Output (PhysicalPort pport_id))
+         let pport_id = from_portId pport_id in
+         if Some pport_id = inPort then
+           (Mod.none, Output InPort)
+         else
+           (Mod.none, Output (PhysicalPort pport_id))
       | AL.Controller n -> 
         (Mod.none, Output (Controller n))
       | AL.Local ->
@@ -119,30 +128,34 @@ module Common = HighLevelSwitch_common.Make (struct
         end
       | AL.Modify (AL.SetVlanPcp pcp) ->
         (Mod.dlVlanPcp, SetDlVlanPcp(VInt.(get_int4 (Int4 pcp))))
-      | AL.Modify (AL.SetEthTyp _) -> raise (Invalid_argument "cannot set Ethernet type")
-      | AL.Modify (AL.SetIPProto _) -> raise (Invalid_argument "cannot set IP protocol")
+      | AL.Modify (AL.SetEthTyp _) ->
+         raise (Invalid_argument "cannot set Ethernet type")
+      | AL.Modify (AL.SetIPProto _) ->
+         raise (Invalid_argument "cannot set IP protocol")
       | AL.Modify (AL.SetIP4Src nwAddr) ->
         (Mod.nwSrc, SetNwSrc nwAddr)
       | AL.Modify (AL.SetIP4Dst nwAddr) ->
         (Mod.nwDst, SetNwDst nwAddr)
       | AL.Modify (AL.SetTCPSrcPort tp) ->
-        (Mod.tpSrc, SetTpSrc VInt.(get_int16 (Int16 tp)))
+         (Mod.tpSrc, SetTpSrc VInt.(get_int16 (Int16 tp)))
       | AL.Modify (AL.SetTCPDstPort tp) ->
         (Mod.tpDst, SetTpDst VInt.(get_int16 (Int16 tp)))
 end)
 
-let from_group (inPort : Core.portId option) (group : AL.group) : Core.action list =
+let from_group (inPort : Core.portId option) (group : AL.group)
+  : Core.action list =
   match group with
   | [] -> []
   | [par] -> Common.flatten_par inPort par
-  | _ -> raise (SDN_Types.Unsupported "OpenFlow 1.0 does not support fast-failover")
+  | _ ->
+     raise (SDN_Types.Unsupported "OpenFlow 1.0 does not support fast-failover")
 
 let from_timeout (timeout : AL.timeout) : Core.timeout =
   match timeout with
     | AL.Permanent -> Core.Permanent
     | AL.ExpiresAfter n -> Core.ExpiresAfter n
 
-let from_flow (priority : int) (flow : AL.flow) : Core.flowMod = 
+let from_flow (priority : int) (flow : AL.flow) : Core.flowMod =
   let open AL in
   match flow with
   | { pattern; action; cookie; idle_timeout; hard_timeout } ->

setup.ml

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.4 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: c29ff81687df0f140f39a12771705bc0) *)
+(* DO NOT EDIT (digest: 6f3af400228e9874f5623738e988b944) *)
 (*
    Regenerated by OASIS v0.4.4
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6825,7 +6825,7 @@ let setup_t =
           alpha_features = [];
           beta_features = [];
           name = "openflow";
-          version = "0.6.0";
+          version = "0.6.2";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
@@ -7256,7 +7256,7 @@ let setup_t =
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.4";
      oasis_digest =
-       Some "\231\164\164\015\002\229\r\186\184\025\214\238\202.\200\227";
+       Some "\030)\144\210=\236\153\165\014\251\028n\230\153\006z";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false