I've got a first pass at a patch for ocserv-fw. If the changes seem reasonable I can open an issue and create a merge request. Diff: https://gitlab.com/snippets/19100/raw Full script: https://gitlab.com/snippets/19098/raw