From 396ff821002809d4de5396266ad5f72a8f6bc2a5 Mon Sep 17 00:00:00 2001
From: Alex Masi <alexmasi@google.com>
Date: Tue, 23 Jul 2024 23:13:07 +0000
Subject: [PATCH] fix fwd proto

---
 examples/forward/.topology.textproto.swp | Bin 12288 -> 0 bytes
 examples/forward/topology.textproto      |  56 +++++++++++++++--------
 proto/forward.proto                      |   4 +-
 proto/forward/forward.pb.go              |  14 +++---
 4 files changed, 45 insertions(+), 29 deletions(-)
 delete mode 100644 examples/forward/.topology.textproto.swp

diff --git a/examples/forward/.topology.textproto.swp b/examples/forward/.topology.textproto.swp
deleted file mode 100644
index 4fc1f7db6e20353bc47b6fe3ba5c45726cdee8b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2O=uHA6vw9uTC}ZVMGB&h75qT5Y1)c3C{$}x0%@wnwue%~G}**$H@k7OHEl!-
z_To)Y4<0<&TPeMGSHz1KZ{n>Wcoi>Nq*wp5A5Av&!>S;KxA4pEzTJ5<^P9JUkR5Lu
zj`#B}rHx@b$k@ucm)WCDo$QBTY^tbQGQ8C$bagr}idrbrrA!q=CADZrLgPwW$*G0V
zq@jjvL^OjvkO{*Ggw<)0FX(D9oHebIurguWESS2Pn^A0a+Adh8ZEn>mT_*!%V4DUS
zSx0-sdDKs}p5)DkhPK(BZYKj|fDDiUGC&5%02v?yWMC&7unTo;78BUzO=8U3*VXL3
zQ`(UMGC&5%02v?yWPl8i0Wv@a$N(8213S=w$T0S(p0UIGFnIj`@BjY)dVsMn;1hTY
zmcSyI2hYGP(7^-{U=VbJPS67OfR9a#y#ov2F_;4r;0EXbXTUMg09G0qTLy2yEASl5
zf+Em>0Ha_841ol=49<fSU^n>Qfc9VsJOyQ7fFW=R90!L$Jy_k(*k|w_EPxka4orYs
z;3i0b7`O_$!9{Quw1B-}70!NwZ(tdG0I$IkSOoLn33v$Z00B~981#Y*;50Y_r2l3>
z8yO%2WPl8i0Wv@a{)d74jPr6zGwdjDRqfmDt<Je&W>f^Mh&&ZFmqp6EoGoQ=gRU8q
z#VEhWHcf?lo!lEHvv7H%RL(HUez)?@z^J@YRz~&PsoWWCl1v&1j7m<DbN92duRaPM
zb8d*dbP2i6IAwFWm7_dv*s7HkX%+IEnDgQ1b|Y9B_nvi9tmV#@0;xrmC(N|alUT*7
z)FsVQorUuIs_v=!nDd%m9pQefs$S*tSHhUldfjg9Bajw@Ue8C(phxYQf~w?9GpDPf
zpcR$0nfG5TR$}f8#yzHy)pBFr%<rm3#<WryVGA#!<wZ`ei1$8nR2TA{WjT|y(^A$l
z=We?wj|~itTp7HEh_{e#CCg%4t9n<Suh8EICtit4W0j%^Ncgj&2&7ocoh=38|GX#y
zYhTr?`<%;3%5B?45lFj}iUI=<6h$5tqNB_bz5V_1WS^`rzorJR_a=J=lCgLnf?g@e
XZ?(T_U){f7s_p|38pjL!=~ng&;*#B1

diff --git a/examples/forward/topology.textproto b/examples/forward/topology.textproto
index c3ac548e..7e8b1b27 100644
--- a/examples/forward/topology.textproto
+++ b/examples/forward/topology.textproto
@@ -17,21 +17,29 @@ nodes: {
     vendor_data {
       [type.googleapis.com/forward.ForwardConfig] {
         wires: {
-          a: Interface {
-            name: "eth1"
+          a: {
+            interface: {
+              name: "eth1"
+            }
           }
-          z: LocalNode {
-            name: "fwd2"
-            interface: "eth1"
+          z: {
+            local_node: {
+              name: "fwd2"
+              interface: "eth1"
+            }
           }
         }
         wires: {
-          a: LocalNode {
-            name: "fw2"
-            interface: "eth2"
+          a: {
+            local_node: {
+              name: "fw2"
+              interface: "eth2"
+            }
           }
-          z: Interface {
-            name: "eth2"
+          z: {
+            interface: {
+              name: "eth2"
+            }
           }
         }
       }
@@ -46,21 +54,29 @@ nodes: {
     vendor_data {
       [type.googleapis.com/forward.ForwardConfig] {
         wires: {
-          a: Interface {
-            name: "eth2"
+          a: {
+            interface: {
+              name: "eth2"
+            }
           }
-          z: LocalNode {
-            name: "fwd1"
-            interface: "eth2"
+          z: {
+            local_node: {
+              name: "fwd1"
+              interface: "eth2"
+            }
           }
         }
         wires: {
-          a: LocalNode {
-            name: "fw1"
-            interface: "eth1"
+          a: {
+            local_node: {
+              name: "fw1"
+              interface: "eth1"
+            }
           }
-          z: Interface {
-            name: "eth1"
+          z: {
+            interface: {
+              name: "eth1"
+            }
           }
         }
       }
diff --git a/proto/forward.proto b/proto/forward.proto
index 16d52f09..d201ccac 100644
--- a/proto/forward.proto
+++ b/proto/forward.proto
@@ -27,8 +27,8 @@ message ForwardConfig {
 message Wire {
   // The a endpoint serves as the client endpoint in the bidirectional stream.
   Endpoint a = 1;
-  // The b endpoint serves as the server endpoint in the bidirectional stream.
-  Endpoint b = 2;
+  // The z endpoint serves as the server endpoint in the bidirectional stream.
+  Endpoint z = 2;
 }
 
 message Endpoint {
diff --git a/proto/forward/forward.pb.go b/proto/forward/forward.pb.go
index b1269aee..173be586 100644
--- a/proto/forward/forward.pb.go
+++ b/proto/forward/forward.pb.go
@@ -91,8 +91,8 @@ type Wire struct {
 
 	// The a endpoint serves as the client endpoint in the bidirectional stream.
 	A *Endpoint `protobuf:"bytes,1,opt,name=a,proto3" json:"a,omitempty"`
-	// The b endpoint serves as the server endpoint in the bidirectional stream.
-	B *Endpoint `protobuf:"bytes,2,opt,name=b,proto3" json:"b,omitempty"`
+	// The z endpoint serves as the server endpoint in the bidirectional stream.
+	Z *Endpoint `protobuf:"bytes,2,opt,name=z,proto3" json:"z,omitempty"`
 }
 
 func (x *Wire) Reset() {
@@ -134,9 +134,9 @@ func (x *Wire) GetA() *Endpoint {
 	return nil
 }
 
-func (x *Wire) GetB() *Endpoint {
+func (x *Wire) GetZ() *Endpoint {
 	if x != nil {
-		return x.B
+		return x.Z
 	}
 	return nil
 }
@@ -406,9 +406,9 @@ var file_forward_proto_rawDesc = []byte{
 	0x72, 0x64, 0x2e, 0x57, 0x69, 0x72, 0x65, 0x52, 0x05, 0x77, 0x69, 0x72, 0x65, 0x73, 0x22, 0x48,
 	0x0a, 0x04, 0x57, 0x69, 0x72, 0x65, 0x12, 0x1f, 0x0a, 0x01, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x0b, 0x32, 0x11, 0x2e, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x2e, 0x45, 0x6e, 0x64, 0x70,
-	0x6f, 0x69, 0x6e, 0x74, 0x52, 0x01, 0x61, 0x12, 0x1f, 0x0a, 0x01, 0x62, 0x18, 0x02, 0x20, 0x01,
+	0x6f, 0x69, 0x6e, 0x74, 0x52, 0x01, 0x61, 0x12, 0x1f, 0x0a, 0x01, 0x7a, 0x18, 0x02, 0x20, 0x01,
 	0x28, 0x0b, 0x32, 0x11, 0x2e, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x2e, 0x45, 0x6e, 0x64,
-	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x01, 0x62, 0x22, 0xb7, 0x01, 0x0a, 0x08, 0x45, 0x6e, 0x64,
+	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x01, 0x7a, 0x22, 0xb7, 0x01, 0x0a, 0x08, 0x45, 0x6e, 0x64,
 	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x32, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61,
 	0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x66, 0x6f, 0x72, 0x77, 0x61,
 	0x72, 0x64, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x48, 0x00, 0x52, 0x09,
@@ -460,7 +460,7 @@ var file_forward_proto_goTypes = []interface{}{
 var file_forward_proto_depIdxs = []int32{
 	1, // 0: forward.ForwardConfig.wires:type_name -> forward.Wire
 	2, // 1: forward.Wire.a:type_name -> forward.Endpoint
-	2, // 2: forward.Wire.b:type_name -> forward.Endpoint
+	2, // 2: forward.Wire.z:type_name -> forward.Endpoint
 	3, // 3: forward.Endpoint.interface:type_name -> forward.Interface
 	4, // 4: forward.Endpoint.local_node:type_name -> forward.LocalNode
 	5, // 5: forward.Endpoint.remote_node:type_name -> forward.RemoteNode