Change intf_socks to a map of (Interface, Socket)

Change intf_socks to a map of (Interface, Socket) #658