Don't interactively ask for an Address when generating an invitation URL.

[meshlink] / src / event.h

diff --git a/src/event.h b/src/event.h
index 3d49fe2d9b825e74e41d9c581b3b4891fd993290..272243ff489330483d1293194bffb67c722eef9e 100644 (file)
--- a/src/event.h
+++ b/src/event.h
@@ -1,5 +1,5 @@
 /*
-    event.h -- I/O, timeout and signal event handling
+    event.h -- I/O and timeout event handling
     Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
@@ -17,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_EVENT_H__
-#define __TINC_EVENT_H__
+#ifndef __MESHLINK_EVENT_H__
+#define __MESHLINK_EVENT_H__
 
 #include "splay_tree.h"
 
@@ -29,7 +29,6 @@ typedef struct event_loop_t event_loop_t;
 
 typedef void (*io_cb_t)(event_loop_t *loop, void *data, int flags);
 typedef void (*timeout_cb_t)(event_loop_t *loop, void *data);
-typedef void (*signal_cb_t)(event_loop_t *loop, void *data);
 
 typedef struct io_t {
        int fd;
@@ -46,13 +45,6 @@ typedef struct timeout_t {
        struct splay_node_t node;
 } timeout_t;
 
-typedef struct signal_t {
-       int signum;
-       signal_cb_t cb;
-       void *data;
-       struct splay_node_t node;
-} signal_t;
-
 struct event_loop_t {
        fd_set readfds;
        fd_set writefds;
@@ -62,17 +54,10 @@ struct event_loop_t {
        
        splay_tree_t ios;
        splay_tree_t timeouts;
-       splay_tree_t signals;
-
-       io_t signalio;
-       int pipefd[2];
 
        void *data;
 };
 
-extern event_loop_t *loop;
-extern struct timeval now;
-
 extern void io_add(event_loop_t *loop, io_t *io, io_cb_t cb, void *data, int fd, int flags);
 extern void io_del(event_loop_t *loop, io_t *io);
 extern void io_set(event_loop_t *loop, io_t *io, int flags);
@@ -81,10 +66,6 @@ extern void timeout_add(event_loop_t *loop, timeout_t *timeout, timeout_cb_t cb,
 extern void timeout_del(event_loop_t *loop, timeout_t *timeout);
 extern void timeout_set(event_loop_t *loop, timeout_t *timeout, struct timeval *tv);
 
-extern void signal_add(event_loop_t *loop, signal_t *sig, signal_cb_t cb, void *data, uint8_t signum);
-extern void signal_trigger(event_loop_t *loop, signal_t *sig);
-extern void signal_del(event_loop_t *loop, signal_t *sig);
-
 extern void event_loop_init(event_loop_t *loop);
 extern void event_loop_exit(event_loop_t *loop);
 extern bool event_loop_run(event_loop_t *loop);