[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCHv3 2/5] domifaddr: Implement the remote protocol



On 23/08/13 06:18, nehaljwani wrote:
Implement RPC calls for virDomainInterfacesAddresses

daemon/remote.c
    * Define remoteSerializeDomainInterfacePtr, remoteDispatchDomainInterfacesAddresses

src/remote/remote_driver.c
    * Define remoteDomainInterfacesAddresses

src/remote/remote_protocol.x
    * New RPC procedure: REMOTE_PROC_DOMAIN_INTERFACES_ADDRESSES
    * Define structs remote_domain_ip_addr, remote_domain_interface,
      remote_domain_interfaces_addresses_args, remote_domain_interfaces_addresses_ret

src/remote_protocol-structs
    * New structs added

---
  daemon/remote.c              | 123 +++++++++++++++++++++++++++++++++++++++++++
  src/remote/remote_driver.c   |  87 ++++++++++++++++++++++++++++++
  src/remote/remote_protocol.x |  41 ++++++++++++++-
  src/remote_protocol-structs  |  24 +++++++++
  4 files changed, 274 insertions(+), 1 deletion(-)

diff --git a/daemon/remote.c b/daemon/remote.c
index 03d5557..31640c6 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -5025,7 +5025,130 @@ cleanup:
      return rv;
  }
+static int
+remoteSerializeDomainInterfacePtr(virDomainInterfacePtr *ifaces,
+                                  unsigned int ifaces_count,
+                                  remote_domain_interfaces_addresses_ret *ret)
+{
+    size_t i, j;
+
+    if (ifaces_count > REMOTE_DOMAIN_INTERFACE_MAX)
+        return -1;
+

It should report error here.

+    if (VIR_ALLOC_N(ret->ifaces.ifaces_val, ifaces_count) < 0)
+        return -1;
+
+    ret->ifaces.ifaces_len = ifaces_count;
+
+    for (i = 0; i < ifaces_count; i++) {
+        virDomainInterfacePtr iface = ifaces[i];
+        remote_domain_interface *iface_ret = &(ret->ifaces.ifaces_val[i]);
+
+        if ((VIR_STRDUP(iface_ret->name, iface->name)) < 0)
+            goto cleanup;
+
+        if (iface->hwaddr) {
+            char **hwaddr_p = NULL;
+            if (VIR_ALLOC(hwaddr_p) < 0)
+                goto cleanup;
+            if (VIR_STRDUP(*hwaddr_p, iface->hwaddr) < 0) {
+                VIR_FREE(hwaddr_p);
+                goto cleanup;
+            }
+
+            iface_ret->hwaddr = hwaddr_p;
+        }
+
+        if (iface->naddrs > REMOTE_DOMAIN_IP_ADDR_MAX)

Like above.

+            goto cleanup;
+
+        if (VIR_ALLOC_N(iface_ret->addrs.addrs_val,
+                        iface->naddrs) < 0)
+            goto cleanup;
+
+        iface_ret->addrs.addrs_len = iface->naddrs;
+
+        for (j = 0; j < iface->naddrs; j++) {
+            virDomainIPAddressPtr ip_addr = &(iface->addrs[j]);
+            remote_domain_ip_addr *ip_addr_ret =
+                &(iface_ret->addrs.addrs_val[j]);
+
+            if (VIR_STRDUP(ip_addr_ret->addr, ip_addr->addr) < 0)
+                goto cleanup;
+
+            ip_addr_ret->prefix = ip_addr->prefix;
+            ip_addr_ret->type = ip_addr->type;
+        }
+    }
+
+    return 0;
+
+cleanup:
+    if (ret->ifaces.ifaces_val) {
+        for (i = 0; i < ifaces_count; i++) {
+            remote_domain_interface *iface_ret = &(ret->ifaces.ifaces_val[i]);
+            VIR_FREE(iface_ret->name);
+            VIR_FREE(iface_ret->hwaddr);
+            for (j = 0; j < iface_ret->addrs.addrs_len; j++) {
+                remote_domain_ip_addr *ip_addr =
+                    &(iface_ret->addrs.addrs_val[j]);
+                VIR_FREE(ip_addr->addr);
+            }
+            VIR_FREE(iface_ret);
+        }
+        VIR_FREE(ret->ifaces.ifaces_val);
+    }
+
+    return -1;
+}
+static int
+remoteDispatchDomainInterfacesAddresses(
+    virNetServerPtr server ATTRIBUTE_UNUSED,
+    virNetServerClientPtr client,
+    virNetMessagePtr msg ATTRIBUTE_UNUSED,
+    virNetMessageErrorPtr rerr,
+    remote_domain_interfaces_addresses_args *args,
+    remote_domain_interfaces_addresses_ret *ret)
+{
+    int rv = -1;
+    virDomainPtr dom = NULL;
+    virDomainInterfacePtr *ifaces = NULL;
+    int ifaces_count = 0;
+    struct daemonClientPrivate *priv =
+        virNetServerClientGetPrivateData(client);
+
+    if (!priv->conn) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open"));
+        goto cleanup;
+    }
+
+    if (!(dom = get_nonnull_domain(priv->conn, args->dom)))
+        goto cleanup;
+
+    if ((ifaces_count = virDomainInterfacesAddresses(dom, &ifaces, args->flags)) < 0)
+        goto cleanup;
+
+    if (remoteSerializeDomainInterfacePtr(ifaces, ifaces_count, ret) < 0)
+        goto cleanup;
+
+    rv = 0;
+
+cleanup:
+    if (rv < 0)
+        virNetMessageSaveError(rerr);
+    if (dom)
+        virDomainFree(dom);
+    if (ifaces) {
+        size_t i;
+        for (i = 0; i < ifaces_count; i++) {
+            if (ifaces[i])
+                virDomainInterfaceFree(ifaces[i]);

Hm, as commented in previous patch, you check the "ifaces[i]" here. "ifaces[i]" is a pointer now, you should free it if it's not free'ed in virDomainInterfacesFree. Like checking before each calling of virDomainInterfacesFree, it's just bad design.
Please do them inside virDomainInterfacesFree.

+        }
+        VIR_FREE(ifaces);
+    }
+    return rv;
+}
/*----- Helpers. -----*/ diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 71d0034..919adb4 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -6477,6 +6477,92 @@ done:
      return rv;
  }
