diff options
| author | Sean O. Stalley <sean.stalley@intel.com> | 2014-10-13 16:09:09 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-10-26 00:55:50 +0000 |
| commit | 3ffd8c57d9f94d1ac3d9d94f8f5aebd78022777c (patch) | |
| tree | 23926412f5fd7cf21ba01ca06a00069ad02dd7cd | |
| parent | 155c939bb945c0ddc41f2a399c4d2b9303c11f51 (diff) | |
Use Wifi Alliance OUI for MA USB packets over SNAP
Change-Id: Icf4c995c8fbdb886e8b4e79a1fc7b62ac7137a07
Reviewed-on: https://code.wireshark.org/review/4667
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/packet-mausb.c | 13 | ||||
| -rw-r--r-- | epan/oui.c | 1 |
2 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-mausb.c b/epan/dissectors/packet-mausb.c index 6e75d68aa9..2670ffd3cb 100644 --- a/epan/dissectors/packet-mausb.c +++ b/epan/dissectors/packet-mausb.c @@ -32,13 +32,13 @@ #include <epan/dissectors/packet-tcp.h> #include <epan/prefs.h> #include <epan/expert.h> +#include <epan/oui.h> #include "packet-llc.h" #include "packet-usb.h" void proto_reg_handoff_mausb(void); void proto_register_mausb(void); -void proto_register_mausb_oui(void); /* For SNAP Packets */ static int hf_llc_mausb_pid = -1; @@ -131,11 +131,10 @@ static expert_field ei_cap_resp_desc_len = EI_INIT; /* for dissecting snap packets */ /* - * TODO: determine assigned OUI & PID value + * TODO: determine assigned PID value * (yet to be assigned as of Earth Day 2014) */ -#define OUI_MAUSB 0xdead54 -#define PID_MAUSB 0xf539 +#define PID_MAUSB 0x1500 static const value_string mausb_pid_string[] = { { PID_MAUSB, "MAUSB" }, @@ -1897,7 +1896,7 @@ proto_reg_handoff_mausb(void) mausb_pkt_handle = new_create_dissector_handle(dissect_mausb_pkt, proto_mausb); - dissector_add_uint("llc.mausb_pid", PID_MAUSB, mausb_pkt_handle); + dissector_add_uint("llc.wfa_pid", PID_MAUSB, mausb_pkt_handle); initialized = TRUE; } else { @@ -1914,7 +1913,7 @@ proto_reg_handoff_mausb(void) } void -proto_register_mausb_oui(void) +proto_register_wfa_oui(void) { static hf_register_info hf[] = { { &hf_llc_mausb_pid, @@ -1923,7 +1922,7 @@ proto_register_mausb_oui(void) } }; - llc_add_oui(OUI_MAUSB, "llc.mausb_pid", "LLC MA USB OUI PID", hf); + llc_add_oui(OUI_WFA, "llc.wfa_pid", "LLC WFA OUI PID", hf); } /* diff --git a/epan/oui.c b/epan/oui.c index 710613f126..5c5658a51e 100644 --- a/epan/oui.c +++ b/epan/oui.c @@ -76,6 +76,7 @@ http://www.cisco.com/univercd/cc/td/doc/product/software/ios113ed/113ed_cr/ibm_r /* Currently, the manuf file calls this "Procurve", as it's assigned to HP! */ { OUI_HP, "Hewlett-Packard" }, { OUI_HP_2, "Hewlett-Packard" }, + { OUI_WFA, "Wi-Fi Alliance" }, /* Registry Name: PPP Vendor Specific OUI Options */ { OUI_3GPP2, "3GPP2 Vendor specific packet ID" }, { OUI_ERICSSON_2, "Ericsson Group" }, |