Skip to content

Commit

Permalink
connman: refresh patches to apply on 1.39 version
Browse files Browse the repository at this point in the history
:Release Notes:

:Detailed Notes:
Fixes:
http://gecko.lge.com/Errors/Details/116853
ERROR: Command Error: 'quilt --quiltrc TOPDIR/BUILD/work/raspberrypi3_64-webos-linux/connman/1.39-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0  Output:
stdout: Applying patch 0001-Add-support-for-the-WPS-PBS-and-PIN-mode.patch
patching file gsupplicant/gsupplicant.h
patching file gsupplicant/supplicant.c
patching file include/device.h
patching file include/technology.h
patching file plugins/wifi.c
Hunk #2 succeeded at 83 (offset 2 lines).
Hunk webosose#3 succeeded at 168 with fuzz 1 (offset 2 lines).
Hunk webosose#4 succeeded at 224 (offset 7 lines).
Hunk webosose#5 succeeded at 812 (offset 8 lines).
Hunk webosose#6 succeeded at 2080 (offset 28 lines).
Hunk webosose#7 succeeded at 2302 (offset 28 lines).
Hunk webosose#8 succeeded at 2328 (offset 28 lines).
Hunk webosose#9 succeeded at 2358 (offset 28 lines).
Hunk webosose#10 succeeded at 2479 (offset 28 lines).
Hunk webosose#11 succeeded at 2536 (offset 40 lines).
Hunk webosose#12 FAILED at 2634.
Hunk webosose#13 succeeded at 2756 (offset 54 lines).
Hunk webosose#14 succeeded at 2822 (offset 54 lines).
Hunk webosose#15 succeeded at 2859 (offset 54 lines).
Hunk webosose#16 succeeded at 2887 (offset 54 lines).
Hunk webosose#17 succeeded at 2897 (offset 54 lines).
Hunk webosose#18 succeeded at 2906 (offset 54 lines).
Hunk webosose#19 succeeded at 2952 (offset 51 lines).
Hunk webosose#20 succeeded at 3633 (offset 51 lines).
1 out of 20 hunks FAILED -- rejects in file plugins/wifi.c
patching file src/connman.h
Hunk #1 succeeded at 573 (offset 7 lines).
patching file src/device.c
patching file src/service.c
patching file src/technology.c
Hunk #1 succeeded at 1099 (offset 5 lines).
Hunk #2 succeeded at 1151 (offset 5 lines).
Patch 0001-Add-support-for-the-WPS-PBS-and-PIN-mode.patch does not apply (enforce with -f)

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[PLAT-122546] Create GPVB with Yocto 3.2 Gatesgarth
  • Loading branch information
shr-project committed Feb 14, 2021
1 parent 35bfab0 commit 243f609
Show file tree
Hide file tree
Showing 11 changed files with 126 additions and 119 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 75513543b8393600f2d14b1b44587e137265b0dd Mon Sep 17 00:00:00 2001
From 6f9c982b15c06c470f05f2d052cbc347becc0eda Mon Sep 17 00:00:00 2001
From: Vibhanshu Dhote <[email protected]>
Date: Wed, 21 Feb 2018 16:36:23 +0530
Subject: [PATCH] Add support for the WPS PBS and PIN mode
Expand All @@ -21,12 +21,12 @@ Upstream-Status : Inappropriate [webOS specific]
gsupplicant/supplicant.c | 66 +++++++
include/device.h | 2 +
include/technology.h | 2 +
plugins/wifi.c | 387 ++++++++++++++++++++++++++++++++++++--
plugins/wifi.c | 395 +++++++++++++++++++++++++++++++++++---
src/connman.h | 2 +
src/device.c | 116 ++++++++++++
src/device.c | 116 +++++++++++
src/service.c | 2 +
src/technology.c | 49 +++++
9 files changed, 611 insertions(+), 20 deletions(-)
9 files changed, 615 insertions(+), 24 deletions(-)

diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h
index 7935c3a6..56cd61ee 100644
Expand Down Expand Up @@ -169,7 +169,7 @@ index 7508a9a1..a3095fb7 100644
const char *name;
enum connman_service_type type;
diff --git a/plugins/wifi.c b/plugins/wifi.c
index fc304e3b..ce761dad 100644
index 6233fe11..0917eaf5 100644
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -64,6 +64,7 @@
Expand All @@ -180,7 +180,7 @@ index fc304e3b..ce761dad 100644

#define BGSCAN_DEFAULT "simple:30:-65:300"
#define AUTOSCAN_EXPONENTIAL "exponential:3:300"
@@ -80,6 +81,8 @@
@@ -82,6 +83,8 @@
static struct connman_technology *wifi_technology = NULL;
static struct connman_technology *p2p_technology = NULL;

