Fix memory freeing bugs. Seems stable, even through loss of connections.

[trust_router.git] / include / tr_trp.h

diff --git a/include/tr_trp.h b/include/tr_trp.h
index 2e5e00d..bb055fc 100644 (file)
--- a/include/tr_trp.h
+++ b/include/tr_trp.h
@@ -5,11 +5,14 @@
 #include <talloc.h>
 #include <pthread.h>
 
+#include <tr.h>
 #include <trp_internal.h>
 #include <tr_config.h>
+#include <tr_cfgwatch.h>
 #include <tr_event.h>
 
 typedef struct tr_trps_events {
+  struct event *trps_ev;
   struct tr_socket_event *listen_ev;
   struct event *mq_ev;
   struct event *connect_ev;
@@ -17,7 +20,17 @@ typedef struct tr_trps_events {
   struct event *sweep_ev;
 } TR_TRPS_EVENTS;
 
+/* typedef'ed as TR_INSTANCE in tr.h */
+struct tr_instance {
+  TR_CFG_MGR *cfg_mgr;
+  TIDS_INSTANCE *tids;
+  TRPS_INSTANCE *trps;
+  TR_CFGWATCH *cfgwatch;
+  TR_TRPS_EVENTS *events;
+};
+
 /* messages between threads */
+#define TR_MQMSG_MSG_RECEIVED "msg received"
 #define TR_MQMSG_TRPC_DISCONNECTED "trpc disconnected"
 #define TR_MQMSG_TRPC_CONNECTED "trpc connected"
 #define TR_MQMSG_TRPS_DISCONNECTED "trps disconnected"
@@ -25,11 +38,9 @@ typedef struct tr_trps_events {
 #define TR_MQMSG_ABORT "abort"
 
 /* prototypes */
-TR_TRPS_EVENTS *tr_trps_events_new(TALLOC_CTX *mem_ctx);
-TRP_RC tr_trps_event_init(struct event_base *base, TRPS_INSTANCE *trps, TR_CFG_MGR *cfg_mgr,
-                       TR_TRPS_EVENTS *trps_ev);
+TRP_RC tr_trps_event_init(struct event_base *base, struct tr_instance *tr);
 TRP_RC tr_add_local_routes(TRPS_INSTANCE *trps, TR_CFG *cfg);
-TRPC_INSTANCE *tr_trpc_initiate(TRPS_INSTANCE *trps, TRP_PEER *peer);
+TRP_RC tr_trpc_initiate(TRPS_INSTANCE *trps, TRP_PEER *peer);
 void tr_config_changed(TR_CFG *new_cfg, void *cookie);
 TRP_RC tr_connect_to_peers(TRPS_INSTANCE *trps);
 #endif /* TR_TRP_H */