Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-26 02:19:26 +01:00
Code Releases Activity
23f0f5717c
iwd/src/wsc.h

59 lines
1.8 KiB
C
Raw Normal View History

wsc: Declare the credentials structure in wsc.h
2019-12-05 04:22:40 +01:00
/*
*
* Wireless daemon for Linux
*
* Copyright (C) 2019 Intel Corporation. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
struct wsc_credentials_info {
char ssid[33];
enum security security;
union {
uint8_t psk[32];
char passphrase[64];
};
uint8_t addr[6];
bool has_passphrase;
};
wsc: Refactor to separate station-specific code Split the interface-specific logic from the core WSC logic. The core WSC code is the part that we can re-use between P2P and station and doesn't include the D-Bus code, scanning for the target BSS or the attempt to make a station mode connection.
2019-12-19 04:50:57 +01:00
wsc: Split out enrollee state machine to own object Create struct wsc_enrollee which is allocated with wsc_enrollee_new, taking a done callback as a parameter. The callback is always called so there's no need for a separate destroy callback. The object only lives until the done callback happens so wsc_enrollee_cancel/destroy can only be used before this. Looks like the rest of the file is simplified thanks to this.
2020-01-16 05:29:29 +01:00
struct wsc_enrollee;
wsc: Refactor to separate station-specific code Split the interface-specific logic from the core WSC logic. The core WSC code is the part that we can re-use between P2P and station and doesn't include the D-Bus code, scanning for the target BSS or the attempt to make a station mode connection.
2019-12-19 04:50:57 +01:00
typedef void (*wsc_done_cb_t)(int err, struct wsc_credentials_info *creds,
unsigned int n_creds, void *user_data);
wsc: Split out enrollee state machine to own object Create struct wsc_enrollee which is allocated with wsc_enrollee_new, taking a done callback as a parameter. The callback is always called so there's no need for a separate destroy callback. The object only lives until the done callback happens so wsc_enrollee_cancel/destroy can only be used before this. Looks like the rest of the file is simplified thanks to this.
2020-01-16 05:29:29 +01:00
struct wsc_enrollee *wsc_enrollee_new(struct netdev *netdev,
struct scan_bss *target,
const char *pin,
wsc: Accept extra IEs in wsc_enrollee_new
2020-01-16 05:29:31 +01:00
struct iovec *ies, unsigned int ies_num,
wsc: Split out enrollee state machine to own object Create struct wsc_enrollee which is allocated with wsc_enrollee_new, taking a done callback as a parameter. The callback is always called so there's no need for a separate destroy callback. The object only lives until the done callback happens so wsc_enrollee_cancel/destroy can only be used before this. Looks like the rest of the file is simplified thanks to this.
2020-01-16 05:29:29 +01:00
wsc_done_cb_t done_cb, void *user_data);
void wsc_enrollee_cancel(struct wsc_enrollee *wsce, bool defer_cb);
wsc: Rework wsc_enrollee_destroy Our design preference is to not call any callbacks in the _free/_destroy method of a class (with the exception of explicit destroy callbacks provided, if any). Invoking the callback in this case was unnecessary: wsc_dbus_free was already replying to pending connect / cancel messages. The only other thing the callback would attempt to do is to set station back into autoconnect mode. This was unnecessary as well since the netdev is already down. This change removes the callback invocation. Since wsc_enrollee_destroy is now just calling wsc_enrollee_free, remove this from the API and expose wsc_enrollee_free instead.
2020-01-17 18:18:23 +01:00
void wsc_enrollee_free(struct wsc_enrollee *wsce);
wsc: Refactor WSC D-Bus interface logic Split the WSC D-Bus interface class (struct wsc) into a base class common to station mode and P2P mode (struct wsc_dbus) and station- specific logic like scanning, saving the credentials as a known network and triggering the station-mode connection (struct wsc_station_dbus). Make the base class and its utilities public in wsc.h for P2P use.
2020-01-16 05:29:30 +01:00
struct wsc_dbus {
struct l_dbus_message *pending_connect;
struct l_dbus_message *pending_cancel;
const char *(*get_path)(struct wsc_dbus *wsc);
void (*connect)(struct wsc_dbus *wsc, const char *pin);
void (*cancel)(struct wsc_dbus *wsc);
void (*remove)(struct wsc_dbus *wsc);
};
bool wsc_dbus_add_interface(struct wsc_dbus *wsc);
void wsc_dbus_remove_interface(struct wsc_dbus *wsc);
Copy Permalink