WIP: Addition of upnp, could be bug in encap if ipv6 used, to correct later
Working UPnP for ipv4 still WIP though
A few modifs