X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=common%2Fserver.h;h=7dec88e3f393355c00d6fdd8dd72273b4235fae0;hb=1f20b76400d58d143d433236a26b43e2c25da1f5;hp=85cbae4edc3b2a346bc6d432e0ca96e46872aa55;hpb=ae0c2eb5d2ea501fd9e458fc138696c268a14569;p=apps%2Fpfixtools.git

diff --git a/common/server.h b/common/server.h
index 85cbae4..7dec88e 100644
--- a/common/server.h
+++ b/common/server.h
@@ -38,44 +38,34 @@
 
 #include "buffer.h"
 
-typedef struct server_t server_t;
-
-#define INVALID_EVENT (NULL)
+typedef struct client_t client_t;
+typedef struct listener_t listener_t;
+PARRAY(client_t)
+PARRAY(listener_t)
 
 typedef void *(*start_listener_t)(void);
 typedef void  (*delete_client_t)(void*);
-typedef void *(*start_client_t)(server_t*);
-typedef int   (*run_client_t)(server_t*, void*);
+typedef void *(*start_client_t)(listener_t*);
+typedef int   (*run_client_t)(client_t*, void*);
 typedef bool	(*refresh_t)(void*);
-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;
 
-    delete_client_t clear_data;
-    void* data;
-};
-ARRAY(server_t);
+listener_t *start_listener(int port);
 
-int start_server(int port, start_listener_t starter, delete_client_t deleter);
+client_t *client_register(int fd, run_client_t runner, void *data);
+void client_delete(client_t **client);
+void client_release(client_t *client);
 
-void server_release(server_t *server);
+void client_io_none(client_t *client);
+void client_io_rw(client_t *client);
+void client_io_ro(client_t *client);
 
-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)
+ssize_t client_read(client_t *client);
+buffer_t *client_input_buffer(client_t *client);
+buffer_t *client_output_buffer(client_t *client);
+void *client_data(client_t *client);
 
 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