X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnode.c;h=92af66a9310444c2b2bdbf3c8144d28f29cc7d0c;hp=4fbec08fabcb8e1a18e8588f089661b3832f5a01;hb=5dde6461a321ee47b06e33f8203f2acf00a31a51;hpb=23e151aeed6b3ffe0fab10f51ffdb134deb7a852 diff --git a/src/node.c b/src/node.c index 4fbec08f..92af66a9 100644 --- a/src/node.c +++ b/src/node.c @@ -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$ + 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. */ #include "system.h" @@ -35,34 +33,29 @@ avl_tree_t *node_udp_tree; /* Known nodes, sorted by address and port */ node_t *myself; -static int node_compare(const node_t *a, const node_t *b) -{ +static int node_compare(const node_t *a, const node_t *b) { return strcmp(a->name, b->name); } -static int node_udp_compare(const node_t *a, const node_t *b) -{ +static int node_udp_compare(const node_t *a, const node_t *b) { return sockaddrcmp(&a->address, &b->address); } -void init_nodes(void) -{ +void init_nodes(void) { cp(); node_tree = avl_alloc_tree((avl_compare_t) node_compare, (avl_action_t) free_node); node_udp_tree = avl_alloc_tree((avl_compare_t) node_udp_compare, NULL); } -void exit_nodes(void) -{ +void exit_nodes(void) { cp(); avl_delete_tree(node_udp_tree); avl_delete_tree(node_tree); } -node_t *new_node(void) -{ +node_t *new_node(void) { node_t *n = xmalloc_and_zero(sizeof(*n)); cp(); @@ -77,8 +70,7 @@ node_t *new_node(void) return n; } -void free_node(node_t *n) -{ +void free_node(node_t *n) { cp(); if(n->inkey) @@ -110,15 +102,13 @@ void free_node(node_t *n) free(n); } -void node_add(node_t *n) -{ +void node_add(node_t *n) { cp(); avl_insert(node_tree, n); } -void node_del(node_t *n) -{ +void node_del(node_t *n) { avl_node_t *node, *next; edge_t *e; subnet_t *s; @@ -141,8 +131,7 @@ void node_del(node_t *n) avl_delete(node_tree, n); } -node_t *lookup_node(char *name) -{ +node_t *lookup_node(char *name) { node_t n = {0}; cp(); @@ -152,8 +141,7 @@ node_t *lookup_node(char *name) return avl_search(node_tree, &n); } -node_t *lookup_node_udp(const sockaddr_t *sa) -{ +node_t *lookup_node_udp(const sockaddr_t *sa) { node_t n = {0}; cp(); @@ -164,8 +152,7 @@ node_t *lookup_node_udp(const sockaddr_t *sa) return avl_search(node_udp_tree, &n); } -void update_node_udp(node_t *n, const sockaddr_t *sa) -{ +void update_node_udp(node_t *n, const sockaddr_t *sa) { avl_delete(node_udp_tree, n); if(n->hostname) @@ -183,8 +170,7 @@ void update_node_udp(node_t *n, const sockaddr_t *sa) } } -void dump_nodes(void) -{ +void dump_nodes(void) { avl_node_t *node; node_t *n;