From: Nickolai Zeldovich Date: Thu, 11 Oct 2001 22:41:45 +0000 (+0000) Subject: irix-adapt-mtu-correctly-in-multi-interface-case-20011011 X-Git-Tag: openafs-devel-1_3_0~208 X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=8cd212c6915bac92ddd2f830aebb351c7ebe953d irix-adapt-mtu-correctly-in-multi-interface-case-20011011 let hash_enum iterate so we get the right interface ==================== This delta was composed from multiple commits as part of the CVS->Git migration. The checkin message with each commit was inconsistent. The following are the additional commit messages. ==================== undo chas's earlier patch fix another flub --- diff --git a/src/rx/IRIX/rx_knet.c b/src/rx/IRIX/rx_knet.c index 74140f9..4128f9e 100644 --- a/src/rx/IRIX/rx_knet.c +++ b/src/rx/IRIX/rx_knet.c @@ -314,7 +314,7 @@ static int rxi_MatchIfnet(struct hashbucket *h, caddr_t key, caddr_t arg1, } } *(int*)arg1 = match_value; - return (match_value ? 1 : 0); + return 0; } @@ -324,7 +324,6 @@ struct ifnet * rxi_FindIfnet(addr, pifad) { afs_uint32 ppaddr; int match_value = 0; - struct hashbucket *slop; if (numMyNetAddrs == 0) (void) rxi_GetIFInfo(); @@ -332,15 +331,13 @@ struct ifnet * rxi_FindIfnet(addr, pifad) ppaddr = ntohl(addr); *pifad = (struct in_ifaddr*)&hashinfo_inaddr; - slop = hash_enum(&hashinfo_inaddr, rxi_MatchIfnet, HTF_INET, + (void) hash_enum(&hashinfo_inaddr, rxi_MatchIfnet, HTF_INET, (caddr_t)&ppaddr, (caddr_t)&match_value, (caddr_t)pifad); - - if (slop) - return ((struct in_ifaddr*)slop)->ia_ifp; + + if (match_value) + return (*pifad)->ia_ifp; else return NULL; - - } static int rxi_EnumGetIfInfo(struct hashbucket *h, caddr_t key, caddr_t arg1,