Merge tag 'upstream/0.9.2' into debian
[mech_eap.git] / libeap / src / p2p / p2p_parse.c
diff --git a/libeap/src/p2p/p2p_parse.c b/libeap/src/p2p/p2p_parse.c
deleted file mode 100644 (file)
index 25337a5..0000000
+++ /dev/null
@@ -1,698 +0,0 @@
-/*
- * P2P - IE parser
- * Copyright (c) 2009-2010, Atheros Communications
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
- */
-
-#include "includes.h"
-
-#include "common.h"
-#include "common/ieee802_11_defs.h"
-#include "common/ieee802_11_common.h"
-#include "wps/wps_i.h"
-#include "p2p_i.h"
-
-
-static int p2p_parse_attribute(u8 id, const u8 *data, u16 len,
-                              struct p2p_message *msg)
-{
-       const u8 *pos;
-       size_t i, nlen;
-       char devtype[WPS_DEV_TYPE_BUFSIZE];
-
-       switch (id) {
-       case P2P_ATTR_CAPABILITY:
-               if (len < 2) {
-                       wpa_printf(MSG_DEBUG, "P2P: Too short Capability "
-                                  "attribute (length %d)", len);
-                       return -1;
-               }
-               msg->capability = data;
-               wpa_printf(MSG_DEBUG, "P2P: * Device Capability %02x "
-                          "Group Capability %02x",
-                          data[0], data[1]);
-               break;
-       case P2P_ATTR_DEVICE_ID:
-               if (len < ETH_ALEN) {
-                       wpa_printf(MSG_DEBUG, "P2P: Too short Device ID "
-                                  "attribute (length %d)", len);
-                       return -1;
-               }
-               msg->device_id = data;
-               wpa_printf(MSG_DEBUG, "P2P: * Device ID " MACSTR,
-                          MAC2STR(msg->device_id));
-               break;
-       case P2P_ATTR_GROUP_OWNER_INTENT:
-               if (len < 1) {
-                       wpa_printf(MSG_DEBUG, "P2P: Too short GO Intent "
-                                  "attribute (length %d)", len);
-                       return -1;
-               }
-               msg->go_intent = data;
-               wpa_printf(MSG_DEBUG, "P2P: * GO Intent: Intent %u "
-                          "Tie breaker %u", data[0] >> 1, data[0] & 0x01);
-               break;
-       case P2P_ATTR_STATUS:
-               if (len < 1) {
-                       wpa_printf(MSG_DEBUG, "P2P: Too short Status "
-                                  "attribute (length %d)", len);
-                       return -1;
-               }
-               msg->status = data;
-               wpa_printf(MSG_DEBUG, "P2P: * Status: %d", data[0]);
-               break;
-       case P2P_ATTR_LISTEN_CHANNEL:
-               if (len == 0) {
-                       wpa_printf(MSG_DEBUG, "P2P: * Listen Channel: Ignore "
-                                  "null channel");
-                       break;
-               }
-               if (len < 5) {
-                       wpa_printf(MSG_DEBUG, "P2P: Too short Listen Channel "
-                                  "attribute (length %d)", len);
-                       return -1;
-               }
-               msg->listen_channel = data;
-               wpa_printf(MSG_DEBUG, "P2P: * Listen Channel: "
-                          "Country %c%c(0x%02x) Regulatory "
-                          "Class %d Channel Number %d", data[0], data[1],
-                          data[2], data[3], data[4]);
-               break;
-       case P2P_ATTR_OPERATING_CHANNEL:
-               if (len == 0) {
-                       wpa_printf(MSG_DEBUG, "P2P: * Operating Channel: "
-                                  "Ignore null channel");
-                       break;
-               }
-               if (len < 5) {
-                       wpa_printf(MSG_DEBUG, "P2P: Too short Operating "
-                                  "Channel attribute (length %d)", len);
-                       return -1;
-               }
-               msg->operating_channel = data;
-               wpa_printf(MSG_DEBUG, "P2P: * Operating Channel: "
-                          "Country %c%c(0x%02x) Regulatory "
-                          "Class %d Channel Number %d", data[0], data[1],
-                          data[2], data[3], data[4]);
-               break;
-       case P2P_ATTR_CHANNEL_LIST:
-               if (len < 3) {
-                       wpa_printf(MSG_DEBUG, "P2P: Too short Channel List "
-                                  "attribute (length %d)", len);
-                       return -1;
-               }
-               msg->channel_list = data;
-               msg->channel_list_len = len;
-               wpa_printf(MSG_DEBUG, "P2P: * Channel List: Country String "
-                          "'%c%c(0x%02x)'", data[0], data[1], data[2]);
-               wpa_hexdump(MSG_MSGDUMP, "P2P: Channel List",
-                           msg->channel_list, msg->channel_list_len);
-               break;
-       case P2P_ATTR_GROUP_INFO:
-               msg->group_info = data;
-               msg->group_info_len = len;
-               wpa_printf(MSG_DEBUG, "P2P: * Group Info");
-               break;
-       case P2P_ATTR_DEVICE_INFO:
-               if (len < ETH_ALEN + 2 + 8 + 1) {
-                       wpa_printf(MSG_DEBUG, "P2P: Too short Device Info "
-                                  "attribute (length %d)", len);
-                       return -1;
-               }
-               msg->p2p_device_info = data;
-               msg->p2p_device_info_len = len;
-               pos = data;
-               msg->p2p_device_addr = pos;
-               pos += ETH_ALEN;
-               msg->config_methods = WPA_GET_BE16(pos);
-               pos += 2;
-               msg->pri_dev_type = pos;
-               pos += 8;
-               msg->num_sec_dev_types = *pos++;
-               if (msg->num_sec_dev_types * 8 > data + len - pos) {
-                       wpa_printf(MSG_DEBUG, "P2P: Device Info underflow");
-                       return -1;
-               }
-               pos += msg->num_sec_dev_types * 8;
-               if (data + len - pos < 4) {
-                       wpa_printf(MSG_DEBUG, "P2P: Invalid Device Name "
-                                  "length %d", (int) (data + len - pos));
-                       return -1;
-               }
-               if (WPA_GET_BE16(pos) != ATTR_DEV_NAME) {
-                       wpa_hexdump(MSG_DEBUG, "P2P: Unexpected Device Name "
-                                   "header", pos, 4);
-                       return -1;
-               }
-               pos += 2;
-               nlen = WPA_GET_BE16(pos);
-               pos += 2;
-               if (data + len - pos < (int) nlen || nlen > 32) {
-                       wpa_printf(MSG_DEBUG, "P2P: Invalid Device Name "
-                                  "length %d (buf len %d)", (int) nlen,
-                                  (int) (data + len - pos));
-                       return -1;
-               }
-               os_memcpy(msg->device_name, pos, nlen);
-               msg->device_name[nlen] = '\0';
-               for (i = 0; i < nlen; i++) {
-                       if (msg->device_name[i] == '\0')
-                               break;
-                       if (msg->device_name[i] < 32)
-                               msg->device_name[i] = '_';
-               }
-               wpa_printf(MSG_DEBUG, "P2P: * Device Info: addr " MACSTR
-                          " primary device type %s device name '%s' "
-                          "config methods 0x%x",
-                          MAC2STR(msg->p2p_device_addr),
-                          wps_dev_type_bin2str(msg->pri_dev_type, devtype,
-                                               sizeof(devtype)),
-                          msg->device_name, msg->config_methods);
-               break;
-       case P2P_ATTR_CONFIGURATION_TIMEOUT:
-               if (len < 2) {
-                       wpa_printf(MSG_DEBUG, "P2P: Too short Configuration "
-                                  "Timeout attribute (length %d)", len);
-                       return -1;
-               }
-               msg->config_timeout = data;
-               wpa_printf(MSG_DEBUG, "P2P: * Configuration Timeout");
-               break;
-       case P2P_ATTR_INTENDED_INTERFACE_ADDR:
-               if (len < ETH_ALEN) {
-                       wpa_printf(MSG_DEBUG, "P2P: Too short Intended P2P "
-                                  "Interface Address attribute (length %d)",
-                                  len);
-                       return -1;
-               }
-               msg->intended_addr = data;
-               wpa_printf(MSG_DEBUG, "P2P: * Intended P2P Interface Address: "
-                          MACSTR, MAC2STR(msg->intended_addr));
-               break;
-       case P2P_ATTR_GROUP_BSSID:
-               if (len < ETH_ALEN) {
-                       wpa_printf(MSG_DEBUG, "P2P: Too short P2P Group BSSID "
-                                  "attribute (length %d)", len);
-                       return -1;
-               }
-               msg->group_bssid = data;
-               wpa_printf(MSG_DEBUG, "P2P: * P2P Group BSSID: " MACSTR,
-                          MAC2STR(msg->group_bssid));
-               break;
-       case P2P_ATTR_GROUP_ID:
-               if (len < ETH_ALEN || len > ETH_ALEN + 32) {
-                       wpa_printf(MSG_DEBUG, "P2P: Invalid P2P Group ID "
-                                  "attribute length %d", len);
-                       return -1;
-               }
-               msg->group_id = data;
-               msg->group_id_len = len;
-               wpa_printf(MSG_DEBUG, "P2P: * P2P Group ID: Device Address "
-                          MACSTR, MAC2STR(msg->group_id));
-               wpa_hexdump_ascii(MSG_DEBUG, "P2P: * P2P Group ID: SSID",
-                                 msg->group_id + ETH_ALEN,
-                                 msg->group_id_len - ETH_ALEN);
-               break;
-       case P2P_ATTR_INVITATION_FLAGS:
-               if (len < 1) {
-                       wpa_printf(MSG_DEBUG, "P2P: Too short Invitation "
-                                  "Flag attribute (length %d)", len);
-                       return -1;
-               }
-               msg->invitation_flags = data;
-               wpa_printf(MSG_DEBUG, "P2P: * Invitation Flags: bitmap 0x%x",
-                          data[0]);
-               break;
-       case P2P_ATTR_MANAGEABILITY:
-               if (len < 1) {
-                       wpa_printf(MSG_DEBUG, "P2P: Too short Manageability "
-                                  "attribute (length %d)", len);
-                       return -1;
-               }
-               msg->manageability = data;
-               wpa_printf(MSG_DEBUG, "P2P: * Manageability: bitmap 0x%x",
-                          data[0]);
-               break;
-       case P2P_ATTR_NOTICE_OF_ABSENCE:
-               if (len < 2) {
-                       wpa_printf(MSG_DEBUG, "P2P: Too short Notice of "
-                                  "Absence attribute (length %d)", len);
-                       return -1;
-               }
-               msg->noa = data;
-               msg->noa_len = len;
-               wpa_printf(MSG_DEBUG, "P2P: * Notice of Absence");
-               break;
-       case P2P_ATTR_EXT_LISTEN_TIMING:
-               if (len < 4) {
-                       wpa_printf(MSG_DEBUG, "P2P: Too short Extended Listen "
-                                  "Timing attribute (length %d)", len);
-                       return -1;
-               }
-               msg->ext_listen_timing = data;
-               wpa_printf(MSG_DEBUG, "P2P: * Extended Listen Timing "
-                          "(period %u msec  interval %u msec)",
-                          WPA_GET_LE16(msg->ext_listen_timing),
-                          WPA_GET_LE16(msg->ext_listen_timing + 2));
-               break;
-       case P2P_ATTR_MINOR_REASON_CODE:
-               if (len < 1) {
-                       wpa_printf(MSG_DEBUG, "P2P: Too short Minor Reason "
-                                  "Code attribute (length %d)", len);
-                       return -1;
-               }
-               msg->minor_reason_code = data;
-               wpa_printf(MSG_DEBUG, "P2P: * Minor Reason Code: %u",
-                          *msg->minor_reason_code);
-               break;
-       default:
-               wpa_printf(MSG_DEBUG, "P2P: Skipped unknown attribute %d "
-                          "(length %d)", id, len);
-               break;
-       }
-
-       return 0;
-}
-
-
-/**
- * p2p_parse_p2p_ie - Parse P2P IE
- * @buf: Concatenated P2P IE(s) payload
- * @msg: Buffer for returning parsed attributes
- * Returns: 0 on success, -1 on failure
- *
- * Note: Caller is responsible for clearing the msg data structure before
- * calling this function.
- */
-int p2p_parse_p2p_ie(const struct wpabuf *buf, struct p2p_message *msg)
-{
-       const u8 *pos = wpabuf_head_u8(buf);
-       const u8 *end = pos + wpabuf_len(buf);
-
-       wpa_printf(MSG_DEBUG, "P2P: Parsing P2P IE");
-
-       while (pos < end) {
-               u16 attr_len;
-               if (pos + 2 >= end) {
-                       wpa_printf(MSG_DEBUG, "P2P: Invalid P2P attribute");
-                       return -1;
-               }
-               attr_len = WPA_GET_LE16(pos + 1);
-               wpa_printf(MSG_DEBUG, "P2P: Attribute %d length %u",
-                          pos[0], attr_len);
-               if (pos + 3 + attr_len > end) {
-                       wpa_printf(MSG_DEBUG, "P2P: Attribute underflow "
-                                  "(len=%u left=%d)",
-                                  attr_len, (int) (end - pos - 3));
-                       wpa_hexdump(MSG_MSGDUMP, "P2P: Data", pos, end - pos);
-                       return -1;
-               }
-               if (p2p_parse_attribute(pos[0], pos + 3, attr_len, msg))
-                       return -1;
-               pos += 3 + attr_len;
-       }
-
-       return 0;
-}
-
-
-static int p2p_parse_wps_ie(const struct wpabuf *buf, struct p2p_message *msg)
-{
-       struct wps_parse_attr attr;
-
-       wpa_printf(MSG_DEBUG, "P2P: Parsing WPS IE");
-       if (wps_parse_msg(buf, &attr))
-               return -1;
-       if (attr.dev_name && attr.dev_name_len < sizeof(msg->device_name) &&
-           !msg->device_name[0])
-               os_memcpy(msg->device_name, attr.dev_name, attr.dev_name_len);
-       if (attr.config_methods) {
-               msg->wps_config_methods =
-                       WPA_GET_BE16(attr.config_methods);
-               wpa_printf(MSG_DEBUG, "P2P: Config Methods (WPS): 0x%x",
-                          msg->wps_config_methods);
-       }
-       if (attr.dev_password_id) {
-               msg->dev_password_id = WPA_GET_BE16(attr.dev_password_id);
-               wpa_printf(MSG_DEBUG, "P2P: Device Password ID: %d",
-                          msg->dev_password_id);
-       }
-       if (attr.primary_dev_type) {
-               char devtype[WPS_DEV_TYPE_BUFSIZE];
-               msg->wps_pri_dev_type = attr.primary_dev_type;
-               wpa_printf(MSG_DEBUG, "P2P: Primary Device Type (WPS): %s",
-                          wps_dev_type_bin2str(msg->wps_pri_dev_type, devtype,
-                                               sizeof(devtype)));
-       }
-
-       return 0;
-}
-
-
-/**
- * p2p_parse_ies - Parse P2P message IEs (both WPS and P2P IE)
- * @data: IEs from the message
- * @len: Length of data buffer in octets
- * @msg: Buffer for returning parsed attributes
- * Returns: 0 on success, -1 on failure
- *
- * Note: Caller is responsible for clearing the msg data structure before
- * calling this function.
- *
- * Note: Caller must free temporary memory allocations by calling
- * p2p_parse_free() when the parsed data is not needed anymore.
- */
-int p2p_parse_ies(const u8 *data, size_t len, struct p2p_message *msg)
-{
-       struct ieee802_11_elems elems;
-
-       ieee802_11_parse_elems(data, len, &elems, 0);
-       if (elems.ds_params && elems.ds_params_len >= 1)
-               msg->ds_params = elems.ds_params;
-       if (elems.ssid)
-               msg->ssid = elems.ssid - 2;
-
-       msg->wps_attributes = ieee802_11_vendor_ie_concat(data, len,
-                                                         WPS_DEV_OUI_WFA);
-       if (msg->wps_attributes &&
-           p2p_parse_wps_ie(msg->wps_attributes, msg)) {
-               p2p_parse_free(msg);
-               return -1;
-       }
-
-       msg->p2p_attributes = ieee802_11_vendor_ie_concat(data, len,
-                                                         P2P_IE_VENDOR_TYPE);
-       if (msg->p2p_attributes &&
-           p2p_parse_p2p_ie(msg->p2p_attributes, msg)) {
-               wpa_printf(MSG_DEBUG, "P2P: Failed to parse P2P IE data");
-               if (msg->p2p_attributes)
-                       wpa_hexdump_buf(MSG_MSGDUMP, "P2P: P2P IE data",
-                                       msg->p2p_attributes);
-               p2p_parse_free(msg);
-               return -1;
-       }
-
-       return 0;
-}
-
-
-/**
- * p2p_parse - Parse a P2P Action frame contents
- * @data: Action frame payload after Category and Code fields
- * @len: Length of data buffer in octets
- * @msg: Buffer for returning parsed attributes
- * Returns: 0 on success, -1 on failure
- *
- * Note: Caller must free temporary memory allocations by calling
- * p2p_parse_free() when the parsed data is not needed anymore.
- */
-int p2p_parse(const u8 *data, size_t len, struct p2p_message *msg)
-{
-       os_memset(msg, 0, sizeof(*msg));
-       wpa_printf(MSG_DEBUG, "P2P: Parsing the received message");
-       if (len < 1) {
-               wpa_printf(MSG_DEBUG, "P2P: No Dialog Token in the message");
-               return -1;
-       }
-       msg->dialog_token = data[0];
-       wpa_printf(MSG_DEBUG, "P2P: * Dialog Token: %d", msg->dialog_token);
-
-       return p2p_parse_ies(data + 1, len - 1, msg);
-}
-
-
-/**
- * p2p_parse_free - Free temporary data from P2P parsing
- * @msg: Parsed attributes
- */
-void p2p_parse_free(struct p2p_message *msg)
-{
-       wpabuf_free(msg->p2p_attributes);
-       msg->p2p_attributes = NULL;
-       wpabuf_free(msg->wps_attributes);
-       msg->wps_attributes = NULL;
-}
-
-
-int p2p_group_info_parse(const u8 *gi, size_t gi_len,
-                        struct p2p_group_info *info)
-{
-       const u8 *g, *gend;
-
-       os_memset(info, 0, sizeof(*info));
-       if (gi == NULL)
-               return 0;
-
-       g = gi;
-       gend = gi + gi_len;
-       while (g < gend) {
-               struct p2p_client_info *cli;
-               const u8 *t, *cend;
-               int count;
-
-               cli = &info->client[info->num_clients];
-               cend = g + 1 + g[0];
-               if (cend > gend)
-                       return -1; /* invalid data */
-               /* g at start of P2P Client Info Descriptor */
-               /* t at Device Capability Bitmap */
-               t = g + 1 + 2 * ETH_ALEN;
-               if (t > cend)
-                       return -1; /* invalid data */
-               cli->p2p_device_addr = g + 1;
-               cli->p2p_interface_addr = g + 1 + ETH_ALEN;
-               cli->dev_capab = t[0];
-
-               if (t + 1 + 2 + 8 + 1 > cend)
-                       return -1; /* invalid data */
-
-               cli->config_methods = WPA_GET_BE16(&t[1]);
-               cli->pri_dev_type = &t[3];
-
-               t += 1 + 2 + 8;
-               /* t at Number of Secondary Device Types */
-               cli->num_sec_dev_types = *t++;
-               if (t + 8 * cli->num_sec_dev_types > cend)
-                       return -1; /* invalid data */
-               cli->sec_dev_types = t;
-               t += 8 * cli->num_sec_dev_types;
-
-               /* t at Device Name in WPS TLV format */
-               if (t + 2 + 2 > cend)
-                       return -1; /* invalid data */
-               if (WPA_GET_BE16(t) != ATTR_DEV_NAME)
-                       return -1; /* invalid Device Name TLV */
-               t += 2;
-               count = WPA_GET_BE16(t);
-               t += 2;
-               if (count > cend - t)
-                       return -1; /* invalid Device Name TLV */
-               if (count >= 32)
-                       count = 32;
-               cli->dev_name = (const char *) t;
-               cli->dev_name_len = count;
-
-               g = cend;
-
-               info->num_clients++;
-               if (info->num_clients == P2P_MAX_GROUP_ENTRIES)
-                       return -1;
-       }
-
-       return 0;
-}
-
-
-static int p2p_group_info_text(const u8 *gi, size_t gi_len, char *buf,
-                              char *end)
-{
-       char *pos = buf;
-       int ret;
-       struct p2p_group_info info;
-       unsigned int i;
-
-       if (p2p_group_info_parse(gi, gi_len, &info) < 0)
-               return 0;
-
-       for (i = 0; i < info.num_clients; i++) {
-               struct p2p_client_info *cli;
-               char name[33];
-               char devtype[WPS_DEV_TYPE_BUFSIZE];
-               u8 s;
-               int count;
-
-               cli = &info.client[i];
-               ret = os_snprintf(pos, end - pos, "p2p_group_client: "
-                                 "dev=" MACSTR " iface=" MACSTR,
-                                 MAC2STR(cli->p2p_device_addr),
-                                 MAC2STR(cli->p2p_interface_addr));
-               if (ret < 0 || ret >= end - pos)
-                       return pos - buf;
-               pos += ret;
-
-               ret = os_snprintf(pos, end - pos,
-                                 " dev_capab=0x%x config_methods=0x%x "
-                                 "dev_type=%s",
-                                 cli->dev_capab, cli->config_methods,
-                                 wps_dev_type_bin2str(cli->pri_dev_type,
-                                                      devtype,
-                                                      sizeof(devtype)));
-               if (ret < 0 || ret >= end - pos)
-                       return pos - buf;
-               pos += ret;
-
-               for (s = 0; s < cli->num_sec_dev_types; s++) {
-                       ret = os_snprintf(pos, end - pos, " dev_type=%s",
-                                         wps_dev_type_bin2str(
-                                                 &cli->sec_dev_types[s * 8],
-                                                 devtype, sizeof(devtype)));
-                       if (ret < 0 || ret >= end - pos)
-                               return pos - buf;
-                       pos += ret;
-               }
-
-               os_memcpy(name, cli->dev_name, cli->dev_name_len);
-               name[cli->dev_name_len] = '\0';
-               count = (int) cli->dev_name_len - 1;
-               while (count >= 0) {
-                       if (name[count] < 32)
-                               name[count] = '_';
-                       count--;
-               }
-
-               ret = os_snprintf(pos, end - pos, " dev_name='%s'\n", name);
-               if (ret < 0 || ret >= end - pos)
-                       return pos - buf;
-               pos += ret;
-       }
-
-       return pos - buf;
-}
-
-
-/**
- * p2p_attr_text - Build text format description of P2P IE attributes
- * @data: P2P IE contents
- * @buf: Buffer for returning text
- * @end: Pointer to the end of the buf area
- * Returns: Number of octets written to the buffer or -1 on faikure
- *
- * This function can be used to parse P2P IE contents into text format
- * field=value lines.
- */
-int p2p_attr_text(struct wpabuf *data, char *buf, char *end)
-{
-       struct p2p_message msg;
-       char *pos = buf;
-       int ret;
-
-       os_memset(&msg, 0, sizeof(msg));
-       if (p2p_parse_p2p_ie(data, &msg))
-               return -1;
-
-       if (msg.capability) {
-               ret = os_snprintf(pos, end - pos,
-                                 "p2p_dev_capab=0x%x\n"
-                                 "p2p_group_capab=0x%x\n",
-                                 msg.capability[0], msg.capability[1]);
-               if (ret < 0 || ret >= end - pos)
-                       return pos - buf;
-               pos += ret;
-       }
-
-       if (msg.pri_dev_type) {
-               char devtype[WPS_DEV_TYPE_BUFSIZE];
-               ret = os_snprintf(pos, end - pos,
-                                 "p2p_primary_device_type=%s\n",
-                                 wps_dev_type_bin2str(msg.pri_dev_type,
-                                                      devtype,
-                                                      sizeof(devtype)));
-               if (ret < 0 || ret >= end - pos)
-                       return pos - buf;
-               pos += ret;
-       }
-
-       ret = os_snprintf(pos, end - pos, "p2p_device_name=%s\n",
-                         msg.device_name);
-       if (ret < 0 || ret >= end - pos)
-               return pos - buf;
-       pos += ret;
-
-       if (msg.p2p_device_addr) {
-               ret = os_snprintf(pos, end - pos, "p2p_device_addr=" MACSTR
-                                 "\n",
-                                 MAC2STR(msg.p2p_device_addr));
-               if (ret < 0 || ret >= end - pos)
-                       return pos - buf;
-               pos += ret;
-       }
-
-       ret = os_snprintf(pos, end - pos, "p2p_config_methods=0x%x\n",
-                         msg.config_methods);
-       if (ret < 0 || ret >= end - pos)
-               return pos - buf;
-       pos += ret;
-
-       ret = p2p_group_info_text(msg.group_info, msg.group_info_len,
-                                 pos, end);
-       if (ret < 0)
-               return pos - buf;
-       pos += ret;
-
-       return pos - buf;
-}
-
-
-int p2p_get_cross_connect_disallowed(const struct wpabuf *p2p_ie)
-{
-       struct p2p_message msg;
-
-       os_memset(&msg, 0, sizeof(msg));
-       if (p2p_parse_p2p_ie(p2p_ie, &msg))
-               return 0;
-
-       if (!msg.manageability)
-               return 0;
-
-       return !(msg.manageability[0] & P2P_MAN_CROSS_CONNECTION_PERMITTED);
-}
-
-
-u8 p2p_get_group_capab(const struct wpabuf *p2p_ie)
-{
-       struct p2p_message msg;
-
-       os_memset(&msg, 0, sizeof(msg));
-       if (p2p_parse_p2p_ie(p2p_ie, &msg))
-               return 0;
-
-       if (!msg.capability)
-               return 0;
-
-       return msg.capability[1];
-}
-
-
-const u8 * p2p_get_go_dev_addr(const struct wpabuf *p2p_ie)
-{
-       struct p2p_message msg;
-
-       os_memset(&msg, 0, sizeof(msg));
-       if (p2p_parse_p2p_ie(p2p_ie, &msg))
-               return NULL;
-
-       if (msg.p2p_device_addr)
-               return msg.p2p_device_addr;
-       if (msg.device_id)
-               return msg.device_id;
-
-       return NULL;
-}