More network utility functions

* src/util/network.[ch] Add functions for address->text and get/set
  port number
* src/libvirt_private.syms: add new entry points

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 8525dbd641438565e5fbb2397302f5ed58d93320..15d75fdd1be5b0f726896dedecfcac2ed293ec5e 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -289,10 +289,13 @@ virFree;
 virSocketAddrInNetwork;
 virSocketAddrIsNetmask;
 virSocketCheckNetmask;
+virSocketFormatAddr;
+virSocketGetPort;
 virSocketGetRange;
 virSocketParseAddr;
 virSocketParseIpv4Addr;
 virSocketParseIpv6Addr;
+virSocketSetPort;
 
 
 # network_conf.h

diff --git a/src/util/network.c b/src/util/network.c
index abd866c3e09d0dcecaec3df26f3deeb84fd2708e..674e7685aaf7af710abd232fd59191be093dd008 100644 (file)
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -9,6 +9,7 @@
  */
 
 #include <config.h>
+#include <arpa/inet.h>
 
 #include "memory.h"
 #include "network.h"
@@ -64,7 +65,7 @@ static int getIPv6Addr(virSocketAddrPtr addr, virIPv6AddrPtr tab) {
  * Mostly a wrapper for getaddrinfo() extracting the address storage
  * from the numeric string like 1.2.3.4 or 2001:db8:85a3:0:0:8a2e:370:7334
  *
- * Returns the lenght of the network address or -1 in case of error.
+ * Returns the length of the network address or -1 in case of error.
  */
 int
 virSocketParseAddr(const char *val, virSocketAddrPtr addr, int hint) {
@@ -116,6 +117,100 @@ virSocketParseIpv6Addr(const char *val, virSocketAddrPtr addr) {
     return(virSocketParseAddr(val, addr, AF_INET6));
 }
 
+/*
+ * virSocketFormatAddr:
+ * @addr: an initialised virSocketAddrPtr
+ *
+ * Returns a string representation of the given address
+ * Returns NULL on any error
+ * Caller must free the returned string
+ */
+char *
+virSocketFormatAddr(virSocketAddrPtr addr) {
+    char   *out;
+    size_t outlen;
+    void   *inaddr;
+
+    if (addr == NULL)
+        return NULL;
+
+    if (addr->stor.ss_family == AF_INET) {
+        outlen = INET_ADDRSTRLEN;
+        inaddr = &addr->inet4.sin_addr;
+    }
+
+    else if (addr->stor.ss_family == AF_INET6) {
+        outlen = INET6_ADDRSTRLEN;
+        inaddr = &addr->inet6.sin6_addr;
+    }
+
+    else {
+        return NULL;
+    }
+
+    if (VIR_ALLOC_N(out, outlen) < 0)
+        return NULL;
+
+    if (inet_ntop(addr->stor.ss_family, inaddr, out, outlen) == NULL) {
+        VIR_FREE(out);
+        return NULL;
+    }
+
+    return out;
+}
+
+/*
+ * virSocketSetPort:
+ * @addr: an initialised virSocketAddrPtr
+ * @port: the port number to set
+ *
+ * Set the transport layer port of the given virtSocketAddr
+ *
+ * Returns 0 on success, -1 on failure
+ */
+int
+virSocketSetPort(virSocketAddrPtr addr, int port) {
+    if (addr == NULL)
+        return -1;
+
+    if(addr->stor.ss_family == AF_INET) {
+        addr->inet4.sin_port = port;
+    }
+
+    else if(addr->stor.ss_family == AF_INET6) {
+        addr->inet6.sin6_port = port;
+    }
+
+    else {
+        return -1;
+    }
+
+    return 0;
+}
+
+/*
+ * virSocketGetPort:
+ * @addr: an initialised virSocketAddrPtr
+ *
+ * Returns the transport layer port of the given virtSocketAddr
+ * Returns -1 if @addr is invalid
+ */
+int
+virSocketGetPort(virSocketAddrPtr addr) {
+    if (addr == NULL)
+        return -1;
+
+    if(addr->stor.ss_family == AF_INET) {
+        return addr->inet4.sin_port;
+    }
+
+    else if(addr->stor.ss_family == AF_INET6) {
+        return addr->inet6.sin6_port;
+    }
+
+    return -1;
+}
+
 /**
  * virSocketAddrIsNetmask:
  * @netmask: the netmask address

diff --git a/src/util/network.h b/src/util/network.h
index e5907478ef517f5594b565a2c16b6ba14f605e0d..3762ef28e0abf1ec1c7f43d59e6edfa751bad2b5 100644 (file)
--- a/src/util/network.h
+++ b/src/util/network.h
@@ -34,6 +34,12 @@ int virSocketParseIpv4Addr(const char *val,
 int virSocketParseIpv6Addr(const char *val,
                            virSocketAddrPtr addr);
 
+char * virSocketFormatAddr(virSocketAddrPtr addr);
+
+int virSocketSetPort(virSocketAddrPtr addr, int port);
+
+int virSocketGetPort(virSocketAddrPtr addr);
+
 int virSocketAddrInNetwork(virSocketAddrPtr addr1,
                            virSocketAddrPtr addr2,
                            virSocketAddrPtr netmask);