diff options
| author | jake <jake@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-01-20 16:46:42 +0000 |
|---|---|---|
| committer | jake <jake@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-01-20 16:46:42 +0000 |
| commit | 6834e58f19d243aeaf026d5b345a34c7b1396961 (patch) | |
| tree | e4ae7e82323d03431c10f42f003a97d020e5abe4 /epan/dissectors | |
| parent | 8e76eac6cb3bfcad47f6001f2d4ff6df14de1ea8 (diff) | |
From Graeme Hewson:
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
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-eth.c | 8 | ||||
| -rw-r--r-- | epan/dissectors/packet-ethertype.c | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index d47b62a27d..6b998d565c 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -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; diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c index b4ded722b6..c78746889c 100644 --- a/epan/dissectors/packet-ethertype.c +++ b/epan/dissectors/packet-ethertype.c @@ -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" }, |