X-Git-Url: http://git.madism.org/?p=apps%2Fpfixtools.git;a=blobdiff_plain;f=common%2Fserver.h;h=33d7157630975e581376be843c8c4b8cd2a41b43;hp=85cbae4edc3b2a346bc6d432e0ca96e46872aa55;hb=6deab7a7086ccb592daa0c41e12759ec0b9c7aa0;hpb=ae0c2eb5d2ea501fd9e458fc138696c268a14569

diff --git a/common/server.h b/common/server.h
index 85cbae4..33d7157 100644
--- a/common/server.h
+++ b/common/server.h
@@ -51,14 +51,13 @@ typedef bool  (*event_handler_t)(server_t *, void*);
 
 struct server_t {
     unsigned listener : 1;
-    unsigned event    : 1;
 
     int fd;
-    int fd2;
 
     buffer_t ibuf;
     buffer_t obuf;
 
+    run_client_t run;
     delete_client_t clear_data;
     void* data;
 };
@@ -66,16 +65,10 @@ ARRAY(server_t);
 
 int start_server(int port, start_listener_t starter, delete_client_t deleter);
 
+server_t *server_register(int fd, run_client_t runner, void *data);
 void server_release(server_t *server);
 
-server_t *event_register(int fd, void *data);
-bool event_fire(server_t *event);
-bool event_cancel(server_t *event);
-void event_release(server_t *event);
-#define event_data(event) ((event)->data)
-
 int server_loop(start_client_t starter, delete_client_t deleter,
-                run_client_t runner, event_handler_t handler,
-                refresh_t refresh, void *config);
+                run_client_t runner, refresh_t refresh, void *config);
 
 #endif