Moved channel export hooks to rt.h as the channel refactoring isn't going to take...

diff --git a/nest/proto.c b/nest/proto.c
index 959c948b031b0a59099c0a971afccd737cbdde38..bdb905c98b1cdd808b9bdd6ad2d894b9b43d9209 100644 (file)
--- 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 8de305c63db282d56add4fb31c6b81db963227de..9a149bfc2f608dfa3a677343a35db86e1697a9a4 100644 (file)
--- 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 */