External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Generate JSON with mDNS entries only when built --with-avahi

Browse Source 
One string was already used only if that condition was true, second one
is added now.  Both are used in a nicer way.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Martin Kletzander 2015-06-15 11:28:11 +02:00
parent fcc2aab688
commit 73ad20e936
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/virnetservertest.c
View File

@ -35,6 +35,13 @@ testCreateServer(const char *host, int family)
virNetServerClientPtr cln1 = NULL, cln2 = NULL; virNetServerClientPtr cln1 = NULL, cln2 = NULL;
virNetSocketPtr sk1 = NULL, sk2 = NULL; virNetSocketPtr sk1 = NULL, sk2 = NULL;
int fdclient[2]; int fdclient[2];
const char *mdns_entry = NULL;
const char *mdns_group = NULL;
# ifdef WITH_AVAHI
mdns_entry = "libvirt-ro";
mdns_group = "libvirtTest";
# endif
if (socketpair(PF_UNIX, SOCK_STREAM, 0, fdclient) < 0) { if (socketpair(PF_UNIX, SOCK_STREAM, 0, fdclient) < 0) {
virReportSystemError(errno, "%s", virReportSystemError(errno, "%s",
@ -44,11 +51,7 @@ testCreateServer(const char *host, int family)
if (!(srv = virNetServerNew(10, 50, 5, 100, 10, if (!(srv = virNetServerNew(10, 50, 5, 100, 10,
120, 5, true, 120, 5, true,
# ifdef WITH_AVAHI mdns_group,
"libvirtTest",
# else
NULL,
# endif
NULL, NULL,
NULL, NULL,
NULL, NULL,
@ -79,9 +82,9 @@ testCreateServer(const char *host, int family)
5))) 5)))
goto error; goto error;
if (virNetServerAddService(srv, svc1, "libvirt-ro") < 0) if (virNetServerAddService(srv, svc1, mdns_entry) < 0)
goto error; goto error;
if (virNetServerAddService(srv, svc2, "libvirt-ro") < 0) if (virNetServerAddService(srv, svc2, mdns_entry) < 0)
goto error; goto error;
if (virNetSocketNewConnectSockFD(fdclient[0], &sk1) < 0) if (virNetSocketNewConnectSockFD(fdclient[0], &sk1) < 0)