From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 29 May 2019 11:56:27 +0000 (+0200)
Subject: varlink: allow using varlink_wait() even with a server
X-Git-Tag: v243-rc1~201
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed9aa225e884dc2a0c857ed1603d3bc3a3758c06;p=thirdparty%2Fsystemd.git

varlink: allow using varlink_wait() even with a server

This call can be useful even if a server object is declared.

(Originally this was not supported, because a server typically needs to
handle multiple connections, and thus a synchronous wait on one would
starve the others out. But in some cases it might make sense to have
varlink point-to-point connections — i.e. where the server only handles
a single connection ever — and there it makes sense to synchronously
wait on the one connection).
---

diff --git a/src/shared/varlink.c b/src/shared/varlink.c
index dea8e4363f2..4ecb763f082 100644
--- a/src/shared/varlink.c
+++ b/src/shared/varlink.c
@@ -1002,7 +1002,6 @@ int varlink_wait(Varlink *v, usec_t timeout) {
         usec_t t;
 
         assert_return(v, -EINVAL);
-        assert_return(!v->server, -ENOTTY);
 
         if (v->state == VARLINK_DISCONNECTED)
                 return -ENOTCONN;