mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-01 06:45:27 +00:00
Code Issues Releases Wiki Activity

Fix copyright; fix INADDR_LOOPBACK; SIN_LEN becomes SA_LEN; lose useless modemd time macros

Browse Source
This commit is contained in:
Ted Lemon
1996-05-20 00:34:56 +00:00
parent e5c3316957
commit 32ec8d4539
2 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cf/bsdos.h
View File

@@ -14,15 +14,15 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* 3. Neither the name of RadioMail Corporation nor the names of its * 3. Neither the name of The Internet Software Consortium nor the names of its
* contributors may be used to endorse or promote products derived * contributors may be used to endorse or promote products derived
* from this software without specific prior written permission. * from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY RADIOMAIL CORPORATION AND CONTRIBUTORS * THIS SOFTWARE IS PROVIDED BY THE INTERNET SOFTWARE CONSORTIUM AND
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
* RADIOMAIL CORPORATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, * THE INTERNET SOFTWARE CONSORTIUM OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
@@ -32,7 +32,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE. * OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* This software was written for the Internet Software Consortium by Ted Lemon * This software was written for the Internet Software Consortium by Ted Lemon
* under a contract with Vixie Labs. * under a contract with Vixie Laboratories.
*/ */
#include <syslog.h> #include <syslog.h>
@@ -51,7 +51,7 @@ extern int h_errno;
#include <net/if.h> #include <net/if.h>
#include <net/if_dl.h> #include <net/if_dl.h>
#define INADDR_LOOPBACK ((u_long)0x7f000001) #define INADDR_LOOPBACK ((u_int32_t) htonl((u_int32_t)0x7f000001))
/* Varargs stuff... */ /* Varargs stuff... */
#include <stdarg.h> #include <stdarg.h>
@@ -68,12 +68,8 @@ extern int h_errno;
#include <sys/time.h> #include <sys/time.h>
#define TIME time_t #define TIME time_t
#define GET_TIME(x) time ((x)) #define GET_TIME(x) time ((x))
#define TIME_DIFF(high, low) (*(high) - *(low))
#define SET_TIME(x, y) (*(x) = (y))
#define ADD_TIME(d, s1, s2) (*(d) = *(s1) + *(s2))
#define SET_MAX_TIME(x) (*(x) = INT_MAX)
#define HAVE_SIN_LEN #define HAVE_SA_LEN
#if defined (USE_DEFAULT_NETWORK) #if defined (USE_DEFAULT_NETWORK)
# define USE_BPF # define USE_BPF

20
includes/cf/bsdos.h
View File

@@ -14,15 +14,15 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* 3. Neither the name of RadioMail Corporation nor the names of its * 3. Neither the name of The Internet Software Consortium nor the names of its
* contributors may be used to endorse or promote products derived * contributors may be used to endorse or promote products derived
* from this software without specific prior written permission. * from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY RADIOMAIL CORPORATION AND CONTRIBUTORS * THIS SOFTWARE IS PROVIDED BY THE INTERNET SOFTWARE CONSORTIUM AND
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
* RADIOMAIL CORPORATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, * THE INTERNET SOFTWARE CONSORTIUM OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
@@ -32,7 +32,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE. * OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* This software was written for the Internet Software Consortium by Ted Lemon * This software was written for the Internet Software Consortium by Ted Lemon
* under a contract with Vixie Labs. * under a contract with Vixie Laboratories.
*/ */
#include <syslog.h> #include <syslog.h>
@@ -51,7 +51,7 @@ extern int h_errno;
#include <net/if.h> #include <net/if.h>
#include <net/if_dl.h> #include <net/if_dl.h>
#define INADDR_LOOPBACK ((u_long)0x7f000001) #define INADDR_LOOPBACK ((u_int32_t) htonl((u_int32_t)0x7f000001))
/* Varargs stuff... */ /* Varargs stuff... */
#include <stdarg.h> #include <stdarg.h>
@@ -68,12 +68,8 @@ extern int h_errno;
#include <sys/time.h> #include <sys/time.h>
#define TIME time_t #define TIME time_t
#define GET_TIME(x) time ((x)) #define GET_TIME(x) time ((x))
#define TIME_DIFF(high, low) (*(high) - *(low))
#define SET_TIME(x, y) (*(x) = (y))
#define ADD_TIME(d, s1, s2) (*(d) = *(s1) + *(s2))
#define SET_MAX_TIME(x) (*(x) = INT_MAX)
#define HAVE_SIN_LEN #define HAVE_SA_LEN
#if defined (USE_DEFAULT_NETWORK) #if defined (USE_DEFAULT_NETWORK)
# define USE_BPF # define USE_BPF