[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/ksniffer
From:       Giovanni Venturi <gventuri73 () tiscali ! it>
Date:       2005-03-19 23:09:44
Message-ID: 20050319230944.71B9F1763F () office ! kde ! org
[Download RAW message or body]

CVS commit by gianni: 

some fix


  M +1 -1      KNOWN-BUGS   1.7
  M +0 -1      Makefile.am   1.7
  M +10 -1     ksniffer.cpp   1.5
  M +169 -133  packetmanager.cpp   1.2
  M +0 -2      packetmanager.h   1.2
  M +1 -1      packetstructures.h   1.2


--- kdenonbeta/ksniffer/KNOWN-BUGS  #1.6:1.7
@@ -2,3 +2,3 @@
 ===================
 
-too much packets during capture session close KSniffer without crash it
+not known

--- kdenonbeta/ksniffer/Makefile.am  #1.6:1.7
@@ -1,4 +1,3 @@
 ## Makefile.am for ksniffer
-SUBDIRS = protocol
 
 # this is the program that gets installed.  it's name is used for all

--- kdenonbeta/ksniffer/ksniffer.cpp  #1.4:1.5
@@ -457,4 +457,5 @@ void KSniffer::slotOpen()
   //delete fd;
   //return;
+  QString fileToCheck;
   do
   {
@@ -462,5 +463,4 @@ void KSniffer::slotOpen()
     if (!url.isEmpty() && url.isValid())
     {
-      QString fileToCheck;
       if ( !url.isLocalFile() )
       {
@@ -489,4 +489,13 @@ void KSniffer::slotOpen()
   if ( (result != Sniffer::NO_FILE_SELECTED) && (result == \
Sniffer::RIGHT_FORMAT_FILE) )  {
+    // we have to remove the captured data
+    m_packets->clearList();
+
+    // we need to store packets again
+    m_packets->acceptPacket(true);
+
+    // clearing the view before to start sniffing from file
+    m_mainWidgetUI->clearView();
+
     // selected a libpcap file
     m_sniffer->startSniffingFromFile( fileToCheck );

--- kdenonbeta/ksniffer/packetmanager.cpp  #1.1:1.2
@@ -179,18 +179,25 @@ QString PacketManager::strSourceAddress(
     switch( ip->protocol )
     {
+    /*
+    case 1:
+      // ICMP
+      break;
+*/
       case 6:
+      // TCP
         p = &tcp;
         break;
+    /*
+    case 17:
+      // DNS
+      break;
+    case 48:
+      // ARP
+      break;
+*/
       default:
         return i18n("IP address not available", "n/a");
     }
 
-    /*struct IpHdr *ip;
-    ip = (struct IpHdr*) ( m_packetVector[num - 1]->getPacket() + m_packetVector[num \
                - 1]->frameHeaderLength() );
-    int hdrlen = ip->ihl << 2;
-    unsigned char *x = (unsigned char *) (&ip->saddr);
-    QString res = "%1.%2.%3.%4";
-
-    return res.arg(x[0]).arg(x[1]).arg(x[2]).arg(x[3]);*/
     return p->sourceAddress(num);
 }
@@ -208,17 +215,22 @@ QString PacketManager::strDestinationAdd
   switch( ip->protocol )
   {
+/*
+    case 1:
+      // ICMP
+      break;
+*/
     case 6:
       p = &tcp;
       break;
+    /*case 17:
+      // DNS
+      break;
+    case 48:
+      // ARP
+      break;*/
     default:
       return i18n("IP address not available", "n/a");
   }
-/*  struct IpHdr *ip;
-  ip = (struct IpHdr*) ( m_packetVector[num - 1]->getPacket() + m_packetVector[num - \
                1]->frameHeaderLength() );
-  int hdrlen = ip->ihl << 2;
-  unsigned char *x = (unsigned char *) (&ip->daddr);
-  QString res = "%1.%2.%3.%4";
 
-  return res.arg(x[0]).arg(x[1]).arg(x[2]).arg(x[3]);*/
   return p->destinationAddress(num);
 }
@@ -237,5 +249,27 @@ QString PacketManager::strProtocol(const
     int hdrlen = ip->ihl << 2;
 
-    return "n/a: " + QString::number( ip->protocol );
+  QString strProtocol;
+  switch( ip->protocol )
+  {
+    case 1:
+      // ICMP
+      strProtocol = i18n("ICMP: %1").arg( QString::number( ip->protocol ) );
+      break;
+    case 6:
+      strProtocol = i18n("TCP: %1").arg( QString::number( ip->protocol ) );
+      break;
+    case 17:
+      // DNS
+      strProtocol = i18n("DNS: %1").arg( QString::number( ip->protocol ) );
+      break;
+    case 48:
+      // ARP
+      strProtocol = i18n("ARP: %1").arg( QString::number( ip->protocol ) );
+      break;
+    default:
+      strProtocol = i18n("protocol not available", "n/a: %1").arg( QString::number( \
ip->protocol ) ); +  }
+
+  return strProtocol;
 }
 
@@ -356,5 +390,6 @@ char *PacketManager::tcp_strflags(char *
         int bit = 0;
 
-        while(bit < 8) {
+  while(bit < 8)
+  {
                 if (flags & (1 << bit))
                         *p++ = ftab[bit];

--- kdenonbeta/ksniffer/packetmanager.h  #1.1:1.2
@@ -90,6 +90,4 @@ private:
                              // false = no storing captured packets
 
-    TcpIpView m_tcpIpView;
-
     // show an IP packet
     void show_ip_packet(struct IpHdr *ip, int il);


[prev in list] [next in list] [prev in thread] [next in thread]