+static int
+remoteDomainInterfacesAddresses(virDomainPtr dom,
+                                virDomainInterfacePtr **ifaces,
+                                unsigned int flags)
+{
+    int rv = -1;
+    size_t i, j;
+
+    virDomainInterfacePtr *ifaces_ret = NULL;
+    remote_domain_interfaces_addresses_args args;
+    remote_domain_interfaces_addresses_ret ret;
+
+    struct private_data *priv = dom->conn->privateData;
+
+    args.flags = flags;
+    make_nonnull_domain(&args.dom, dom);
+
+    remoteDriverLock(priv);
+
+    memset(&ret, 0, sizeof(ret));
+
+    if (call(dom->conn, priv, 0, REMOTE_PROC_DOMAIN_INTERFACES_ADDRESSES,
+             (xdrproc_t)xdr_remote_domain_interfaces_addresses_args,
+             (char *)&args,
+             (xdrproc_t)xdr_remote_domain_interfaces_addresses_ret,
+             (char *)&ret) == -1) {
+        goto done;
+    }
+
+    if (ret.ifaces.ifaces_len &&
+        VIR_ALLOC_N(ifaces_ret, ret.ifaces.ifaces_len) < 0)
+        goto cleanup;
+
+    for (i = 0; i < ret.ifaces.ifaces_len; i++) {
+        if (VIR_ALLOC(ifaces_ret[i]) < 0)
+            goto cleanup;
+
+        virDomainInterfacePtr iface = ifaces_ret[i];
+        remote_domain_interface *iface_ret = &(ret.ifaces.ifaces_val[i]);
+
+        if (VIR_STRDUP(iface->name, iface_ret->name) < 0)
+            goto cleanup;
+
+        if (iface_ret->hwaddr &&
+            VIR_STRDUP(iface->hwaddr, *iface_ret->hwaddr) < 0)
+            goto cleanup;
+
+        iface->naddrs = iface_ret->addrs.addrs_len;
+
+        if (iface->naddrs) {
+            if (VIR_ALLOC_N(iface->addrs, iface->naddrs) < 0)
+                goto cleanup;
+
+            for (j = 0; j < iface->naddrs; j++) {
+                virDomainIPAddressPtr ip_addr = &(iface->addrs[j]);
+                remote_domain_ip_addr *ip_addr_ret =
+                    &(iface_ret->addrs.addrs_val[j]);
+
+                if (VIR_STRDUP(ip_addr->addr, ip_addr_ret->addr) < 0) {
+                    goto cleanup;
+                }
+                ip_addr->prefix = ip_addr_ret->prefix;
+                ip_addr->type = ip_addr_ret->type;
+            }
+        }
+    }
+    *ifaces = ifaces_ret;
+    ifaces_ret = NULL;
+
+    rv = ret.ifaces.ifaces_len;
+
+cleanup:
+    if (ifaces_ret) {
+        for (i = 0; i < ret.ifaces.ifaces_len; i++) {
+            if (ifaces_ret[i])
+                virDomainInterfaceFree(ifaces_ret[i]);
+        }
+        VIR_FREE(ifaces_ret);
+    }
+    xdr_free((xdrproc_t)xdr_remote_domain_interfaces_addresses_ret,
+             (char *) &ret);
+done:
+    remoteDriverUnlock(priv);
+    return rv;
+}
+
  static void
  remoteDomainEventQueue(struct private_data *priv, virDomainEventPtr event)
  {
@@ -6811,6 +6897,7 @@ static virDriver remote_driver = {
      .domainMigratePerform3Params = remoteDomainMigratePerform3Params, /* 1.1.0 */
      .domainMigrateFinish3Params = remoteDomainMigrateFinish3Params, /* 1.1.0 */
      .domainMigrateConfirm3Params = remoteDomainMigrateConfirm3Params, /* 1.1.0 */
+    .domainInterfacesAddresses = remoteDomainInterfacesAddresses, /* 1.1.2 */
  };
static virNetworkDriver network_driver = {
diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 7cfebdf..1bab644 100644
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -237,6 +237,17 @@ const REMOTE_NODE_MEMORY_PARAMETERS_MAX = 64;
  /* UUID.  VIR_UUID_BUFLEN definition comes from libvirt.h */
  typedef opaque remote_uuid[VIR_UUID_BUFLEN];
+/*
+ * Upper limit on number of interfaces per domain
+ */
+const REMOTE_DOMAIN_INTERFACE_MAX = 256;

Is 256 big enough in principle?

+
+/*
+ * Upper limit on number of ip addresses per interface

s/ip/IP/,

+ */
+const REMOTE_DOMAIN_IP_ADDR_MAX = 64;
+
+
  /* A domain which may not be NULL. */
  struct remote_nonnull_domain {
      remote_nonnull_string name;
@@ -2837,6 +2848,27 @@ struct remote_domain_event_device_removed_msg {
      remote_nonnull_string devAlias;
  };
+struct remote_domain_ip_addr {
+    int type;
+    remote_nonnull_string addr;
+    int prefix;
+};
+
+struct remote_domain_interface {
+    remote_nonnull_string name;
+    remote_string hwaddr;
+    remote_domain_ip_addr addrs<REMOTE_DOMAIN_IP_ADDR_MAX>;
+};
+
+struct remote_domain_interfaces_addresses_args {
+    remote_nonnull_domain dom;
+    unsigned int flags;
+};
+
+struct remote_domain_interfaces_addresses_ret {
+    remote_domain_interface ifaces<REMOTE_DOMAIN_INTERFACE_MAX>;
+};
+
  /*----- Protocol. -----*/
/* Define the program number, protocol version and procedure numbers here. */
@@ -5000,5 +5032,12 @@ enum remote_procedure {
       * @generate: both
       * @acl: none
       */
-    REMOTE_PROC_DOMAIN_EVENT_DEVICE_REMOVED = 311
+    REMOTE_PROC_DOMAIN_EVENT_DEVICE_REMOVED = 311,
+
+    /**
+     * @generate: none
+     * @acl: domain:read
+     */
+    REMOTE_PROC_DOMAIN_INTERFACES_ADDRESSES = 312
+
  };
diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index 4e27aae..e08fe43 100644
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -2316,6 +2316,29 @@ struct remote_domain_event_device_removed_msg {
          remote_nonnull_domain      dom;
          remote_nonnull_string      devAlias;
  };
+struct remote_domain_ip_addr {
+        int                        type;
+        remote_nonnull_string      addr;
+        int                        prefix;
+};
+struct remote_domain_interface {
+        remote_nonnull_string      name;
+        remote_string              hwaddr;
+        struct {
+                u_int              addrs_len;
+                remote_domain_ip_addr * addrs_val;
+        } addrs;
+};
+struct remote_domain_interfaces_addresses_args {
+        remote_nonnull_domain      dom;
+        u_int                      flags;
+};
+struct remote_domain_interfaces_addresses_ret {
+        struct {
+                u_int              ifaces_len;
+                remote_domain_interface * ifaces_val;
+        } ifaces;
+};
  enum remote_procedure {
          REMOTE_PROC_CONNECT_OPEN = 1,
          REMOTE_PROC_CONNECT_CLOSE = 2,
@@ -2628,4 +2651,5 @@ enum remote_procedure {
          REMOTE_PROC_DOMAIN_CREATE_XML_WITH_FILES = 309,
          REMOTE_PROC_DOMAIN_CREATE_WITH_FILES = 310,
          REMOTE_PROC_DOMAIN_EVENT_DEVICE_REMOVED = 311,
+        REMOTE_PROC_DOMAIN_INTERFACES_ADDRESSES = 312,
  };


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]