From Bernd Leibing: catch another place where we weren't checking

[obnox/wireshark/wip.git] / packet-sll.c

diff --git a/packet-sll.c b/packet-sll.c
index cf1cd7838399b6c13fb701d476b5bd75b1b6461f..da07b713949b733b1034064852859eb9f42e53e6 100644 (file)
--- a/packet-sll.c
+++ b/packet-sll.c
@@ -1,22 +1,22 @@
 /* packet-sll.c
  * Routines for disassembly of packets from Linux "cooked mode" captures
  *
- * $Id: packet-sll.c,v 1.15 2001/12/10 00:25:34 guy Exp $
+ * $Id: packet-sll.c,v 1.19 2002/08/28 21:00:31 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 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.
@@ -26,18 +26,14 @@
 # include "config.h"
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
 #include "packet-sll.h"
 #include "packet-ipx.h"
 #include "packet-llc.h"
-#include "resolv.h"
+#include <epan/resolv.h>
 #include "etypes.h"
 
 static int proto_sll = -1;
@@ -93,7 +89,7 @@ static dissector_handle_t llc_handle;
 static dissector_handle_t data_handle;
 
 void
-capture_sll(const u_char *pd, int len, packet_counts *ld)
+capture_sll(const guchar *pd, int len, packet_counts *ld)
 {
        guint16 protocol;
 
@@ -121,7 +117,7 @@ capture_sll(const u_char *pd, int len, packet_counts *ld)
                         * Novell IPX inside 802.3 with no 802.2 LLC
                         * header.
                         */
-                       capture_ipx(pd, len, SLL_HEADER_SIZE, ld);
+                       capture_ipx(ld);
                        break;
 
                default: