Merge "[gdhcp/client] Reopen socket GIO channel when failed" into tizen

diff --git a/gdhcp/client.c b/gdhcp/client.c
index 22bbc8e..2bdc616 100755 (executable)
--- 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 (file)
--- 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