Avoid allocating packet buffers unnecessarily.

[meshlink] / src / edge.h

diff --git a/src/edge.h b/src/edge.h
index 2a62cb754ab878dd4bbd11325f5f5f125744a451..3805e557c634146b87beafd5efa4438260e859b2 100644 (file)
--- a/src/edge.h
+++ b/src/edge.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_EDGE_H
+#define MESHLINK_EDGE_H
+
 /*
     edge.h -- header for edge.c
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_EDGE_H__
-#define __MESHLINK_EDGE_H__
-
 #include "splay_tree.h"
 #include "connection.h"
 #include "net.h"
@@ -30,21 +30,21 @@ typedef struct edge_t {
        struct node_t *to;
        sockaddr_t address;
 
-       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 */
        struct edge_t *reverse;                 /* edge in the opposite direction, if available */
+
+       int weight;                             /* weight of this edge */
+       uint32_t session_id;                     /* the session_id of the from node */
 } edge_t;
 
 extern void init_edges(struct meshlink_handle *mesh);
 extern void exit_edges(struct meshlink_handle *mesh);
-extern edge_t *new_edge(void) __attribute__ ((__malloc__));
+extern edge_t *new_edge(void) __attribute__((__malloc__));
 extern void free_edge(edge_t *);
-extern struct splay_tree_t *new_edge_tree(void) __attribute__ ((__malloc__));
+extern struct splay_tree_t *new_edge_tree(void) __attribute__((__malloc__));
 extern void free_edge_tree(struct splay_tree_t *);
 extern void edge_add(struct meshlink_handle *mesh, edge_t *);
 extern void edge_del(struct meshlink_handle *mesh, edge_t *);
-extern edge_t *lookup_edge(struct node_t *, struct node_t *);
+extern edge_t *lookup_edge(struct node_t *, struct node_t *) __attribute__((__warn_unused_result__));
 
-#endif /* __MESHLINK_EDGE_H__ */
+#endif