projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up last part of main().
[tinc]
/
src
/
connection.h
diff --git
a/src/connection.h
b/src/connection.h
index
30102f2
..
29bace1
100644
(file)
--- a/
src/connection.h
+++ b/
src/connection.h
@@
-17,34
+17,16
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: connection.h,v 1.1.2.3
3 2003/07/12 17:41:45
guus Exp $
+ $Id: connection.h,v 1.1.2.3
6 2003/07/30 21:52:41
guus Exp $
*/
#ifndef __TINC_CONNECTION_H__
#define __TINC_CONNECTION_H__
*/
#ifndef __TINC_CONNECTION_H__
#define __TINC_CONNECTION_H__
-#include <sys/time.h>
+#include <openssl/rsa.h>
+#include <openssl/evp.h>
-#include <avl_tree.h>
-#include <list.h>
-
-#ifdef HAVE_OPENSSL_EVP_H
-# include <openssl/evp.h>
-#else
-# include <evp.h>
-#endif
-
-#ifdef HAVE_OPENSSL_RSA_H
-# include <openssl/rsa.h>
-#else
-# include <rsa.h>
-#endif
-
-#include "net.h"
-#include "conf.h"
-
-#include "node.h"
-#include "edge.h"
+#include "avl_tree.h"
#define OPTION_INDIRECT 0x0001
#define OPTION_TCPONLY 0x0002
#define OPTION_INDIRECT 0x0001
#define OPTION_TCPONLY 0x0002
@@
-62,10
+44,15
@@
typedef struct connection_status_t {
int unused:18;
} connection_status_t;
int unused:18;
} connection_status_t;
+#include "edge.h"
+#include "list.h"
+#include "net.h"
+#include "node.h"
+
typedef struct connection_t {
char *name; /* name he claims to have */
typedef struct connection_t {
char *name; /* name he claims to have */
-
sockaddr_t address;
/* his real (internet) ip */
+
union sockaddr_t address;
/* his real (internet) ip */
char *hostname; /* the hostname of its real ip */
int protocol_version; /* used protocol */
char *hostname; /* the hostname of its real ip */
int protocol_version; /* used protocol */
@@
-113,11
+100,11
@@
extern connection_t *broadcast;
extern void init_connections(void);
extern void exit_connections(void);
extern void init_connections(void);
extern void exit_connections(void);
-extern connection_t *new_connection(void) __attribute__ ((
malloc
));
+extern connection_t *new_connection(void) __attribute__ ((
__malloc__
));
extern void free_connection(connection_t *);
extern void connection_add(connection_t *);
extern void connection_del(connection_t *);
extern void dump_connections(void);
extern void free_connection(connection_t *);
extern void connection_add(connection_t *);
extern void connection_del(connection_t *);
extern void dump_connections(void);
-extern
int
read_connection_config(connection_t *);
+extern
bool
read_connection_config(connection_t *);
#endif /* __TINC_CONNECTION_H__ */
#endif /* __TINC_CONNECTION_H__ */