summaryrefslogtreecommitdiff
path: root/support/dktools/dk4sock02.c
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-09-20 03:03:26 +0000
committerNorbert Preining <norbert@preining.info>2020-09-20 03:03:26 +0000
commit1f457376b478257b88d4a857f5ec1b6155442dd7 (patch)
tree2a06a60551dea362cf8cb0cb0ba66c78608717c4 /support/dktools/dk4sock02.c
parentac690ca29ad5bf8a5203a65fd6252f7b564f4727 (diff)
CTAN sync 202009200303
Diffstat (limited to 'support/dktools/dk4sock02.c')
-rw-r--r--support/dktools/dk4sock02.c65
1 files changed, 34 insertions, 31 deletions
diff --git a/support/dktools/dk4sock02.c b/support/dktools/dk4sock02.c
index a33a52c729..ba964127aa 100644
--- a/support/dktools/dk4sock02.c
+++ b/support/dktools/dk4sock02.c
@@ -1,36 +1,14 @@
/*
- WARNING: This file was generated by dkct.
- Changes you make here will be lost if dkct is run again!
- You should modify the original source and run dkct on it.
- Original source: dk4sock02.ctr
+Copyright (C) 2015-2020, Dirk Krause
+SPDX-License-Identifier: BSD-3-Clause
*/
/*
-Copyright (C) 2015-2017, Dirk Krause
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above opyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-* Neither the name of the author nor the names of contributors may be used
- to endorse or promote products derived from this software without specific
- prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ WARNING: This file was generated by the dkct program (see
+ http://dktools.sourceforge.net/ for details).
+ Changes you make here will be lost if dkct is run again!
+ You should modify the original source and run dkct on it.
+ Original source: dk4sock02.ctr
*/
@@ -39,6 +17,15 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/** @file dk4sock01.c Conversion between host and net representation.
*/
+#include "dk4conf.h"
+
+#if DK4_HAVE_ASSERT_H
+#ifndef ASSERT_H_INCLUDED
+#include <assert.h>
+#define ASSERT_H_INCLUDED 1
+#endif
+#endif
+
#include "dk4types.h"
#include "dk4error.h"
#include "dk4sock.h"
@@ -190,6 +177,9 @@ dk4socket_mask_bits(unsigned long *dptr, size_t sz, dk4_er_t *erp)
unsigned long res = 0UL;
unsigned long val = 0x80000000UL;
int back = DK4_SOCKET_RESULT_FAILED;
+#if DK4_USE_ASSERT
+ assert(NULL != dptr);
+#endif
if (NULL != dptr) {
if ((0 < sz) && (33 > sz)) {
while (0 < sz--) {
@@ -219,7 +209,9 @@ dk4socket_mask6_bits(struct in6_addr *inp, size_t sz, dk4_er_t *erp)
size_t j = 0;
unsigned char rchr = 0x00;
unsigned char vchr = 0x80;
-
+#if DK4_USE_ASSERT
+ assert(NULL != inp);
+#endif
if (NULL != inp) {
for (i = 0; i < 16; i++) { inp->s6_addr[i] = 0xFF; }
if ((0 < sz) && (129 > sz)) {
@@ -253,7 +245,11 @@ void
dk4socket_set_one_bytes(void *ptr, size_t nbytes)
{
unsigned char *cptr;
- cptr = ptr;
+#if DK4_USE_ASSERT
+ assert(NULL != ptr);
+ assert(0 < nbytes);
+#endif
+ cptr = (unsigned char *)ptr;
while (0 < nbytes--) { *(cptr++) = 0x01; }
}
@@ -265,6 +261,9 @@ size_t
dk4socket_unix_length(const struct sockaddr_un *sock)
{
size_t back = 0;
+#if DK4_USE_ASSERT
+ assert(NULL != sock);
+#endif
if (NULL != sock) {
#ifdef SUN_LEN
back = SUN_LEN(sock);
@@ -426,6 +425,10 @@ int
dk4socket_correct_addr_lgt(const struct sockaddr *soa, size_t *plgt)
{
int back = 0;
+#if DK4_USE_ASSERT
+ assert(NULL != soa);
+ assert(NULL != plgt);
+#endif
if ((NULL != soa) && (NULL != plgt)) {
back = 1;
switch (soa->sa_family) {