Changeset 110

Timestamp:

06.08.2005 00:14:53 (3 years ago)

Author:

tibob

Message:

- Changed from pcap_next to pcap_next_ex so we are able to know if ter is an error or a time-out. Closes #1
- Added a debug message before we do anything.

Location:

trunk/source

Files:

• ipfm.c (modified) (2 diffs)
• pcap.c (modified) (4 diffs)

trunk/source/ipfm.c

@@ -55 +55 @@
 #include "pcap.h"
 #include "utils.h"
+#include "debug.h"
 
 struct AllLogsType * pAllLogs = NULL;
@@ -63 +64 @@
   struct ip *p_packet;
   struct AllLogsType * pTempLog;
+  
+  DEBUG_MSG("Starting IPFM\n");
   
   ParseCmdLine(argc, argv);

trunk/source/pcap.c

@@ -247 +247 @@
 u_char *getnextippkt()
 {
-  struct pcap_pkthdr useless;
-  u_char * packet;
+  /* these are allocated by pcap (I think they are saved in pcap_global_descriptor allocated by me...) */
+  struct pcap_pkthdr *header;
+  u_char *packet;
+  
+  int pcap_result;
+  struct AllLogsType *pTempLog;
 
   if (NULL == pcap_global_descriptor) {
@@ -255 +259 @@
 
   for (;;) {
-    packet = (u_char *) pcap_next(pcap_global_descriptor, &useless);
-    DEBUG_MSG("received a packet\n")
-    if (NULL == packet) {
-      /* if pcap_next returns, there is an error on the link, so we close it and try to reopen it */
-      DEBUG_MSG("pcap_next returned a null pointer [errormessage : %s]\n", pcap_geterr(pcap_global_descriptor));
-      if (Options.ReadFromFile != NULL) {
+    pcap_result = pcap_next_ex(pcap_global_descriptor, &header, (const u_char **) &packet);
+    DEBUG_MSG("pcap_next_ex returned %i\n", pcap_result);
+    switch (pcap_result) {
+      case 1:
+        /* A packet was received, nothing to do! */
+        DEBUG_MSG("packet time/length/size %i %i %i\n", header->ts, header->caplen, header->len);
+        break;
+      case 0:
+        /* pcap_next_ex reached a time out, check if there is someting to dump and if not, continue */
+        /* FIXME: ungly code duplication here! */
+        /* handle HUP signal */
+        if (SigHup) {
+          struct AllLogsType *pTempLog;
+          for (pTempLog = pAllLogs; pTempLog; pTempLog = pTempLog->Next) {
+            data_dump(pTempLog);
+            data_clear(pTempLog);
+          }
+
+          Clean();
+          ReInit();
+          SigHup = 0;
+        }
+        
+        /* handle USR1 signal */
+        if (SigDump) {
+          for (pTempLog = pAllLogs; pTempLog; pTempLog = pTempLog->Next) {
+            data_dump(pTempLog);
+          }
+          SigDump = 0;
+        }
+        
+        continue;
+        break;
+      
+      case -2:
         /* we reached the end of the file ; dump and exit. */
-        struct AllLogsType *pTempLog;
-
         for (pTempLog = pAllLogs;
              NULL != pTempLog;
@@ -271 +302 @@
         }
         Exit(0);
-      }
-      closepcap();
-      sleep(2);
-      while (!openpcap(device, promisc)) {
-        sleep(2);
-      }
-      continue;
+        break;
+      
+      default:
+        /* If pcap_next returns with -1, there is an error on the link, so we close it and try to reopen it
+           Other return codes should not exist, but as I don't know what could hapen, we'll handel them like a -1 return code.
+        */
+        DEBUG_MSG("pcap_next_ex error [errormessage : %s]\n", pcap_geterr(pcap_global_descriptor));
+      
+        closepcap();
+        sleep(2);
+        while (!openpcap(device, promisc)) {
+          sleep(2);
+        }
+        continue;
+        break;
+
+      
     }
     packet = packet + offset;
@@ -291 +332 @@
 
     /* handle HUP signal */
-
     if (SigHup) {
       struct AllLogsType *pTempLog;