aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am3
-rw-r--r--capture.c6
-rw-r--r--packet-sll.h30
3 files changed, 37 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 34543625f0..1f7929aebe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal
#
-# $Id: Makefile.am,v 1.274 2001/01/11 16:46:21 gram Exp $
+# $Id: Makefile.am,v 1.275 2001/01/13 03:17:15 gram Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
@@ -240,6 +240,7 @@ noinst_HEADERS = \
packet-rtcp.h \
packet-rtp.h \
packet-rx.h \
+ packet-sll.h \
packet-smb.h \
packet-smb-common.h \
packet-sna.h \
diff --git a/capture.c b/capture.c
index 9c3cf55660..dfbd87dc71 100644
--- a/capture.c
+++ b/capture.c
@@ -1,7 +1,7 @@
/* capture.c
* Routines for packet capture windows
*
- * $Id: capture.c,v 1.135 2001/01/09 00:53:26 guy Exp $
+ * $Id: capture.c,v 1.136 2001/01/13 03:17:15 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -157,6 +157,7 @@
#include "packet-null.h"
#include "packet-ppp.h"
#include "packet-raw.h"
+#include "packet-sll.h"
#include "packet-tr.h"
#include "packet-ieee80211.h"
@@ -1702,6 +1703,9 @@ capture_pcap_cb(u_char *user, const struct pcap_pkthdr *phdr,
case WTAP_ENCAP_RAW_IP:
capture_raw(pd, &ld->counts);
break;
+ case WTAP_ENCAP_SLL:
+ capture_sll(pd, &ld->counts);
+ break;
case WTAP_ENCAP_LINUX_ATM_CLIP:
capture_clip(pd, &ld->counts);
break;
diff --git a/packet-sll.h b/packet-sll.h
new file mode 100644
index 0000000000..422eb5ea5a
--- /dev/null
+++ b/packet-sll.h
@@ -0,0 +1,30 @@
+/* packet-sll.h
+ *
+ * $Id: packet-sll.h,v 1.1 2001/01/13 03:17:15 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 2001 Gerald Combs
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __PACKET_SLL_H__
+#define __PACKET_SLL_H__
+
+void capture_sll(const u_char *, packet_counts *);
+
+#endif