Changeset 7954 in orxonox.OLD for trunk/src/lib/network/connection_monitor.h

Timestamp:

May 29, 2006, 3:28:41 PM (19 years ago)

Author:

patrick

Message:

trunk: merged the network branche back to trunk.

File:

• trunk/src/lib/network/connection_monitor.h (modified) (1 diff)

trunk/src/lib/network/connection_monitor.h

@@ -10 +10 @@
 #include "netdefs.h"
 
+#include <map>
+
+#define N_PACKETS_FOR_PING 20
+#define MSECS_TO_CALC_BWIDTH 1000
+#define SECS_TO_TIMEOUT 10
+
 class ConnectionMonitor : virtual public BaseObject
-  {
+{
   public:
-    ConnectionMonitor();
+    ConnectionMonitor( int userId );
     virtual ~ConnectionMonitor();
 
-    void                processPacket(byte* packet, unsigned int packetLength);
+    void processUnzippedOutgoingPacket( byte * data, int length, int stateId );
+    void processUnzippedIncomingPacket( byte * data, int length, int stateId, int ackedState );
+    
+    void processZippedOutgoingPacket( byte * data, int length, int stateId );
+    void processZippedIncomingPacket( byte * data, int length, int stateId, int ackedState );
+    
+    void calculatePing();
+    
+    bool hasTimedOut();
+    
+    void printStatis();
+    
+  private:
+    float calculateBandWidth( std::map<int,int> packetHistory, int tick );
+    
+    int userId;       //!< user's id 
 
+    std::map<int,int>   sentStateTicks;
+    
+    std::map<int,int>   incomingUnzippedPacketHistory;
+    std::map<int,int>   outgoingUnzippedPacketHistory;
+    
+    std::map<int,int>   incomingZippedPacketHistory;
+    std::map<int,int>   outgoingZippedPacketHistory;
+    
+    std::list<int>      ackDelay;
+    int                 ping;
 
-  private:
-
-
-    void                displayStatistic();
-    void                computeCurrentDatarate();
-    void                doUDPRelatedStuff();
-
-    /*Data of the lifetime of the ConnectionMonitor Object*/
-    unsigned int        packetToAverage;
-    char*               protocollType;
-
-    unsigned int        totalReceivedPackets;
-    float               averageDatarate;
-    unsigned int        totalLostPackets;
-    float               totalPacketloss;
-    unsigned int        startTime;
-
-    /*Data of the current packet*/
-    unsigned int        currentPacketID;
-    unsigned int        currentPacketTick;
-    unsigned int        lastPacketID;
-    unsigned int        lastPacketTick;
-    unsigned int        currentDelay;
-
-    /*Data of the last n packets (n is specified by paxketsToAverage)*/
-    unsigned int        sizeOfLastFewPackets;
-    unsigned int        currentDatarate;
-    byte**              lastFewPackets;
-    unsigned int*       lastFewDelays;
-    unsigned int        packetCounter;
-
+    float               incomingUnzippedBandWidth;
+    float               outgoingUnzippedBandWidth;
+    
+    float               incomingZippedBandWidth;
+    float               outgoingZippedBandWidth;
+    
+    int                 nIncomingPackets;
+    int                 nOutgoingPackets;
+    
+    int                 nZIncomingPackets;
+    int                 nZOutgoingPackets;
+    
+    int                 lastPacketTick;
+    
+    int                 lastPrintTick;
   };