X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Feventl.h;h=595d85876baba03f8604ed491cb225f1dae2e47e;hb=dc9f59ce5f4bedc6cd1cc68e0309b74d241f434d;hp=aee2106d840a944ed12d87cf8922fc2d812a56c6;hpb=235995289021a11b33312c91a55ccfbca605348b;p=pazpar2-moved-to-github.git

diff --git a/src/eventl.h b/src/eventl.h
index aee2106..595d858 100644
--- a/src/eventl.h
+++ b/src/eventl.h
@@ -1,59 +1,22 @@
-/*
- * Copyright (c) 1995-1999, Index Data
- * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: eventl.h,v 1.2 2007-03-28 12:05:18 marc Exp $
- * Revision 1.1  2006/12/20 20:47:16  quinn
- * Reorganized source tree
- *
- * Revision 1.3  2006/12/12 02:36:24  quinn
- * Implemented session timeout; ping command
- *
- * Revision 1.2  2006/11/18 05:00:38  quinn
- * Added record retrieval, etc.
- *
- * Revision 1.1.1.1  2006/11/14 20:44:38  quinn
- * PazPar2
- *
- * Revision 1.1.1.1  2000/02/23 14:40:18  heikki
- * Original import to cvs
- *
- * Revision 1.11  1999/04/20 09:56:48  adam
- * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
- * Modified all encoders/decoders to reflect this change.
- *
- * Revision 1.10  1998/01/29 13:30:23  adam
- * Better event handle system for NT/Unix.
- *
- * Revision 1.9  1997/09/01 09:31:48  adam
- * Removed definition statserv_remove from statserv.h to eventl.h.
- *
- * Revision 1.8  1995/06/19 12:39:09  quinn
- * Fixed bug in timeout code. Added BER dumper.
- *
- * Revision 1.7  1995/06/16  10:31:34  quinn
- * Added session timeout.
- *
- * Revision 1.6  1995/05/16  08:51:02  quinn
- * License, documentation, and memory fixes
- *
- * Revision 1.5  1995/05/15  11:56:37  quinn
- * Asynchronous facilities. Restructuring of seshigh code.
- *
- * Revision 1.4  1995/03/27  08:34:23  quinn
- * Added dynamic server functionality.
- * Released bindings to session.c (is now redundant)
- *
- * Revision 1.3  1995/03/15  08:37:42  quinn
- * Now we're pretty much set for nonblocking I/O.
- *
- * Revision 1.2  1995/03/14  10:28:00  quinn
- * More work on demo server.
- *
- * Revision 1.1  1995/03/10  18:22:45  quinn
- * The rudiments of an asynchronous server.
- *
+/* $Id: eventl.h,v 1.4 2007-04-10 08:48:56 adam Exp $
+   Copyright (c) 2006-2007, Index Data.
+
+This file is part of Pazpar2.
+
+Pazpar2 is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Pazpar2 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 Pazpar2; see the file LICENSE.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
  */
 
 #ifndef EVENTL_H
@@ -61,14 +24,6 @@
 
 #include <time.h>
 
-#ifdef WIN32
-#include <winsock.h>
-#else
-#include <unistd.h>
-#include <arpa/inet.h>
-#endif
-
-
 struct iochan;
 
 typedef void (*IOC_CALLBACK)(struct iochan *i, int event);
@@ -76,8 +31,6 @@ typedef void (*IOC_CALLBACK)(struct iochan *i, int event);
 typedef struct iochan
 {
     int fd;
-    struct sockaddr_in addr_in;
-    char addr_str[64];
     int flags;
 #define EVENT_INPUT     0x01
 #define EVENT_OUTPUT    0x02
@@ -111,8 +64,7 @@ typedef struct iochan
 #define iochan_settimeout(i, t) ((i)->max_idle = (t), (i)->last_event = time(0))
 #define iochan_activity(i) ((i)->last_event = time(0))
 
-IOCHAN iochan_create(int fd, struct sockaddr_in * addr_in, 
-                     IOC_CALLBACK cb, int flags);
+IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags);
 int event_loop(IOCHAN *iochans);
 
 #endif