Put "WTP" into the Info column for segmented invoke/result PDUs on which

[obnox/wireshark/wip.git] / xdlc.h

diff --git a/xdlc.h b/xdlc.h
index d79e1e0d12f10b278d92e059a7e176f55b8c5fb7..5684c5fa18cdeb07efb1050325b9e31b0ddb3b06 100644 (file)
--- a/xdlc.h
+++ b/xdlc.h
@@ -2,28 +2,31 @@
  * Define *DLC frame types, and routine to dissect the control field of
  * a *DLC frame.
  *
- * $Id: xdlc.h,v 1.8 1999/10/10 03:59:29 gram Exp $
+ * $Id: xdlc.h,v 1.17 2002/08/28 21:00:41 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@unicom.net>
+ * By Gerald Combs <gerald@zing.org>
  * 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.
  */
 
+#ifndef __XDLC_H__
+#define __XDLC_H__
+
 /*
  * Low-order bits of first (extended) or only (basic) octet of control
  * field, specifying the frame type.
@@ -60,23 +63,27 @@
 /*
  * This macro takes the control field of an xDLC frame, as returned by
  * "get_xdlc_control()" or "dissect_xdlc_control()", and evaluates to
- * TRUE if the frame has a payload (i.e., if it's an Information or
- * Unnumbered Information frame) and FALSE if it doesn't.
+ * TRUE if the frame is an "information" frame and FALSE if it isn't.
+ * Note that frames other than information frames can have data in them,
+ * e.g. TEST frames.
  */
-#define XDLC_HAS_PAYLOAD(control) \
+#define XDLC_IS_INFORMATION(control) \
        (((control) & 0x1) == XDLC_I || (control) == (XDLC_UI|XDLC_U))
 
 /*
  * This macro takes the control field of an xDLC frame, and a flag saying
  * whether we're doing basic or extended operation, and evaluates to
  * the length of that field (if it's an Unnumbered frame, or we're not
- * in extended mode, it's 3 bytes long, otherwise it's 4 bytes long).
+ * in extended mode, it's 1 byte long, otherwise it's 2 bytes long).
  */
 #define XDLC_CONTROL_LEN(control, is_extended) \
-       ((((control) & 0x3) == XDLC_U || !(is_extended)) ? 3 : 4)
+       ((((control) & 0x3) == XDLC_U || !(is_extended)) ? 1 : 2)
 
-int get_xdlc_control(const u_char *pd, int offset, int is_response,
+int get_xdlc_control(const guchar *pd, int offset,
   int extended);
 
-int dissect_xdlc_control(const u_char *pd, int offset, frame_data *fd,
-  proto_tree *xdlc_tree, int hf_xdlc_control, int is_response, int extended);
+int dissect_xdlc_control(tvbuff_t *tvb, int offset, packet_info *pinfo,
+  proto_tree *xdlc_tree, int hf_xdlc_control, gint ett_xdlc_control,
+  int is_response, int extended);
+
+#endif