P2PS: Add parsing of new P2P attributes

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>

diff --git a/src/p2p/p2p.h b/src/p2p/p2p.h
index fa886f742b23ce9eb7de0b430262c8d80d3787e7..36e3fe73ce380b9b5ee4b0d4529bb647dd28f913 100644 (file)
--- a/src/p2p/p2p.h
+++ b/src/p2p/p2p.h
@@ -11,6 +11,8 @@
 
 #include "wps/wps_defs.h"
 
+#define P2PS_HASH_LEN 6
+
 /**
  * P2P_MAX_REG_CLASSES - Maximum number of regulatory classes
  */

diff --git a/src/p2p/p2p_i.h b/src/p2p/p2p_i.h
index 62711e7c88942b60021f516982e17a336dc54948..c6093b664b80c5384ae22c0976cf977c1ed5e69b 100644 (file)
--- a/src/p2p/p2p_i.h
+++ b/src/p2p/p2p_i.h
@@ -586,6 +586,31 @@ struct p2p_message {
 
        /* SSID IE */
        const u8 *ssid;
+
+       /* P2PS */
+       u8 service_hash_count;
+       const u8 *service_hash;
+
+       const u8 *session_info;
+       size_t session_info_len;
+
+       const u8 *conn_cap;
+
+       const u8 *adv_id;
+       const u8 *adv_mac;
+
+       const u8 *adv_service_instance;
+       size_t adv_service_instance_len;
+
+       const u8 *session_id;
+       const u8 *session_mac;
+
+       const u8 *feature_cap;
+       size_t feature_cap_len;
+
+       const u8 *persistent_dev;
+       const u8 *persistent_ssid;
+       size_t persistent_ssid_len;
 };
 
 

diff --git a/src/p2p/p2p_parse.c b/src/p2p/p2p_parse.c
index 52ba19e0a032ddb33ab674b26f882d955c88b2a8..fd6a4610d839fabd7adda95b3fe0b02dea30ce61 100644 (file)
--- a/src/p2p/p2p_parse.c
+++ b/src/p2p/p2p_parse.c
@@ -281,6 +281,112 @@ static int p2p_parse_attribute(u8 id, const u8 *data, u16 len,
                           data[0], data[1], data[2], data[3], data[4],
                           data[5]);
                break;
+       case P2P_ATTR_SERVICE_HASH:
+               if (len < P2PS_HASH_LEN) {
+                       wpa_printf(MSG_DEBUG,
+                                  "P2P: Too short Service Hash (length %u)",
+                                  len);
+                       return -1;
+               }
+               msg->service_hash_count = len / P2PS_HASH_LEN;
+               msg->service_hash = data;
+               wpa_hexdump(MSG_DEBUG, "P2P: * Service Hash(s)", data, len);
+               break;
+       case P2P_ATTR_SESSION_INFORMATION_DATA:
+               msg->session_info = data;
+               msg->session_info_len = len;
+               wpa_printf(MSG_DEBUG, "P2P: * Service Instance: %u bytes - %p",
+                          len, data);
+               break;
+       case P2P_ATTR_CONNECTION_CAPABILITY:
+               if (len < 1) {
+                       wpa_printf(MSG_DEBUG,
+                                  "P2P: Too short Connection Capability (length %u)",
+                                  len);
+                       return -1;
+               }
+               msg->conn_cap = data;
+               wpa_printf(MSG_DEBUG, "P2P: * Connection Capability: 0x%x",
+                          *msg->conn_cap);
+               break;
+       case P2P_ATTR_ADVERTISEMENT_ID:
+               if (len < 10) {
+                       wpa_printf(MSG_DEBUG,
+                                  "P2P: Too short Advertisement ID (length %u)",
+                                  len);
+                       return -1;
+               }
+               msg->adv_id = data;
+               msg->adv_mac = &data[sizeof(u32)];
+               wpa_printf(MSG_DEBUG, "P2P: * Advertisement ID %x",
+                          WPA_GET_LE32(data));
+               break;
+       case P2P_ATTR_ADVERTISED_SERVICE:
+               if (len < 8) {
+                       wpa_printf(MSG_DEBUG,
+                                  "P2P: Too short Service Instance (length %u)",
+                                  len);
+                       return -1;
+               }
+               msg->adv_service_instance = data;
+               msg->adv_service_instance_len = len;
+               if (len <= 255 + 8) {
+                       char str[256];
+                       u8 namelen;
+
+                       namelen = data[6];
+                       if (namelen > len - 7)
+                               break;
+                       os_memcpy(str, &data[7], namelen);
+                       str[namelen] = '\0';
+                       wpa_printf(MSG_DEBUG, "P2P: * Service Instance: %x-%s",
+                                  WPA_GET_LE32(data), str);
+               } else {
+                       wpa_printf(MSG_DEBUG, "P2P: * Service Instance: %p",
+                                  data);
+               }
+               break;
+       case P2P_ATTR_SESSION_ID:
+               if (len < sizeof(u32) + ETH_ALEN) {
+                       wpa_printf(MSG_DEBUG,
+                                  "P2P: Too short Session ID Info (length %u)",
+                                  len);
+                       return -1;
+               }
+               msg->session_id = data;
+               msg->session_mac = &data[sizeof(u32)];
+               wpa_printf(MSG_DEBUG, "P2P: * Session ID: %x " MACSTR,
+                          WPA_GET_LE32(data), MAC2STR(msg->session_mac));
+               break;
+       case P2P_ATTR_FEATURE_CAPABILITY:
+               if (!len) {
+                       wpa_printf(MSG_DEBUG,
+                                  "P2P: Too short Feature Capability (length %u)",
+                                  len);
+                       return -1;
+               }
+               msg->feature_cap = data;
+               msg->feature_cap_len = len;
+               wpa_printf(MSG_DEBUG, "P2P: * Feature Cap (length=%u)", len);
+               break;
+       case P2P_ATTR_PERSISTENT_GROUP:
+       {
+               if (len < ETH_ALEN) {
+                       wpa_printf(MSG_DEBUG,
+                                  "P2P: Too short Persistent Group Info (length %u)",
+                                  len);
+                       return -1;
+               }
+
+               msg->persistent_dev = data;
+               msg->persistent_ssid_len = len - ETH_ALEN;
+               msg->persistent_ssid = &data[ETH_ALEN];
+               wpa_printf(MSG_DEBUG, "P2P: * Persistent Group: " MACSTR " %s",
+                          MAC2STR(msg->persistent_dev),
+                          wpa_ssid_txt(msg->persistent_ssid,
+                                       msg->persistent_ssid_len));
+               break;
+       }
        default:
                wpa_printf(MSG_DEBUG, "P2P: Skipped unknown attribute %d "
                           "(length %d)", id, len);