X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fipaddr%2Fng_ipaddr.h;h=f8409de99288e7f6b666e1f18c0a63c10b4ec8ad;hb=b130b35f4;hp=4582e2a533eca80c7948d0ca00db3fc5106348d8;hpb=1e281a8baa5dc0499ad8f0b75d5f366b498511f6;p=ngircd-alex.git

diff --git a/src/ipaddr/ng_ipaddr.h b/src/ipaddr/ng_ipaddr.h
index 4582e2a5..f8409de9 100644
--- a/src/ipaddr/ng_ipaddr.h
+++ b/src/ipaddr/ng_ipaddr.h
@@ -1,14 +1,19 @@
 /*
- * Functions for AF_ agnostic ipv4/ipv6 handling.
- *
  * (c) 2008 Florian Westphal <fw@strlen.de>, public domain.
  */
 
 #ifndef NG_IPADDR_HDR
 #define NG_IPADDR_HDR
+
 #include "portab.h"
 
+/**
+ * @file
+ * Functions for AF_ agnostic ipv4/ipv6 handling (header).
+ */
+
 #include <assert.h>
+#include <string.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 
@@ -44,6 +49,7 @@ typedef struct NG_IP_ADDR_DONTUSE ng_ipaddr_t;
 static inline int
 ng_ipaddr_af(const ng_ipaddr_t *a)
 {
+	assert(a != NULL);
 #ifdef WANT_IPV6
 	return a->sa.sa_family;
 #else
@@ -56,6 +62,7 @@ ng_ipaddr_af(const ng_ipaddr_t *a)
 static inline socklen_t
 ng_ipaddr_salen(const ng_ipaddr_t *a)
 {
+	assert(a != NULL);
 #ifdef WANT_IPV6
 	assert(a->sa.sa_family == AF_INET || a->sa.sa_family == AF_INET6);
 	if (a->sa.sa_family == AF_INET6)
@@ -72,11 +79,14 @@ ng_ipaddr_getport(const ng_ipaddr_t *a)
 #ifdef WANT_IPV6
 	int af = a->sa.sa_family;
 
+	assert(a != NULL);
 	assert(af == AF_INET || af == AF_INET6);
 
 	if (af == AF_INET6)
 		return ntohs(a->sin6.sin6_port);
 #endif /* WANT_IPV6 */
+
+	assert(a != NULL);
 	assert(a->sin4.sin_family == AF_INET);
 	return ntohs(a->sin4.sin_port);
 }
@@ -103,12 +113,18 @@ GLOBAL const char *ng_ipaddr_tostr PARAMS((const ng_ipaddr_t *addr));
 /* convert struct sockaddr to string. dest must be NG_INET_ADDRSTRLEN bytes long */
 GLOBAL bool ng_ipaddr_tostr_r PARAMS((const ng_ipaddr_t *addr, char *dest));
 #else
-static inline const char *
-ng_ipaddr_tostr(const ng_ipaddr_t *addr) { return inet_ntoa(addr->sin4.sin_addr); }
+static inline const char*
+ng_ipaddr_tostr(const ng_ipaddr_t *addr)
+{
+	assert(addr != NULL);
+	return inet_ntoa(addr->sin4.sin_addr);
+}
 
 static inline bool
 ng_ipaddr_tostr_r(const ng_ipaddr_t *addr, char *d)
 {
+	assert(addr != NULL);
+	assert(d != NULL);
 	strlcpy(d, inet_ntoa(addr->sin4.sin_addr), NG_INET_ADDRSTRLEN);
 	return true;
 }