This is a large patch (sorry). Migrate from struct in_addr