Use the new defines that include the trailing '\0' in the code.

Replace occurences of the magic constant 2 with an offsetof macro
call that computes the size of the leading members of the sockaddr.
Use strlcpy instead of sprintf where appropriate. Document the new changes
in the man page.

1 files changed, 5 insertions, 0 deletions

diff --git a/lib/libnetgraph/internal.h b/lib/libnetgraph/internal.h
index 99b5ecc..0c947e5 100644
--- a/lib/libnetgraph/internal.h
+++ b/lib/libnetgraph/internal.h
@@ -46,6 +46,7 @@
 #include <sys/socket.h>
 #include <sys/select.h>
 #include <sys/linker.h>
+#include <stddef.h>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -55,6 +56,10 @@
 #include <ctype.h>
 #include <err.h>
 
+/* the 'sockaddr overhead' for a netgraph address. This is everything before
+ * the string that constitutes the address. */
+#define	NGSA_OVERHEAD	(offsetof(struct sockaddr_ng, sg_data))
+
 extern int	_gNgDebugLevel;
 
 extern void	(*_NgLog)(const char *fmt, ...);