NetKAT JSON IP4 Inconsistency

[mwhittaker]

There are some inconsistencies between the parsing and serialization of IPv4 headers to and from JSON. More specifically, Frenetic_NetKAT_Json.ml serializes IP4Src and IP4Dst header values into JSON objects, but it parses IP source and destination addresses expecting they're just strings. There are some other discrepancies too (e.g. "ip4dst" vs "ipDst").

I can write up a fix.

[jnfoster]

Oh man :-( Thanks for fixing this.

[arjunguha]

Oh wow.

[seliopou]

type ip_addr = Ipaddr.V4.Prefix.t

let ip_addr_to_yojson ip =
  `String (Ipaddr.V4.Prefix.to_string ip)

let ip_addr_of_yojson = function
  | `String str ->
    begin match Ipaddr.V4.Prefix.of_string str with
    | None -> `Error (Printf.sprintf "unable to parse: %S" str)
    | Some ip -> `Ok ip
    end
  | _ -> `Error "expecting string but got someting else"

Also see ocaml-ppx/ppx_deriving_yojson#37. Haven't gotten around to it yet.

[craig-riecke]

Ok fixed is merged in. Thanks for pointing this out @mwhittaker and for fixing it @smolkaj.

[mwhittaker]

Oops, I had forgotten about this :P. Thanks for the fix @smolkaj!