From: Ronnie Sahlberg Date: Sun, 3 Jul 2011 22:46:19 +0000 (+1000) Subject: when ioctl() for getting the broadcast address fails, continue the loop to the next... X-Git-Tag: upstream/1.9.6^2~352 X-Git-Url: https://git.piment-noir.org/?p=deb_libnfs.git;a=commitdiff_plain;h=1ad6f93185b6735f259d2e7ff13da0f6776e8f5c when ioctl() for getting the broadcast address fails, continue the loop to the next entry instead of exiting out --- diff --git a/examples/nfsclient-bcast.c b/examples/nfsclient-bcast.c index 8140f52..f461a29 100644 --- a/examples/nfsclient-bcast.c +++ b/examples/nfsclient-bcast.c @@ -157,12 +157,10 @@ int main(int argc _U_, char *argv[] _U_) continue; } if (ioctl(rpc_get_fd(rpc), SIOCGIFBRDADDR, &ifc.ifc_req[i]) < 0) { - printf("ioctl DRBADDR failed\n"); - exit(10); + continue; } if (getnameinfo(&ifc.ifc_req[i].ifr_broadaddr, sizeof(struct sockaddr_in), &bcdd[0], sizeof(bcdd), NULL, 0, NI_NUMERICHOST) < 0) { - printf("getnameinfo failed\n"); - exit(10); + continue; } if (rpc_set_udp_destination(rpc, bcdd, 111, 1) < 0) { printf("failed to set udp destination %s\n", rpc_get_error(rpc)); diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c index 59493c5..4dd224c 100644 --- a/lib/libnfs-sync.c +++ b/lib/libnfs-sync.c @@ -1259,14 +1259,10 @@ struct nfs_server_list *nfs_find_local_servers(void) continue; } if (ioctl(rpc_get_fd(rpc), SIOCGIFBRDADDR, &ifc.ifc_req[i]) < 0) { - rpc_destroy_context(rpc); - free(ifc.ifc_buf); - return NULL; + continue; } if (getnameinfo(&ifc.ifc_req[i].ifr_broadaddr, sizeof(struct sockaddr_in), &bcdd[0], sizeof(bcdd), NULL, 0, NI_NUMERICHOST) < 0) { - rpc_destroy_context(rpc); - free(ifc.ifc_buf); - return NULL; + continue; } if (rpc_set_udp_destination(rpc, bcdd, 111, 1) < 0) { rpc_destroy_context(rpc);