Send connman mailing list submissions to
        [email protected]

To subscribe or unsubscribe via email, send a message with subject or
body 'help' to
        [email protected]

You can reach the person managing the list at
        [email protected]

When replying, please edit your Subject line so it is more specific
than "Re: Contents of connman digest..."

Today's Topics:

   1. [PATCH 1/2] vpn: Send D-Bus response when connecting for daemon-less 
setups
      (Daniel Wagner)
   2. [PATCH 2/2] session: Fix state initializiation (Daniel Wagner)
   3. [PATCH 0/2] A couple of small fixes (Daniel Wagner)


----------------------------------------------------------------------

Date: Wed, 29 Jul 2020 08:51:06 +0200
From: Daniel Wagner <[email protected]>
Subject: [PATCH 1/2] vpn: Send D-Bus response when connecting for
        daemon-less setups
To: [email protected]
Cc: Daniel Wagner <[email protected]>
Message-ID: <[email protected]>

Pass in the callback to the connect() call to allow the plugin to
trigger the D-Bus response when done.

ConnMan was complaining it didn't receive a reply for the Connect2
call.
---
 vpn/plugins/vpn.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vpn/plugins/vpn.c b/vpn/plugins/vpn.c
index e04670c85d13..30517a1153ab 100644
--- a/vpn/plugins/vpn.c
+++ b/vpn/plugins/vpn.c
@@ -632,7 +632,7 @@ static int vpn_connect(struct vpn_provider *provider,
                        vpn_driver_data->vpn_driver->flags & 
VPN_FLAG_NO_DAEMON) {
 
                ret = vpn_driver_data->vpn_driver->connect(provider,
-                                               NULL, NULL, NULL, NULL, NULL);
+                                       NULL, NULL, cb, dbus_sender, user_data);
                if (ret) {
                        stop_vpn(provider);
                        goto exist_err;
-- 
2.27.0

------------------------------

Date: Wed, 29 Jul 2020 08:51:07 +0200
From: Daniel Wagner <[email protected]>
Subject: [PATCH 2/2] session: Fix state initializiation
To: [email protected]
Cc: Daniel Wagner <[email protected]>
Message-ID: <[email protected]>
Content-Type: text/plain; charset=UTF-8

gcc complains about using the wrong enum type:

src/session.c:1808:38: error: implicit conversion from ‘enum 
connman_session_state’ to ‘enum connman_service_state’ [-Werror=enum-conversion]
 1808 |   enum connman_service_state state = CONNMAN_SESSION_STATE_DISCONNECTED;
x
---
 src/session.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/session.c b/src/session.c
index 2a1dd9aab221..eeefe3f28b3c 100644
--- a/src/session.c
+++ b/src/session.c
@@ -1804,7 +1804,7 @@ static void session_activate(struct connman_session 
*session)
                struct connman_service *service;
                struct connman_service_info *info;
                GSList *service_list = NULL;
-               enum connman_service_state state = 
CONNMAN_SESSION_STATE_DISCONNECTED;
+               enum connman_service_state state = 
CONNMAN_SERVICE_STATE_DISCONNECT;
 
                g_hash_table_iter_init(&iter, service_hash);
 
-- 
2.27.0

------------------------------

Date: Wed, 29 Jul 2020 08:51:05 +0200
From: Daniel Wagner <[email protected]>
Subject: [PATCH 0/2] A couple of small fixes
To: [email protected]
Cc: Daniel Wagner <[email protected]>
Message-ID: <[email protected]>
Content-Type: text/plain; charset=UTF-8

Two small fixes found while ramping up again...

Daniel Wagner (2):
  vpn: Send D-Bus response when connecting for daemon-less setups
  session: Fix state initializiation

 src/session.c     | 2 +-
 vpn/plugins/vpn.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
2.27.0

------------------------------

Subject: Digest Footer

_______________________________________________
connman mailing list -- [email protected]
To unsubscribe send an email to [email protected]


------------------------------

End of connman Digest, Vol 57, Issue 4
**************************************

Reply via email to