Fix whitespace throughout.

[fwd] / identify.h

diff --git a/identify.h b/identify.h
index c4019b6..66dc1c7 100644 (file)
--- a/identify.h
+++ b/identify.h
@@ -1,13 +1,11 @@
 /* -*-c-*-
  *
- * $Id: identify.h,v 1.1 1999/07/01 08:56:23 mdw Exp $
- *
  * Identifies and logs the client of a connection
  *
- * (c) 1999 Mark Wooding
+ * (c) 1999 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of the `fw' port forwarder.
  *
@@ -15,25 +13,17 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * `fw' is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with `fw'; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: identify.h,v $
- * Revision 1.1  1999/07/01 08:56:23  mdw
- * Initial revision
- *
- */
-
 #ifndef IDENTIFY_H
 #define IDENTIFY_H
 
@@ -43,9 +33,14 @@
 
 /*----- Header files ------------------------------------------------------*/
 
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 
+#ifndef REFFD_H
+#  include "reffd.h"
+#endif
+
 /*----- Data structures ---------------------------------------------------*/
 
 typedef struct id_req {
@@ -53,6 +48,7 @@ typedef struct id_req {
   struct sockaddr_in rsin;             /* Remote address of connection */
   const char *desc;                    /* Description of connection */
   const char *act;                     /* Action taken by server */
+  reffd *r;                            /* Pointer to file descriptor */
 } id_req;
 
 /*----- Functions provided ------------------------------------------------*/
@@ -60,8 +56,6 @@ typedef struct id_req {
 /* --- @identify@ --- *
  *
  * Arguments:  @const id_req *q@ = pointer to request block
- *             @void (*func)(void *p)@ = function to call when done
- *             @void *p@ = argument to pass to function
  *
  * Returns:    ---
  *
@@ -69,8 +63,7 @@ typedef struct id_req {
  *             which will, eventually, report a message to the system log.
  */
 
-extern void identify(const id_req */*q*/,
-                    void (*/*func*/)(void */*p*/), void */*p*/);
+extern void identify(const id_req */*q*/);
 
 /*----- That's all, folks -------------------------------------------------*/