Merge pull request #1664 from Kentzo/vmci

Add special interface to represent local VMCI context.

doc/zmq_vmci.txt

@@ -34,7 +34,7 @@ colon and the TCP port number to use.
 An 'interface' may be specified by either of the following:
 
 * The wild-card `*`, meaning all available interfaces.
-* An integer returned by `VMCISock_GetLocalCID`
+* An integer returned by `VMCISock_GetLocalCID` or `@` (ZeroMQ will call VMCISock_GetLocalCID internally).
 
 The port may be specified by:
 

src/vmci_address.cpp

@@ -77,6 +77,14 @@ int zmq::vmci_address_t::resolve(const char *path_)
         errno = EINVAL;
         return -1;
     }
+    else if (addr_str == "@") {
+        cid = VMCISock_GetLocalCID();
+
+        if (cid == VMADDR_CID_ANY) {
+            errno = ENODEV;
+            return -1;
+        }
+    }
     else if (addr_str != "*" && addr_str != "-1") {
         const char *begin = addr_str.c_str();
         char *end = NULL;