From Graeme Hewson:
authorjake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 20 Jan 2007 16:46:42 +0000 (16:46 +0000)
committerjake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 20 Jan 2007 16:46:42 +0000 (16:46 +0000)
The attached patch adds Homeplug to the table of ethernet types.

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

epan/dissectors/packet-eth.c
epan/dissectors/packet-ethertype.c

index d47b62a27daac5c6d9fdc571779284d27bd7cafd..6b998d565cbecaebd8838457d214dc0a9fb9c7e9 100644 (file)
@@ -19,7 +19,7 @@
  *
  * 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
@@ -472,7 +472,7 @@ proto_register_eth(void)
                { "Length",             "eth.len", FT_UINT16, BASE_DEC, NULL, 0x0,
                        "", HFILL }},
 
-               /* registered here but handled in ethertype.c */
+               /* registered here but handled in packet-ethertype.c */
                { &hf_eth_type,
                { "Type",               "eth.type", FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0,
                        "", HFILL }},
@@ -492,13 +492,13 @@ proto_register_eth(void)
                 { &hf_eth_lg,
                { "LG bit", "eth.lg", FT_BOOLEAN, 24,
                  TFS(&lg_tfs), 0x020000,
-                 "Specifies if this is a locally administered or globally unique (IEEE assigned) address", HFILL }},
+                 "Specifies if this is a locally administered or globally unique (IEEE assigned) address", HFILL }}
 
        };
        static gint *ett[] = {
                &ett_ieee8023,
                &ett_ether2,
-               &ett_addr,
+               &ett_addr
        };
        module_t *eth_module;
 
index b4ded722b6de1741dfb010ac5fd5f36c9d5ccb7f..c78746889c72cdc7ee3849c4e6f706e51d8a1241 100644 (file)
@@ -1,4 +1,4 @@
-/* ethertype.c
+/* packet-ethertype.c
  * Routines for calling the right protocol for the ethertype.
  *
  * $Id$
@@ -21,7 +21,7 @@
  *
  * 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
@@ -73,6 +73,7 @@ const value_string etype_vals[] = {
     {ETHERTYPE_PPPOES,                         "PPPoE Session"                 },
     {ETHERTYPE_INTEL_ANS,                      "Intel ANS probe"               },
     {ETHERTYPE_MS_NLB_HEARTBEAT,       "MS NLB heartbeat"      },
+    {ETHERTYPE_HOMEPLUG,                       "Homeplug"                      },
     {ETHERTYPE_VLAN,                           "802.1Q Virtual LAN"            },
     {ETHERTYPE_EAPOL,                          "802.1X Authentication"         },
     {ETHERTYPE_RSN_PREAUTH,                    "802.11i Pre-Authentication"    },