From: Andrew Zaborowski <balrogg@gmail.com>
To: iwd@lists.01.org
Subject: [PATCH 09/11] wsc: Accept extra IEs in wsc_new_p2p_enrollee
Date: Mon, 21 Oct 2019 15:55:08 +0200 [thread overview]
Message-ID: <20191021135510.12657-9-balrogg@gmail.com> (raw)
In-Reply-To: <20191021135510.12657-1-balrogg@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2945 bytes --]
From: Andrew Zaborowski <andrew.zaborowski@intel.com>
---
src/wsc.c | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/wsc.c b/src/wsc.c
index 61683e7b..6d232139 100644
--- a/src/wsc.c
+++ b/src/wsc.c
@@ -440,7 +440,8 @@ static inline enum wsc_rf_band freq_to_rf_band(uint32_t freq)
return WSC_RF_BAND_2_4_GHZ;
}
-static void wsc_connect(struct wsc *wsc)
+static void wsc_connect(struct wsc *wsc, struct iovec *ies,
+ unsigned int ies_num)
{
struct handshake_state *hs;
struct l_settings *settings = l_settings_new();
@@ -449,7 +450,7 @@ static void wsc_connect(struct wsc *wsc)
struct wsc_association_request request;
uint8_t *pdu;
size_t pdu_len;
- struct iovec ie_iov;
+ struct iovec ie_iov[1 + ies_num];
wsc->target = NULL;
@@ -496,18 +497,20 @@ static void wsc_connect(struct wsc *wsc)
goto error;
}
- ie_iov.iov_base = ie_tlv_encapsulate_wsc_payload(pdu, pdu_len,
- &ie_iov.iov_len);
+ ie_iov[0].iov_base = ie_tlv_encapsulate_wsc_payload(pdu, pdu_len,
+ &ie_iov[0].iov_len);
l_free(pdu);
- if (!ie_iov.iov_base) {
+ if (!ie_iov[0].iov_base) {
r = -ENOMEM;
goto error;
}
- r = netdev_connect(wsc->netdev, bss, hs, &ie_iov, 1, wsc_netdev_event,
- wsc_connect_cb, wsc);
- l_free(ie_iov.iov_base);
+ memcpy(ie_iov + 1, ies, sizeof(struct iovec) * ies_num);
+
+ r = netdev_connect(wsc->netdev, bss, hs, ie_iov, 1 + ies_num,
+ wsc_netdev_event, wsc_connect_cb, wsc);
+ l_free(ie_iov[0].iov_base);
if (r < 0)
goto error;
@@ -562,7 +565,7 @@ static void station_state_watch(enum station_state state, void *userdata)
station_remove_state_watch(wsc->station, wsc->station_state_watch);
wsc->station_state_watch = 0;
- wsc_connect(wsc);
+ wsc_connect(wsc, NULL, 0);
}
static void wsc_check_can_connect(struct wsc *wsc, struct scan_bss *target)
@@ -594,7 +597,7 @@ static void wsc_check_can_connect(struct wsc *wsc, struct scan_bss *target)
switch (station_get_state(wsc->station)) {
case STATION_STATE_DISCONNECTED:
- wsc_connect(wsc);
+ wsc_connect(wsc, NULL, 0);
return;
case STATION_STATE_CONNECTING:
case STATION_STATE_CONNECTED:
@@ -1188,8 +1191,9 @@ static void wsc_netdev_watch(struct netdev *netdev,
}
struct wsc *wsc_new_p2p_enrollee(struct netdev *netdev, struct scan_bss *target,
- char *pin, wsc_done_cb_t done_cb,
- void *user_data)
+ char *pin,
+ struct iovec *ies, unsigned int ies_num,
+ wsc_done_cb_t done_cb, void *user_data)
{
struct wsc *wsc;
@@ -1202,7 +1206,7 @@ struct wsc *wsc_new_p2p_enrollee(struct netdev *netdev, struct scan_bss *target,
wsc->done_data = user_data;
wsc->pin = l_strdup(pin);
- wsc_connect(wsc);
+ wsc_connect(wsc, ies, ies_num);
/*
* Wsc objects created this way are not handled in wsc_remove_interface,
--
2.20.1
next prev parent reply other threads:[~2019-10-21 13:55 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-21 13:55 [PATCH 01/11] netdev: Add a wdev_id based frame watch API Andrew Zaborowski
2019-10-21 13:55 ` [PATCH 02/11] netdev: Report RSSI to frame watch callbacks Andrew Zaborowski
2019-10-22 3:34 ` Denis Kenzior
2019-10-22 13:46 ` Andrew Zaborowski
2019-10-21 13:55 ` [PATCH 03/11] netdev: Extend checks for P2P scenarios Andrew Zaborowski
2019-10-22 3:36 ` Denis Kenzior
2019-10-21 13:55 ` [PATCH 04/11] eapol: Move the EAP event handler to handshake state Andrew Zaborowski
2019-10-22 4:11 ` Denis Kenzior
2019-10-22 14:00 ` Andrew Zaborowski
2019-10-22 14:34 ` Denis Kenzior
2019-10-21 13:55 ` [PATCH 05/11] unit: Update test-wsc to use handshake_state_set_eap_event_func Andrew Zaborowski
2019-10-21 13:55 ` [PATCH 06/11] wsc: Replace netdev_connect_wsc with netdev_connect usage Andrew Zaborowski
2019-10-21 13:55 ` [PATCH 07/11] netdev: Drop unused netdev_connect_wsc Andrew Zaborowski
2019-10-21 13:55 ` [PATCH 08/11] wsc: Add wsc_new_p2p_enrollee, refactor Andrew Zaborowski
2019-10-22 14:47 ` Denis Kenzior
2019-10-22 23:46 ` Andrew Zaborowski
2019-10-21 13:55 ` Andrew Zaborowski [this message]
2019-10-21 13:55 ` [PATCH 10/11] wiphy: Add wiphy_get_max_roc_duration Andrew Zaborowski
2019-10-22 3:26 ` Denis Kenzior
2019-10-21 13:55 ` [PATCH 11/11] wiphy: Add wiphy_get_supported_rates Andrew Zaborowski
2019-10-22 14:53 ` [PATCH 01/11] netdev: Add a wdev_id based frame watch API Denis Kenzior
2019-10-22 23:56 ` Andrew Zaborowski
2019-10-23 0:23 ` Denis Kenzior
2019-10-23 1:04 ` Andrew Zaborowski
2019-10-23 1:32 ` Denis Kenzior
2019-10-24 0:59 ` Andrew Zaborowski
2019-10-24 2:53 ` Denis Kenzior
2019-10-24 3:22 ` Andrew Zaborowski
2019-10-24 15:29 ` Denis Kenzior
2019-10-24 21:47 ` Andrew Zaborowski
2019-10-24 22:16 ` Denis Kenzior
2019-10-24 22:45 ` Andrew Zaborowski
2019-10-25 1:27 ` Denis Kenzior
2019-10-25 2:59 ` Andrew Zaborowski
2019-10-25 3:56 ` Denis Kenzior
2019-10-25 4:42 ` Andrew Zaborowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191021135510.12657-9-balrogg@gmail.com \
--to=balrogg@gmail.com \
--cc=iwd@lists.01.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox