X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fedge.h;h=4c65213b9f1dba9a0d9db39e76d7946bbe448286;hp=0f7231325501fa9a64028ce8c3fbf7397d4f5a53;hb=f2570c1b7f5813e087c867cf002f36f0c09b5cfa;hpb=83263b74460656ba557fd9bb84dc27258549e9cd

diff --git a/src/edge.h b/src/edge.h
index 0f723132..4c65213b 100644
--- a/src/edge.h
+++ b/src/edge.h
@@ -1,7 +1,7 @@
 /*
     edge.h -- header for edge.c
-    Copyright (C) 2001-2003 Guus Sliepen <guus@sliepen.eu.org>,
-                  2001-2003 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2001-2006 Guus Sliepen <guus@tinc-vpn.org>,
+                  2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -13,11 +13,9 @@
     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 this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id: edge.h,v 1.1.2.15 2003/07/24 12:08:15 guus Exp $
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #ifndef __TINC_EDGE_H__
@@ -33,7 +31,7 @@ typedef struct edge_t {
 	struct node_t *to;
 	sockaddr_t address;
 
-	long int options;			/* options turned on for this edge */
+	uint32_t options;			/* options turned on for this edge */
 	int weight;					/* weight of this edge */
 
 	struct connection_t *connection;	/* connection associated with this edge, if available */
@@ -44,13 +42,13 @@ extern avl_tree_t *edge_weight_tree;	/* Tree with all known edges sorted on weig
 
 extern void init_edges(void);
 extern void exit_edges(void);
-extern edge_t *new_edge(void) __attribute__ ((malloc));
+extern edge_t *new_edge(void) __attribute__ ((__malloc__));
 extern void free_edge(edge_t *);
-extern avl_tree_t *new_edge_tree(void) __attribute__ ((malloc));
+extern avl_tree_t *new_edge_tree(void) __attribute__ ((__malloc__));
 extern void free_edge_tree(avl_tree_t *);
 extern void edge_add(edge_t *);
 extern void edge_del(edge_t *);
-extern edge_t *lookup_edge(const struct node_t *, const struct node_t *);
+extern edge_t *lookup_edge(struct node_t *, struct node_t *);
 extern void dump_edges(void);
 
 #endif							/* __TINC_EDGE_H__ */