summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaehyun Kim <jeik01.kim@samsung.com>2020-10-27 03:06:27 (GMT)
committerGerrit Code Review <gerrit@review>2020-10-27 03:06:27 (GMT)
commitac76bee17d44c17c8867972b1c5e108b7a32ce7f (patch)
treee6cda8901c6f32006d2d523e7c5eaa5a81842c65
parent72d860550e92489f203362d5fba7ae372427ed42 (diff)
parentd56fb241d6eb569acd54848d83d20d5bda3cf3cc (diff)
downloadconnman-accepted/tizen_unified.zip
connman-accepted/tizen_unified.tar.gz
connman-accepted/tizen_unified.tar.bz2
Merge "[gdhcp/client] Reopen socket GIO channel when failed" into tizensubmit/tizen/20201028.023046accepted/tizen/unified/20201029.124906accepted/tizen_unified
-rwxr-xr-xgdhcp/client.c8
-rw-r--r--packaging/connman.spec2
2 files changed, 9 insertions, 1 deletions
diff --git a/gdhcp/client.c b/gdhcp/client.c
index 22bbc8e..2bdc616 100755
--- a/gdhcp/client.c
+++ b/gdhcp/client.c
@@ -2324,6 +2324,14 @@ static gboolean listener_event(GIOChannel *channel, GIOCondition condition,
if (condition & (G_IO_NVAL | G_IO_ERR | G_IO_HUP)) {
dhcp_client->listener_watch = 0;
+#if defined TIZEN_EXT
+ /* re-register event listener when socket failed */
+ int retry_count = 0;
+ int ret = -1;
+ while (retry_count++ < GIO_SOCKET_RETRY_COUNT && ret < 0)
+ ret = switch_listening_mode(dhcp_client,
+ dhcp_client->type);
+#endif /* defined TIZEN_EXT */
return FALSE;
}
diff --git a/packaging/connman.spec b/packaging/connman.spec
index e108c84..56cf406 100644
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -5,7 +5,7 @@
Name: connman
Version: 1.37
-Release: 47
+Release: 48
License: GPL-2.0+
Summary: Connection Manager
Url: http://connman.net