This series adds JSON support for tproxy and osf.
Furthermore, it relaxes a tproxy check that prohibited use
of 'tproxy ip' syntax in ip family, and 'tproxy ip6' syntax
in ip6 family.

Reason is that this check makes JSON support harder as
we'd need to be able to add conditional family handling
rather than just always including this information.

 include/json.h                |    4 +
 src/evaluate.c                |   30 +++++--------
 src/json.c                    |   31 +++++++++++++
 src/osf.c                     |    2 
 src/parser_bison.y            |   18 +------
 src/parser_json.c             |   60 ++++++++++++++++++++++++++
 src/statement.c               |    1 
 tests/py/inet/osf.t.json      |   67 +++++++++++++++++++++++++++++
 tests/py/inet/tproxy.t.json   |   91 ++++++++++++++++++++++++++++++++++++++++
 tests/py/ip/tproxy.t          |    4 -
 tests/py/ip/tproxy.t.json     |   95 ++++++++++++++++++++++++++++++++++++++++++
 tests/py/ip/tproxy.t.payload  |   14 ++++++
 tests/py/ip6/tproxy.t         |    6 --
 tests/py/ip6/tproxy.t.json    |   90 +++++++++++++++++++++++++++++++++++++++
 tests/py/ip6/tproxy.t.payload |   11 ----
 15 files changed, 477 insertions(+), 47 deletions(-)

Reply via email to