Module Name: src
Committed By: christos
Date: Sun Jan 27 01:51:50 UTC 2019
Modified Files:
src/external/mpl/dhcp/dist/omapip: buffer.c dispatch.c
Log Message:
apparently the fdwatch crap is needed, so undo the ifdefs.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/omapip/buffer.c \
src/external/mpl/dhcp/dist/omapip/dispatch.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/dhcp/dist/omapip/buffer.c
diff -u src/external/mpl/dhcp/dist/omapip/buffer.c:1.3 src/external/mpl/dhcp/dist/omapip/buffer.c:1.4
--- src/external/mpl/dhcp/dist/omapip/buffer.c:1.3 Thu Jan 10 12:41:47 2019
+++ src/external/mpl/dhcp/dist/omapip/buffer.c Sat Jan 26 20:51:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: buffer.c,v 1.3 2019/01/10 17:41:47 christos Exp $ */
+/* $NetBSD: buffer.c,v 1.4 2019/01/27 01:51:50 christos Exp $ */
/* buffer.c
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: buffer.c,v 1.3 2019/01/10 17:41:47 christos Exp $");
+__RCSID("$NetBSD: buffer.c,v 1.4 2019/01/27 01:51:50 christos Exp $");
#include "dhcpd.h"
@@ -341,7 +341,6 @@ isc_result_t omapi_connection_copyin (om
status = ISC_R_SUCCESS;
leave:
-#if 0
/*
* If we have any bytes to send and we have a proper io object
* inform the socket code that we would like to know when we
@@ -355,7 +354,6 @@ isc_result_t omapi_connection_copyin (om
ISC_SOCKFDWATCH_WRITE);
}
}
-#endif
return (status);
}
Index: src/external/mpl/dhcp/dist/omapip/dispatch.c
diff -u src/external/mpl/dhcp/dist/omapip/dispatch.c:1.3 src/external/mpl/dhcp/dist/omapip/dispatch.c:1.4
--- src/external/mpl/dhcp/dist/omapip/dispatch.c:1.3 Thu Jan 10 12:41:47 2019
+++ src/external/mpl/dhcp/dist/omapip/dispatch.c Sat Jan 26 20:51:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dispatch.c,v 1.3 2019/01/10 17:41:47 christos Exp $ */
+/* $NetBSD: dispatch.c,v 1.4 2019/01/27 01:51:50 christos Exp $ */
/* dispatch.c
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: dispatch.c,v 1.3 2019/01/10 17:41:47 christos Exp $");
+__RCSID("$NetBSD: dispatch.c,v 1.4 2019/01/27 01:51:50 christos Exp $");
#include "dhcpd.h"
@@ -121,7 +121,6 @@ trigger_event(struct eventqueue **queue)
* 1 is delete, 0 is leave in place
*/
#define SOCKDELETE 1
-#ifdef ISC_SOCKFDWATCH_READ
static int
omapi_iscsock_cb(isc_task_t *task,
isc_socket_t *socket,
@@ -198,7 +197,6 @@ omapi_iscsock_cb(isc_task_t *task,
*/
return (0);
}
-#endif
/* Register an I/O handle so that we can do asynchronous I/O on it. */
@@ -214,9 +212,7 @@ isc_result_t omapi_register_io_object (o
{
isc_result_t status;
omapi_io_object_t *obj, *p;
-#ifdef ISC_SOCKFDWATCH_READ
int fd_flags = 0, fd = 0;
-#endif
/* omapi_io_states is a static object. If its reference count
is zero, this is the first I/O handle to be registered, so
@@ -254,7 +250,6 @@ isc_result_t omapi_register_io_object (o
* a write socket we asssume they are the same socket.
*/
-#ifdef ISC_SOCKFDWATCH_READ
if (readfd) {
fd_flags |= ISC_SOCKFDWATCH_READ;
fd = readfd(h);
@@ -283,7 +278,6 @@ isc_result_t omapi_register_io_object (o
return (status);
}
}
-#endif
/* Find the last I/O state, if there are any. */
@@ -324,9 +318,7 @@ isc_result_t omapi_reregister_io_object
(omapi_object_t *))
{
omapi_io_object_t *obj;
-#ifdef ISC_SOCKFDWATCH_READ
int fd_flags = 0;
-#endif
if ((!h -> outer) || (h -> outer -> type != omapi_type_io_object)) {
/*
@@ -352,7 +344,6 @@ isc_result_t omapi_reregister_io_object
obj->writer = writer;
obj->reaper = reaper;
-#ifdef ISC_SOCKFDWATCH_READ
if (readfd) {
fd_flags |= ISC_SOCKFDWATCH_READ;
}
@@ -362,7 +353,6 @@ isc_result_t omapi_reregister_io_object
}
isc_socket_fdwatchpoke(obj->fd, fd_flags);
-#endif
return (ISC_R_SUCCESS);
}
