From 2c9df304f5662a3f885ad5513b5f3180ba7c382c Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 2 Apr 2004 01:15:37 +0000 Subject: 2004-04-01 Ralf Corsepius * libnetworking/poll.h: Replace with sys/poll.h wrapper. * libnetworking/sys/poll.h: New (Original FreeBSD file). * libnetworking/Makefile.am: Don't install opt_ipfw.h, opt_mrouting.h, opt_tcpdebug.h. Add sys/poll.h. --- cpukit/ChangeLog | 7 +++ cpukit/libnetworking/Makefile.am | 22 +++----- cpukit/libnetworking/poll.h | 110 ++------------------------------------- cpukit/libnetworking/sys/poll.h | 104 ++++++++++++++++++++++++++++++++++++ 4 files changed, 123 insertions(+), 120 deletions(-) create mode 100644 cpukit/libnetworking/sys/poll.h (limited to 'cpukit') diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 09cc1fc443..db5bf4fe21 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,10 @@ +2004-04-01 Ralf Corsepius + + * libnetworking/poll.h: Replace with sys/poll.h wrapper. + * libnetworking/sys/poll.h: New (Original FreeBSD file). + * libnetworking/Makefile.am: Don't install opt_ipfw.h, + opt_mrouting.h, opt_tcpdebug.h. Add sys/poll.h. + 2004-04-01 Ralf Corsepius * libmisc/serdbg/serdbgcnf.h: Include instead of diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am index 57d3398455..bb6bfd7b22 100644 --- a/cpukit/libnetworking/Makefile.am +++ b/cpukit/libnetworking/Makefile.am @@ -10,7 +10,10 @@ AM_CPPFLAGS += -I$(top_builddir) EXTRA_DIST = README CLEANFILES = +# poll is not supported UNUSED_FILES = poll.h +# Original FreeBSD file +UNUSED_FILES += sys/poll.h UNUSED_FILES += net/zlib.c net/zlib.h UNUSED_FILES += net/ppp.h net/ppp-deflate.c net/bsd-comp.c @@ -35,8 +38,11 @@ TMP_LIBS = libnetworking$(LIB_VARIANT).a ## poll.h is not in the list because RTEMS does not have poll() ## and installing poll.h confuses autoconf. -include_HEADERS = bpfilter.h loop.h netdb.h opt_ipfw.h opt_mrouting.h \ - opt_tcpdebug.h resolv.h syslog.h memory.h +include_HEADERS = bpfilter.h loop.h netdb.h +include_HEADERS += resolv.h syslog.h memory.h + +libnetworking_a_SOURCES += opt_ipfw.h opt_mrouting.h opt_tcpdebug.h + # arpa include_arpadir = $(includedir)/arpa @@ -224,18 +230,6 @@ $(PROJECT_INCLUDE)/netdb.h: netdb.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netdb.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/netdb.h -$(PROJECT_INCLUDE)/opt_ipfw.h: opt_ipfw.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/opt_ipfw.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/opt_ipfw.h - -$(PROJECT_INCLUDE)/opt_mrouting.h: opt_mrouting.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/opt_mrouting.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/opt_mrouting.h - -$(PROJECT_INCLUDE)/opt_tcpdebug.h: opt_tcpdebug.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/opt_tcpdebug.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/opt_tcpdebug.h - $(PROJECT_INCLUDE)/resolv.h: resolv.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/resolv.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/resolv.h diff --git a/cpukit/libnetworking/poll.h b/cpukit/libnetworking/poll.h index 74dfca76c1..0287495599 100644 --- a/cpukit/libnetworking/poll.h +++ b/cpukit/libnetworking/poll.h @@ -1,108 +1,6 @@ -/*- - * Copyright (c) 1997 Peter Wemm - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. - * - * $Id$ - */ +#ifndef _POLL_H_ +#define _POLL_H_ -#ifndef _SYS_POLL_H_ -#define _SYS_POLL_H_ +#include -/* - * This file is intended to be compatable with the traditional poll.h. - */ - -/* - * This structure is passed as an array to poll(2). - */ -struct pollfd { - int fd; /* which file descriptor to poll */ - short events; /* events we are interested in */ - short revents; /* events found on return */ -}; - -/* - * Requestable events. If poll(2) finds any of these set, they are - * copied to revents on return. - * XXX Note that FreeBSD doesn't make much distinction between POLLPRI - * and POLLRDBAND since none of the file types have distinct priority - * bands - and only some have an urgent "mode". - * XXX Note POLLIN isn't really supported in true SVSV terms. Under SYSV - * POLLIN includes all of normal, band and urgent data. Most poll handlers - * on FreeBSD only treat it as "normal" data. - */ -#define POLLIN 0x0001 /* any readable data available */ -#define POLLPRI 0x0002 /* OOB/Urgent readable data */ -#define POLLOUT 0x0004 /* file descriptor is writeable */ -#define POLLRDNORM 0x0040 /* non-OOB/URG data available */ -#define POLLWRNORM POLLOUT /* no write type differentiation */ -#define POLLRDBAND 0x0080 /* OOB/Urgent readable data */ -#define POLLWRBAND 0x0100 /* OOB/Urgent data can be written */ - -/* - * FreeBSD extensions: polling on a regular file might return one - * of these events (currently only supported on UFS). - */ -#define POLLEXTEND 0x0200 /* file may have been extended */ -#define POLLATTRIB 0x0400 /* file attributes may have changed */ -#define POLLNLINK 0x0800 /* (un)link/rename may have happened */ -#define POLLWRITE 0x1000 /* file's contents may have changed */ - -/* - * These events are set if they occur regardless of whether they were - * requested. - */ -#define POLLERR 0x0008 /* some poll error occurred */ -#define POLLHUP 0x0010 /* file descriptor was "hung up" */ -#define POLLNVAL 0x0020 /* requested events "invalid" */ - -#define POLLSTANDARD (POLLIN|POLLPRI|POLLOUT|POLLRDNORM|POLLRDBAND|\ - POLLWRBAND|POLLERR|POLLHUP|POLLNVAL) - -/* - * Request that poll() wait forever. - * XXX in SYSV, this is defined in stropts.h, which is not included - * by poll.h. - */ -#define INFTIM (-1) - -#ifndef KERNEL - -#include - -__BEGIN_DECLS -/* - * XXX logically, poll() should be declared in , but SVR4 at - * least has it here in . - * XXX poll() has "unsigned long" nfds on SVR4, not unsigned as on the - * other BSDs. - */ -int poll __P((struct pollfd *_pfd, unsigned _nfds, int _timeout)); -__END_DECLS - -#endif /* !KERNEL */ - -#endif /* !_SYS_POLL_H_ */ +#endif /* !_POLL_H_ */ diff --git a/cpukit/libnetworking/sys/poll.h b/cpukit/libnetworking/sys/poll.h new file mode 100644 index 0000000000..9ea42b9ddf --- /dev/null +++ b/cpukit/libnetworking/sys/poll.h @@ -0,0 +1,104 @@ +/*- + * Copyright (c) 1997 Peter Wemm + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. + * + * $FreeBSD: src/sys/sys/poll.h,v 1.13 2002/07/10 04:47:25 mike Exp $ + */ + +#ifndef _SYS_POLL_H_ +#define _SYS_POLL_H_ + +#include + +/* + * This file is intended to be compatible with the traditional poll.h. + */ + +typedef unsigned int nfds_t; + +/* + * This structure is passed as an array to poll(2). + */ +struct pollfd { + int fd; /* which file descriptor to poll */ + short events; /* events we are interested in */ + short revents; /* events found on return */ +}; + +/* + * Requestable events. If poll(2) finds any of these set, they are + * copied to revents on return. + * XXX Note that FreeBSD doesn't make much distinction between POLLPRI + * and POLLRDBAND since none of the file types have distinct priority + * bands - and only some have an urgent "mode". + * XXX Note POLLIN isn't really supported in true SVSV terms. Under SYSV + * POLLIN includes all of normal, band and urgent data. Most poll handlers + * on FreeBSD only treat it as "normal" data. + */ +#define POLLIN 0x0001 /* any readable data available */ +#define POLLPRI 0x0002 /* OOB/Urgent readable data */ +#define POLLOUT 0x0004 /* file descriptor is writeable */ +#define POLLRDNORM 0x0040 /* non-OOB/URG data available */ +#define POLLWRNORM POLLOUT /* no write type differentiation */ +#define POLLRDBAND 0x0080 /* OOB/Urgent readable data */ +#define POLLWRBAND 0x0100 /* OOB/Urgent data can be written */ + +#if __BSD_VISIBLE +/* General FreeBSD extension (currently only supported for sockets): */ +#define POLLINIGNEOF 0x2000 /* like POLLIN, except ignore EOF */ +#endif + +/* + * These events are set if they occur regardless of whether they were + * requested. + */ +#define POLLERR 0x0008 /* some poll error occurred */ +#define POLLHUP 0x0010 /* file descriptor was "hung up" */ +#define POLLNVAL 0x0020 /* requested events "invalid" */ + +#if __BSD_VISIBLE + +#define POLLSTANDARD (POLLIN|POLLPRI|POLLOUT|POLLRDNORM|POLLRDBAND|\ + POLLWRBAND|POLLERR|POLLHUP|POLLNVAL) + +/* + * Request that poll() wait forever. + * XXX in SYSV, this is defined in stropts.h, which is not included + * by poll.h. + */ +#define INFTIM (-1) + +#endif + +#ifndef _KERNEL + +__BEGIN_DECLS +int poll(struct pollfd _pfd[], nfds_t _nfds, int _timeout); +__END_DECLS + +#endif /* !_KERNEL */ + +#endif /* !_SYS_POLL_H_ */ -- cgit v1.2.3