From 8c90be2a29053ac613dfe0c11a423da16c7c4520 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sun, 13 Sep 2015 11:56:41 -0500 Subject: allow nc to build on linux and os x --- include/Makefile.am | 2 +- include/compat/netinet/ip.h | 43 ++++++++++++++++++++++++++++++++++++ include/compat/readpassphrase.h | 48 +++++++++++++++++++++++++++++++++++++++++ include/compat/sys/socket.h | 10 --------- 4 files changed, 92 insertions(+), 11 deletions(-) create mode 100644 include/compat/netinet/ip.h create mode 100644 include/compat/readpassphrase.h delete mode 100644 include/compat/sys/socket.h (limited to 'include') diff --git a/include/Makefile.am b/include/Makefile.am index 3978af7..929ff7d 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -23,6 +23,7 @@ noinst_HEADERS += compat/arpa/nameser.h noinst_HEADERS += compat/machine/endian.h noinst_HEADERS += compat/netinet/in.h +noinst_HEADERS += compat/netinet/ip.h noinst_HEADERS += compat/netinet/tcp.h noinst_HEADERS += compat/sys/cdefs.h @@ -31,7 +32,6 @@ noinst_HEADERS += compat/sys/mman.h noinst_HEADERS += compat/sys/param.h noinst_HEADERS += compat/sys/select.h noinst_HEADERS += compat/sys/stat.h -noinst_HEADERS += compat/sys/socket.h noinst_HEADERS += compat/sys/time.h noinst_HEADERS += compat/sys/types.h noinst_HEADERS += compat/sys/uio.h diff --git a/include/compat/netinet/ip.h b/include/compat/netinet/ip.h new file mode 100644 index 0000000..405bbcf --- /dev/null +++ b/include/compat/netinet/ip.h @@ -0,0 +1,43 @@ +/* + * Public domain + * netinet/ip.h compatibility shim + */ + +#ifndef _WIN32 +#include_next +#else +#include +#endif + +/* + * Definitions for DiffServ Codepoints as per RFC2474 + */ +#ifndef IPTOS_DSCP_CS0 +#define IPTOS_DSCP_CS0 0x00 +#define IPTOS_DSCP_CS1 0x20 +#define IPTOS_DSCP_CS2 0x40 +#define IPTOS_DSCP_CS3 0x60 +#define IPTOS_DSCP_CS4 0x80 +#define IPTOS_DSCP_CS5 0xa0 +#define IPTOS_DSCP_CS6 0xc0 +#define IPTOS_DSCP_CS7 0xe0 +#endif + +#ifndef IPTOS_DSCP_AF11 +#define IPTOS_DSCP_AF11 0x28 +#define IPTOS_DSCP_AF12 0x30 +#define IPTOS_DSCP_AF13 0x38 +#define IPTOS_DSCP_AF21 0x48 +#define IPTOS_DSCP_AF22 0x50 +#define IPTOS_DSCP_AF23 0x58 +#define IPTOS_DSCP_AF31 0x68 +#define IPTOS_DSCP_AF32 0x70 +#define IPTOS_DSCP_AF33 0x78 +#define IPTOS_DSCP_AF41 0x88 +#define IPTOS_DSCP_AF42 0x90 +#define IPTOS_DSCP_AF43 0x98 +#endif + +#ifndef IPTOS_DSCP_EF +#define IPTOS_DSCP_EF 0xb8 +#endif diff --git a/include/compat/readpassphrase.h b/include/compat/readpassphrase.h new file mode 100644 index 0000000..aedf16c --- /dev/null +++ b/include/compat/readpassphrase.h @@ -0,0 +1,48 @@ +/* $OpenBSD: readpassphrase.h,v 1.5 2003/06/17 21:56:23 millert Exp $ */ + +/* + * Copyright (c) 2000, 2002 Todd C. Miller + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Sponsored in part by the Defense Advanced Research Projects + * Agency (DARPA) and Air Force Research Laboratory, Air Force + * Materiel Command, USAF, under agreement number F39502-99-1-0512. + */ + +#ifdef HAVE_READPASSPHRASE_H + +#include_next + +#else + +#ifndef _READPASSPHRASE_H_ +#define _READPASSPHRASE_H_ + +#define RPP_ECHO_OFF 0x00 /* Turn off echo (default). */ +#define RPP_ECHO_ON 0x01 /* Leave echo on. */ +#define RPP_REQUIRE_TTY 0x02 /* Fail if there is no tty. */ +#define RPP_FORCELOWER 0x04 /* Force input to lower case. */ +#define RPP_FORCEUPPER 0x08 /* Force input to upper case. */ +#define RPP_SEVENBIT 0x10 /* Strip the high bit from input. */ +#define RPP_STDIN 0x20 /* Read from stdin, not /dev/tty */ + +#include + +__BEGIN_DECLS +char * readpassphrase(const char *, char *, size_t, int); +__END_DECLS + +#endif /* !_READPASSPHRASE_H_ */ + +#endif diff --git a/include/compat/sys/socket.h b/include/compat/sys/socket.h deleted file mode 100644 index 17e84f1..0000000 --- a/include/compat/sys/socket.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Public domain - * sys/socket.h compatibility shim - */ - -#ifndef _WIN32 -#include_next -#else -#include -#endif -- cgit v1.2.3-55-g6feb