summaryrefslogtreecommitdiff
path: root/nest/protocol.h
diff options
context:
space:
mode:
authorOndrej Zajicek (work) <santiago@crfreenet.org>2017-09-12 16:33:29 +0200
committerOndrej Zajicek (work) <santiago@crfreenet.org>2017-09-12 16:33:29 +0200
commitf2dd602fef2ecf0a6598b817d71ce2ee8fadd5cc (patch)
tree5f6a44704530554148565c7f0a563ad124bd79c3 /nest/protocol.h
parent9f4908fe78cb3e5191bca721588ee1acb10876e3 (diff)
Backport some minor changes from int-new
Diffstat (limited to 'nest/protocol.h')
-rw-r--r--nest/protocol.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/nest/protocol.h b/nest/protocol.h
index 3c30a581..18dfbd6f 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -12,6 +12,7 @@
#include "lib/lists.h"
#include "lib/resource.h"
#include "lib/timer.h"
+#include "nest/route.h"
#include "conf/conf.h"
struct iface;
@@ -287,6 +288,17 @@ proto_get_router_id(struct proto_config *pc)
return pc->router_id ? pc->router_id : pc->global->router_id;
}
+static inline struct ea_list *
+rte_make_tmp_attrs(struct rte *rt, struct linpool *pool)
+{
+ struct ea_list *(*mta)(struct rte *rt, struct linpool *pool);
+ mta = rt->attrs->src->proto->make_tmp_attrs;
+ return mta ? mta(rt, pool) : NULL;
+}
+
+/* Moved from route.h to avoid dependency conflicts */
+static inline void rte_update(struct proto *p, net *net, rte *new) { rte_update2(p->main_ahook, net, new, p->main_source); }
+
extern list active_proto_list;
/*