Fix matching on transport ports for non-TCP traffic

Previously, we would overwrite the RFProtocol-specified network protocol
with TCP if a transport port was specified. This patch fixes the
behaviour.

Signed-off-by: Joe Stringer <joe@wand.net.nz>