Move dissectors to epan/dissectors directory.

Also move ncp222.py, x11-fields, process-x11-fields.pl,
make-reg-dotc, and make-reg-dotc.py.

Adjust #include lines in files that include packet-*.h
files.

svn path=/trunk/; revision=11410

1 files changed, 0 insertions, 362 deletions

diff --git a/packet-sap.c b/packet-sap.c
deleted file mode 100644
index c54ad1ecd8..0000000000
--- a/packet-sap.c
+++ /dev/null
@@ -1,362 +0,0 @@
-/* packet-sap.c
- * Routines for sap packet dissection
- * RFC 2974
- *
- * Heikki Vatiainen <hessu@cs.tut.fi>
- *
- * $Id$
- *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
- * Copyright 1998 Gerald Combs
- *
- * Copied from packet-tftp.c
- *
- * 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.
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <glib.h>
-#include <epan/packet.h>
-#include "packet-ipv6.h"
-
-#define UDP_PORT_SAP	9875
-
-#define MCAST_SAP_VERSION_MASK 0xE0 /* 3 bits for  SAP version*/
-#define MCAST_SAP_VERSION_SHIFT 5   /* Right shift 5 bits to get the version */
-#define MCAST_SAP_VER0 0            /* Version 0 */
-#define MCAST_SAP_VER1PLUS 1        /* Version 1 or later */
-static const value_string mcast_sap_ver[] = {
-                  { MCAST_SAP_VER0,     "SAPv0"},
-                  { MCAST_SAP_VER1PLUS, "SAPv1 or later"},
-                  { 0,                  NULL} };
-
-static const true_false_string mcast_sap_address_type = {
-        "IPv6",
-        "IPv4"
-};
-
-static const true_false_string mcast_sap_message_type = {
-        "Deletion",
-        "Announcement"
-};
-
-static const true_false_string mcast_sap_crypt_type = {
-        "Payload encrypted",
-        "Payload not encrypted "
-};
-
-static const true_false_string mcast_sap_comp_type = {
-        "Payload compressed",
-        "Payload not compressed"
-};
-
-static const value_string mcast_sap_auth_ver[] = {
-                  { 1, "SAP authentication header v1"},
-                  { 0,                  NULL} };
-
-static const true_false_string mcast_sap_auth_pad = {
-        "Authentication subheader padded to 32 bits",
-        "No padding required for the authentication subheader"
-};
-
-#define MCAST_SAP_AUTH_TYPE_MASK 0x0F /* 4 bits for the type of the authentication header */
-#define MCAST_SAP_AUTH_TYPE_PGP 0
-#define MCAST_SAP_AUTH_TYPE_CMS 1
-static const value_string mcast_sap_auth_type[] = {
-                  { MCAST_SAP_AUTH_TYPE_PGP,  "PGP"},
-                  { MCAST_SAP_AUTH_TYPE_CMS,  "CMS"},
-                  { 0,                   NULL} };
-
-#define MCAST_SAP_BIT_A 0x10 /* Address type: 0 IPv4, 1 IPv6 */
-#define MCAST_SAP_BIT_R 0x08 /* Reserved: Must be 0 */
-#define MCAST_SAP_BIT_T 0x04 /* Message Type: 0 announcement, 1 deletion */
-#define MCAST_SAP_BIT_E 0x02 /* Encryption Bit: 1 payload encrypted */
-#define MCAST_SAP_BIT_C 0x01 /* Compressed Bit: 1 payload zlib compressed */
-
-#define MCAST_SAP_AUTH_BIT_P 0x10 /* Padding required for the authentication header */
-
-
-static int proto_sap = -1;
-static int hf_sap_flags = -1;
-static int hf_sap_flags_v = -1;
-static int hf_sap_flags_a = -1;
-static int hf_sap_flags_r = -1;
-static int hf_sap_flags_t = -1;
-static int hf_sap_flags_e = -1;
-static int hf_sap_flags_c = -1;
-static int hf_auth_data = -1;
-static int hf_auth_flags = -1;
-static int hf_auth_flags_v = -1;
-static int hf_auth_flags_p = -1;
-static int hf_auth_flags_t = -1;
-
-static gint ett_sap = -1;
-static gint ett_sap_flags = -1;
-static gint ett_sap_auth = -1;
-static gint ett_sap_authf = -1;
-
-static dissector_handle_t sdp_handle;
-
-static void
-dissect_sap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-{
-	int offset = 0;
-        int sap_version, is_ipv6, is_del, is_enc, is_comp, addr_len;
-        guint8 vers_flags;
-        guint8 auth_len;
-        guint16 tmp1;
-        const guint8 *addr;
-        guint8 auth_flags;
-        tvbuff_t *next_tvb;
-
-        proto_item *si, *sif;
-        proto_tree *sap_tree, *sap_flags_tree;
-
-        if (check_col(pinfo->cinfo, COL_PROTOCOL))
-                col_set_str(pinfo->cinfo, COL_PROTOCOL, "SAP");
-        if (check_col(pinfo->cinfo, COL_INFO))
-                col_clear(pinfo->cinfo, COL_INFO);
-
-	vers_flags = tvb_get_guint8(tvb, offset);
-        is_ipv6 = vers_flags&MCAST_SAP_BIT_A;
-        is_del = vers_flags&MCAST_SAP_BIT_T;
-        is_enc = vers_flags&MCAST_SAP_BIT_E;
-        is_comp = vers_flags&MCAST_SAP_BIT_C;
-
-        sap_version = (vers_flags&MCAST_SAP_VERSION_MASK)>>MCAST_SAP_VERSION_SHIFT;
-        addr_len = (is_ipv6) ? sizeof(struct e_in6_addr) : 4;
-
-        if (check_col(pinfo->cinfo, COL_INFO)) {
-                col_add_fstr(pinfo->cinfo, COL_INFO, "%s (v%u)",
-                             (is_del) ? "Deletion" : "Announcement", sap_version);
-        }
-
-	if (tree) {
-	  si = proto_tree_add_item(tree, proto_sap, tvb, offset, -1, FALSE);
-	  sap_tree = proto_item_add_subtree(si, ett_sap);
-
-	  sif = proto_tree_add_uint(sap_tree, hf_sap_flags, tvb, offset, 1, vers_flags);
-          sap_flags_tree = proto_item_add_subtree(sif, ett_sap_flags);
-          proto_tree_add_uint(sap_flags_tree, hf_sap_flags_v, tvb, offset, 1, vers_flags);
-          proto_tree_add_boolean(sap_flags_tree, hf_sap_flags_a, tvb, offset, 1, vers_flags);
-          proto_tree_add_boolean(sap_flags_tree, hf_sap_flags_r, tvb, offset, 1, vers_flags);
-          proto_tree_add_boolean(sap_flags_tree, hf_sap_flags_t, tvb, offset, 1, vers_flags);
-          proto_tree_add_boolean(sap_flags_tree, hf_sap_flags_e, tvb, offset, 1, vers_flags);
-          proto_tree_add_boolean(sap_flags_tree, hf_sap_flags_c, tvb, offset, 1, vers_flags);
-          offset++;
-
-          auth_len = tvb_get_guint8(tvb, offset);
-          proto_tree_add_text(sap_tree, tvb, offset, 1, "Authentication Length: %u", auth_len);
-          offset++;
-
-          tmp1 = tvb_get_ntohs(tvb, offset);
-          proto_tree_add_text(sap_tree, tvb, offset, 2, "Message Identifier Hash: 0x%x", tmp1);
-          offset +=2;
-
-          addr = tvb_get_ptr(tvb, offset, addr_len);
-          proto_tree_add_text(sap_tree, tvb, offset, addr_len, "Originating Source: %s",
-              (is_ipv6) ? ip6_to_str((const struct e_in6_addr*)addr) : ip_to_str(addr));
-          offset += addr_len;
-
-          /* Authentication data lives in its own subtree */
-          if (auth_len > 0) {
-                  guint32 auth_data_len;
-                  proto_item *sdi, *sai;
-                  proto_tree *sa_tree, *saf_tree;
-                  int has_pad;
-                  guint8 pad_len = 0;
-
-                  auth_data_len = auth_len * sizeof(guint32);
-
-                  sdi = proto_tree_add_item(sap_tree, hf_auth_data, tvb, offset, auth_data_len, FALSE);
-                  sa_tree = proto_item_add_subtree(sdi, ett_sap_auth);
-
-                  auth_flags = tvb_get_guint8(tvb, offset);
-                  sai = proto_tree_add_uint(sa_tree, hf_auth_flags, tvb, offset, 1, auth_flags);
-                  saf_tree = proto_item_add_subtree(sai, ett_sap_authf);
-                  proto_tree_add_uint(saf_tree, hf_auth_flags_v, tvb, offset, 1, auth_flags);
-                  proto_tree_add_boolean(saf_tree, hf_auth_flags_p, tvb, offset, 1, auth_flags);
-                  proto_tree_add_uint(saf_tree, hf_auth_flags_t, tvb, offset, 1, auth_flags);
-
-                  has_pad = auth_flags&MCAST_SAP_AUTH_BIT_P;
-                  if (has_pad)
-                         pad_len = tvb_get_guint8(tvb, offset+auth_data_len-1);
-
-                  proto_tree_add_text(sa_tree, tvb, offset+1, auth_data_len-pad_len-1,
-                                      "Authentication subheader: (%u byte%s)",
-                                      auth_data_len-1, plurality(auth_data_len-1, "", "s"));
-                  if (has_pad) {
-                          proto_tree_add_text(sa_tree, tvb, offset+auth_data_len-pad_len, pad_len,
-                                              "Authentication data padding: (%u byte%s)",
-                                              pad_len, plurality(pad_len, "", "s"));
-                          proto_tree_add_text(sa_tree, tvb, offset+auth_data_len-1, 1,
-                                              "Authentication data pad count: %u byte%s",
-                                              pad_len, plurality(pad_len, "", "s"));
-                  }
-
-                  offset += auth_data_len;
-          }
-          if (is_enc || is_comp) {
-                  char *mangle;
-                  if (is_enc && is_comp) mangle = "compressed and encrypted";
-                  else if (is_enc) mangle = "encrypted";
-                  else mangle = "compressed";
-                  proto_tree_add_text(sap_tree, tvb, offset, -1,
-                                      "The rest of the packet is %s", mangle);
-                  return;
-          }
-
-          /* Do we have the optional payload type aka. MIME content specifier */
-          if (tvb_strneql(tvb, offset, "v=", strlen("v="))) {
-                  gint remaining_len;
-                  guint32 pt_len;
-                  int pt_string_len;
-
-                  remaining_len = tvb_length_remaining(tvb, offset);
-                  if (remaining_len == 0) {
-                      /*
-                       * "tvb_strneql()" failed because there was no
-		       * data left in the packet.
-		       *
-		       * Set the remaining length to 1, so that
-		       * we throw the appropriate exception in
-		       * "tvb_get_ptr()", rather than displaying
-		       * the payload type.
-		       */
-		      remaining_len = 1;
-		  }
-                  pt_string_len = tvb_strnlen(tvb, offset, remaining_len);
-                  if (pt_string_len == -1) {
-                      /*
-                       * We didn't find a terminating '\0'; run to the
-                       * end of the buffer.
-                       */
-                      pt_string_len = remaining_len;
-                      pt_len = pt_string_len;
-                  } else {
-                      /*
-                       * Include the '\0' in the total item length.
-                       */
-                      pt_len = pt_string_len + 1;
-                  }
-                  proto_tree_add_text(sap_tree, tvb, offset, pt_len,
-                      "Payload type: %.*s", pt_string_len,
-                      tvb_get_ptr(tvb, offset, pt_string_len));
-                  offset += pt_len;
-          }
-	}
-
-        /* Done with SAP */
-        next_tvb = tvb_new_subset(tvb, offset, -1, -1);
-        call_dissector(sdp_handle, next_tvb, pinfo, tree);
-
-        return;
-}
-
-void proto_register_sap(void)
-{
-
-  static hf_register_info hf[] = {
-    { &hf_sap_flags,
-      { "Flags",         "sap.flags",
-	FT_UINT8, BASE_HEX, NULL, 0x0,
-      	"Bits in the beginning of the SAP header", HFILL }},
-
-    { &hf_sap_flags_v,
-      { "Version Number",         "sap.flags.v",
-	FT_UINT8, BASE_DEC, VALS(mcast_sap_ver), MCAST_SAP_VERSION_MASK,
-      	"3 bit version field in the SAP header", HFILL }},
-
-    { &hf_sap_flags_a,
-      { "Address Type",           "sap.flags.a",
-	FT_BOOLEAN, 8, TFS(&mcast_sap_address_type), MCAST_SAP_BIT_A,
-      	"Originating source address type", HFILL }},
-
-    { &hf_sap_flags_r,
-      { "Reserved",               "sap.flags.r",
-	FT_BOOLEAN, 8, TFS(&flags_set_truth), MCAST_SAP_BIT_R,
-      	"Reserved", HFILL }},
-
-    { &hf_sap_flags_t,
-      { "Message Type",           "sap.flags.t",
-	FT_BOOLEAN, 8, TFS(&mcast_sap_message_type), MCAST_SAP_BIT_T,
-      	"Announcement type", HFILL }},
-
-    { &hf_sap_flags_e,
-      { "Encryption Bit",         "sap.flags.e",
-	FT_BOOLEAN, 8, TFS(&mcast_sap_crypt_type), MCAST_SAP_BIT_E,
-      	"Encryption", HFILL }},
-
-    { &hf_sap_flags_c,
-      { "Compression Bit",         "sap.flags.c",
-	FT_BOOLEAN, 8, TFS(&mcast_sap_comp_type), MCAST_SAP_BIT_C,
-      	"Compression", HFILL }},
-
-    { &hf_auth_data,
-      { "Authentication data",     "sap.auth",
-	FT_NONE, BASE_NONE, NULL, 0x0,
-      	"Auth data", HFILL }},
-
-    { &hf_auth_flags,
-      { "Authentication data flags", "sap.auth.flags",
-	FT_UINT8, BASE_HEX, NULL, 0x0,
-      	"Auth flags", HFILL }},
-
-    { &hf_auth_flags_v,
-      { "Version Number",         "sap.auth.flags.v",
-	FT_UINT8, BASE_DEC, VALS(&mcast_sap_auth_ver), MCAST_SAP_VERSION_MASK,
-      	"Version", HFILL }},
-
-    { &hf_auth_flags_p,
-      { "Padding Bit",            "sap.auth.flags.p",
-	FT_BOOLEAN, 8, TFS(&mcast_sap_auth_pad), MCAST_SAP_AUTH_BIT_P,
-      	"Compression", HFILL }},
-
-    { &hf_auth_flags_t,
-      { "Authentication Type",         "sap.auth.flags.t",
-	FT_UINT8, BASE_DEC, VALS(&mcast_sap_auth_type), MCAST_SAP_AUTH_TYPE_MASK,
-      	"Auth type", HFILL }}
-  };
-  static gint *ett[] = {
-    &ett_sap,
-    &ett_sap_flags,
-    &ett_sap_auth,
-    &ett_sap_authf,
-  };
-
-  proto_sap = proto_register_protocol("Session Announcement Protocol", "SAP",
-				      "sap");
-  proto_register_field_array(proto_sap, hf, array_length(hf));
-  proto_register_subtree_array(ett, array_length(ett));
-}
-
-void
-proto_reg_handoff_sap(void)
-{
-  dissector_handle_t sap_handle;
-
-  sap_handle = create_dissector_handle(dissect_sap, proto_sap);
-  dissector_add("udp.port", UDP_PORT_SAP, sap_handle);
-
-  /*
-   * Get a handle for the SDP dissector.
-   */
-  sdp_handle = find_dissector("sdp");
-}