Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/libnetutil/netutil.cc b/libnetutil/netutil.cc
- index 28c624c..ce7d92b 100644
- --- a/libnetutil/netutil.cc
- +++ b/libnetutil/netutil.cc
- @@ -1298,6 +1298,9 @@ static int canonicalize_address(const struct sockaddr_storage *ss,
- hints.ai_flags |= AI_NUMERICHOST;
- rc = getaddrinfo(canonical_ip_string, NULL, &hints, &ai);
- + if (rc != 0) {
- + fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(rc));
- + }
- if (rc != 0 || ai == NULL)
- return -1;
- assert(ai->ai_addrlen > 0 && ai->ai_addrlen <= (int) sizeof(*output));
- @@ -1328,8 +1331,15 @@ static int collect_dnet_interfaces(const struct intf_entry *entry, void *arg) {
- After that we add the aliases one at a time. */
- if (!primary_done) {
- if (addr_ntos(&entry->intf_addr, (struct sockaddr *) &tmpss) == -1) {
- + fprintf(stderr,"primary - trying %s, type %d, addr_type %d\n", entry->intf_name, entry->intf_type, entry->intf_addr.addr_type);
- dcrn->ifaces[dcrn->numifaces].addr.ss_family = 0;
- } else {
- + fprintf(stderr,"primary - Canonicalizing %s, type %d, addr_type %d\n", entry->intf_name, entry->intf_type, entry->intf_addr.addr_type);
- + fprintf(stderr," ai_family = %d, address %s\n", tmpss.ss_family, addr_ntoa(&entry->intf_addr));
- +#ifdef AF_LINK
- + if (tmpss.ss_family == AF_LINK)
- + tmpss.ss_familiy = AF_UNSPEC;
- +#endif
- rc = canonicalize_address(&tmpss, &dcrn->ifaces[dcrn->numifaces].addr);
- assert(rc == 0);
- }
- @@ -1337,8 +1347,11 @@ static int collect_dnet_interfaces(const struct intf_entry *entry, void *arg) {
- primary_done = true;
- } else if (num_aliases_done < entry->intf_alias_num) {
- if (addr_ntos(&entry->intf_alias_addrs[num_aliases_done], (struct sockaddr *) &tmpss) == -1) {
- + fprintf(stderr,"trying %s, type %d, addr_type %d\n", entry->intf_name, entry->intf_type, entry->intf_addr.addr_type);
- dcrn->ifaces[dcrn->numifaces].addr.ss_family = 0;
- } else {
- + fprintf(stderr,"Canonicalizing %s, type %d, addr_type %d\n", entry->intf_name, entry->intf_type, entry->intf_addr.addr_type);
- + fprintf(stderr," ai_family = %d, address %s\n", tmpss.ss_family, addr_ntoa(&entry->intf_addr));
- rc = canonicalize_address(&tmpss, &dcrn->ifaces[dcrn->numifaces].addr);
- assert(rc == 0);
- }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement