svn commit: r196867 - stable/8/usr.sbin/ndp

[Bjoern A. Zeeb]

Author: bz
Date: Sat Sep  5 17:29:08 2009
New Revision: 196867
URL: http://svn.freebsd.org/changeset/base/196867

Log:
  MFC r196866:
    In the NEXTADDR macro use SA_SIZE() rather than directly using
    sizeof(), as introduced in r186119, for advancing the current
    position into the buffer.
    See comment in net/route.h for a description of the difference.
    This makes ndp -s work again.
  
     Reviewed by:	qingli
  
  Approved by:	re (kib)

Modified:
  stable/8/usr.sbin/ndp/   (props changed)
  stable/8/usr.sbin/ndp/ndp.c

Modified: stable/8/usr.sbin/ndp/ndp.c
==============================================================================
--- stable/8/usr.sbin/ndp/ndp.c	Sat Sep  5 16:51:51 2009	(r196866)
+++ stable/8/usr.sbin/ndp/ndp.c	Sat Sep  5 17:29:08 2009	(r196867)
@@ -116,7 +116,7 @@
 
 #define NEXTADDR(w, s) \
 	if (rtm->rtm_addrs & (w)) { \
-		bcopy((char *)&s, cp, sizeof(s)); cp += sizeof(s);}
+		bcopy((char *)&s, cp, sizeof(s)); cp += SA_SIZE(&s);}
 
 
 static pid_t pid;