jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

WPS: Update couple of missed Primary Device Type uses

Browse source
This commit is contained in:
Jouni Malinen 2009-11-26 11:54:37 +02:00 committed by Jouni Malinen
parent 96750ea5e5
commit ed45947e9b
2 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/wps/wps.c
View file

@ -419,11 +419,12 @@ int wps_attr_text(struct wpabuf *data, char *buf, char *end)
} }
if (attr.primary_dev_type) { if (attr.primary_dev_type) {
char devtype[WPS_DEV_TYPE_BUFSIZE];
ret = os_snprintf(pos, end - pos, ret = os_snprintf(pos, end - pos,
"wps_primary_device_type=%u-%08x-%u\n", "wps_primary_device_type=%s\n",
WPA_GET_BE16(attr.primary_dev_type), wps_dev_type_bin2str(attr.primary_dev_type,
WPA_GET_BE32(&attr.primary_dev_type[2]), devtype,
WPA_GET_BE16(&attr.primary_dev_type[6])); sizeof(devtype)));
if (ret < 0 || ret >= end - pos) if (ret < 0 || ret >= end - pos)
return pos - buf; return pos - buf;
pos += ret; pos += ret;

16
wpa_supplicant/wps_supplicant.c
View file

@ -414,14 +414,12 @@ static void wpa_supplicant_wps_event_er_ap_add(struct wpa_supplicant *wpa_s,
struct wps_event_er_ap *ap) struct wps_event_er_ap *ap)
{ {
char uuid_str[100]; char uuid_str[100];
char dev_type[20]; char dev_type[WPS_DEV_TYPE_BUFSIZE];
uuid_bin2str(ap->uuid, uuid_str, sizeof(uuid_str)); uuid_bin2str(ap->uuid, uuid_str, sizeof(uuid_str));
if (ap->pri_dev_type) if (ap->pri_dev_type)
os_snprintf(dev_type, sizeof(dev_type), "%u-%08X-%u", wps_dev_type_bin2str(ap->pri_dev_type, dev_type,
WPA_GET_BE16(ap->pri_dev_type), sizeof(dev_type));
WPA_GET_BE32(ap->pri_dev_type + 2),
WPA_GET_BE16(ap->pri_dev_type + 6));
else else
dev_type[0] = '\0'; dev_type[0] = '\0';
@ -450,14 +448,12 @@ static void wpa_supplicant_wps_event_er_enrollee_add(
struct wpa_supplicant *wpa_s, struct wps_event_er_enrollee *enrollee) struct wpa_supplicant *wpa_s, struct wps_event_er_enrollee *enrollee)
{ {
char uuid_str[100]; char uuid_str[100];
char dev_type[20]; char dev_type[WPS_DEV_TYPE_BUFSIZE];
uuid_bin2str(enrollee->uuid, uuid_str, sizeof(uuid_str)); uuid_bin2str(enrollee->uuid, uuid_str, sizeof(uuid_str));
if (enrollee->pri_dev_type) if (enrollee->pri_dev_type)
os_snprintf(dev_type, sizeof(dev_type), "%u-%08X-%u", wps_dev_type_bin2str(enrollee->pri_dev_type, dev_type,
WPA_GET_BE16(enrollee->pri_dev_type), sizeof(dev_type));
WPA_GET_BE32(enrollee->pri_dev_type + 2),
WPA_GET_BE16(enrollee->pri_dev_type + 6));
else else
dev_type[0] = '\0'; dev_type[0] = '\0';