osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Graeme Hewson: 

The attached patch adds Homeplug to the table of ethernet types.

svn path=/trunk/; revision=20509
This commit is contained in:
Jaap Keuter 2007-01-20 16:46:42 +00:00
parent c01c996999
commit fce186d76a
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-eth.c
View 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;

5
epan/dissectors/packet-ethertype.c
View 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" },