summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nest/proto.c11
-rw-r--r--nest/rt.h16
2 files changed, 16 insertions, 11 deletions
diff --git a/nest/proto.c b/nest/proto.c
index 959c948b..bdb905c9 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -177,15 +177,6 @@ proto_find_channel_by_name(struct proto *p, const char *n)
return NULL;
}
-int channel_preimport(struct rt_import_request *req, rte *new, rte *old);
-
-void rt_notify_optimal(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe);
-void rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe);
-void rt_feed_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
-void rt_notify_accepted(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
-void rt_notify_merged(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
-
-
/**
* proto_add_channel - connect protocol to a routing table
* @p: protocol instance
@@ -687,8 +678,6 @@ channel_reload_dump_req(struct rt_export_request *req)
debug(" Channel %s.%s import reload request %p\n", c->proto->name, c->name, req);
}
-void channel_reload_export_bulk(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
-
/* Called by protocol to activate in_table */
static void
channel_setup_in_table(struct channel *c)
diff --git a/nest/rt.h b/nest/rt.h
index 8de305c6..9a149bfc 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -438,6 +438,22 @@ void rt_stop_export_common(struct rt_export_hook *hook);
void rt_export_stopped(struct rt_export_hook *hook);
void rt_exporter_init(struct rt_exporter *re);
+/*
+ * Channel export hooks. To be refactored out.
+ */
+
+int channel_preimport(struct rt_import_request *req, rte *new, rte *old);
+
+void channel_reload_export_bulk(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
+
+void rt_notify_optimal(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe);
+void rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe);
+void rt_feed_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
+void rt_notify_accepted(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
+void rt_notify_merged(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
+
+
+
/* Types of route announcement, also used as flags */
#define RA_UNDEF 0 /* Undefined RA type */
#define RA_OPTIMAL 1 /* Announcement of optimal route change */