Expand All @@ -189,7 +189,7 @@ index fc304e3b..ce761dad 100644
enum wifi_ap_capability{
WIFI_AP_UNKNOWN = 0,
WIFI_AP_SUPPORTED = 1,
@@ -163,6 +166,11 @@ struct wifi_data {
@@ -165,6 +168,11 @@ struct wifi_data {
int servicing;
int disconnect_code;
int assoc_code;
Expand All @@ -200,8 +200,8 @@ index fc304e3b..ce761dad 100644
+ bool wps_start_deferred;
};

static GList *iface_list = NULL;
@@ -209,6 +217,17 @@ static bool is_p2p_connecting(void)
struct disconnect_data {
@@ -216,6 +224,17 @@ static bool is_p2p_connecting(void)
return false;
}

Expand All @@ -219,7 +219,7 @@ index fc304e3b..ce761dad 100644
static void add_pending_wifi_device(struct wifi_data *wifi)
{
if (g_list_find(pending_wifi_device, wifi))
@@ -785,6 +804,9 @@ static int wifi_probe(struct connman_device *device)
@@ -793,6 +812,9 @@ static int wifi_probe(struct connman_device *device)

wifi->watch = connman_rtnl_add_newlink_watch(wifi->index,
wifi_newlink, device);
Expand All @@ -229,7 +229,7 @@ index fc304e3b..ce761dad 100644
if (is_p2p_connecting())
add_pending_wifi_device(wifi);
else
@@ -2030,6 +2052,217 @@ static int wifi_set_regdom(struct connman_device *device, const char *alpha2)
@@ -2058,6 +2080,217 @@ static int wifi_set_regdom(struct connman_device *device, const char *alpha2)
return ret;
}

Expand Down Expand Up @@ -447,7 +447,7 @@ index fc304e3b..ce761dad 100644
static struct connman_device_driver wifi_ng_driver = {
.name = "wifi",
.type = CONNMAN_DEVICE_TYPE_WIFI,
@@ -2041,6 +2274,8 @@ static struct connman_device_driver wifi_ng_driver = {
@@ -2069,6 +2302,8 @@ static struct connman_device_driver wifi_ng_driver = {
.scan = wifi_scan,
.stop_scan = wifi_stop_scan,
.set_regdom = wifi_set_regdom,
Expand All @@ -456,7 +456,7 @@ index fc304e3b..ce761dad 100644
};

static void system_ready(void)
@@ -2065,6 +2300,23 @@ static int network_probe(struct connman_network *network)
@@ -2093,6 +2328,23 @@ static int network_probe(struct connman_network *network)
return 0;
}

Expand All @@ -480,7 +480,7 @@ index fc304e3b..ce761dad 100644
static void network_remove(struct connman_network *network)
{
struct connman_device *device = connman_network_get_device(network);
@@ -2078,6 +2330,10 @@ static void network_remove(struct connman_network *network)
@@ -2106,6 +2358,10 @@ static void network_remove(struct connman_network *network)

if (wifi->network != network)
return;
Expand All @@ -491,7 +491,7 @@ index fc304e3b..ce761dad 100644

wifi->network = NULL;
}
@@ -2195,6 +2451,9 @@ static int network_connect(struct connman_network *network)
@@ -2223,6 +2479,9 @@ static int network_connect(struct connman_network *network)
if (!wifi)
return -ENODEV;

Expand All @@ -501,7 +501,7 @@ index fc304e3b..ce761dad 100644
ssid = g_try_malloc0(sizeof(GSupplicantSSID));
if (!ssid)
return -ENOMEM;
@@ -2237,12 +2496,10 @@ static void disconnect_callback(int result, GSupplicantInterface *interface,
@@ -2277,12 +2536,10 @@ static void disconnect_callback(int result, GSupplicantInterface *interface,
wifi->disconnecting = false;
wifi->connected = false;

Expand All @@ -517,8 +517,8 @@ index fc304e3b..ce761dad 100644
}

static int network_disconnect(struct connman_network *network)
@@ -2377,20 +2634,22 @@ static bool handle_wps_completion(GSupplicantInterface *interface,
unsigned int ssid_len, wps_ssid_len;
@@ -2425,24 +2682,26 @@ static bool handle_wps_completion(GSupplicantInterface *interface,
struct disconnect_data *dd;
const char *wps_key;

- /* Checking if we got associated with requested
Expand All @@ -531,9 +531,13 @@ index fc304e3b..ce761dad 100644
-
- if (!wps_ssid || wps_ssid_len != ssid_len ||
- memcmp(ssid, wps_ssid, ssid_len) != 0) {
- dd = g_malloc0(sizeof(*dd));
- dd->wifi = wifi;
- dd->network = network;
-
- connman_network_set_associating(network, false);
- g_supplicant_interface_disconnect(wifi->interface,
- disconnect_callback, wifi);
- disconnect_callback, dd);
- return false;
+ if (wifi->wps_active == FALSE) {
+ /* Checking if we got associated with requested
Expand All @@ -546,15 +550,19 @@ index fc304e3b..ce761dad 100644
+
+ if (!wps_ssid || wps_ssid_len != ssid_len ||
+ memcmp(ssid, wps_ssid, ssid_len) != 0) {
+ dd = g_malloc0(sizeof(*dd));
+ dd->wifi = wifi;
+ dd->network = network;
+
+ connman_network_set_associating(network, false);
+ g_supplicant_interface_disconnect(wifi->interface,
+ disconnect_callback, wifi);
+ disconnect_callback, dd);
+ return false;
+ }
}

wps_key = g_supplicant_interface_get_wps_key(interface);
@@ -2445,6 +2704,65 @@ static bool handle_4way_handshake_failure(GSupplicantInterface *interface,
@@ -2499,6 +2758,65 @@ static bool handle_4way_handshake_failure(GSupplicantInterface *interface,
return false;
}

Expand Down Expand Up @@ -620,7 +628,7 @@ index fc304e3b..ce761dad 100644
static void interface_state(GSupplicantInterface *interface)
{
struct connman_network *network;
@@ -2452,7 +2770,10 @@ static void interface_state(GSupplicantInterface *interface)
@@ -2506,7 +2824,10 @@ static void interface_state(GSupplicantInterface *interface)
struct wifi_data *wifi;
GSupplicantState state = g_supplicant_interface_get_state(interface);
bool wps;
Expand All @@ -631,7 +639,7 @@ index fc304e3b..ce761dad 100644

wifi = g_supplicant_interface_get_data(interface);

@@ -2486,6 +2807,23 @@ static void interface_state(GSupplicantInterface *interface)
@@ -2540,6 +2861,23 @@ static void interface_state(GSupplicantInterface *interface)
if (!network)
return;

Expand All @@ -655,31 +663,31 @@ index fc304e3b..ce761dad 100644
switch (state) {
case G_SUPPLICANT_STATE_SCANNING:
if (wifi->connected)
@@ -2497,6 +2835,7 @@ static void interface_state(GSupplicantInterface *interface)
@@ -2551,6 +2889,7 @@ static void interface_state(GSupplicantInterface *interface)
case G_SUPPLICANT_STATE_ASSOCIATING:
stop_autoscan(device);

+ connman_device_set_scanning(device, CONNMAN_SERVICE_TYPE_WIFI,FALSE);
if (!wifi->connected)
connman_network_set_associating(network, true);

@@ -2506,6 +2845,7 @@ static void interface_state(GSupplicantInterface *interface)
@@ -2560,6 +2899,7 @@ static void interface_state(GSupplicantInterface *interface)
/* though it should be already stopped: */
stop_autoscan(device);

+ connman_device_set_scanning(device,CONNMAN_SERVICE_TYPE_WIFI,FALSE);
if (!handle_wps_completion(interface, network, device, wifi))
break;

@@ -2514,6 +2854,7 @@ static void interface_state(GSupplicantInterface *interface)
@@ -2568,6 +2908,7 @@ static void interface_state(GSupplicantInterface *interface)
wifi->disconnect_code = 0;
wifi->assoc_code = 0;
wifi->load_shaping_retries = 0;
+ wifi->wps_active = FALSE;
break;

case G_SUPPLICANT_STATE_DISCONNECTED:
@@ -2562,7 +2903,12 @@ static void interface_state(GSupplicantInterface *interface)
@@ -2613,7 +2954,12 @@ static void interface_state(GSupplicantInterface *interface)
}
wifi->disconnecting = false;

Expand All @@ -693,7 +701,7 @@ index fc304e3b..ce761dad 100644

break;

@@ -3238,6 +3584,7 @@ static const GSupplicantCallbacks callbacks = {
@@ -3289,6 +3635,7 @@ static const GSupplicantCallbacks callbacks = {
.peer_lost = peer_lost,
.peer_changed = peer_changed,
.peer_request = peer_request,
Expand All @@ -702,10 +710,10 @@ index fc304e3b..ce761dad 100644
.disconnect_reasoncode = disconnect_reasoncode,
.assoc_status_code = assoc_status_code,
diff --git a/src/connman.h b/src/connman.h
index 3bdc0dc7..86e481e6 100644
index a43a6b8b..b8de7bd1 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -566,6 +566,8 @@ enum connman_service_type __connman_device_get_service_type(struct connman_devic
@@ -573,6 +573,8 @@ enum connman_service_type __connman_device_get_service_type(struct connman_devic
struct connman_device *__connman_device_find_device(enum connman_service_type type);
int __connman_device_request_scan(enum connman_service_type type);
int __connman_device_request_scan_full(enum connman_service_type type);
Expand Down Expand Up @@ -842,7 +850,7 @@ index 264c5e2d..d3048379 100644
{
struct ifreq ifr;
diff --git a/src/service.c b/src/service.c
index 2f497d10..58d91d74 100644
index 69f0a511..06f7893d 100644
--- a/src/service.c
+++ b/src/service.c
@@ -55,6 +55,8 @@ static unsigned int vpn_autoconnect_id = 0;
Expand All @@ -855,10 +863,10 @@ index 2f497d10..58d91d74 100644
bool valid;
bool enabled;
diff --git a/src/technology.c b/src/technology.c
index 4e053fc9..0119c2d5 100644
index 672d6ea8..817d9753 100644
--- a/src/technology.c
+++ b/src/technology.c
@@ -1094,6 +1094,50 @@ static DBusMessage *scan(DBusConnection *conn, DBusMessage *msg, void *data)
@@ -1099,6 +1099,50 @@ static DBusMessage *scan(DBusConnection *conn, DBusMessage *msg, void *data)
return NULL;
}

Expand Down Expand Up @@ -909,7 +917,7 @@ index 4e053fc9..0119c2d5 100644
static const GDBusMethodTable technology_methods[] = {
{ GDBUS_DEPRECATED_METHOD("GetProperties",
NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
@@ -1102,12 +1146,17 @@ static const GDBusMethodTable technology_methods[] = {
@@ -1107,12 +1151,17 @@ static const GDBusMethodTable technology_methods[] = {
GDBUS_ARGS({ "name", "s" }, { "value", "v" }),
NULL, set_property) },
{ GDBUS_ASYNC_METHOD("Scan", NULL, NULL, scan) },
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 920cf80d8b0f3192039662b79c60e2d681ad5454 Mon Sep 17 00:00:00 2001
From a435d92e28c041f492b4e23081c52493daa53302 Mon Sep 17 00:00:00 2001
From: "krishna.konwar" <[email protected]>
Date: Fri, 3 Aug 2018 16:17:00 +0530
Subject: [PATCH] Set IPv6 state same as IPV4 on disconnect
Expand All @@ -17,10 +17,10 @@ Upstream-Status : Inappropriate [webOS specific]
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/service.c b/src/service.c
index 58d91d74..ff44f9c2 100644
index 06f7893d..0e1bc59d 100644
--- a/src/service.c
+++ b/src/service.c
@@ -6294,8 +6294,10 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service,
@@ -6368,8 +6368,10 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service,
if (service->state == CONNMAN_SERVICE_STATE_IDLE)
return -EINVAL;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 4d8b4db852decca3847d3cf49dec69688d2d168f Mon Sep 17 00:00:00 2001
From 1a63735249f4cee5ded31304cc1e1291b4d64b1a Mon Sep 17 00:00:00 2001
From: Vasu Kantubukta <[email protected]>
Date: Wed, 19 Dec 2018 21:02:59 +0530
Subject: [PATCH] Fix for wifi network switching and unable to connect to open
Expand Down Expand Up @@ -32,10 +32,10 @@ Upstream-Status: Inappropriate [webOS specific]
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/wifi.c b/plugins/wifi.c
index ce761dad..246d7335 100644
index 0917eaf5..a9dd35c4 100644
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -2903,7 +2903,7 @@ static void interface_state(GSupplicantInterface *interface)
@@ -2954,7 +2954,7 @@ static void interface_state(GSupplicantInterface *interface)
}
wifi->disconnecting = false;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 11b028d0a07e653411cb66149cc9a3dbcce14aaf Mon Sep 17 00:00:00 2001
From db4b54b53137e213b7b0437d51e6b7c18b9b73fe Mon Sep 17 00:00:00 2001
From: "sachin.shetty" <[email protected]>
Date: Mon, 24 Jun 2019 16:55:43 +0530
Subject: [PATCH] Multiple wi-fi networks are connected via WPS PIN.
Expand Down
Loading

0 comments on commit 243f609

Please sign in to comment.