New interface changes (#493)

Author: PaulRalnikov

source/connection/flow/i_flow_factory.hpp

@@ -23,9 +23,6 @@ struct FlowContext {
 // path
 class INewFlow : public virtual Identifiable {
 public:
-    // Callback that should be triggered when packet arrives to endpoint
-    virtual void on_packet(const Packet& packet) = 0;
-
     virtual void send(std::vector<Packet> packets) = 0;
 
     virtual const FlowContext& get_context() = 0;

source/connection/flow/i_new_flow.hpp

@@ -17,10 +17,10 @@ struct ConnectionContext {
 // Logical path in network. Corresponds to application layer in TCP\IP stack
 class INewConnection : public virtual Identifiable {
 public:
-    virtual void add_data_to_send(Data data) = 0;
+    virtual void send_data(Data data, OnDeliveryCallback callback) = 0;
 
     // Confirm data_size bytes delivery for data with given id
-    virtual void confirm(DataId id, SizeByte data_size) = 0;
+    virtual const ConnectionContext& get_context() const = 0;
 };
 
 }  // namespace sim

source/connection/i_new_connection.hpp

@@ -20,13 +20,13 @@ struct MPLBContext {
 // Owns multiple flows; balances the load between them
 class INewMPLB {
 public:
-    // Callback that is triggered when ack is received by sender of a given flow
-    virtual void on_ack(std::shared_ptr<const INewFlow> flow, const Packet& ack,
-                        std::vector<PacketNum> confinfed_packet_nums) = 0;
+    // Forward data to transport layer
+    // Returns error given data might not be sent (e.g. its size greater than
+    // quota)
+    virtual utils::StrExpected<void> send_data(Data data,
+                                               OnDeliveryCallback callback) = 0;
 
-    // Forward data to transport layer as much as possible
-    // Returns size of transfered data
-    virtual SizeByte send_data(Data data) = 0;
+    virtual const MPLBContext& get_context() const = 0;
 };
 
 }  // namespace sim

source/connection/mplb/i_new_mplb.hpp

@@ -28,6 +28,7 @@ struct Packet {
     Id dest_id;
     SizeByte size;
     IFlow* flow;
+    OnDeliveryCallback callback = []() {};
     TimeNs generated_time;  // Note: ACK's generated time is the data packet
                             // generated time
     TimeNs sent_time;  // Note: ACK's sent time is the data packet sent time