{ WFA_SUBTYPE_HS20_INDICATION, "Hotspot 2.0 Indication" },
{ WFA_SUBTYPE_HS20_ANQP, "Hotspot 2.0 ANQP" },
{ WFA_SUBTYPE_DPP, "Device Provisioning Protocol" },
+ { WFA_SUBTYPE_IEEE1905_MULTI_AP, "IEEE1905 Multi-AP" },
{ 0, NULL }
};
subtype = tvb_get_guint8(tag_tvb, 3);
proto_item_append_text(item, ": %s", val_to_str_const(subtype, wfa_subtype_vals, "Unknown"));
- vendor_tvb = tvb_new_subset_length(tag_tvb, offset, tag_len - 4);
+ vendor_tvb = tvb_new_subset_length(tag_tvb, offset + 4, tag_len - 4);
dissector_try_uint_new(wifi_alliance_ie_table, subtype, vendor_tvb, pinfo, item, FALSE, NULL);
}
dissector_add_uint("wlan.anqp.vendor_specific", OUI_WFA, create_dissector_handle(dissect_vendor_wifi_alliance_anqp, -1));
dissector_add_uint("wlan.anqp.wifi_alliance.subtype", WFA_SUBTYPE_HS20_ANQP, create_dissector_handle(dissect_hs20_anqp, -1));
dissector_add_uint("wlan.ie.wifi_alliance.subtype", WFA_SUBTYPE_HS20_INDICATION, create_dissector_handle(dissect_hs20_indication, -1));
-
}
/*
} anqp_info_dissector_data_t;
/* WFA vendor specific subtypes */
-#define WFA_SUBTYPE_P2P 9
-#define WFA_SUBTYPE_WIFI_DISPLAY 10
-#define WFA_SUBTYPE_HS20_INDICATION 16
-#define WFA_SUBTYPE_HS20_ANQP 17
-#define WFA_SUBTYPE_DPP 26
-
+#define WFA_SUBTYPE_P2P 9
+#define WFA_SUBTYPE_WIFI_DISPLAY 10
+#define WFA_SUBTYPE_HS20_INDICATION 16
+#define WFA_SUBTYPE_HS20_ANQP 17
+#define WFA_SUBTYPE_DPP 26
+#define WFA_SUBTYPE_IEEE1905_MULTI_AP 27 /* ox1B */
/*
* Editor modelines
#include <epan/sminmpec.h>
#include "packet-wps.h"
+#include "packet-ieee80211.h"
void proto_register_wps(void);
}
}
+static int
+dissect_wps_wfa_ext_via_dt(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
+ void *data _U_)
+{
+ gint size = tvb_reported_length(tvb);
+
+ dissect_wps_wfa_ext(tree, tvb, 0, size);
+
+ return size;
+}
+
static void
dissect_wps_vendor_ext(proto_tree *tree, tvbuff_t *tvb,
int offset, gint size)
expert_register_field_array(expert_wps, ei, array_length(ei));
}
+void
+proto_reg_handoff_wps(void)
+{
+ dissector_add_uint("wlan.ie.wifi_alliance.subtype", WFA_SUBTYPE_IEEE1905_MULTI_AP, create_dissector_handle(dissect_wps_wfa_ext_via_dt, -1));
+}
+
/*
* Editor modelines
*