static const int peer_role_address = Qt::UserRole + 1;
static const int peer_role_type = Qt::UserRole + 2;
+static const int peer_role_uuid = Qt::UserRole + 3;
/*
* TODO:
PEER_TYPE_AP,
PEER_TYPE_AP_WPS,
PEER_TYPE_WPS_PIN_NEEDED,
+ PEER_TYPE_WPS_ER_AP,
+ PEER_TYPE_WPS_ER_AP_UNCONFIGURED,
+ PEER_TYPE_WPS_ER_ENROLLEE
};
setupUi(this);
if (QImageReader::supportedImageFormats().contains(QByteArray("svg")))
+ {
default_icon = new QIcon(":/icons/wpa_gui.svg");
- else
+ ap_icon = new QIcon(":/icons/ap.svg");
+ laptop_icon = new QIcon(":/icons/laptop.svg");
+ } else {
default_icon = new QIcon(":/icons/wpa_gui.png");
+ ap_icon = new QIcon(":/icons/ap.png");
+ laptop_icon = new QIcon(":/icons/laptop.png");
+ }
peers->setModel(&model);
peers->setResizeMode(QListView::Adjust);
Peers::~Peers()
{
delete default_icon;
+ delete ap_icon;
+ delete laptop_icon;
}
case PEER_TYPE_WPS_PIN_NEEDED:
title = tr("WPS PIN needed");
break;
+ case PEER_TYPE_WPS_ER_AP:
+ title = tr("ER: WPS AP");
+ break;
+ case PEER_TYPE_WPS_ER_AP_UNCONFIGURED:
+ title = tr("ER: WPS AP (Unconfigured)");
+ break;
+ case PEER_TYPE_WPS_ER_ENROLLEE:
+ title = tr("ER: WPS Enrollee");
+ break;
}
menu->addAction(title)->setEnabled(false);
menu->addSeparator();
if (type == PEER_TYPE_ASSOCIATED_STATION ||
type == PEER_TYPE_AP_WPS ||
- type == PEER_TYPE_WPS_PIN_NEEDED) {
+ type == PEER_TYPE_WPS_PIN_NEEDED ||
+ type == PEER_TYPE_WPS_ER_ENROLLEE) {
/* TODO: only for peers that are requesting WPS PIN
* method */
menu->addAction(QString("Enter WPS PIN"), this,
{
if (ctx_item == NULL)
return;
- QString addr = ctx_item->data(peer_role_address).toString();
+
+ int peer_type = ctx_item->data(peer_role_type).toInt();
+ QString uuid;
+ QString addr;
+ if (peer_type == PEER_TYPE_WPS_ER_ENROLLEE)
+ uuid = ctx_item->data(peer_role_uuid).toString();
+ else
+ addr = ctx_item->data(peer_role_address).toString();
+
StringQuery input(tr("PIN:"));
input.setWindowTitle(tr("PIN for ") + ctx_item->text());
if (input.exec() != QDialog::Accepted)
char cmd[100];
char reply[100];
size_t reply_len;
- snprintf(cmd, sizeof(cmd), "WPS_PIN %s %s",
- addr.toAscii().constData(),
- input.get_string().toAscii().constData());
+
+ if (peer_type == PEER_TYPE_WPS_ER_ENROLLEE) {
+ snprintf(cmd, sizeof(cmd), "WPS_ER_PIN %s %s",
+ uuid.toAscii().constData(),
+ input.get_string().toAscii().constData());
+ } else {
+ snprintf(cmd, sizeof(cmd), "WPS_PIN %s %s",
+ addr.toAscii().constData(),
+ input.get_string().toAscii().constData());
+ }
reply_len = sizeof(reply) - 1;
if (wpagui->ctrlRequest(cmd, reply, &reply_len) < 0) {
QMessageBox msg;
if (name.isEmpty())
name = lines[0];
- QStandardItem *item = new QStandardItem(*default_icon, name);
+ QStandardItem *item = new QStandardItem(*laptop_icon, name);
if (item) {
item->setData(lines[0], peer_role_address);
item->setData(PEER_TYPE_ASSOCIATED_STATION,
if (name.isEmpty())
name = ssid + "\n" + bssid;
- QStandardItem *item = new QStandardItem(*default_icon, name);
+ QStandardItem *item = new QStandardItem(*ap_icon, name);
if (item) {
item->setData(bssid, peer_role_address);
if (flags.contains("[WPS"))
if (wpagui == NULL)
return;
+ char reply[20];
+ size_t replylen = sizeof(reply) - 1;
+ wpagui->ctrlRequest("WPS_ER_START", reply, &replylen);
+
add_stations();
add_scan_results();
}
}
+QStandardItem * Peers::find_uuid(QString uuid)
+{
+ if (model.rowCount() == 0)
+ return NULL;
+
+ QModelIndexList lst = model.match(model.index(0, 0), peer_role_uuid,
+ uuid);
+ if (lst.size() == 0)
+ return NULL;
+ return model.itemFromIndex(lst[0]);
+}
+
+
void Peers::event_notify(WpaMsg msg)
{
QString text = msg.getMsg();
}
}
- item = new QStandardItem(*default_icon, name);
+ item = new QStandardItem(*laptop_icon, name);
if (item) {
item->setData(addr, peer_role_address);
item->setData(PEER_TYPE_WPS_PIN_NEEDED,
}
return;
}
+
+ if (text.startsWith(WPS_EVENT_ER_AP_ADD)) {
+ /*
+ * WPS-ER-AP-ADD 87654321-9abc-def0-1234-56789abc0002
+ * 02:11:22:33:44:55 pri_dev_type=6-0050F204-1 wps_state=1
+ * |Very friendly name|Company|Long description of the model|
+ * WAP|http://w1.fi/|http://w1.fi/hostapd/
+ */
+ QStringList items = text.split(' ');
+ if (items.size() < 5)
+ return;
+ QString uuid = items[1];
+ QString addr = items[2];
+ QString pri_dev_type = items[3];
+ int wps_state = items[4].mid(10).toInt();
+
+ int pos = text.indexOf('|');
+ if (pos < 0)
+ return;
+ items = text.mid(pos + 1).split('|');
+ if (items.size() < 1)
+ return;
+
+ QStandardItem *item = find_uuid(uuid);
+ if (item)
+ return;
+
+ item = new QStandardItem(*ap_icon, items[0]);
+ if (item) {
+ item->setData(uuid, peer_role_uuid);
+ item->setData(addr, peer_role_address);
+ item->setData(wps_state == 2 ? PEER_TYPE_WPS_ER_AP:
+ PEER_TYPE_WPS_ER_AP_UNCONFIGURED,
+ peer_role_type);
+ item->setToolTip(addr + QString("\n") +
+ pri_dev_type + QString("\n") +
+ items.join(QString("\n")));
+ model.appendRow(item);
+ }
+
+ return;
+ }
+
+ if (text.startsWith(WPS_EVENT_ER_AP_REMOVE)) {
+ /* WPS-ER-AP-REMOVE 87654321-9abc-def0-1234-56789abc0002 */
+ QStringList items = text.split(' ');
+ if (items.size() < 2)
+ return;
+ if (model.rowCount() == 0)
+ return;
+
+ QModelIndexList lst = model.match(model.index(0, 0),
+ peer_role_uuid, items[1]);
+ for (int i = 0; i < lst.size(); i++) {
+ QStandardItem *item = model.itemFromIndex(lst[i]);
+ if (item &&
+ (item->data(peer_role_type).toInt() ==
+ PEER_TYPE_WPS_ER_AP ||
+ item->data(peer_role_type).toInt() ==
+ PEER_TYPE_WPS_ER_AP_UNCONFIGURED))
+ model.removeRow(lst[i].row());
+ }
+ return;
+ }
+
+ if (text.startsWith(WPS_EVENT_ER_ENROLLEE_ADD)) {
+ /*
+ * WPS-ER-ENROLLEE-ADD 2b7093f1-d6fb-5108-adbb-bea66bb87333
+ * 02:66:a0:ee:17:27 M1=1 config_methods=0x14d dev_passwd_id=0
+ * pri_dev_type=1-0050F204-1
+ * |Wireless Client|Company|cmodel|123|12345|
+ */
+ QStringList items = text.split(' ');
+ if (items.size() < 3)
+ return;
+ QString uuid = items[1];
+ QString addr = items[2];
+
+ int pos = text.indexOf('|');
+ if (pos < 0)
+ return;
+ items = text.mid(pos + 1).split('|');
+ if (items.size() < 1)
+ return;
+ QString name = items[0];
+ if (name.length() == 0)
+ name = addr;
+
+ remove_enrollee_uuid(uuid);
+
+ QStandardItem *item;
+ item = new QStandardItem(*laptop_icon, name);
+ if (item) {
+ item->setData(uuid, peer_role_uuid);
+ item->setData(addr, peer_role_address);
+ item->setData(PEER_TYPE_WPS_ER_ENROLLEE,
+ peer_role_type);
+ item->setToolTip(items.join(QString("\n")));
+ model.appendRow(item);
+ }
+
+ return;
+ }
+
+ if (text.startsWith(WPS_EVENT_ER_ENROLLEE_REMOVE)) {
+ /*
+ * WPS-ER-ENROLLEE-REMOVE 2b7093f1-d6fb-5108-adbb-bea66bb87333
+ * 02:66:a0:ee:17:27
+ */
+ QStringList items = text.split(' ');
+ if (items.size() < 2)
+ return;
+ remove_enrollee_uuid(items[1]);
+ return;
+ }
+}
+
+
+void Peers::closeEvent(QCloseEvent *)
+{
+ if (wpagui) {
+ char reply[20];
+ size_t replylen = sizeof(reply) - 1;
+ wpagui->ctrlRequest("WPS_ER_STOP", reply, &replylen);
+ }
+}
+
+
+void Peers::done(int r)
+{
+ QDialog::done(r);
+ close();
+}
+
+
+void Peers::remove_enrollee_uuid(QString uuid)
+{
+ if (model.rowCount() == 0)
+ return;
+
+ QModelIndexList lst = model.match(model.index(0, 0),
+ peer_role_uuid, uuid);
+ for (int i = 0; i < lst.size(); i++) {
+ QStandardItem *item = model.itemFromIndex(lst[i]);
+ if (item && item->data(peer_role_type).toInt() ==
+ PEER_TYPE_WPS_ER_ENROLLEE)
+ model.removeRow(lst[i].row());
+ }
}
projects / libeap.git / blobdiff