albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add some assert() calls to ng_ipaddr library

This commit is contained in:
Alexander Barton 2013-08-21 00:22:55 +02:00
parent 212d99146d
commit d56341c77b
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ipaddr/ng_ipaddr.h
View File

@ -47,6 +47,7 @@ typedef struct NG_IP_ADDR_DONTUSE ng_ipaddr_t;
static inline int static inline int
ng_ipaddr_af(const ng_ipaddr_t *a) ng_ipaddr_af(const ng_ipaddr_t *a)
{ {
assert(a != NULL);
#ifdef WANT_IPV6 #ifdef WANT_IPV6
return a->sa.sa_family; return a->sa.sa_family;
#else #else
@ -59,6 +60,7 @@ ng_ipaddr_af(const ng_ipaddr_t *a)
static inline socklen_t static inline socklen_t
ng_ipaddr_salen(const ng_ipaddr_t *a) ng_ipaddr_salen(const ng_ipaddr_t *a)
{ {
assert(a != NULL);
#ifdef WANT_IPV6 #ifdef WANT_IPV6
assert(a->sa.sa_family == AF_INET || a->sa.sa_family == AF_INET6); assert(a->sa.sa_family == AF_INET || a->sa.sa_family == AF_INET6);
if (a->sa.sa_family == AF_INET6) if (a->sa.sa_family == AF_INET6)
@ -75,11 +77,14 @@ ng_ipaddr_getport(const ng_ipaddr_t *a)
#ifdef WANT_IPV6 #ifdef WANT_IPV6
int af = a->sa.sa_family; int af = a->sa.sa_family;
assert(a != NULL);
assert(af == AF_INET || af == AF_INET6); assert(af == AF_INET || af == AF_INET6);
if (af == AF_INET6) if (af == AF_INET6)
return ntohs(a->sin6.sin6_port); return ntohs(a->sin6.sin6_port);
#endif /* WANT_IPV6 */ #endif /* WANT_IPV6 */
assert(a != NULL);
assert(a->sin4.sin_family == AF_INET); assert(a->sin4.sin_family == AF_INET);
return ntohs(a->sin4.sin_port); return ntohs(a->sin4.sin_port);
} }
@ -109,12 +114,15 @@ GLOBAL bool ng_ipaddr_tostr_r PARAMS((const ng_ipaddr_t *addr, char *dest));
static inline const char* static inline const char*
ng_ipaddr_tostr(const ng_ipaddr_t *addr) ng_ipaddr_tostr(const ng_ipaddr_t *addr)
{ {
assert(addr != NULL);
return inet_ntoa(addr->sin4.sin_addr); return inet_ntoa(addr->sin4.sin_addr);
} }
static inline bool static inline bool
ng_ipaddr_tostr_r(const ng_ipaddr_t *addr, char *d) 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); strlcpy(d, inet_ntoa(addr->sin4.sin_addr), NG_INET_ADDRSTRLEN);
return true; return true;
} }