diff --git a/src/openvpn/dco_freebsd.c b/src/openvpn/dco_freebsd.c index 931f9f68..65303cd4 100644 --- a/src/openvpn/dco_freebsd.c +++ b/src/openvpn/dco_freebsd.c @@ -100,7 +100,7 @@ nvlist_to_sockaddr(const nvlist_t *nvl, struct sockaddr_storage *ss) in->sin_len = sizeof(*in); data = nvlist_get_binary(nvl, "address", &len); - assert(len == sizeof(in->sin_addr)); + ASSERT(len == sizeof(in->sin_addr)); memcpy(&in->sin_addr, data, sizeof(in->sin_addr)); in->sin_port = nvlist_get_number(nvl, "port"); break; @@ -114,7 +114,7 @@ nvlist_to_sockaddr(const nvlist_t *nvl, struct sockaddr_storage *ss) in6->sin6_len = sizeof(*in6); data = nvlist_get_binary(nvl, "address", &len); - assert(len == sizeof(in6->sin6_addr)); + ASSERT(len == sizeof(in6->sin6_addr)); memcpy(&in6->sin6_addr, data, sizeof(in6->sin6_addr)); in6->sin6_port = nvlist_get_number(nvl, "port"); diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 39ea8e4a..2821cd44 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -319,7 +319,7 @@ management_callback_send_cc_message(void *arg, const char *command, const char * static unsigned int management_callback_remote_entry_count(void *arg) { - assert(arg); + ASSERT(arg); struct context *c = (struct context *)arg; struct connection_list *l = c->options.connection_list; @@ -329,8 +329,8 @@ management_callback_remote_entry_count(void *arg) static bool management_callback_remote_entry_get(void *arg, unsigned int index, char **remote) { - assert(arg); - assert(remote); + ASSERT(arg); + ASSERT(remote); struct context *c = (struct context *)arg; struct connection_list *l = c->options.connection_list; diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 0616a176..6858a690 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3486,9 +3486,9 @@ tuntap_options_postprocess_dns(struct options *o) { /* Copy --dhcp-options to tuntap_options */ struct dhcp_options *dhcp = &dns->from_dhcp; - assert(sizeof(dhcp->dns) == sizeof(tt->dns)); - assert(sizeof(dhcp->dns6) == sizeof(tt->dns6)); - assert(sizeof(dhcp->domain_search_list) == sizeof(tt->domain_search_list)); + ASSERT(sizeof(dhcp->dns) == sizeof(tt->dns)); + ASSERT(sizeof(dhcp->dns6) == sizeof(tt->dns6)); + ASSERT(sizeof(dhcp->domain_search_list) == sizeof(tt->domain_search_list)); tt->domain = dhcp->domain; tt->dns_len = dhcp->dns_len;