From nobody Mon Dec 15 23:51:47 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1495199035447498.5591959841215; Fri, 19 May 2017 06:03:55 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EA993624B1; Fri, 19 May 2017 13:03:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B56D05C663; Fri, 19 May 2017 13:03:51 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 683C4180BAF5; Fri, 19 May 2017 13:03:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v4JD3cEH003790 for ; Fri, 19 May 2017 09:03:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 19A3518C50; Fri, 19 May 2017 13:03:38 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-18.phx2.redhat.com [10.3.116.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 823E118C5D for ; Fri, 19 May 2017 13:03:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com EA993624B1 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com EA993624B1 From: John Ferlan To: libvir-list@redhat.com Date: Fri, 19 May 2017 09:03:14 -0400 Message-Id: <20170519130324.4624-7-jferlan@redhat.com> In-Reply-To: <20170519130324.4624-1-jferlan@redhat.com> References: <20170519130324.4624-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 06/16] network: Add virNetworkObj Get/Set API's for @dnsmasqPid and @radvdPid X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 19 May 2017 13:03:52 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" In preparation for making the object private, create/use a couple of API's to get/set the obj->dnsmasqPid and obj->radvdPid. NB: Since the pid's can sometimes changed based on intervening functions, be sure to always fetch the latest value. Signed-off-by: John Ferlan --- src/conf/virnetworkobj.c | 30 ++++++++++++++ src/conf/virnetworkobj.h | 14 +++++++ src/libvirt_private.syms | 4 ++ src/network/bridge_driver.c | 96 ++++++++++++++++++++++++++++-------------= ---- 4 files changed, 109 insertions(+), 35 deletions(-) diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 562fb91..e44684a 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -107,6 +107,36 @@ virNetworkObjEndAPI(virNetworkObjPtr *net) } =20 =20 +pid_t +virNetworkObjGetDnsmasqPid(virNetworkObjPtr obj) +{ + return obj->dnsmasqPid; +} + + +void +virNetworkObjSetDnsmasqPid(virNetworkObjPtr obj, + pid_t dnsmasqPid) +{ + obj->dnsmasqPid =3D dnsmasqPid; +} + + +pid_t +virNetworkObjGetRadvdPid(virNetworkObjPtr obj) +{ + return obj->radvdPid; +} + + +void +virNetworkObjSetRadvdPid(virNetworkObjPtr obj, + pid_t radvdPid) +{ + obj->radvdPid =3D radvdPid; +} + + virMacMapPtr virNetworkObjGetMacMap(virNetworkObjPtr obj) { diff --git a/src/conf/virnetworkobj.h b/src/conf/virnetworkobj.h index da12848..9323692 100644 --- a/src/conf/virnetworkobj.h +++ b/src/conf/virnetworkobj.h @@ -53,6 +53,20 @@ virNetworkObjNew(void); virMacMapPtr virNetworkObjGetMacMap(virNetworkObjPtr obj); =20 +pid_t +virNetworkObjGetDnsmasqPid(virNetworkObjPtr obj); + +void +virNetworkObjSetDnsmasqPid(virNetworkObjPtr obj, + pid_t dnsmasqPid); + +pid_t +virNetworkObjGetRadvdPid(virNetworkObjPtr obj); + +void +virNetworkObjSetRadvdPid(virNetworkObjPtr obj, + pid_t radvdPid); + void virNetworkObjSetMacMap(virNetworkObjPtr obj, virMacMapPtr macmap); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1907afe..56b969c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -931,8 +931,10 @@ virNetworkObjFindByName; virNetworkObjFindByNameLocked; virNetworkObjFindByUUID; virNetworkObjFindByUUIDLocked; +virNetworkObjGetDnsmasqPid; virNetworkObjGetMacMap; virNetworkObjGetPersistentDef; +virNetworkObjGetRadvdPid; virNetworkObjListExport; virNetworkObjListForEach; virNetworkObjListGetNames; @@ -949,7 +951,9 @@ virNetworkObjRemoveInactive; virNetworkObjReplacePersistentDef; virNetworkObjSaveStatus; virNetworkObjSetDefTransient; +virNetworkObjSetDnsmasqPid; virNetworkObjSetMacMap; +virNetworkObjSetRadvdPid; virNetworkObjTaint; virNetworkObjUnrefMacMap; virNetworkObjUnsetDefTransient; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index d8d3782..31a3d40 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -485,12 +485,15 @@ networkUpdateState(virNetworkObjPtr obj, =20 /* Try and read dnsmasq/radvd pids of active networks */ if (obj->active && obj->def->ips && (obj->def->nips > 0)) { + pid_t radvdPid; + pid_t dnsmasqPid; char *radvdpidbase; =20 ignore_value(virPidFileReadIfAlive(driver->pidDir, obj->def->name, - &obj->dnsmasqPid, + &dnsmasqPid, dnsmasqCapsGetBinaryPath(dnsmas= q_caps))); + virNetworkObjSetDnsmasqPid(obj, dnsmasqPid); =20 radvdpidbase =3D networkRadvdPidfileBasename(obj->def->name); if (!radvdpidbase) @@ -498,7 +501,8 @@ networkUpdateState(virNetworkObjPtr obj, =20 ignore_value(virPidFileReadIfAlive(driver->pidDir, radvdpidbase, - &obj->radvdPid, RADVD)); + &radvdPid, RADVD)); + virNetworkObjSetRadvdPid(obj, radvdPid); VIR_FREE(radvdpidbase); } =20 @@ -1481,7 +1485,7 @@ networkBuildDhcpDaemonCommandLine(virNetworkDriverSta= tePtr driver, char *configstr =3D NULL; char *leaseshelper_path =3D NULL; =20 - obj->dnsmasqPid =3D -1; + virNetworkObjSetDnsmasqPid(obj, -1); =20 if (networkDnsmasqConfContents(obj, pidfile, &configstr, dctx, dnsmasq_caps) < 0) @@ -1534,6 +1538,7 @@ networkStartDhcpDaemon(virNetworkDriverStatePtr drive= r, bool needDnsmasq =3D false; virCommandPtr cmd =3D NULL; char *pidfile =3D NULL; + pid_t dnsmasqPid; int ret =3D -1; dnsmasqContext *dctx =3D NULL; =20 @@ -1602,9 +1607,10 @@ networkStartDhcpDaemon(virNetworkDriverStatePtr driv= er, * pid */ =20 - ret =3D virPidFileRead(driver->pidDir, obj->def->name, &obj->dnsmasqPi= d); + ret =3D virPidFileRead(driver->pidDir, obj->def->name, &dnsmasqPid); if (ret < 0) goto cleanup; + virNetworkObjSetDnsmasqPid(obj, dnsmasqPid); =20 ret =3D 0; cleanup: @@ -1628,6 +1634,7 @@ networkRefreshDhcpDaemon(virNetworkDriverStatePtr dri= ver, { int ret =3D -1; size_t i; + pid_t dnsmasqPid; virNetworkIPDefPtr ipdef, ipv4def, ipv6def; dnsmasqContext *dctx =3D NULL; =20 @@ -1636,7 +1643,8 @@ networkRefreshDhcpDaemon(virNetworkDriverStatePtr dri= ver, return 0; =20 /* if there's no running dnsmasq, just start it */ - if (obj->dnsmasqPid <=3D 0 || (kill(obj->dnsmasqPid, 0) < 0)) + dnsmasqPid =3D virNetworkObjGetDnsmasqPid(obj); + if (dnsmasqPid <=3D 0 || (kill(dnsmasqPid, 0) < 0)) return networkStartDhcpDaemon(driver, obj); =20 VIR_INFO("Refreshing dnsmasq for network %s", obj->def->bridge); @@ -1677,7 +1685,8 @@ networkRefreshDhcpDaemon(virNetworkDriverStatePtr dri= ver, if ((ret =3D dnsmasqSave(dctx)) < 0) goto cleanup; =20 - ret =3D kill(obj->dnsmasqPid, SIGHUP); + dnsmasqPid =3D virNetworkObjGetDnsmasqPid(obj); + ret =3D kill(dnsmasqPid, SIGHUP); cleanup: dnsmasqContextFree(dctx); return ret; @@ -1695,10 +1704,12 @@ static int networkRestartDhcpDaemon(virNetworkDriverStatePtr driver, virNetworkObjPtr obj) { + pid_t dnsmasqPid =3D virNetworkObjGetDnsmasqPid(obj); + /* if there is a running dnsmasq, kill it */ - if (obj->dnsmasqPid > 0) { - networkKillDaemon(obj->dnsmasqPid, "dnsmasq", obj->def->name); - obj->dnsmasqPid =3D -1; + if (dnsmasqPid > 0) { + networkKillDaemon(dnsmasqPid, "dnsmasq", obj->def->name); + virNetworkObjSetDnsmasqPid(obj, -1); } /* now start dnsmasq if it should be started */ return networkStartDhcpDaemon(driver, obj); @@ -1838,13 +1849,14 @@ networkStartRadvd(virNetworkDriverStatePtr driver, virNetworkObjPtr obj) { dnsmasqCapsPtr dnsmasq_caps =3D networkGetDnsmasqCaps(driver); + pid_t radvdPid; char *pidfile =3D NULL; char *radvdpidbase =3D NULL; char *configfile =3D NULL; virCommandPtr cmd =3D NULL; int ret =3D -1; =20 - obj->radvdPid =3D -1; + virNetworkObjSetRadvdPid(obj, -1); =20 /* Is dnsmasq handling RA? */ if (DNSMASQ_RA_SUPPORT(dnsmasq_caps)) { @@ -1908,8 +1920,9 @@ networkStartRadvd(virNetworkDriverStatePtr driver, if (virCommandRun(cmd, NULL) < 0) goto cleanup; =20 - if (virPidFileRead(driver->pidDir, radvdpidbase, &obj->radvdPid) < 0) + if (virPidFileRead(driver->pidDir, radvdpidbase, &radvdPid) < 0) goto cleanup; + virNetworkObjSetRadvdPid(obj, radvdPid); =20 ret =3D 0; cleanup: @@ -1928,26 +1941,29 @@ networkRefreshRadvd(virNetworkDriverStatePtr driver, { dnsmasqCapsPtr dnsmasq_caps =3D networkGetDnsmasqCaps(driver); char *radvdpidbase; + pid_t radvdPid; =20 /* Is dnsmasq handling RA? */ if (DNSMASQ_RA_SUPPORT(dnsmasq_caps)) { virObjectUnref(dnsmasq_caps); - if (obj->radvdPid <=3D 0) + radvdPid =3D virNetworkObjGetRadvdPid(obj); + if (radvdPid <=3D 0) return 0; /* radvd should not be running but in case it is */ - if ((networkKillDaemon(obj->radvdPid, "radvd", obj->def->name) >= =3D 0) && + if ((networkKillDaemon(radvdPid, "radvd", obj->def->name) >=3D 0) = && ((radvdpidbase =3D networkRadvdPidfileBasename(obj->def->name)) !=3D NULL)) { virPidFileDelete(driver->pidDir, radvdpidbase); VIR_FREE(radvdpidbase); } - obj->radvdPid =3D -1; + virNetworkObjSetRadvdPid(obj, -1); return 0; } virObjectUnref(dnsmasq_caps); =20 /* if there's no running radvd, just start it */ - if (obj->radvdPid <=3D 0 || (kill(obj->radvdPid, 0) < 0)) + radvdPid =3D virNetworkObjGetRadvdPid(obj); + if (radvdPid <=3D 0 || (kill(radvdPid, 0) < 0)) return networkStartRadvd(driver, obj); =20 if (!virNetworkDefGetIPByIndex(obj->def, AF_INET6, 0)) { @@ -1958,7 +1974,7 @@ networkRefreshRadvd(virNetworkDriverStatePtr driver, if (networkRadvdConfWrite(driver, obj, NULL) < 0) return -1; =20 - return kill(obj->radvdPid, SIGHUP); + return kill(radvdPid, SIGHUP); } =20 =20 @@ -1968,21 +1984,22 @@ static int networkRestartRadvd(virNetworkObjPtr obj) { char *radvdpidbase; + pid_t radvdPid =3D virNeworkObjGetRadvdPid(obj); =20 /* if there is a running radvd, kill it */ - if (obj->radvdPid > 0) { + if (radvdPid > 0) { /* essentially ignore errors from the following two functions, * since there's really no better recovery to be done than to * just push ahead (and that may be exactly what's needed). */ - if ((networkKillDaemon(obj->radvdPid, "radvd", + if ((networkKillDaemon(radvdPid, "radvd", obj->def->name) >=3D 0) && ((radvdpidbase =3D networkRadvdPidfileBasename(obj->def->name)) !=3D NULL)) { virPidFileDelete(driver->pidDir, radvdpidbase); VIR_FREE(radvdpidbase); } - obj->radvdPid =3D -1; + virNetworkObjSetRadvdPid(obj, -1); } /* now start radvd if it should be started */ return networkStartRadvd(obj); @@ -2266,6 +2283,7 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr d= river, virMacMapPtr macmap; char *macMapFile =3D NULL; int tapfd =3D -1; + pid_t dnsmasqPid; =20 /* Check to see if any network IP collides with an existing route */ if (networkCheckRouteCollision(obj->def) < 0) @@ -2433,9 +2451,10 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr = driver, if (!save_err) save_err =3D virSaveLastError(); =20 - if (obj->dnsmasqPid > 0) { - kill(obj->dnsmasqPid, SIGTERM); - obj->dnsmasqPid =3D -1; + dnsmasqPid =3D virNetworkObjGetDnsmasqPid(obj); + if (dnsmasqPid > 0) { + kill(dnsmasqPid, SIGTERM); + virNetworkObjSetDnsmasqPid(obj, -1); } =20 err3: @@ -2478,15 +2497,19 @@ static int networkShutdownNetworkVirtual(virNetworkDriverStatePtr driver, virNetworkObjPtr obj) { + pid_t radvdPid; + pid_t dnsmasqPid; + if (obj->def->bandwidth) virNetDevBandwidthClear(obj->def->bridge); =20 virNetworkObjUnrefMacMap(obj); =20 - if (obj->radvdPid > 0) { + radvdPid =3D virNetworkObjGetRadvdPid(obj); + if (radvdPid > 0) { char *radvdpidbase; =20 - kill(obj->radvdPid, SIGTERM); + kill(radvdPid, SIGTERM); /* attempt to delete the pidfile we created */ if ((radvdpidbase =3D networkRadvdPidfileBasename(obj->def->name))= ) { virPidFileDelete(driver->pidDir, radvdpidbase); @@ -2494,8 +2517,9 @@ networkShutdownNetworkVirtual(virNetworkDriverStatePt= r driver, } } =20 - if (obj->dnsmasqPid > 0) - kill(obj->dnsmasqPid, SIGTERM); + dnsmasqPid =3D virNetworkObjGetDnsmasqPid(obj); + if (dnsmasqPid > 0) + kill(dnsmasqPid, SIGTERM); =20 if (obj->def->mac_specified) { char *macTapIfName =3D networkBridgeDummyNicName(obj->def->bridge); @@ -2513,15 +2537,17 @@ networkShutdownNetworkVirtual(virNetworkDriverState= Ptr driver, ignore_value(virNetDevBridgeDelete(obj->def->bridge)); =20 /* See if its still alive and really really kill it */ - if (obj->dnsmasqPid > 0 && - (kill(obj->dnsmasqPid, 0) =3D=3D 0)) - kill(obj->dnsmasqPid, SIGKILL); - obj->dnsmasqPid =3D -1; - - if (obj->radvdPid > 0 && - (kill(obj->radvdPid, 0) =3D=3D 0)) - kill(obj->radvdPid, SIGKILL); - obj->radvdPid =3D -1; + dnsmasqPid =3D virNetworkObjGetDnsmasqPid(obj); + if (dnsmasqPid > 0 && + (kill(dnsmasqPid, 0) =3D=3D 0)) + kill(dnsmasqPid, SIGKILL); + virNetworkObjSetDnsmasqPid(obj, -1); + + radvdPid =3D virNetworkObjGetRadvdPid(obj); + if (radvdPid > 0 && + (kill(radvdPid, 0) =3D=3D 0)) + kill(radvdPid, SIGKILL); + virNetworkObjSetRadvdPid(obj, -1); =20 return 0; } --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list