aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>1999-03-22 03:56:34 +0000
committerGuy Harris <guy@alum.mit.edu>1999-03-22 03:56:34 +0000
commit05e5c40597167ced79f7026c757f0828eed46720 (patch)
tree37f38b99fb2b4bc7f4ba7ede3a0d79f507e82933
parent8f70ffdda97858ba912ee6cfd1c094515b0a926c (diff)
downloadwireshark-05e5c40597167ced79f7026c757f0828eed46720.tar.gz
wireshark-05e5c40597167ced79f7026c757f0828eed46720.tar.bz2
wireshark-05e5c40597167ced79f7026c757f0828eed46720.zip
Well, that was dumb. I didn't have to add a "capture_data()" routine; I
just had to make "sap_capture_func()" return NULL if it didn't find an entry for the SAP it was passed. svn path=/trunk/; revision=220
-rw-r--r--packet-data.c7
-rw-r--r--packet-llc.c4
-rw-r--r--packet.h3
3 files changed, 4 insertions, 10 deletions
diff --git a/packet-data.c b/packet-data.c
index 77f5cde17c..9aa97f771a 100644
--- a/packet-data.c
+++ b/packet-data.c
@@ -2,7 +2,7 @@
* Routines for raw data (default case)
* Gilbert Ramirez <gram@verdict.uthscsa.edu>
*
- * $Id: packet-data.c,v 1.6 1999/03/22 03:44:43 guy Exp $
+ * $Id: packet-data.c,v 1.7 1999/03/22 03:56:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net>
@@ -39,11 +39,6 @@
#include "ethereal.h"
#include "packet.h"
-void
-capture_data(const u_char *pd, int offset, guint32 cap_len, packet_counts *ld) {
-
- ld->other++;
-}
void
dissect_data(const u_char *pd, int offset, frame_data *fd, GtkTree *tree) {
diff --git a/packet-llc.c b/packet-llc.c
index a995afc9fa..622f61298d 100644
--- a/packet-llc.c
+++ b/packet-llc.c
@@ -2,7 +2,7 @@
* Routines for IEEE 802.2 LLC layer
* Gilbert Ramirez <gram@verdict.uthscsa.edu>
*
- * $Id: packet-llc.c,v 1.12 1999/03/22 03:44:44 guy Exp $
+ * $Id: packet-llc.c,v 1.13 1999/03/22 03:56:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net>
@@ -103,7 +103,7 @@ sap_capture_func(u_char sap) {
}
i++;
}
- return capture_data;
+ return NULL;
}
static dissect_func_t *
diff --git a/packet.h b/packet.h
index 0d1c59b172..a8fc887e7b 100644
--- a/packet.h
+++ b/packet.h
@@ -1,7 +1,7 @@
/* packet.h
* Definitions for packet disassembly structures and routines
*
- * $Id: packet.h,v 1.39 1999/03/22 03:44:44 guy Exp $
+ * $Id: packet.h,v 1.40 1999/03/22 03:56:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -545,7 +545,6 @@ void capture_tr(const u_char *, guint32, packet_counts *);
* packet_counts *
* They should never modify the packet data.
*/
-void capture_data(const u_char *, int, guint32, packet_counts *);
void capture_llc(const u_char *, int, guint32, packet_counts *);
void capture_ip(const u_char *, int, guint32, packet_counts *);