[src/trunk]: src/external/mpl/dhcp/dist/omapip apparently the fdwatch crap is...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/248bca59da9b
branches:  trunk
changeset: 447852:248bca59da9b
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jan 27 01:51:50 2019 +0000

description:
apparently the fdwatch crap is needed, so undo the ifdefs.

diffstat:

 external/mpl/dhcp/dist/omapip/buffer.c   |   6 ++----
 external/mpl/dhcp/dist/omapip/dispatch.c |  14 ++------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diffs (120 lines):

diff -r 6e1b43cd569b -r 248bca59da9b external/mpl/dhcp/dist/omapip/buffer.c
--- a/external/mpl/dhcp/dist/omapip/buffer.c    Sun Jan 27 01:51:00 2019 +0000
+++ b/external/mpl/dhcp/dist/omapip/buffer.c    Sun Jan 27 01:51:50 2019 +0000
@@ -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 @@
        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_SOCKFDWATCH_WRITE);
                }
        }
-#endif
 
        return (status);
 }
diff -r 6e1b43cd569b -r 248bca59da9b external/mpl/dhcp/dist/omapip/dispatch.c
--- a/external/mpl/dhcp/dist/omapip/dispatch.c  Sun Jan 27 01:51:00 2019 +0000
+++ b/external/mpl/dhcp/dist/omapip/dispatch.c  Sun Jan 27 01:51:50 2019 +0000
@@ -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 @@
  * 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 @@
         */
        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 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 @@
         * 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 @@
                        return (status);
                }
        }
-#endif
 
 
        /* Find the last I/O state, if there are any. */
@@ -324,9 +318,7 @@
                                                (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 @@
        obj->writer = writer;
        obj->reaper = reaper;
 
-#ifdef ISC_SOCKFDWATCH_READ
        if (readfd) {
                fd_flags |= ISC_SOCKFDWATCH_READ;
        }
@@ -362,7 +353,6 @@
        }
 
        isc_socket_fdwatchpoke(obj->fd, fd_flags);
-#endif
        
        return (ISC_R_SUCCESS);
 }