net_util: add tap support for mac address

Allow get/set for the host mac on the tap interface. Also add read accessors
for the host IP address and netmask, and make using IFF_VNET_HDR optional.

BUG=none
TEST=./build_test

Change-Id: I9999bf5aa8aa35b8cae702d9bc6f94602d6fe32e
Reviewed-on: https://chromium-review.googlesource.com/918406
Commit-Ready: Stephen Barber <smbarber@chromium.org>
Tested-by: Stephen Barber <smbarber@chromium.org>
Reviewed-by: Dylan Reid <dgreid@chromium.org>

1 files changed, 11 insertions, 2 deletions

diff --git a/src/main.rs b/src/main.rs
index bb6692d..8b0506d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -65,7 +65,7 @@ pub struct Config {
     params: Vec<String>,
     host_ip: Option<net::Ipv4Addr>,
     netmask: Option<net::Ipv4Addr>,
-    mac_address: Option<String>,
+    mac_address: Option<net_util::MacAddress>,
     vhost_net: bool,
     wayland_socket_path: Option<PathBuf>,
     socket_path: Option<PathBuf>,
@@ -239,7 +239,16 @@ fn set_argument(cfg: &mut Config, name: &str, value: Option<&str>) -> argument::
             if cfg.mac_address.is_some() {
                 return Err(argument::Error::TooManyArguments("`mac` already given".to_owned()));
             }
-            cfg.mac_address = Some(value.unwrap().to_owned());
+            cfg.mac_address =
+                Some(value
+                         .unwrap()
+                         .parse()
+                         .map_err(|_| {
+                                      argument::Error::InvalidValue {
+                                          value: value.unwrap().to_owned(),
+                                          expected: "`mac` needs to be in the form \"XX:XX:XX:XX:XX:XX\"",
+                                      }
+                                  })?)
         }
         "wayland-sock" => {
             if cfg.wayland_socket_path.is_some() {