PortMapper fix for same port on many IPs

In my previous commit, I didn't notice that the PortMapper didn't keep track
of the same port across different interfaces. This is now fixed.