Merge pull request #7 from Code-Hex/add/macaddr

Supported MAC Address

README.md

@@ -44,7 +44,8 @@ If you want to use [`VZBridgedNetworkDeviceAttachment`](https://developer.apple.
 
 ## TODO
 
-- [ ] [VZMACAddress](https://developer.apple.com/documentation/virtualization/vzmacaddress?language=objc)
+- [x] [VZMACAddress](https://developer.apple.com/documentation/virtualization/vzmacaddress?language=objc)
+- [ ] [VZVirtioSocketDeviceConfiguration](https://developer.apple.com/documentation/virtualization/sockets?language=objc)
 
 ## LICENSE
 

example/main.go

@@ -80,6 +80,7 @@ func main() {
 	config.SetNetworkDevicesVirtualMachineConfiguration([]*vz.VirtioNetworkDeviceConfiguration{
 		networkConfig,
 	})
+	networkConfig.SetMacAddress(vz.NewRandomLocallyAdministeredMACAddress())
 
 	// entropy
 	entropyConfig := vz.NewVirtioEntropyDeviceConfiguration()

network.go

@@ -7,6 +7,7 @@ package vz
 */
 import "C"
 import (
+	"net"
 	"os"
 	"runtime"
 )
@@ -160,3 +161,51 @@ func NewVirtioNetworkDeviceConfiguration(attachment NetworkDeviceAttachment) *Vi
 	})
 	return config
 }
+
+func (v *VirtioNetworkDeviceConfiguration) SetMacAddress(macAddress *MACAddress) {
+	C.setNetworkDevicesVZMACAddress(v.Ptr(), macAddress.Ptr())
+}
+
+// MACAddress represents a media access control address (MAC address), the 48-bit ethernet address.
+// see: https://developer.apple.com/documentation/virtualization/vzmacaddress?language=objc
+type MACAddress struct {
+	pointer
+}
+
+// NewMACAddress creates a new MACAddress with net.HardwareAddr (MAC address).
+func NewMACAddress(macAddr net.HardwareAddr) *MACAddress {
+	macAddrChar := charWithGoString(macAddr.String())
+	defer macAddrChar.Free()
+	ma := &MACAddress{
+		pointer: pointer{
+			ptr: C.newVZMACAddress(macAddrChar.CString()),
+		},
+	}
+	runtime.SetFinalizer(ma, func(self *MACAddress) {
+		self.Release()
+	})
+	return ma
+}
+
+// NewRandomLocallyAdministeredMACAddress creates a valid, random, unicast, locally administered address.
+func NewRandomLocallyAdministeredMACAddress() *MACAddress {
+	ma := &MACAddress{
+		pointer: pointer{
+			ptr: C.newRandomLocallyAdministeredVZMACAddress(),
+		},
+	}
+	runtime.SetFinalizer(ma, func(self *MACAddress) {
+		self.Release()
+	})
+	return ma
+}
+
+func (m *MACAddress) String() string {
+	cstring := (*char)(C.getVZMACAddressString(m.Ptr()))
+	return cstring.String()
+}
+
+func (m *MACAddress) HardwareAddr() net.HardwareAddr {
+	hw, _ := net.ParseMAC(m.String())
+	return hw
+}

virtualization.h

@@ -50,11 +50,15 @@ void *newVZBridgedNetworkDeviceAttachment(void *networkInterface);
 void *newVZNATNetworkDeviceAttachment(void);
 void *newVZFileHandleNetworkDeviceAttachment(int fileDescriptor);
 void *newVZVirtioNetworkDeviceConfiguration(void *attachment);
+void setNetworkDevicesVZMACAddress(void *config, void *macAddress);
 void *newVZVirtioEntropyDeviceConfiguration(void);
 void *newVZVirtioBlockDeviceConfiguration(void *attachment);
 void *newVZDiskImageStorageDeviceAttachment(const char *diskPath, bool readOnly, void **error);
 void *newVZVirtioTraditionalMemoryBalloonDeviceConfiguration();
 void *newVZVirtioSocketDeviceConfiguration();
+void *newVZMACAddress(const char *macAddress);
+void *newRandomLocallyAdministeredVZMACAddress();
+const char *getVZMACAddressString(void *macAddress);
 
 /* VirtualMachine */
 void *newVZVirtualMachineWithDispatchQueue(void *config, void *queue, const char *vmid);

virtualization.m

@@ -419,6 +419,55 @@ void setStorageDevicesVZVirtualMachineConfiguration(void *config,
     return vm;
 }
 
+/*!
+ @abstract Initialize the VZMACAddress from a string representation of a MAC address.
+ @param string
+    The string should be formatted representing the 6 bytes in hexadecimal separated by a colon character.
+        e.g. "01:23:45:ab:cd:ef"
+
+    The alphabetical characters can appear lowercase or uppercase.
+ @return A VZMACAddress or nil if the string is not formatted correctly.
+ */
+void *newVZMACAddress(const char *macAddress)
+{
+    VZMACAddress *ret;
+    @autoreleasepool {
+        NSString *str = [NSString stringWithUTF8String:macAddress];
+        ret = [[VZMACAddress alloc] initWithString:str];
+    }
+    return ret;
+}
+
+/*!
+ @abstract Create a valid, random, unicast, locally administered address.
+ @discussion The generated address is not guaranteed to be unique.
+ */
+void *newRandomLocallyAdministeredVZMACAddress()
+{
+    return [VZMACAddress randomLocallyAdministeredAddress];
+}
+
+/*!
+ @abstract Sets the media access control address of the device.
+ */
+void setNetworkDevicesVZMACAddress(void *config, void *macAddress)
+{
+    [(VZNetworkDeviceConfiguration *)config setMACAddress:[(VZMACAddress *)macAddress copy]];
+}
+
+/*!
+ @abstract The address represented as a string.
+ @discussion
+    The 6 bytes are represented in hexadecimal form, separated by a colon character.
+    Alphabetical characters are lowercase.
+
+    The address is compatible with the parameter of -[VZMACAddress initWithString:].
+ */
+const char *getVZMACAddressString(void *macAddress)
+{
+    return [[(VZMACAddress *)macAddress string] UTF8String];
+}
+
 /*!
  @abstract Request that the guest turns itself off.
  @param error If not nil, assigned with the error if the request failed.