Refactor Wiretap

Start of refactoring Wiretap and breaking structures down into "generally useful fields for dissection" and "capture specific". Since this in intended as a "base" for Wiretap and Filetap, the "wft" prefix is used for "common" functionality.

The "architectural" changes can be found in cfile.h, wtap.h, wtap-int.h and (new file) wftap-int.h. Most of the other (painstaking) changes were really just the result of compiling those new architecture changes.

bug:9607
Change-Id: Ife858a61760d7a8a03be073546c0e7e582cab2ae
Reviewed-on: https://code.wireshark.org/review/1485
Reviewed-by: Michael Mann <mmann78@netscape.net>

1 files changed, 30 insertions, 27 deletions

diff --git a/wiretap/dbs-etherwatch.c b/wiretap/dbs-etherwatch.c
index 0a3e9f57e1..6cc1e98db7 100644
--- a/wiretap/dbs-etherwatch.c
+++ b/wiretap/dbs-etherwatch.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "wftap-int.h"
 #include "wtap-int.h"
 #include "buffer.h"
 #include "dbs-etherwatch.h"
@@ -84,10 +85,10 @@ static const char dbs_etherwatch_rec_magic[]  =
  */
 #define DBS_ETHERWATCH_MAX_PACKET_LEN	16384
 
-static gboolean dbs_etherwatch_read(wtap *wth, int *err, gchar **err_info,
+static gboolean dbs_etherwatch_read(wftap *wfth, int *err, gchar **err_info,
 	gint64 *data_offset);
-static gboolean dbs_etherwatch_seek_read(wtap *wth, gint64 seek_off,
-	struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info);
+static gboolean dbs_etherwatch_seek_read(wftap *wth, gint64 seek_off,
+	void* header, Buffer *buf, int *err, gchar **err_info);
 static gboolean parse_dbs_etherwatch_packet(struct wtap_pkthdr *phdr, FILE_T fh,
 	Buffer* buf, int *err, gchar **err_info);
 static guint parse_single_hex_dump_line(char* rec, guint8 *buf,
@@ -97,22 +98,22 @@ static guint parse_hex_dump(char* dump, guint8 *buf, char seperator, char end);
 /* Seeks to the beginning of the next packet, and returns the
    byte offset.  Returns -1 on failure, and sets "*err" to the error
    and "*err_info" to null or an additional error string. */
-static gint64 dbs_etherwatch_seek_next_packet(wtap *wth, int *err,
+static gint64 dbs_etherwatch_seek_next_packet(wftap *wfth, int *err,
     gchar **err_info)
 {
   int byte;
   unsigned int level = 0;
   gint64 cur_off;
 
-  while ((byte = file_getc(wth->fh)) != EOF) {
+  while ((byte = file_getc(wfth->fh)) != EOF) {
     if (byte == dbs_etherwatch_rec_magic[level]) {
       level++;
       if (level >= DBS_ETHERWATCH_REC_MAGIC_SIZE) {
         /* note: we're leaving file pointer right after the magic characters */
-        cur_off = file_tell(wth->fh);
+        cur_off = file_tell(wfth->fh);
         if (cur_off == -1) {
           /* Error. */
-          *err = file_error(wth->fh, err_info);
+          *err = file_error(wfth->fh, err_info);
           return -1;
         }
         return cur_off + 1;
@@ -122,7 +123,7 @@ static gint64 dbs_etherwatch_seek_next_packet(wtap *wth, int *err,
     }
   }
   /* EOF or error. */
-  *err = file_error(wth->fh, err_info);
+  *err = file_error(wfth->fh, err_info);
   return -1;
 }
 
@@ -136,7 +137,7 @@ static gint64 dbs_etherwatch_seek_next_packet(wtap *wth, int *err,
  * if we get an I/O error, "*err" will be set to a non-zero value and
  * "*err_info" will be set to null or an error string.
  */
-static gboolean dbs_etherwatch_check_file_type(wtap *wth, int *err,
+static gboolean dbs_etherwatch_check_file_type(wftap *wfth, int *err,
     gchar **err_info)
 {
 	char	buf[DBS_ETHERWATCH_LINE_LENGTH];
@@ -147,9 +148,9 @@ static gboolean dbs_etherwatch_check_file_type(wtap *wth, int *err,
 	buf[DBS_ETHERWATCH_LINE_LENGTH-1] = 0;
 
 	for (line = 0; line < DBS_ETHERWATCH_HEADER_LINES_TO_CHECK; line++) {
-		if (file_gets(buf, DBS_ETHERWATCH_LINE_LENGTH, wth->fh) == NULL) {
+		if (file_gets(buf, DBS_ETHERWATCH_LINE_LENGTH, wfth->fh) == NULL) {
 			/* EOF or error. */
-			*err = file_error(wth->fh, err_info);
+			*err = file_error(wfth->fh, err_info);
 			return FALSE;
 		}
 
@@ -176,51 +177,53 @@ static gboolean dbs_etherwatch_check_file_type(wtap *wth, int *err,
 }
 
 
-int dbs_etherwatch_open(wtap *wth, int *err, gchar **err_info)
+int dbs_etherwatch_open(wftap *wfth, int *err, gchar **err_info)
 {
 	/* Look for DBS ETHERWATCH header */
-	if (!dbs_etherwatch_check_file_type(wth, err, err_info)) {
+	if (!dbs_etherwatch_check_file_type(wfth, err, err_info)) {
 		if (*err != 0 && *err != WTAP_ERR_SHORT_READ)
 			return -1;
 		return 0;
 	}
 
-	wth->file_encap = WTAP_ENCAP_ETHERNET;
-	wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_DBS_ETHERWATCH;
-	wth->snapshot_length = 0;	/* not known */
-	wth->subtype_read = dbs_etherwatch_read;
-	wth->subtype_seek_read = dbs_etherwatch_seek_read;
-	wth->tsprecision = WTAP_FILE_TSPREC_CSEC;
+	wfth->file_encap = WTAP_ENCAP_ETHERNET;
+	wfth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_DBS_ETHERWATCH;
+	wfth->snapshot_length = 0;	/* not known */
+	wfth->subtype_read = dbs_etherwatch_read;
+	wfth->subtype_seek_read = dbs_etherwatch_seek_read;
+	wfth->tsprecision = WTAP_FILE_TSPREC_CSEC;
 
 	return 1;
 }
 
 /* Find the next packet and parse it; called from wtap_read(). */
-static gboolean dbs_etherwatch_read(wtap *wth, int *err, gchar **err_info,
+static gboolean dbs_etherwatch_read(wftap *wfth, int *err, gchar **err_info,
     gint64 *data_offset)
 {
 	gint64	offset;
+	wtap* wth = (wtap*)wfth->tap_specific_data;
 
 	/* Find the next packet */
-	offset = dbs_etherwatch_seek_next_packet(wth, err, err_info);
+	offset = dbs_etherwatch_seek_next_packet(wfth, err, err_info);
 	if (offset < 1)
 		return FALSE;
 	*data_offset = offset;
 
 	/* Parse the packet */
-	return parse_dbs_etherwatch_packet(&wth->phdr, wth->fh,
-	     wth->frame_buffer, err, err_info);
+	return parse_dbs_etherwatch_packet(&wth->phdr, wfth->fh,
+	     wfth->frame_buffer, err, err_info);
 }
 
 /* Used to read packets in random-access fashion */
 static gboolean
-dbs_etherwatch_seek_read(wtap *wth, gint64 seek_off,
-	struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info)
+dbs_etherwatch_seek_read(wftap *wfth, gint64 seek_off,
+	void* header, Buffer *buf, int *err, gchar **err_info)
 {
-	if (file_seek(wth->random_fh, seek_off - 1, SEEK_SET, err) == -1)
+	struct wtap_pkthdr *phdr = (struct wtap_pkthdr*)header;
+	if (file_seek(wfth->random_fh, seek_off - 1, SEEK_SET, err) == -1)
 		return FALSE;
 
-	return parse_dbs_etherwatch_packet(phdr, wth->random_fh, buf, err,
+	return parse_dbs_etherwatch_packet(phdr, wfth->random_fh, buf, err,
 	    err_info);
 }