Dragonfly Plus: Model progress and ConnMan Notes

codes/connection-manager.h

@@ -166,6 +166,7 @@ public:
      * @brief returns a vector of connections to the destination ID based on the connection type
      * @param dest_id the ID of the destination depending on the type
      * @param type the type of the connection, CONN_LOCAL, CONN_GLOBAL, or CONN_TERMINAL
+     * @note note that the method is called get connections to router but could also apply to terminal connections
      */
     vector< Connection > get_connections_to_router(int dest_id, ConnectionType type);
 

codes/net/dragonfly-plus.h

@@ -57,10 +57,15 @@ struct terminal_plus_message
   /* last hop of the message, can be a terminal, local router or global router */
   short last_hop;
    /* For routing */
-  int intm_rtr_id;
   int saved_src_dest;
   int saved_src_chan;
 
+  //DFP Specific Routing
+  int intm_rtr_id; //Router ID of the intermediate router for nonminimal routes
+  int intm_group_id; //Group ID of the intermediate router for nonminimal routes
+
+  short dfp_upward_channel_flag;
+
    uint32_t chunk_id;
    uint32_t packet_size;
    uint32_t message_id;