[Seq-cvs-commit] showeq/src netdiag.cpp,1.11,1.12 netdiag.h,1.9,1.10 packet.cpp,1.64,1.65 packet.h,1.40,1.41 packetstream.cpp,1.3,1.4 packetstream.h,1.2,1.3

[Chad M. <cmm...@us...>]

Update of /cvsroot/seq/showeq/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4972/src

Modified Files:
	netdiag.cpp netdiag.h packet.cpp packet.h packetstream.cpp 
	packetstream.h 
Log Message:

Added the max length for the sessions into the net diag window.


Index: packet.h
===================================================================
RCS file: /cvsroot/seq/showeq/src/packet.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- packet.h	13 Sep 2005 15:23:12 -0000	1.40
+++ packet.h	20 Dec 2005 18:48:33 -0000	1.41
@@ -80,6 +80,7 @@
    int playbackPackets(void);
    int playbackSpeed(void);
    size_t currentCacheSize(int);
+   uint32_t currentMaxLength(int);
    uint16_t serverSeqExp(int);
    uint16_t arqSeqGiveUp(void);
    bool session_tracking(void);
@@ -114,6 +115,7 @@
    void seqReceive(int, int);
    void seqExpect(int, int);
    void numPacket(int, int);
+   void maxLength(int, int);
    void resetPacket(int, int);
    void playbackSpeedChanged(int);
    void clientChanged(in_addr_t);

Index: packet.cpp
===================================================================
RCS file: /cvsroot/seq/showeq/src/packet.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- packet.cpp	13 Sep 2005 15:23:12 -0000	1.64
+++ packet.cpp	20 Dec 2005 18:48:33 -0000	1.65
@@ -561,6 +561,10 @@
       SIGNAL(sessionKey(uint32_t, EQStreamID, uint32_t)),
       this,
       SLOT(dispatchSessionKey(uint32_t, EQStreamID, uint32_t)));
+  connect(stream,
+      SIGNAL(maxLength(int, int)),
+      this,
+      SIGNAL(maxLength(int, int)));
 }
 
 ////////////////////////////////////////////////////
@@ -1131,6 +1135,11 @@
   return m_streams[stream]->currentCacheSize();
 }
 
+uint32_t EQPacket::currentMaxLength(int streamId)
+{
+    return m_streams[streamId]->getMaxLength();
+}
+
 uint16_t EQPacket::serverSeqExp(int stream)
 {
   return m_streams[stream]->arqSeqExp();

Index: packetstream.cpp
===================================================================
RCS file: /cvsroot/seq/showeq/src/packetstream.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- packetstream.cpp	7 Oct 2005 00:16:56 -0000	1.3
+++ packetstream.cpp	20 Dec 2005 18:48:33 -0000	1.4
@@ -949,6 +949,8 @@
         m_maxLength = maxPacketSize;
       }
 
+      emit maxLength((int) m_maxLength, (int) m_streamid);
+
 #if defined(PACKET_PROCESS_DIAG) || defined(PACKET_SESSION_DIAG)
       seqDebug("EQPacket: SessionRequest found, resetting expected seq, stream %s (%d) (session tracking %s)",
 	    EQStreamStr[m_streamid], m_streamid,
@@ -1031,6 +1033,8 @@
         m_maxLength = maxPacketSize;
       }
 
+      emit maxLength((int) m_maxLength, (int) m_streamid);
+
 #if defined(PACKET_PROCESS_DIAG) || defined(PACKET_SESSION_DIAG)
       seqDebug("EQPacket: SessionResponse found %s:%u->%s:%u, resetting expected seq, stream %s (%d) (session tracking %s)",
         ((EQUDPIPPacketFormat&) packet).getIPv4SourceA().ascii(),

Index: netdiag.h
===================================================================
RCS file: /cvsroot/seq/showeq/src/netdiag.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- netdiag.h	11 Nov 2003 07:13:52 -0000	1.9
+++ netdiag.h	20 Dec 2005 18:48:33 -0000	1.10
@@ -47,6 +47,7 @@
    void seqReceive             (int, int);
    void seqExpect              (int, int);
    void cacheSize              (int, int);
+   void maxLength              (int, int);
 
  protected:
    QString print_addr(in_addr_t);
@@ -64,6 +65,7 @@
   QLabel* m_serverPortLabel;
   QLabel* m_clientPortLabel;
   QLabel* m_cache[MAXSTREAMS];
+  QLabel* m_maxLength[MAXSTREAMS];
   QLabel* m_filterLabel;
 
   int  m_packetStartTime[MAXSTREAMS];

Index: packetstream.h
===================================================================
RCS file: /cvsroot/seq/showeq/src/packetstream.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- packetstream.h	13 Sep 2005 15:23:13 -0000	1.2
+++ packetstream.h	20 Dec 2005 18:48:33 -0000	1.3
@@ -79,6 +79,7 @@
   void close(uint32_t sessionId, EQStreamID streamid, uint8_t sessionTracking);
   uint16_t calculateCRC(EQProtocolPacket& packet);
   uint32_t getSessionKey() const { return m_sessionKey; }
+  uint32_t getMaxLength() const { return m_maxLength; }
   
  public slots:
   void handlePacket(EQUDPIPPacketFormat& pf);
@@ -108,6 +109,7 @@
   void seqExpect(int, int);
   void numPacket(int, int);
   void resetPacket(int, int);
+  void maxLength(int, int);
 
  protected:
   void resetCache();

Index: netdiag.cpp
===================================================================
RCS file: /cvsroot/seq/showeq/src/netdiag.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- netdiag.cpp	13 Sep 2005 15:23:12 -0000	1.11
+++ netdiag.cpp	20 Dec 2005 18:48:33 -0000	1.12
@@ -88,7 +88,14 @@
 
   for (int a = 0; a < MAXSTREAMS; a++)
   {
-      tmpGrid->addWidget(new QLabel(eqStreams[a], this), row++, col);
+     tmpGrid->addWidget(new QLabel(eqStreams[a], this), row, col++);
+     tmpGrid->addWidget(new QLabel("Max Length:", this), row, col++);
+     m_maxLength[a] = new QLabel(this, "unknown");
+     m_maxLength[a]->setNum((int)m_packet->currentMaxLength(a));
+     tmpGrid->addWidget(m_maxLength[a], row, col++);
+     col++;
+
+     row++; col = 0;
 
      // packet throughput
      tmpGrid->addWidget(new QLabel("Packets ", this), row, col++);
@@ -167,6 +174,8 @@
 	   this, SLOT(resetPacket(int, int)));
   connect (m_packet, SIGNAL(filterChanged()),
 	   this, SLOT(filterChanged()));
+  connect (m_packet, SIGNAL(maxLength(int, int)),
+	   this, SLOT(maxLength(int, int)));
 
   if (m_playbackSpeed)
   {
@@ -305,6 +314,11 @@
   m_cache[stream]->setNum(size);
 }
 
+void NetDiag::maxLength(int len, int streamId)
+{
+  m_maxLength[streamId]->setNum(len);
+}
+
 QString NetDiag::print_addr(in_addr_t  addr)
 {
 #ifdef DEBUG_PACKET