aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKonguraj(Raj) Kulanthaivel <konguraj.kulanthaivel@intel.com>2011-02-24 19:51:17 (GMT)
committerJouni Malinen <j@w1.fi>2011-02-24 19:51:17 (GMT)
commitc5db8e517040f096d6c180150219c8ff88791efa (patch)
treede148421557e3890aa81e71abcb94a199ab7c657 /src
parente926bcffd80ad0df3a7dc987d396a3b28f212783 (diff)
downloadhostap-c5db8e517040f096d6c180150219c8ff88791efa.zip
hostap-c5db8e517040f096d6c180150219c8ff88791efa.tar.gz
hostap-c5db8e517040f096d6c180150219c8ff88791efa.tar.bz2
P2P: Embed publically visible struct in peer info
This embeds some information about each P2P peer that will be publically visible in a struct that is shared. The dev_found notification function is also passed the new struct, which requires some work for the driver-based P2P management. Signed-off-by: Konguraj(Raj) Kulanthaivel <konguraj.kulanthaivel@intel.com> Signed-off-by: Fabien Marotte <fabienx.marotte@linux.intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'src')
-rw-r--r--src/drivers/driver_test.c24
-rw-r--r--src/p2p/p2p.c133
-rw-r--r--src/p2p/p2p.h48
-rw-r--r--src/p2p/p2p_dev_disc.c22
-rw-r--r--src/p2p/p2p_go_neg.c6
-rw-r--r--src/p2p/p2p_i.h7
-rw-r--r--src/p2p/p2p_invitation.c11
-rw-r--r--src/p2p/p2p_pd.c15
-rw-r--r--src/p2p/p2p_sd.c17
9 files changed, 155 insertions, 128 deletions
diff --git a/src/drivers/driver_test.c b/src/drivers/driver_test.c
index 597ab2d..43b7c60 100644
--- a/src/drivers/driver_test.c
+++ b/src/drivers/driver_test.c
@@ -3117,9 +3117,8 @@ static void test_go_neg_req_rx(void *ctx, const u8 *src, u16 dev_passwd_id)
}
-static void test_dev_found(void *ctx, const u8 *addr, const u8 *dev_addr,
- const u8 *pri_dev_type, const char *dev_name,
- u16 config_methods, u8 dev_capab, u8 group_capab)
+static void test_dev_found(void *ctx, const u8 *addr,
+ const struct p2p_peer_info *info)
{
struct wpa_driver_test_data *drv = ctx;
union wpa_event_data event;
@@ -3127,19 +3126,20 @@ static void test_dev_found(void *ctx, const u8 *addr, const u8 *dev_addr,
wpa_printf(MSG_DEBUG, "%s(" MACSTR " p2p_dev_addr=" MACSTR
" pri_dev_type=%s name='%s' config_methods=0x%x "
"dev_capab=0x%x group_capab=0x%x)",
- __func__, MAC2STR(addr), MAC2STR(dev_addr),
- wps_dev_type_bin2str(pri_dev_type, devtype,
+ __func__, MAC2STR(addr), MAC2STR(info->p2p_device_addr),
+ wps_dev_type_bin2str(info->pri_dev_type, devtype,
sizeof(devtype)),
- dev_name, config_methods, dev_capab, group_capab);
+ info->device_name, info->config_methods, info->dev_capab,
+ info->group_capab);
os_memset(&event, 0, sizeof(event));
event.p2p_dev_found.addr = addr;
- event.p2p_dev_found.dev_addr = dev_addr;
- event.p2p_dev_found.pri_dev_type = pri_dev_type;
- event.p2p_dev_found.dev_name = dev_name;
- event.p2p_dev_found.config_methods = config_methods;
- event.p2p_dev_found.dev_capab = dev_capab;
- event.p2p_dev_found.group_capab = group_capab;
+ event.p2p_dev_found.dev_addr = info->p2p_device_addr;
+ event.p2p_dev_found.pri_dev_type = info->pri_dev_type;
+ event.p2p_dev_found.dev_name = info->device_name;
+ event.p2p_dev_found.config_methods = info->config_methods;
+ event.p2p_dev_found.dev_capab = info->dev_capab;
+ event.p2p_dev_found.group_capab = info->group_capab;
wpa_supplicant_event(drv->ctx, EVENT_P2P_DEV_FOUND, &event);
}
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
index 181f74c..d655484 100644
--- a/src/p2p/p2p.c
+++ b/src/p2p/p2p.c
@@ -61,7 +61,7 @@ static void p2p_expire_peers(struct p2p_data *p2p)
if (dev->last_seen.sec + P2P_PEER_EXPIRATION_AGE >= now.sec)
continue;
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Expiring old peer "
- "entry " MACSTR, MAC2STR(dev->p2p_device_addr));
+ "entry " MACSTR, MAC2STR(dev->info.p2p_device_addr));
dl_list_del(&dev->list);
p2p_device_free(p2p, dev);
}
@@ -149,7 +149,7 @@ void p2p_go_neg_failed(struct p2p_data *p2p, struct p2p_device *peer,
os_memset(&res, 0, sizeof(res));
res.status = status;
if (peer) {
- os_memcpy(res.peer_device_addr, peer->p2p_device_addr,
+ os_memcpy(res.peer_device_addr, peer->info.p2p_device_addr,
ETH_ALEN);
os_memcpy(res.peer_interface_addr, peer->intended_addr,
ETH_ALEN);
@@ -262,7 +262,7 @@ struct p2p_device * p2p_get_device(struct p2p_data *p2p, const u8 *addr)
{
struct p2p_device *dev;
dl_list_for_each(dev, &p2p->devices, struct p2p_device, list) {
- if (os_memcmp(dev->p2p_device_addr, addr, ETH_ALEN) == 0)
+ if (os_memcmp(dev->info.p2p_device_addr, addr, ETH_ALEN) == 0)
return dev;
}
return NULL;
@@ -324,7 +324,7 @@ static struct p2p_device * p2p_create_device(struct p2p_data *p2p,
if (dev == NULL)
return NULL;
dl_list_add(&p2p->devices, &dev->list);
- os_memcpy(dev->p2p_device_addr, addr, ETH_ALEN);
+ os_memcpy(dev->info.p2p_device_addr, addr, ETH_ALEN);
return dev;
}
@@ -333,11 +333,11 @@ static struct p2p_device * p2p_create_device(struct p2p_data *p2p,
static void p2p_copy_client_info(struct p2p_device *dev,
struct p2p_client_info *cli)
{
- os_memcpy(dev->device_name, cli->dev_name, cli->dev_name_len);
- dev->device_name[cli->dev_name_len] = '\0';
- dev->dev_capab = cli->dev_capab;
- dev->config_methods = cli->config_methods;
- os_memcpy(dev->pri_dev_type, cli->pri_dev_type, 8);
+ os_memcpy(dev->info.device_name, cli->dev_name, cli->dev_name_len);
+ dev->info.device_name[cli->dev_name_len] = '\0';
+ dev->info.dev_capab = cli->dev_capab;
+ dev->info.config_methods = cli->config_methods;
+ os_memcpy(dev->info.pri_dev_type, cli->pri_dev_type, 8);
}
@@ -388,11 +388,9 @@ static int p2p_add_group_clients(struct p2p_data *p2p, const u8 *go_dev_addr,
dev->flags |= P2P_DEV_GROUP_CLIENT_ONLY;
p2p_copy_client_info(dev, cli);
dev->oper_freq = freq;
- p2p->cfg->dev_found(
- p2p->cfg->cb_ctx, dev->p2p_device_addr,
- dev->p2p_device_addr, dev->pri_dev_type,
- dev->device_name, dev->config_methods,
- dev->dev_capab, 0);
+ p2p->cfg->dev_found(p2p->cfg->cb_ctx,
+ dev->info.p2p_device_addr,
+ &dev->info);
}
os_memcpy(dev->interface_addr, cli->p2p_interface_addr,
@@ -496,8 +494,8 @@ int p2p_add_device(struct p2p_data *p2p, const u8 *addr, int freq, int level,
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: Update Listen frequency based on scan "
"results (" MACSTR " %d -> %d MHz (DS param %d)",
- MAC2STR(dev->p2p_device_addr), dev->listen_freq, freq,
- msg.ds_params ? *msg.ds_params : -1);
+ MAC2STR(dev->info.p2p_device_addr), dev->listen_freq,
+ freq, msg.ds_params ? *msg.ds_params : -1);
}
dev->listen_freq = freq;
if (msg.group_info)
@@ -505,14 +503,16 @@ int p2p_add_device(struct p2p_data *p2p, const u8 *addr, int freq, int level,
dev->level = level;
if (msg.pri_dev_type)
- os_memcpy(dev->pri_dev_type, msg.pri_dev_type,
- sizeof(dev->pri_dev_type));
- os_memcpy(dev->device_name, msg.device_name, sizeof(dev->device_name));
- dev->config_methods = msg.config_methods ? msg.config_methods :
+ os_memcpy(dev->info.pri_dev_type, msg.pri_dev_type,
+ sizeof(dev->info.pri_dev_type));
+ os_memcpy(dev->info.device_name, msg.device_name,
+ sizeof(dev->info.device_name));
+ dev->info.config_methods = msg.config_methods ? msg.config_methods :
msg.wps_config_methods;
+
if (msg.capability) {
- dev->dev_capab = msg.capability[0];
- dev->group_capab = msg.capability[1];
+ dev->info.dev_capab = msg.capability[0];
+ dev->info.group_capab = msg.capability[1];
}
if (msg.ext_listen_timing) {
@@ -539,10 +539,7 @@ int p2p_add_device(struct p2p_data *p2p, const u8 *addr, int freq, int level,
"P2P: Do not report rejected device");
return 0;
}
- p2p->cfg->dev_found(p2p->cfg->cb_ctx, addr, dev->p2p_device_addr,
- dev->pri_dev_type, dev->device_name,
- dev->config_methods, dev->dev_capab,
- dev->group_capab);
+ p2p->cfg->dev_found(p2p->cfg->cb_ctx, addr, &dev->info);
dev->flags |= P2P_DEV_REPORTED;
return 0;
@@ -932,7 +929,8 @@ int p2p_connect(struct p2p_data *p2p, const u8 *peer_addr,
}
if (dev->flags & P2P_DEV_GROUP_CLIENT_ONLY) {
- if (!(dev->dev_capab & P2P_DEV_CAPAB_CLIENT_DISCOVERABILITY)) {
+ if (!(dev->info.dev_capab &
+ P2P_DEV_CAPAB_CLIENT_DISCOVERABILITY)) {
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: Cannot connect to P2P Device " MACSTR
" that is in a group and is not discoverable",
@@ -1059,15 +1057,15 @@ void p2p_add_dev_info(struct p2p_data *p2p, const u8 *addr,
os_get_time(&dev->last_seen);
if (msg->pri_dev_type)
- os_memcpy(dev->pri_dev_type, msg->pri_dev_type,
- sizeof(dev->pri_dev_type));
- os_memcpy(dev->device_name, msg->device_name,
- sizeof(dev->device_name));
- dev->config_methods = msg->config_methods ? msg->config_methods :
+ os_memcpy(dev->info.pri_dev_type, msg->pri_dev_type,
+ sizeof(dev->info.pri_dev_type));
+ os_memcpy(dev->info.device_name, msg->device_name,
+ sizeof(dev->info.device_name));
+ dev->info.config_methods = msg->config_methods ? msg->config_methods :
msg->wps_config_methods;
if (msg->capability) {
- dev->dev_capab = msg->capability[0];
- dev->group_capab = msg->capability[1];
+ dev->info.dev_capab = msg->capability[0];
+ dev->info.group_capab = msg->capability[1];
}
if (msg->listen_channel) {
int freq;
@@ -1086,7 +1084,7 @@ void p2p_add_dev_info(struct p2p_data *p2p, const u8 *addr,
} else {
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Update "
"peer " MACSTR " Listen channel: %u -> %u MHz",
- MAC2STR(dev->p2p_device_addr),
+ MAC2STR(dev->info.p2p_device_addr),
dev->listen_freq, freq);
dev->listen_freq = freq;
}
@@ -1107,8 +1105,9 @@ void p2p_add_dev_info(struct p2p_data *p2p, const u8 *addr,
"P2P: Created device entry based on GO Neg Req: "
MACSTR " dev_capab=0x%x group_capab=0x%x name='%s' "
"listen_freq=%d",
- MAC2STR(dev->p2p_device_addr), dev->dev_capab,
- dev->group_capab, dev->device_name, dev->listen_freq);
+ MAC2STR(dev->info.p2p_device_addr),
+ dev->info.dev_capab, dev->info.group_capab,
+ dev->info.device_name, dev->listen_freq);
}
dev->flags &= ~P2P_DEV_GROUP_CLIENT_ONLY;
@@ -1119,10 +1118,7 @@ void p2p_add_dev_info(struct p2p_data *p2p, const u8 *addr,
return;
}
- p2p->cfg->dev_found(p2p->cfg->cb_ctx, addr, dev->p2p_device_addr,
- dev->pri_dev_type, dev->device_name,
- dev->config_methods, dev->dev_capab,
- dev->group_capab);
+ p2p->cfg->dev_found(p2p->cfg->cb_ctx, addr, &dev->info);
}
@@ -1154,12 +1150,12 @@ void p2p_go_complete(struct p2p_data *p2p, struct p2p_device *peer)
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: GO Negotiation with " MACSTR " completed (%s will be "
- "GO)", MAC2STR(peer->p2p_device_addr),
+ "GO)", MAC2STR(peer->info.p2p_device_addr),
go ? "local end" : "peer");
os_memset(&res, 0, sizeof(res));
res.role_go = go;
- os_memcpy(res.peer_device_addr, peer->p2p_device_addr, ETH_ALEN);
+ os_memcpy(res.peer_device_addr, peer->info.p2p_device_addr, ETH_ALEN);
os_memcpy(res.peer_interface_addr, peer->intended_addr, ETH_ALEN);
res.wps_method = peer->wps_method;
if (peer->flags & P2P_DEV_PREFER_PERSISTENT_GROUP)
@@ -1420,8 +1416,8 @@ static void p2p_add_dev_from_probe_req(struct p2p_data *p2p, const u8 *addr,
dev->flags |= P2P_DEV_PROBE_REQ_ONLY;
if (msg.capability) {
- dev->dev_capab = msg.capability[0];
- dev->group_capab = msg.capability[1];
+ dev->info.dev_capab = msg.capability[0];
+ dev->info.group_capab = msg.capability[1];
}
if (msg.listen_channel) {
@@ -1431,19 +1427,21 @@ static void p2p_add_dev_from_probe_req(struct p2p_data *p2p, const u8 *addr,
msg.listen_channel[4]);
}
- os_memcpy(dev->device_name, msg.device_name, sizeof(dev->device_name));
+ os_memcpy(dev->info.device_name, msg.device_name,
+ sizeof(dev->info.device_name));
if (msg.wps_pri_dev_type)
- os_memcpy(dev->pri_dev_type, msg.wps_pri_dev_type,
- sizeof(dev->pri_dev_type));
+ os_memcpy(dev->info.pri_dev_type, msg.wps_pri_dev_type,
+ sizeof(dev->info.pri_dev_type));
p2p_parse_free(&msg);
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: Created device entry based on Probe Req: " MACSTR
" dev_capab=0x%x group_capab=0x%x name='%s' listen_freq=%d",
- MAC2STR(dev->p2p_device_addr), dev->dev_capab,
- dev->group_capab, dev->device_name, dev->listen_freq);
+ MAC2STR(dev->info.p2p_device_addr), dev->info.dev_capab,
+ dev->info.group_capab, dev->info.device_name,
+ dev->listen_freq);
}
@@ -1669,8 +1667,8 @@ int p2p_probe_req_rx(struct p2p_data *p2p, const u8 *addr, const u8 *ie,
if ((p2p->state == P2P_CONNECT || p2p->state == P2P_CONNECT_LISTEN) &&
p2p->go_neg_peer &&
- os_memcmp(addr, p2p->go_neg_peer->p2p_device_addr, ETH_ALEN) == 0)
- {
+ os_memcmp(addr, p2p->go_neg_peer->info.p2p_device_addr, ETH_ALEN)
+ == 0) {
/* Received a Probe Request from GO Negotiation peer */
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: Found GO Negotiation peer - try to start GO "
@@ -1681,8 +1679,8 @@ int p2p_probe_req_rx(struct p2p_data *p2p, const u8 *addr, const u8 *ie,
if ((p2p->state == P2P_INVITE || p2p->state == P2P_INVITE_LISTEN) &&
p2p->invite_peer &&
- os_memcmp(addr, p2p->invite_peer->p2p_device_addr, ETH_ALEN) == 0)
- {
+ os_memcmp(addr, p2p->invite_peer->info.p2p_device_addr, ETH_ALEN)
+ == 0) {
/* Received a Probe Request from Invite peer */
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: Found Invite peer - try to start Invite from "
@@ -2008,7 +2006,7 @@ void p2p_continue_find(struct p2p_data *p2p)
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Send "
"pending Provisioning Discovery Request to "
MACSTR " (config methods 0x%x)",
- MAC2STR(dev->p2p_device_addr),
+ MAC2STR(dev->info.p2p_device_addr),
dev->req_config_methods);
if (p2p_send_prov_disc_req(p2p, dev, 0) == 0)
return;
@@ -2047,7 +2045,6 @@ static void p2p_sd_cb(struct p2p_data *p2p, int success)
p2p_set_timeout(p2p, 0, 200000);
}
-
static void p2p_prov_disc_cb(struct p2p_data *p2p, int success)
{
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
@@ -2074,8 +2071,8 @@ int p2p_scan_res_handler(struct p2p_data *p2p, const u8 *bssid, int freq,
p2p_add_device(p2p, bssid, freq, level, ies, ies_len);
if (p2p->go_neg_peer && p2p->state == P2P_SEARCH &&
- os_memcmp(p2p->go_neg_peer->p2p_device_addr, bssid, ETH_ALEN) == 0)
- {
+ os_memcmp(p2p->go_neg_peer->info.p2p_device_addr, bssid, ETH_ALEN)
+ == 0) {
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: Found GO Negotiation peer - try to start GO "
"negotiation");
@@ -2148,12 +2145,12 @@ static void p2p_go_neg_req_cb(struct p2p_data *p2p, int success)
}
if (!success &&
- (dev->dev_capab & P2P_DEV_CAPAB_CLIENT_DISCOVERABILITY) &&
+ (dev->info.dev_capab & P2P_DEV_CAPAB_CLIENT_DISCOVERABILITY) &&
!is_zero_ether_addr(dev->member_in_go_dev)) {
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: Peer " MACSTR " did not acknowledge request - "
"try to use device discoverability through its GO",
- MAC2STR(dev->p2p_device_addr));
+ MAC2STR(dev->info.p2p_device_addr));
p2p->cfg->send_action_done(p2p->cfg->cb_ctx);
p2p_send_dev_disc_req(p2p, dev);
return;
@@ -2623,7 +2620,7 @@ int p2p_get_peer_info(struct p2p_data *p2p, const u8 *addr, int next,
end = buf + buflen;
res = os_snprintf(pos, end - pos, MACSTR "\n",
- MAC2STR(dev->p2p_device_addr));
+ MAC2STR(dev->info.p2p_device_addr));
if (res < 0 || res >= end - pos)
return pos - buf;
pos += res;
@@ -2660,12 +2657,12 @@ int p2p_get_peer_info(struct p2p_data *p2p, const u8 *addr, int next,
MAC2STR(dev->interface_addr),
MAC2STR(dev->member_in_go_dev),
MAC2STR(dev->member_in_go_iface),
- wps_dev_type_bin2str(dev->pri_dev_type,
+ wps_dev_type_bin2str(dev->info.pri_dev_type,
devtype, sizeof(devtype)),
- dev->device_name,
- dev->config_methods,
- dev->dev_capab,
- dev->group_capab,
+ dev->info.device_name,
+ dev->info.config_methods,
+ dev->info.dev_capab,
+ dev->info.group_capab,
dev->go_neg_req_sent,
p2p_go_state_text(dev->go_state),
dev->dialog_token,
@@ -3135,7 +3132,7 @@ int p2p_get_dev_addr(struct p2p_data *p2p, const u8 *iface_addr,
struct p2p_device *dev = p2p_get_device_interface(p2p, iface_addr);
if (dev == NULL)
return -1;
- os_memcpy(dev_addr, dev->p2p_device_addr, ETH_ALEN);
+ os_memcpy(dev_addr, dev->info.p2p_device_addr, ETH_ALEN);
return 0;
}
@@ -3235,5 +3232,5 @@ const u8 * p2p_get_go_neg_peer(struct p2p_data *p2p)
{
if (p2p == NULL || p2p->go_neg_peer == NULL)
return NULL;
- return p2p->go_neg_peer->p2p_device_addr;
+ return p2p->go_neg_peer->info.p2p_device_addr;
}
diff --git a/src/p2p/p2p.h b/src/p2p/p2p.h
index 0a7e6b2..8324399 100644
--- a/src/p2p/p2p.h
+++ b/src/p2p/p2p.h
@@ -139,6 +139,42 @@ enum p2p_scan_type {
};
/**
+ * struct p2p_peer_info - P2P peer information
+
+ */
+struct p2p_peer_info {
+ /**
+ * p2p_device_addr - P2P Device Address of the peer
+ */
+ u8 p2p_device_addr[ETH_ALEN];
+
+ /**
+ * pri_dev_type - Primary Device Type
+ */
+ u8 pri_dev_type[8];
+
+ /**
+ * device_name - Device Name
+ */
+ char device_name[33];
+
+ /**
+ * config_methods - WPS Configuration Methods
+ */
+ u16 config_methods;
+
+ /**
+ * dev_capab - Device Capabilities
+ */
+ u8 dev_capab;
+
+ /**
+ * group_capab - Group Capabilities
+ */
+ u8 group_capab;
+};
+
+/**
* struct p2p_config - P2P configuration
*
* This configuration is provided to the P2P module during initialization with
@@ -393,21 +429,15 @@ struct p2p_config {
* dev_found - Notification of a found P2P Device
* @ctx: Callback context from cb_ctx
* @addr: Source address of the message triggering this notification
- * @dev_addr: P2P Device Address of the found P2P Device
- * @pri_dev_type: Primary Device Type
- * @dev_name: Device Name
- * @config_methods: Configuration Methods
- * @dev_capab: Device Capabilities
- * @group_capab: Group Capabilities
+ * @info: P2P peer information
*
* This callback is used to notify that a new P2P Device has been
* found. This may happen, e.g., during Search state based on scan
* results or during Listen state based on receive Probe Request and
* Group Owner Negotiation Request.
*/
- void (*dev_found)(void *ctx, const u8 *addr, const u8 *dev_addr,
- const u8 *pri_dev_type, const char *dev_name,
- u16 config_methods, u8 dev_capab, u8 group_capab);
+ void (*dev_found)(void *ctx, const u8 *addr,
+ const struct p2p_peer_info *info);
/**
* go_neg_req_rx - Notification of a receive GO Negotiation Request
diff --git a/src/p2p/p2p_dev_disc.c b/src/p2p/p2p_dev_disc.c
index 2a0db6f..47cc0fd 100644
--- a/src/p2p/p2p_dev_disc.c
+++ b/src/p2p/p2p_dev_disc.c
@@ -38,7 +38,7 @@ static struct wpabuf * p2p_build_dev_disc_req(struct p2p_data *p2p,
len = p2p_buf_add_ie_hdr(buf);
p2p_buf_add_device_id(buf, dev_id);
- p2p_buf_add_group_id(buf, go->p2p_device_addr, go->oper_ssid,
+ p2p_buf_add_group_id(buf, go->info.p2p_device_addr, go->oper_ssid,
go->oper_ssid_len);
p2p_buf_update_ie_hdr(buf, len);
@@ -86,21 +86,22 @@ int p2p_send_dev_disc_req(struct p2p_data *p2p, struct p2p_device *dev)
return -1;
}
- req = p2p_build_dev_disc_req(p2p, go, dev->p2p_device_addr);
+ req = p2p_build_dev_disc_req(p2p, go, dev->info.p2p_device_addr);
if (req == NULL)
return -1;
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: Sending Device Discoverability Request to GO " MACSTR
" for client " MACSTR,
- MAC2STR(go->p2p_device_addr), MAC2STR(dev->p2p_device_addr));
+ MAC2STR(go->info.p2p_device_addr),
+ MAC2STR(dev->info.p2p_device_addr));
p2p->pending_client_disc_go = go;
- os_memcpy(p2p->pending_client_disc_addr, dev->p2p_device_addr,
+ os_memcpy(p2p->pending_client_disc_addr, dev->info.p2p_device_addr,
ETH_ALEN);
p2p->pending_action_state = P2P_PENDING_DEV_DISC_REQUEST;
- if (p2p_send_action(p2p, dev->oper_freq, go->p2p_device_addr,
- p2p->cfg->dev_addr, go->p2p_device_addr,
+ if (p2p_send_action(p2p, dev->oper_freq, go->info.p2p_device_addr,
+ p2p->cfg->dev_addr, go->info.p2p_device_addr,
wpabuf_head(req), wpabuf_len(req), 1000) < 0) {
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: Failed to send Action frame");
@@ -243,7 +244,8 @@ void p2p_process_dev_disc_resp(struct p2p_data *p2p, const u8 *sa,
MAC2STR(sa));
go = p2p->pending_client_disc_go;
- if (go == NULL || os_memcmp(sa, go->p2p_device_addr, ETH_ALEN) != 0) {
+ if (go == NULL ||
+ os_memcmp(sa, go->info.p2p_device_addr, ETH_ALEN) != 0) {
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Ignore unexpected "
"Device Discoverability Response");
return;
@@ -274,9 +276,9 @@ void p2p_process_dev_disc_resp(struct p2p_data *p2p, const u8 *sa,
if (p2p->go_neg_peer == NULL ||
os_memcmp(p2p->pending_client_disc_addr,
- p2p->go_neg_peer->p2p_device_addr, ETH_ALEN) != 0 ||
- os_memcmp(p2p->go_neg_peer->member_in_go_dev, go->p2p_device_addr,
- ETH_ALEN) != 0) {
+ p2p->go_neg_peer->info.p2p_device_addr, ETH_ALEN) != 0 ||
+ os_memcmp(p2p->go_neg_peer->member_in_go_dev,
+ go->info.p2p_device_addr, ETH_ALEN) != 0) {
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: No pending "
"operation with the client discoverability peer "
"anymore");
diff --git a/src/p2p/p2p_go_neg.c b/src/p2p/p2p_go_neg.c
index d5e3f1c..1c96486 100644
--- a/src/p2p/p2p_go_neg.c
+++ b/src/p2p/p2p_go_neg.c
@@ -196,7 +196,7 @@ int p2p_connect_send(struct p2p_data *p2p, struct p2p_device *dev)
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: No Listen/Operating frequency known for the "
"peer " MACSTR " to send GO Negotiation Request",
- MAC2STR(dev->p2p_device_addr));
+ MAC2STR(dev->info.p2p_device_addr));
return -1;
}
@@ -210,8 +210,8 @@ int p2p_connect_send(struct p2p_data *p2p, struct p2p_device *dev)
p2p->go_neg_peer = dev;
dev->flags |= P2P_DEV_WAIT_GO_NEG_RESPONSE;
dev->connect_reqs++;
- if (p2p_send_action(p2p, freq, dev->p2p_device_addr,
- p2p->cfg->dev_addr, dev->p2p_device_addr,
+ if (p2p_send_action(p2p, freq, dev->info.p2p_device_addr,
+ p2p->cfg->dev_addr, dev->info.p2p_device_addr,
wpabuf_head(req), wpabuf_len(req), 200) < 0) {
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: Failed to send Action frame");
diff --git a/src/p2p/p2p_i.h b/src/p2p/p2p_i.h
index 4dc3c78..0207c5b 100644
--- a/src/p2p/p2p_i.h
+++ b/src/p2p/p2p_i.h
@@ -36,12 +36,7 @@ struct p2p_device {
int level;
enum p2p_wps_method wps_method;
- u8 p2p_device_addr[ETH_ALEN]; /* P2P Device Address of the peer */
- u8 pri_dev_type[8];
- char device_name[33];
- u16 config_methods;
- u8 dev_capab;
- u8 group_capab;
+ struct p2p_peer_info info;
/*
* If the peer was discovered based on an interface address (e.g., GO
diff --git a/src/p2p/p2p_invitation.c b/src/p2p/p2p_invitation.c
index 6a085cb..bb2767d 100644
--- a/src/p2p/p2p_invitation.c
+++ b/src/p2p/p2p_invitation.c
@@ -53,7 +53,7 @@ static struct wpabuf * p2p_build_invitation_req(struct p2p_data *p2p,
if (go_dev_addr)
dev_addr = go_dev_addr;
else if (p2p->inv_role == P2P_INVITE_ROLE_CLIENT)
- dev_addr = peer->p2p_device_addr;
+ dev_addr = peer->info.p2p_device_addr;
else
dev_addr = p2p->cfg->dev_addr;
p2p_buf_add_group_id(buf, dev_addr, p2p->inv_ssid, p2p->inv_ssid_len);
@@ -343,7 +343,7 @@ int p2p_invite_send(struct p2p_data *p2p, struct p2p_device *dev,
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: No Listen/Operating frequency known for the "
"peer " MACSTR " to send Invitation Request",
- MAC2STR(dev->p2p_device_addr));
+ MAC2STR(dev->info.p2p_device_addr));
return -1;
}
@@ -356,8 +356,8 @@ int p2p_invite_send(struct p2p_data *p2p, struct p2p_device *dev,
p2p->pending_action_state = P2P_PENDING_INVITATION_REQUEST;
p2p->invite_peer = dev;
dev->invitation_reqs++;
- if (p2p_send_action(p2p, freq, dev->p2p_device_addr,
- p2p->cfg->dev_addr, dev->p2p_device_addr,
+ if (p2p_send_action(p2p, freq, dev->info.p2p_device_addr,
+ p2p->cfg->dev_addr, dev->info.p2p_device_addr,
wpabuf_head(req), wpabuf_len(req), 200) < 0) {
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: Failed to send Action frame");
@@ -443,7 +443,8 @@ int p2p_invite(struct p2p_data *p2p, const u8 *peer, enum p2p_invite_role role,
}
if (dev->flags & P2P_DEV_GROUP_CLIENT_ONLY) {
- if (!(dev->dev_capab & P2P_DEV_CAPAB_CLIENT_DISCOVERABILITY)) {
+ if (!(dev->info.dev_capab &
+ P2P_DEV_CAPAB_CLIENT_DISCOVERABILITY)) {
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: Cannot invite a P2P Device " MACSTR
" that is in a group and is not discoverable",
diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c
index 55341aa..e064216 100644
--- a/src/p2p/p2p_pd.c
+++ b/src/p2p/p2p_pd.c
@@ -56,8 +56,8 @@ static struct wpabuf * p2p_build_prov_disc_req(struct p2p_data *p2p,
p2p_buf_add_capability(buf, p2p->dev_capab, 0);
p2p_buf_add_device_info(buf, p2p, NULL);
if (go) {
- p2p_buf_add_group_id(buf, go->p2p_device_addr, go->oper_ssid,
- go->oper_ssid_len);
+ p2p_buf_add_group_id(buf, go->info.p2p_device_addr,
+ go->oper_ssid, go->oper_ssid_len);
}
p2p_buf_update_ie_hdr(buf, len);
@@ -266,16 +266,17 @@ int p2p_send_prov_disc_req(struct p2p_data *p2p, struct p2p_device *dev,
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: No Listen/Operating frequency known for the "
"peer " MACSTR " to send Provision Discovery Request",
- MAC2STR(dev->p2p_device_addr));
+ MAC2STR(dev->info.p2p_device_addr));
return -1;
}
if (dev->flags & P2P_DEV_GROUP_CLIENT_ONLY) {
- if (!(dev->dev_capab & P2P_DEV_CAPAB_CLIENT_DISCOVERABILITY)) {
+ if (!(dev->info.dev_capab &
+ P2P_DEV_CAPAB_CLIENT_DISCOVERABILITY)) {
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: Cannot use PD with P2P Device " MACSTR
" that is in a group and is not discoverable",
- MAC2STR(dev->p2p_device_addr));
+ MAC2STR(dev->info.p2p_device_addr));
return -1;
}
/* TODO: use device discoverability request through GO */
@@ -291,8 +292,8 @@ int p2p_send_prov_disc_req(struct p2p_data *p2p, struct p2p_device *dev,
return -1;
p2p->pending_action_state = P2P_PENDING_PD;
- if (p2p_send_action(p2p, freq, dev->p2p_device_addr,
- p2p->cfg->dev_addr, dev->p2p_device_addr,
+ if (p2p_send_action(p2p, freq, dev->info.p2p_device_addr,
+ p2p->cfg->dev_addr, dev->info.p2p_device_addr,
wpabuf_head(req), wpabuf_len(req), 200) < 0) {
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: Failed to send Action frame");
diff --git a/src/p2p/p2p_sd.c b/src/p2p/p2p_sd.c
index 5b286de..926fc03 100644
--- a/src/p2p/p2p_sd.c
+++ b/src/p2p/p2p_sd.c
@@ -25,14 +25,15 @@ struct p2p_sd_query * p2p_pending_sd_req(struct p2p_data *p2p,
{
struct p2p_sd_query *q;
- if (!(dev->dev_capab & P2P_DEV_CAPAB_SERVICE_DISCOVERY))
+ if (!(dev->info.dev_capab & P2P_DEV_CAPAB_SERVICE_DISCOVERY))
return 0; /* peer does not support SD */
for (q = p2p->sd_queries; q; q = q->next) {
if (q->for_all_peers && !(dev->flags & P2P_DEV_SD_INFO))
return q;
if (!q->for_all_peers &&
- os_memcmp(q->peer, dev->p2p_device_addr, ETH_ALEN) == 0)
+ os_memcmp(q->peer, dev->info.p2p_device_addr, ETH_ALEN) ==
+ 0)
return q;
}
@@ -265,7 +266,7 @@ int p2p_start_sd(struct p2p_data *p2p, struct p2p_device *dev)
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: No Listen/Operating frequency known for the "
"peer " MACSTR " to send SD Request",
- MAC2STR(dev->p2p_device_addr));
+ MAC2STR(dev->info.p2p_device_addr));
return -1;
}
@@ -275,7 +276,7 @@ int p2p_start_sd(struct p2p_data *p2p, struct p2p_device *dev)
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: Start Service Discovery with " MACSTR,
- MAC2STR(dev->p2p_device_addr));
+ MAC2STR(dev->info.p2p_device_addr));
req = p2p_build_sd_query(p2p->srv_update_indic, query->tlvs);
if (req == NULL)
@@ -285,8 +286,8 @@ int p2p_start_sd(struct p2p_data *p2p, struct p2p_device *dev)
p2p->sd_query = query;
p2p->pending_action_state = P2P_PENDING_SD;
- if (p2p_send_action(p2p, freq, dev->p2p_device_addr,
- p2p->cfg->dev_addr, dev->p2p_device_addr,
+ if (p2p_send_action(p2p, freq, dev->info.p2p_device_addr,
+ p2p->cfg->dev_addr, dev->info.p2p_device_addr,
wpabuf_head(req), wpabuf_len(req), 5000) < 0) {
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: Failed to send Action frame");
@@ -472,7 +473,7 @@ void p2p_rx_gas_initial_resp(struct p2p_data *p2p, const u8 *sa,
u16 update_indic;
if (p2p->state != P2P_SD_DURING_FIND || p2p->sd_peer == NULL ||
- os_memcmp(sa, p2p->sd_peer->p2p_device_addr, ETH_ALEN) != 0) {
+ os_memcmp(sa, p2p->sd_peer->info.p2p_device_addr, ETH_ALEN) != 0) {
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: Ignore unexpected GAS Initial Response from "
MACSTR, MAC2STR(sa));
@@ -713,7 +714,7 @@ void p2p_rx_gas_comeback_resp(struct p2p_data *p2p, const u8 *sa,
wpa_hexdump(MSG_DEBUG, "P2P: RX GAS Comeback Response", data, len);
if (p2p->state != P2P_SD_DURING_FIND || p2p->sd_peer == NULL ||
- os_memcmp(sa, p2p->sd_peer->p2p_device_addr, ETH_ALEN) != 0) {
+ os_memcmp(sa, p2p->sd_peer->info.p2p_device_addr, ETH_ALEN) != 0) {
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: Ignore unexpected GAS Comeback Response from "
MACSTR, MAC2STR(sa));