diff options
| -rw-r--r-- | app/main.cpp | 16 | ||||
| -rw-r--r-- | app/wifi/Wifi.qml | 352 | ||||
| -rw-r--r-- | binding-wifi/agent.c | 70 | ||||
| -rw-r--r-- | binding-wifi/wifi-api.c | 263 | ||||
| -rw-r--r-- | binding-wifi/wifi-connman.c | 18 | ||||
| -rw-r--r-- | binding-wifi/wifi-connman.h | 7 |
6 files changed, 541 insertions, 185 deletions
diff --git a/app/main.cpp b/app/main.cpp index a55ebad..381b936 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -79,17 +79,25 @@ int main(int argc, char *argv[]) if (!positionalArguments.isEmpty()) { port = positionalArguments.takeFirst().toInt(); } -// QString secret = positionalArguments.takeFirst(); + QString secret = positionalArguments.takeFirst(); QUrl bindingAddress; bindingAddress.setScheme(QStringLiteral("http")); bindingAddress.setHost(QStringLiteral("localhost")); bindingAddress.setPort(port); bindingAddress.setPath(QStringLiteral("/api")); -// QUrlQuery query; -// query.addQueryItem(QStringLiteral("token"), secret); -// bindingAddress.setQuery(query); + QUrlQuery query; + query.addQueryItem(QStringLiteral("token"), secret); + //bindingAddress.setQuery(query); + + QUrl bindingAddressWS; + bindingAddressWS.setScheme(QStringLiteral("ws")); + bindingAddressWS.setHost(QStringLiteral("localhost")); + bindingAddressWS.setPort(port); + bindingAddressWS.setPath(QStringLiteral("/api")); + bindingAddressWS.setQuery(query); QQmlContext *context = engine.rootContext(); context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress); + context->setContextProperty(QStringLiteral("bindingAddressWS"), bindingAddressWS); QFile version("/proc/version"); if (version.open(QFile::ReadOnly)) { diff --git a/app/wifi/Wifi.qml b/app/wifi/Wifi.qml index 52cd44d..53ab274 100644 --- a/app/wifi/Wifi.qml +++ b/app/wifi/Wifi.qml @@ -1,3 +1,4 @@ + /* * Copyright (C) 2016 The Qt Company Ltd. * @@ -18,7 +19,8 @@ import QtQuick 2.6 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.0 import AGL.Demo.Controls 1.0 -import '..' +import QtWebSockets 1.0 +import ".." SettingPage { id: root @@ -27,50 +29,215 @@ SettingPage { checkable: true property string wifiAPIpath: bindingAddress + '/wifi-manager/' + //http://localhost:12345/api + + property string address_str: bindingAddressWS + + property string token_str: "" + property string api_str: "wifi-manager" + property string verb_str: "" + property string parameter_str: "" + property string payloadLength: "9999" + + property var msgid_enu: { + "call": 2, + "retok": 3, + "reterr": 4, + "event": 5 + } + property string request_str: "" + property string status_str: "" + + WebSocket { + id: websocket + url: address_str + onTextMessageReceived: { + var message_json = JSON.parse(message) + //console.log("Raw response: " + message) + //console.log("JSON response: " + message_json) + /* server is not happy with our request, ignore it */ + if ((message_json[0] === msgid_enu.reterr)) { + + console.log("Return value is not ok !") + console.log("Raw response: " + message) + return + + } else if ((message_json[0] === msgid_enu.event)) { + + var eventContent = JSON.parse(JSON.stringify(message_json[2])) + + console.log("Return value is EVENT: " + eventContent.event) + + if (eventContent.event === "wifi-manager/networkListUpdated") { + + console.log("Event data:" + eventContent.data.data1 + ", " + eventContent.data.data2 ) + console.log("Network List was updated, sending scan_result request") + + //update network list + verb_str = "scan_result" + var parameterJson = 'None' + sendSocketMesage(verb_str, parameterJson) + } + + else if (eventContent.event === "wifi-manager/passwordQuery") { + + console.log("Event data:" + eventContent.data.data1 + ", " + eventContent.data.data2 ) + + console.log("Passkey requested") + dialog.visible = true + + } + else { + + console.error("Unhadled event.") + + } + } else if ((message_json[0] === msgid_enu.retok)) { + + + /* token creation or refresh happened, store it and enable buttons */ + if (verb_str == "connect") { + token_str = message_json[3] + + console.error("Connect reply received!") + + + } else if (verb_str == "logout") { + websocket.active = false // close the socket + + } else if (verb_str == "scan_result") { + + var jsonObjectNetworks = JSON.parse( + JSON.stringify(message_json[2].response)) + + networkList.clear() + for (var i = 0; i < jsonObjectNetworks.length; i++) { + + networkList.append({ + number: jsonObjectNetworks[i].Number, + name: jsonObjectNetworks[i].ESSID, + strength: jsonObjectNetworks[i].Strength, + serviceState: jsonObjectNetworks[i].State, + security: jsonObjectNetworks[i].Security, + address: jsonObjectNetworks[i].IPAddress + }) + } + + } + } else + console.log("ELSE msgid", message_json[0]) + } + onStatusChanged: { + + var parameterJson = 0 + var requestJson = 0 + + console.log("Status changed") + if (websocket.status == WebSocket.Error) { + status_str = "Error: " + websocket.errorString + + } else if (websocket.status == WebSocket.Open) { + status_str = "Socket opened; sending message..." + + //subscribe for events + + + //network list updated event + verb_str = "eventadd" + parameterJson = { + tag: 'networkList', + name: 'networkListUpdated' + } + sendSocketMesage(verb_str, parameterJson) + + + //TODO: send this ONLY when OK response is received + verb_str = "eventsub" + parameterJson = { + tag: 'networkList' + } + sendSocketMesage(verb_str, parameterJson) + + + //password required event + verb_str = "eventadd" + parameterJson = { + tag: 'password', + name: 'passwordQuery' + } + sendSocketMesage(verb_str, parameterJson) + + + //TODO: send this ONLY when OK response is received + verb_str = "eventsub" + parameterJson = { + tag: 'password' + } + sendSocketMesage(verb_str, parameterJson) + + + verb_str = "activate" + parameterJson = 'None' + sendSocketMesage(verb_str, parameterJson) + + + //get scan results right away + verb_str = "scan_result" + parameterJson = 'None' + sendSocketMesage(verb_str, parameterJson) + + + } else if (websocket.status == WebSocket.Closed) { + status_str = "Socket closed" + //TODO: unsubscribe for events + } + + console.log(status_str) + console.log(websocket.status) + } + active: false + } onCheckedChanged: { console.log("Wifi set to", checked) + if (checked == true) { - periodicRefresh.start() - request(wifiAPIpath + 'activate', function (o) { - // log the json response - console.log(o.responseText) - }) + //activating is done when socket is opened + websocket.active = true } else { - //console.log(networkPath) networkList.clear() - request(wifiAPIpath + 'deactivate', function (o) { - // log the json response - console.log(o.responseText) - }) + + verb_str = "deactivate" + var parameterJson = 'None' + sendSocketMesage(verb_str, parameterJson) + + websocket.active = false } + + } - function listWifiNetworks() { - console.log("test #4") + + + function sendSocketMesage(verb, parameter) { + + + var requestJson = [msgid_enu.call, payloadLength, api_str + '/' + + verb, parameter] + + websocket.sendTextMessage(JSON.stringify(requestJson)) + } ListModel { id: networkList } - function request(url, callback) { - var xhr = new XMLHttpRequest() - xhr.onreadystatechange = (function (myxhr) { - return function () { - if (xhr.readyState == 4 && xhr.status == 200) - callback(myxhr) - } - }) - (xhr) - xhr.open('GET', url, false) - xhr.send('') - } function securityType(security) { - if (security === "Open") - return "unsecured" - else - return "secured" + if (security === "Open") + return "unsecured" + else + return "secured" } Component { @@ -108,57 +275,71 @@ SettingPage { text: name color: '#66FF99' font.pixelSize: 48 - font.bold: serviceState === "ready" || serviceState === "online" + font.bold: serviceState === "ready" + || serviceState === "online" } Label { - visible: serviceState === "ready" || serviceState === "online" + visible: serviceState === "ready" + || serviceState === "online" text: "connected, " + address - font.pointSize: 18 + font.pixelSize: 18 color: "white" //font.italic: true } } + + onClicked: { + var parameterJson = 0 + var requestJson = 0 + //connectButton.border.color = "steelblue" - if ((serviceState === "ready") - || serviceState === "online") { + if ((serviceState === "ready") || serviceState === "online") { + //means we are connected console.log("Disconnecting from", index, " ,", name) - request(wifiAPIpath + 'disconnect?network=' + index, - function (o) { - //showRequestInfo(o.responseText) - console.log(o.responseText) - }) + //make some indication that disconnection is in progress + //probably not good enough, though. TODO: make it better + networkNameText.font.italic = 1 + + verb_str = "disconnect" + parameterJson = { + network: view.currentIndex + } + sendSocketMesage(verb_str, parameterJson) + + + + } else { - console.log("Conect to", index, " ,", name) + console.log("Connect to", index, " ,", name) view.currentIndex = model.index - if (securityType(security) === "unsecured") { - request(wifiAPIpath + 'connect?network=' + view.currentIndex, - function (o) { - // log the json response - //showRequestInfo(o.responseText) - console.log(o.responseText) - }) - } else { - dialog.visible = true + //make some indication that connection is in progress + //probably not good enough, though. TODO: make it better + networkNameText.font.italic = 1 + + verb_str = "connect" + parameterJson = { + network: view.currentIndex } + sendSocketMesage(verb_str, parameterJson) + } } -// ImageButton { -// anchors.verticalCenter: parent.verticalCenter -// anchors.right: parent.right -// offImage: '../images/HMI_Settings_X.svg' -// onClicked: { - -// } -// } + // ImageButton { + // anchors.verticalCenter: parent.verticalCenter + // anchors.right: parent.right + // offImage: '../images/HMI_Settings_X.svg' + // onClicked: { + // } + // } Image { source: '../images/HMI_Settings_DividingLine.svg' anchors.horizontalCenter: parent.horizontalCenter @@ -174,7 +355,7 @@ SettingPage { id: view anchors.fill: parent anchors.margins: 100 - model: networkList //WifiList {} + model: networkList delegate: wifiDevice clip: true } @@ -213,25 +394,16 @@ SettingPage { text: 'Connect' highlighted: true onClicked: { + var passkey = password.text console.log("Validating", passkey) - console.log("Passkey is", passkey) - request(wifiAPIpath + 'security?passkey=' + passkey, - function (o) { - - //showRequestInfo(o.responseText) - console.log(o.responseText) - }) - - request(wifiAPIpath + 'connect?network=' + view.currentIndex, - function (o) { - - // log the json response - //showRequestInfo(o.responseText) - console.log(o.responseText) - }) - + //just send the password, binder is waiting for it + verb_str = "insertpasskey" + var parameterJson = { + passkey: passkey + } + sendSocketMesage(verb_str, parameterJson) dialog.visible = false } } @@ -252,36 +424,4 @@ SettingPage { } } - //Timer for periodic refresh; this is BAD solution, need to figure out how to subscribe for events - Timer { - id: periodicRefresh - interval: 1000 // 1second - running: !dialog.visible - onTriggered: { - - networkList.clear() - request(wifiAPIpath + 'scan_result', function (o) { - // log the json response - console.log(o.responseText) - - // translate response into object - var jsonObject = JSON.parse(o.responseText) - var jsonObjectNetworks = jsonObject.response - console.log("WiFi list refreshed") - //console.log(jsonObject.response) - for (var i = 0; i < jsonObjectNetworks.length; i++) { - networkList.append({ - number: jsonObjectNetworks[i].Number, - name: jsonObjectNetworks[i].ESSID, - strength: jsonObjectNetworks[i].Strength, - serviceState: jsonObjectNetworks[i].State, - security: jsonObjectNetworks[i].Security, - address: jsonObjectNetworks[i].IPAddress - }) - } - }) - start() - } - } } - diff --git a/binding-wifi/agent.c b/binding-wifi/agent.c index a22dc31..66f23be 100644 --- a/binding-wifi/agent.c +++ b/binding-wifi/agent.c @@ -23,6 +23,8 @@ static GMainLoop *loop = NULL; static GDBusNodeInfo *introspection_data = NULL; +GDBusConnection *connectionAgent; + GDBusMethodInvocation *invocation_passkey = NULL; /* Introspection data for the agent service */ @@ -41,6 +43,7 @@ static const gchar introspection_xml[] = "<node>" "</node>"; callback password_callback; +callback wifiListChanged_callback; static void handle_method_call(GDBusConnection *connection, const gchar *sender, const gchar *object_path, const gchar *interface_name, @@ -53,10 +56,6 @@ static void handle_method_call(GDBusConnection *connection, const gchar *sender, invocation_passkey = invocation; - //TODO: send the name of the network to callback - - (*password_callback)(0); - GVariantIter *array; gchar * object_path; g_variant_get(parameters, "(oa{sv})", &object_path, &array); @@ -81,6 +80,8 @@ static void handle_method_call(GDBusConnection *connection, const gchar *sender, ] */ printf("Passphrase requested for network : %s\n", object_path); + (*password_callback)(0, object_path); + } @@ -97,7 +98,7 @@ static void handle_method_call(GDBusConnection *connection, const gchar *sender, if (g_strcmp0(error_string, "invalid-key") == 0) { printf("Passkey is not correct.\n"); - (*password_callback)(1); + (*password_callback)(1, "invalid-key"); } @@ -142,12 +143,45 @@ static void on_bus_acquired(GDBusConnection *connection, const gchar *name, return NULL; } +static void test_signal_handler (GDBusConnection *connection, const gchar *sender_name, const gchar *object_path, const gchar *interface_name, const gchar *signal_name, GVariant *parameters, gpointer user_data) { + + //openlog("WIFI Binder", LOG_PID | LOG_CONS, LOG_USER); + + + //do not parse, just check what has changed and make callback - + // we need to refresh completelist anyway.. + if (g_strcmp0(signal_name, "PropertiesChanged") == 0) { + + //syslog(LOG_INFO, "PropertiesChanged"); + (*wifiListChanged_callback)(1, "PropertiesChanged"); + } + else if (g_strcmp0(signal_name, "BSSRemoved") == 0) { + //syslog(LOG_INFO, "BSSRemoved" ); + (*wifiListChanged_callback)(2, "BSSRemoved"); + } + + else if (g_strcmp0(signal_name, "BSSAdded") == 0) { + //syslog(LOG_INFO, "BSSAdded" ); + (*wifiListChanged_callback)(2, "BSSAdded"); + } + else printf ("unhandled signal %s %s %s, %s", sender_name, object_path, interface_name, signal_name);//syslog(LOG_INFO, "unhandled signal %s %s %s, %s", sender_name, object_path, interface_name, signal_name); + + + + //closelog(); + + + + +} + void* register_agent(void *data) { - //printf("Loop start\n"); + printf("Loop start\n"); guint owner_id; - //MyObject *myobj; + + guint networkChangedID; introspection_data = g_dbus_node_info_new_for_xml(introspection_xml, NULL); g_assert(introspection_data != NULL); @@ -165,6 +199,12 @@ void* register_agent(void *data) { NULL); //G_BUS_NAME_OWNER_FLAGS_NONE G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT + + //"net.connman.Manager", "ServicesChanged", + networkChangedID = g_dbus_connection_signal_subscribe(connectionAgent, NULL, "fi.w1.wpa_supplicant1.Interface", NULL, NULL, NULL, G_DBUS_SIGNAL_FLAGS_NONE, test_signal_handler, NULL, NULL); + + g_assert(networkChangedID !=0); + loop = g_main_loop_new(NULL, FALSE); //sleep(10); @@ -189,7 +229,8 @@ GError* create_agent(GDBusConnection *connection) { int err = -1; pthread_t tid[1]; - //struct callbackData *threadData; + + connectionAgent = connection; err = pthread_create((&tid[0]), NULL, register_agent, NULL); @@ -215,11 +256,11 @@ GError* create_agent(GDBusConnection *connection) { if (error) { printf("error: %d:%s\n", error->code, error->message); - + return error; } else { - printf("Agent registered\n"); + printf("Agent registered\n"); return NULL; } @@ -254,9 +295,16 @@ GError* stop_agent(GDBusConnection *connection) { } -void register_callback(callback callback_function) { +void register_callbackSecurity(callback callback_function) { password_callback = callback_function; } +void register_callbackWiFiList(callback callback_function) { + + wifiListChanged_callback = callback_function; + +} + + diff --git a/binding-wifi/wifi-api.c b/binding-wifi/wifi-api.c index f6d6d52..dba07d9 100644 --- a/binding-wifi/wifi-api.c +++ b/binding-wifi/wifi-api.c @@ -42,9 +42,11 @@ static int password_not_correct_flag = 0; char *passkey; callback ptr_my_callback; +callback wifiListChanged_clbck; GSList *wifi_list = NULL; + /** * \brief Read out the passkey from the use and pass it to Agent * @@ -54,74 +56,120 @@ GSList *wifi_list = NULL; * * * */ -void passkey_inserted(void) { +void wifi_passkey(struct afb_req request) { - printf("Passkey inserted: %s\n", passkey); - if (passkey != NULL) { + const char *passkey_from_user; - registerPasskey(passkey); - } else { - printf("Please enter the password first\n"); + /* retrieves the argument, expects password string */ + passkey_from_user = afb_req_value(request, "passkey"); - } + printf("Passkey inserted: %s\n", passkey_from_user); + + sendPasskey(passkey_from_user); + + + if (passkey != NULL) { + + registerPasskey(passkey); + } else { + printf("Please enter the password first\n"); + + } +} + + + +struct event +{ + struct event *next; + struct afb_event event; + char tag[1]; +}; + +static struct event *events = 0; + +/* searchs the event of tag */ +static struct event *event_get(const char *tag) +{ + struct event *e = events; + while(e && strcmp(e->tag, tag)) + e = e->next; + return e; +} + +static int event_push(struct json_object *args, const char *tag) +{ + struct event *e; + e = event_get(tag); + return e ? afb_event_push(e->event, json_object_get(args)) : -1; +} + +static void eventpush (struct afb_req request) +{ + const char *tag = afb_req_value(request, "tag"); + const char *data = afb_req_value(request, "data"); + ///data = "mojedata"; + json_object *object = data ? json_tokener_parse(data) : NULL; + + if (tag == NULL) + afb_req_fail(request, "failed", "bad arguments"); + else if (0 > event_push(object, tag)) + afb_req_fail(request, "failed", "push error"); + else + afb_req_success(request, NULL, NULL); } /** * \brief Notify user that password is necessary * * This function is called from the registered agent on RequestInput() call. - * \todo Subscribe for this event from GUI. * * */ -void ask_for_passkey(int password_rejected_flag) { - //TODO: show network we are asking password for - printf("Insert passkey.\n"); +void ask_for_passkey(int number, const char* asciidata) { + //TODO: show network we are asking password for + printf("Insert passkey.\n"); + ERROR(afbitf, "Insert passkey."); - if (!password_rejected_flag) { - need_password_flag = 1; - password_not_correct_flag = 0; - //sleep(1); - passkey_inserted(); + json_object *jresp = json_object_new_object(); - } + json_object *int1 = json_object_new_int(number); + json_object *string = json_object_new_string(asciidata); - else if (password_rejected_flag) { - need_password_flag = 1; - printf("Password not correct!\n"); + json_object_object_add(jresp, "data1", int1); + json_object_object_add(jresp, "data2", string); - } + event_push(jresp, "password"); } /** - * \brief Insert passkey that will be used for connections to secured AP. + * \brief Notify GUI that wifi list has changed * - * \TODO Only temporary, user should enter the password on ask_for_passkey() callback + * This function is called from the registered agent on RequestInput() call. + * \todo Subscribe for this event from GUI. * * */ -void wifi_insertpasskey(struct afb_req request) { +void wifiListChanged(int number, const char* asciidata) { - const char *passkey_from_user; + //WARNING(afbitf, "wifiListChanged, reason:%d, %s",number, asciidata ); - /* retrieves the argument, expects password string */ - passkey_from_user = afb_req_value(request, "passkey"); - if (passkey_from_user == NULL) { - //TODO:better error message - afb_req_fail(request, "failed", "specify a security key"); + json_object *jresp = json_object_new_object(); - } else { + json_object *int1 = json_object_new_int(number); + json_object *string = json_object_new_string(asciidata); + + json_object_object_add(jresp, "data1", int1); + json_object_object_add(jresp, "data2", string); + + event_push(jresp, "networkList"); - passkey = g_try_malloc0(256); - strcpy(passkey, passkey_from_user); - printf("Passkey is %s\n", passkey); - } - afb_req_success(request, NULL, NULL); } + /** * \brief initialize the binder and activates the WiFi HW, should be called first * @@ -141,23 +189,32 @@ static void wifi_activate(struct afb_req request) /*AFB_SESSION_CHECK*/ printf("Registering callback\n"); - ptr_my_callback = ask_for_passkey; - register_callback(ptr_my_callback); + ptr_my_callback = ask_for_passkey; + register_callbackSecurity(ptr_my_callback); } - jresp = json_object_new_object(); - json_object_object_add(jresp, "activation", json_object_new_string("on")); + if (wifiListChanged_clbck == NULL) { - error = do_wifiActivate(); + printf("Registering callback wifiListChanged_clbck \n"); - if (error == NULL) { + wifiListChanged_clbck = wifiListChanged; + register_callbackWiFiList(wifiListChanged_clbck); - afb_req_success(request, jresp, "Wi-Fi - Activated"); + } - } else + jresp = json_object_new_object(); + json_object_object_add(jresp, "activation", json_object_new_string("on")); - afb_req_fail(request, "failed", error->message); + error = do_wifiActivate(); + + if (error == NULL) { + + afb_req_success(request, jresp, "Wi-Fi - Activated"); + + } else + + afb_req_fail(request, "failed", error->message); } @@ -230,7 +287,7 @@ void wifi_scanResult(struct afb_req request) /*AFB_SESSION_CHECK*/ char *address = NULL; char *security = NULL; char *state = NULL; - int strength = 0; + unsigned int strength = 0; int number = 0; GError *error = NULL; @@ -268,7 +325,7 @@ void wifi_scanResult(struct afb_req request) /*AFB_SESSION_CHECK*/ json_object_object_add(jresp, "IPAddress", jstring3); json_object_object_add(jresp, "State", jstring4); - printf("The object json: %s\n", json_object_to_json_string(jresp)); + //printf("The object json: %s\n", json_object_to_json_string(jresp)); /*input each scan result into my_array*/ json_object_array_add(my_array, jresp); number += 1; @@ -472,7 +529,91 @@ void wifi_status(struct afb_req request) { } void wifi_reconnect() { - /*TBD*/ + /*TBD*/ +} + + + + +/* deletes the event of tag */ +static int event_del(const char *tag) +{ + struct event *e, **p; + + /* check exists */ + e = event_get(tag); + if (!e) return -1; + + /* unlink */ + p = &events; + while(*p != e) p = &(*p)->next; + *p = e->next; + + /* destroys */ + afb_event_drop(e->event); + free(e); + return 0; +} + +/* creates the event of tag */ +static int event_add(const char *tag, const char *name) +{ + struct event *e; + + /* check valid tag */ + e = event_get(tag); + if (e) return -1; + + /* creation */ + e = malloc(strlen(tag) + sizeof *e); + if (!e) return -1; + strcpy(e->tag, tag); + + /* make the event */ + e->event = afb_daemon_make_event(afbitf->daemon, name); + if (!e->event.closure) { free(e); return -1; } + + /* link */ + e->next = events; + events = e; + return 0; +} + +static void eventadd (struct afb_req request) +{ + const char *tag = afb_req_value(request, "tag"); + const char *name = afb_req_value(request, "name"); + + printf ("Name: %s\n", name); + printf ("Tag: %s\n", tag); + + json_object *query = afb_req_json(request); + + if (tag == NULL || name == NULL) + afb_req_fail(request, "failed", "bad arguments"); + else if (0 != event_add(tag, name)) + afb_req_fail(request, "failed", "creation error"); + else + afb_req_success(request, NULL, NULL); +} + +static int event_subscribe(struct afb_req request, const char *tag) +{ + struct event *e; + e = event_get(tag); + return e ? afb_req_subscribe(request, e->event) : -1; +} + +static void eventsub (struct afb_req request) +{ + const char *tag = afb_req_value(request, "tag"); + + if (tag == NULL) + afb_req_fail(request, "failed", "bad arguments"); + else if (0 != event_subscribe(request, tag)) + afb_req_fail(request, "failed", "subscription error"); + else + afb_req_success(request, NULL, NULL); } @@ -482,15 +623,23 @@ void wifi_reconnect() { */ static const struct afb_verb_desc_v1 binding_verbs[] = { /* VERB'S NAME SESSION MANAGEMENT FUNCTION TO CALL SHORT DESCRIPTION */ -{ .name = "activate", .session = AFB_SESSION_NONE, .callback = wifi_activate, .info = "Activate Wi-Fi" }, -{ .name = "deactivate", .session = AFB_SESSION_NONE, .callback = wifi_deactivate, .info ="Deactivate Wi-Fi" }, -{ .name = "scan", .session = AFB_SESSION_NONE, .callback = wifi_scan, .info = "Scanning Wi-Fi" }, -{ .name = "scan_result",.session = AFB_SESSION_NONE, .callback = wifi_scanResult, .info = "Get scan result Wi-Fi" }, -{ .name = "connect", .session = AFB_SESSION_NONE, .callback = wifi_connect, .info ="Connecting to Access Point" }, -{ .name = "status", .session = AFB_SESSION_NONE, .callback = wifi_status, .info ="Check connection status" }, -{ .name = "disconnect", .session = AFB_SESSION_NONE, .callback = wifi_disconnect, .info ="Disconnecting connection" }, -{ .name = "reconnect", .session = AFB_SESSION_NONE, .callback = wifi_reconnect, .info ="Reconnecting to Access Point" }, -{ .name = "security", .session = AFB_SESSION_NONE, .callback = wifi_insertpasskey, .info ="Insert passkey" }, +{ .name = "activate", .session = AFB_SESSION_NONE, .callback = wifi_activate, .info = "Activate Wi-Fi" }, +{ .name = "deactivate", .session = AFB_SESSION_NONE, .callback = wifi_deactivate, .info ="Deactivate Wi-Fi" }, +{ .name = "scan", .session = AFB_SESSION_NONE, .callback = wifi_scan, .info = "Scanning Wi-Fi" }, +{ .name = "scan_result", .session = AFB_SESSION_NONE, .callback = wifi_scanResult, .info = "Get scan result Wi-Fi" }, +{ .name = "connect", .session = AFB_SESSION_NONE, .callback = wifi_connect, .info ="Connecting to Access Point" }, +{ .name = "status", .session = AFB_SESSION_NONE, .callback = wifi_status, .info ="Check connection status" }, +{ .name = "disconnect", .session = AFB_SESSION_NONE, .callback = wifi_disconnect, .info ="Disconnecting connection" }, +{ .name = "reconnect", .session = AFB_SESSION_NONE, .callback = wifi_reconnect, .info ="Reconnecting to Access Point" }, +{ .name = "insertpasskey",.session = AFB_SESSION_NONE, .callback = wifi_passkey, .info ="inputs the passkey after it has been requsted"}, +{ .name = "eventadd", .session = AFB_SESSION_NONE, .callback = eventadd, .info ="adds the event of 'name' for the 'tag'"}, +{ .name = "eventsub", .session = AFB_SESSION_NONE, .callback = eventsub, .info ="unsubscribes to the event of 'tag'"}, +{ .name = "eventpush", .session = AFB_SESSION_NONE, .callback = eventpush, .info ="pushes the event of 'tag' with the 'data'"}, + + + + + { .name = NULL } /* marker for end of the array */ }; diff --git a/binding-wifi/wifi-connman.c b/binding-wifi/wifi-connman.c index 68e5e3d..7dc2aac 100644 --- a/binding-wifi/wifi-connman.c +++ b/binding-wifi/wifi-connman.c @@ -25,6 +25,8 @@ #include "wifi-api.h" #include "wifi-connman.h" +//#include "syslog.h" + static __thread struct security_profile Security = { NULL, NULL, NULL, NULL, 0, 0 }; @@ -36,7 +38,7 @@ int extract_values(GVariantIter *content, struct wifi_profile_info* wifiProfile) const gchar *subkey = NULL; const gchar *value_char = NULL; GVariantIter *content_sub; - int value_int; + unsigned int value_int; gsize length; while (g_variant_iter_loop(content, "{sv}", &key, &var)) { @@ -272,7 +274,7 @@ GError* do_displayScan(GSList **wifi_list) { extract_values(content, wifiProfile); wifiProfile->NetworkPath = g_try_malloc0(strlen(object)); strcpy(wifiProfile->NetworkPath, object); - printf( + /*printf( "SSID= %s, security= %s, path= %s, Strength= %d, wps support= %d\n", wifiProfile->ESSID, wifiProfile->Security.sec_type, wifiProfile->NetworkPath, wifiProfile->Strength, @@ -280,7 +282,7 @@ GError* do_displayScan(GSList **wifi_list) { printf("method= %s, ip address= %s, netmask= %s\n", wifiProfile->wifiNetwork.method, wifiProfile->wifiNetwork.IPaddress, - wifiProfile->wifiNetwork.netmask); + wifiProfile->wifiNetwork.netmask);*/ *wifi_list = g_slist_append(*wifi_list, (struct wifi_profile_info *) wifiProfile); } @@ -361,12 +363,18 @@ GError* setHMIStatus(enum wifiStates state) { GVariant *message = NULL; GError *error = NULL; + //openlog("WIFI Binder", LOG_PID | LOG_CONS, LOG_USER); + if (state==BAR_NO) iconString = "qrc:/images/Status/HMI_Status_Wifi_NoBars-01.png"; else if (state==BAR_1) iconString = "qrc:/images/Status/HMI_Status_Wifi_1Bar-01.png"; else if (state==BAR_2) iconString = "qrc:/images/Status/HMI_Status_Wifi_2Bars-01.png"; else if (state==BAR_3) iconString = "qrc:/images/Status/HMI_Status_Wifi_3Bars-01.png"; else if (state==BAR_FULL) iconString = "qrc:/images/Status/HMI_Status_Wifi_Full-01.png"; - else iconString = "qrc:/images/Status/HMI_Status_Wifi_NoBars-01.png"; + //else {syslog(LOG_ERR, "Default value for wifi HMI icon, should not happened.. : %d", state); + // iconString = "qrc:/images/Status/HMI_Status_Wifi_NoBars-01.png"; + //} + + //syslog(LOG_INFO, "%s", iconString); connection = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error); @@ -385,5 +393,7 @@ GError* setHMIStatus(enum wifiStates state) { return NULL; } + //closelog(); + } diff --git a/binding-wifi/wifi-connman.h b/binding-wifi/wifi-connman.h index c47cbcd..90533dd 100644 --- a/binding-wifi/wifi-connman.h +++ b/binding-wifi/wifi-connman.h @@ -104,9 +104,10 @@ struct wifi_profile_info{ enum wifiStates {BAR_NO, BAR_1, BAR_2, BAR_3, BAR_FULL}; -//typedef void(*callback)(void); -typedef void(*callback)(int password_rejected_flag); -void register_callback(callback ptr); +typedef void(*callback)(int number, const char* asciidata); +void register_callbackSecurity(callback ptr); +void register_callbackWiFiList(callback ptr); + int extract_values(GVariantIter *content, struct wifi_profile_info* wifiProfile); |