projects
/
project
/
unetd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unet-cli: strip initial newline in usage message
[project/unetd.git]
/
utils.h
diff --git
a/utils.h
b/utils.h
index 164070af8df9851962b2215da54722424a257d69..5d7acc85637bc69aa219c1dfc1495c3f4c86cf57 100644
(file)
--- a/
utils.h
+++ b/
utils.h
@@
-30,11
+30,13
@@
static inline void *
network_endpoint_addr(union network_endpoint *ep, int *addr_len)
{
if (ep->sa.sa_family == AF_INET6) {
network_endpoint_addr(union network_endpoint *ep, int *addr_len)
{
if (ep->sa.sa_family == AF_INET6) {
- *addr_len = sizeof(ep->in6.sin6_addr);
+ if (addr_len)
+ *addr_len = sizeof(ep->in6.sin6_addr);
return &ep->in6.sin6_addr;
}
return &ep->in6.sin6_addr;
}
- *addr_len = sizeof(ep->in.sin_addr);
+ if (addr_len)
+ *addr_len = sizeof(ep->in.sin_addr);
return &ep->in.sin_addr;
}
return &ep->in.sin_addr;
}
@@
-53,7
+55,7
@@
network_endpoint_addr_equal(union network_endpoint *ep1, union network_endpoint
return !memcmp(a1, a2, len);
}
return !memcmp(a1, a2, len);
}
-int network_get_endpoint(union network_endpoint *dest, const char *str,
+int network_get_endpoint(union network_endpoint *dest,
int af,
const char *str,
int default_port, int idx);
int network_get_subnet(int af, union network_addr *addr, int *mask,
const char *str);
int default_port, int idx);
int network_get_subnet(int af, union network_addr *addr, int *mask,
const char *str);