mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-04 01:48:54 +00:00
b77059fee2
isc-dhcp3-client/pkg-message updated isc-dhcp3-devel/pkg-plist updated from PR#61620 isc-dhcp3-relay/pkg-message rewritten to reflect rcNG change isc-dhcp3-relay/pkg-plist etc/rc.isc-dhcrelay.conf deleted etc/rc.d/isc-dhcrelay.sh.sample renamed to etc/rc.d/isc-dhcrelay.sh isc-dhcp3-server/Makefile PORTREVISION bumped USE_RC_SUBR added *_SUB added pre-everything added (WITHOUT_INTERFACE_POLLING cond added) patch-scripts and patch-pkgmessage (! -devel cond) updated patch-site-conf and patch-rc-scripts added install-startup-files now install etc/rc.d/isc-dhcpd.sh instead of etc/rc.d/isc-dhcpd.sh.sample display-message updated (! -devel cond) isc-dhcp3-server/pkg-message rewritten to reflect rcNG change isc-dhcp3-server/pkg-plist etc/rc.isc-dhcpd.conf deleted etc/rc.d/isc-dhcpd.sh.sample renamed to etc/rc.d/isc-dhcpd.sh isc-dhcp3-server/files/isc-dhcpd.sh.sample isc-dhcp3-server/files/isc-dhcrelay.sh.sample both converted to rcNG isc-dhcp3-server/files/patch-freebsd synced w/ -current isc-dhcp3-server/files/patch-site.conf CLIENT_PATH added CFLAGS synced w/ -current isc-dhcp3-server/patch-client::clparse.c isc-dhcp3-server/patch-client::dhclient.8 new files synced w/ -current isc-dhcp3-server/patch-client::dhclient.c new file synced w/ -current (-DENABLE_POLLING_MODE) isc-dhcp3-server/patch-client::dhclient.conf new file isc-dhcp3-server/patch-common::dhcp-options.5 new file synced w/ -current isc-dhcp3-server/patch-common::discover.c new file from PR#61011 isc-dhcp3-server/patch-common::dispatch.c new file synced w/ -current (-DENABLE_POLLING_MODE) isc-dhcp3-server/files/patch-common::parse.c fix time_t issues on little-endian 64-bit platforms isc-dhcp3-server/patch-dst::Makefile.dist new file from PR#61620 isc-dhcp3-server/patch-includes::cf::freebsd.h new file synced w/ -current (-DRESCUE unused right now) isc-dhcp3-server/patch-includes::dhcpd.h new file synced w/ -current (-DENABLE_POLLING_MODE) isc-dhcp3-server/files/rc.isc-dhcpd.conf.sample isc-dhcp3-server/files/rc.isc-dhcrelay.conf.sample deleted files PR: 57943, 61011, 61620 Submitted by: sec@42.org, andy@fud.org.nz, kaa@in-line.ru, des, ru
30 lines
884 B
C
30 lines
884 B
C
--- common/dispatch.c.orig Sun Nov 17 03:26:57 2002
|
|
+++ common/dispatch.c Wed Mar 3 16:20:15 2004
|
|
@@ -95,11 +95,26 @@
|
|
void dispatch ()
|
|
{
|
|
struct timeval tv, *tvp;
|
|
+#ifdef ENABLE_POLLING_MODE
|
|
+ struct timeval *tvp_new;
|
|
+#endif
|
|
isc_result_t status;
|
|
+ TIME cur_time;
|
|
|
|
+ tvp = NULL;
|
|
+#ifdef ENABLE_POLLING_MODE
|
|
+ tvp_new = NULL;
|
|
+#endif
|
|
/* Wait for a packet or a timeout... XXX */
|
|
do {
|
|
tvp = process_outstanding_timeouts (&tv);
|
|
+#ifdef ENABLE_POLLING_MODE
|
|
+ GET_TIME (&cur_time);
|
|
+ add_timeout(cur_time + polling_interval, state_polling, 0, 0, 0);
|
|
+ tvp_new = process_outstanding_timeouts(&tv);
|
|
+ if (tvp != NULL && (tvp -> tv_sec > tvp_new -> tv_sec))
|
|
+ tvp = tvp_new;
|
|
+#endif /* ENABLE_POLLING_MODE */
|
|
status = omapi_one_dispatch (0, tvp);
|
|
} while (status == ISC_R_TIMEDOUT || status == ISC_R_SUCCESS);
|
|
log_fatal ("omapi_one_dispatch failed: %s -- exiting.",
|