[netperf-dev] netperf2 commit notice r269 - trunk/src

[raj at netperf.org]

Author: raj
Date: 2008-03-19 12:42:20 -0700 (Wed, 19 Mar 2008)
New Revision: 269

Modified:
   trunk/src/netrt_rtmget.c
Log:
let us increment by the correct quantity when walking the ifr list

Modified: trunk/src/netrt_rtmget.c
===================================================================
--- trunk/src/netrt_rtmget.c	2008-03-19 00:28:01 UTC (rev 268)
+++ trunk/src/netrt_rtmget.c	2008-03-19 19:42:20 UTC (rev 269)
@@ -163,7 +163,16 @@
 	   ifr->ifr_name,
 	   ifr->ifr_addr.sa_family);
 #endif
-    
+
+#ifdef HAVE_SOCKADDR_SA_LEN
+    if (sizeof(struct sockaddr) > ifr->ifr_addr.sa_len)
+      len = sizeof(struct sockaddr);
+    else
+      len = ifr->ifr_addr.sa_len;
+#endif
+
+    /* we are basicaly ass-u-me-ing that an ifr is only a name and a
+       sockaddr */
     ptr += sizeof(ifr->ifr_name) + len;
     
     if (ifr->ifr_addr.sa_family != sin->sin_family)