From 268416811f02e43983fb52c945cedf344fce39b3 Mon Sep 17 00:00:00 2001
From: Ryan Goodfellow <ryan.goodfellow@oxide.computer>
Date: Wed, 9 Aug 2023 15:01:13 -0700
Subject: [PATCH] bump opte

---
 Cargo.lock     | 12 ++++++------
 ddm/src/sys.rs |  9 ++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 26e9e9ee..bdaae4e5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1170,7 +1170,7 @@ dependencies = [
 [[package]]
 name = "illumos-sys-hdrs"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/opte?branch=boundary-services-overlay-flow-pinning#601694fa47cabe1bf12411146c74454fabd9e1fd"
+source = "git+https://github.com/oxidecomputer/opte?branch=boundary-services-overlay-flow-pinning#05a0042cb126ffe2f68dceb7c15604a6f7ae56a1"
 
 [[package]]
 name = "indexmap"
@@ -1280,7 +1280,7 @@ dependencies = [
 [[package]]
 name = "kstat-macro"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/opte?branch=boundary-services-overlay-flow-pinning#601694fa47cabe1bf12411146c74454fabd9e1fd"
+source = "git+https://github.com/oxidecomputer/opte?branch=boundary-services-overlay-flow-pinning#05a0042cb126ffe2f68dceb7c15604a6f7ae56a1"
 dependencies = [
  "quote",
  "syn 1.0.109",
@@ -1715,7 +1715,7 @@ dependencies = [
 [[package]]
 name = "opte"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/opte?branch=boundary-services-overlay-flow-pinning#601694fa47cabe1bf12411146c74454fabd9e1fd"
+source = "git+https://github.com/oxidecomputer/opte?branch=boundary-services-overlay-flow-pinning#05a0042cb126ffe2f68dceb7c15604a6f7ae56a1"
 dependencies = [
  "cfg-if 0.1.10",
  "dyn-clone",
@@ -1732,7 +1732,7 @@ dependencies = [
 [[package]]
 name = "opte-api"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/opte?branch=boundary-services-overlay-flow-pinning#601694fa47cabe1bf12411146c74454fabd9e1fd"
+source = "git+https://github.com/oxidecomputer/opte?branch=boundary-services-overlay-flow-pinning#05a0042cb126ffe2f68dceb7c15604a6f7ae56a1"
 dependencies = [
  "cfg-if 0.1.10",
  "illumos-sys-hdrs",
@@ -1745,7 +1745,7 @@ dependencies = [
 [[package]]
 name = "opte-ioctl"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/opte?branch=boundary-services-overlay-flow-pinning#601694fa47cabe1bf12411146c74454fabd9e1fd"
+source = "git+https://github.com/oxidecomputer/opte?branch=boundary-services-overlay-flow-pinning#05a0042cb126ffe2f68dceb7c15604a6f7ae56a1"
 dependencies = [
  "libc",
  "libnet 0.1.0 (git+https://github.com/oxidecomputer/netadm-sys)",
@@ -1759,7 +1759,7 @@ dependencies = [
 [[package]]
 name = "oxide-vpc"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/opte?branch=boundary-services-overlay-flow-pinning#601694fa47cabe1bf12411146c74454fabd9e1fd"
+source = "git+https://github.com/oxidecomputer/opte?branch=boundary-services-overlay-flow-pinning#05a0042cb126ffe2f68dceb7c15604a6f7ae56a1"
 dependencies = [
  "cfg-if 0.1.10",
  "illumos-sys-hdrs",
diff --git a/ddm/src/sys.rs b/ddm/src/sys.rs
index 45c7b454..739a375b 100644
--- a/ddm/src/sys.rs
+++ b/ddm/src/sys.rs
@@ -233,8 +233,8 @@ pub fn add_tunnel_routes(
     routes: &HashSet<TunnelRoute>,
 ) -> Result<(), opte_ioctl::Error> {
     use oxide_vpc::api::{
-        IpCidr, Ipv4Cidr, Ipv4PrefixLen, Ipv6Cidr, Ipv6PrefixLen, PhysNet,
-        SetVirt2BoundaryReq, Vni,
+        IpCidr, Ipv4Cidr, Ipv4PrefixLen, Ipv6Cidr, Ipv6PrefixLen,
+        SetVirt2BoundaryReq, TunnelEndpoint, Vni,
     };
     let hdl = OpteHdl::open(OpteHdl::XDE_CTL)?;
     for r in routes {
@@ -256,12 +256,11 @@ pub fn add_tunnel_routes(
                 Ipv6PrefixLen::new(p.len).unwrap(),
             )),
         };
-        let phys = PhysNet {
-            ether: [0, 0, 0, 0, 0, 0].into(), //XXX should not need
+        let tep = TunnelEndpoint {
             ip: r.boundary_addr.into(),
             vni: Vni::new(r.vni).unwrap(),
         };
-        let req = SetVirt2BoundaryReq { vip, phys };
+        let req = SetVirt2BoundaryReq { vip, tep };
         hdl.set_v2b(&req)?;
     }