Add HP Switch Protocol SAP value

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19812 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-hpext.c b/epan/dissectors/packet-hpext.c
index f5ec744c5d3124e4f4ad10f700ed0e04e4720749..4b30da18cbe86cb6eb34af288deee3ec97923ce1 100644 (file)
--- a/epan/dissectors/packet-hpext.c
+++ b/epan/dissectors/packet-hpext.c
@@ -20,7 +20,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  *
  * 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

  */
 
 #ifdef HAVE_CONFIG_H
  */
 
 #ifdef HAVE_CONFIG_H


@@ -48,6 +48,7 @@ static gint ett_hpext = -1;
 const value_string xsap_vals[] = {
        { HPEXT_DXSAP,  "RBOOT Destination Service Access Point" },
        { HPEXT_SXSAP,  "RBOOT Source Service Access Point" },
 const value_string xsap_vals[] = {
        { HPEXT_DXSAP,  "RBOOT Destination Service Access Point" },
        { HPEXT_SXSAP,  "RBOOT Source Service Access Point" },

+       { HPEXT_HPSW,   "HP Switch Protocol" },

        { HPEXT_SNMP,   "SNMP" },
        { 0x00,         NULL }
 };
        { HPEXT_SNMP,   "SNMP" },
        { 0x00,         NULL }
 };


@@ -102,10 +103,10 @@ proto_register_hpext(void)
 
                { &hf_hpext_sxsap,
                { "SXSAP", "hpext.sxsap", FT_UINT16, BASE_HEX,
 
                { &hf_hpext_sxsap,
                { "SXSAP", "hpext.sxsap", FT_UINT16, BASE_HEX,

-                       VALS(xsap_vals), 0x0, "", HFILL }},
+                       VALS(xsap_vals), 0x0, "", HFILL }}

        };
        static gint *ett[] = {
        };
        static gint *ett[] = {

-               &ett_hpext,
+               &ett_hpext

        };
 
        proto_hpext = proto_register_protocol(
        };
 
        proto_hpext = proto_register_protocol(

diff --git a/epan/dissectors/packet-hpext.h b/epan/dissectors/packet-hpext.h
index 830b18db10be718d2bfd68d1970b8363db7fffc9..c30428f41a16727699ee631cfee1ae8f956e10d6 100644 (file)
--- a/epan/dissectors/packet-hpext.h
+++ b/epan/dissectors/packet-hpext.h
@@ -20,9 +20,10 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  *
  * 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

  */
 
 #define HPEXT_DXSAP     0x608
 #define HPEXT_SXSAP     0x609
  */
 
 #define HPEXT_DXSAP     0x608
 #define HPEXT_SXSAP     0x609

+#define HPEXT_HPSW     0x623

 #define HPEXT_SNMP      0x165A
 #define HPEXT_SNMP      0x165A

diff --git a/epan/dissectors/packet-hpsw.c b/epan/dissectors/packet-hpsw.c
index af1c13134ddad98005f348b0ef3221df5a6c412c..678437e73e6437206f1fbad557d2675379dd2817 100644 (file)
--- a/epan/dissectors/packet-hpsw.c
+++ b/epan/dissectors/packet-hpsw.c
@@ -20,7 +20,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  *
  * 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

  */
 
 #ifdef HAVE_CONFIG_H
  */
 
 #ifdef HAVE_CONFIG_H


@@ -257,12 +257,12 @@ proto_register_hpsw(void)
                        VALS(hpsw_tlv_type_vals), 0x0, "", HFILL }},
                { &hf_hpsw_tlvlength,
                { "Length", "hpsw.tlv_len", FT_UINT8, BASE_DEC,
                        VALS(hpsw_tlv_type_vals), 0x0, "", HFILL }},
                { &hf_hpsw_tlvlength,
                { "Length", "hpsw.tlv_len", FT_UINT8, BASE_DEC,

-                       NULL, 0x0, "", HFILL }},
+                       NULL, 0x0, "", HFILL }}

        };
 
        static gint *ett[] = {
                &ett_hpsw,
        };
 
        static gint *ett[] = {
                &ett_hpsw,

-               &ett_hpsw_tlv,
+               &ett_hpsw_tlv

        };
 
        proto_hpsw = proto_register_protocol( "HP Switch Protocol", "HPSW", "hpsw");
        };
 
        proto_hpsw = proto_register_protocol( "HP Switch Protocol", "HPSW", "hpsw");


@@ -279,5 +279,5 @@ proto_reg_handoff_hpsw(void)
 
        hpsw_handle = find_dissector("hpsw");
 
 
        hpsw_handle = find_dissector("hpsw");
 

-       dissector_add("hpext.dxsap", 0x0623, hpsw_handle);
+       dissector_add("hpext.dxsap", HPEXT_HPSW, hpsw_handle);

 }
 }