Frame numbers are unsigned.

[obnox/wireshark/wip.git] / packet-wap.h

diff --git a/packet-wap.h b/packet-wap.h
index b514ede83d2321f95e60a6b6ee3508b1f01e50d0..0b5cf2e5e758499118468fb923f837778d7aa00c 100644 (file)
--- a/packet-wap.h
+++ b/packet-wap.h
@@ -1,41 +1,74 @@
-/* packet-wap.h (c) 2000 Neil Hunter
- * Based on original work by Ben Fowler
+/* packet-wap.h
  *
  * Declarations for WAP packet disassembly
  *
- * $Id: packet-wap.h,v 1.1 2000/11/04 03:30:40 guy Exp $
+ * $Id: packet-wap.h,v 1.8 2002/08/28 21:00:37 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
  *
- * 
+ * WAP dissector based on original work by Ben Fowler
+ * Updated by Neil Hunter <neil.hunter@energis-squared.com>
+ * WTLS support by Alexandre P. Ferreira (Splice IP)
+ *
  * 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_WAP_H__
 #define __PACKET_WAP_H__
 
+#include <glib.h>
+#include <epan/packet.h>
+
 /* Port Numbers as per IANA */
 /* < URL:http://www.isi.edu/in-notes/iana/assignments/port-numbers/ > */
 #define UDP_PORT_WSP                   9200            /* wap-wsp                      */
 #define UDP_PORT_WTP_WSP               9201            /* wap-wsp-wtp          */
 #define UDP_PORT_WTLS_WSP              9202            /* wap-wsp-s            */
-#define UDP_PORT_WTLS_WTP_WSP  9203            /* wap-wsp-wtp-s        */
+#define UDP_PORT_WTLS_WTP_WSP          9203            /* wap-wsp-wtp-s        */
+#define UDP_PORT_WSP_PUSH              2948            /* wap-wsp              */
+#define UDP_PORT_WTLS_WSP_PUSH         2949            /* wap-wsp-s            */
+
+/*
+ * Note:
+ *   There are four dissectors for the WAP protocol:
+ *     WTLS
+ *     WTP
+ *     WSP
+ *     WMLC
+ *   Which of these are necessary is determined by the port number above.
+ *   I.e. port 9200 (wap-wsp) indicates WSP data and possibly WMLC (depending on
+ *   the WSP PDU).
+ *   Port 9203 (wap-wsp-wtp-s), on the other hand, has WTLS, WTP, WSP and
+ *   possibly WMLC data in that order in the packet.
+ *
+ *   Therefore the dissectors are chained as follows:
+ *
+ *   Port        Dissectors
+ *   9200                     WSP  ->  WMLC
+ *   9201            WTP  ->  WSP  ->  WMLC
+ *   9202  WTLS  ->           WSP  ->  WMLC
+ *   9203  WTLS  ->  WTP  ->  WSP  ->  WMLC
+ *
+ *   2948                     WSP  ->  WMLC (Push)
+ *   2949  WTLS  ->           WSP  ->  WMLC (Push)
+ *
+ *   At present, only the unencrypted parts of WTLS can be analysed. Therefore
+ *   the WTP and WSP dissectors are not called.
+ */
 
 #define HF_EMPTY       ( -1 )
 #define ETT_EMPTY      ( -1 )
@@ -46,4 +79,22 @@ enum
        bo_little_endian        = 1
 };
 
+/* Utility function for reading Uintvar encoded values */
+guint tvb_get_guintvar (tvbuff_t *, guint , guint *);
+
+/* Character set encoding */
+extern const value_string vals_character_sets[];
+
+/*
+ * Misc TODO:
+ *
+ * WMLC Dissector
+ * Check Protocol display
+ * Check Protocol information display
+ * Check CONNECT/CONNECT REPLY headers
+ * Check add_headers code
+ * Check Content-Length code
+ *
+ */
+
 #endif /* packet-wap.h */