From 3e6e389e1f6e62471c1b8ab32a5ba2256b1367b8 Mon Sep 17 00:00:00 2001
From: Matthew Holt <mholt@users.noreply.github.com>
Date: Sat, 24 Feb 2018 15:24:11 -0700
Subject: [PATCH] Restore commented fields (issue #2)

---
 origin/tunnel.go            | 10 +++++-----
 tunnelrpc/pogs/tunnelrpc.go | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/origin/tunnel.go b/origin/tunnel.go
index 7a9fb33f..dfeb3ee8 100644
--- a/origin/tunnel.go
+++ b/origin/tunnel.go
@@ -93,11 +93,11 @@ func (c *TunnelConfig) RegistrationOptions(connectionID uint8, OriginLocalIP str
 		Version:              c.ReportedVersion,
 		OS:                   fmt.Sprintf("%s_%s", runtime.GOOS, runtime.GOARCH),
 		ExistingTunnelPolicy: policy,
-		// PoolName:             c.LBPool,        // TODO - see issue #2
-		Tags:          c.Tags,
-		ConnectionID:  connectionID,
-		OriginLocalIP: OriginLocalIP,
-		// IsAutoupdated:        c.IsAutoupdated, // TODO - see issue #2
+		PoolName:             c.LBPool,
+		Tags:                 c.Tags,
+		ConnectionID:         connectionID,
+		OriginLocalIP:        OriginLocalIP,
+		IsAutoupdated:        c.IsAutoupdated,
 	}
 }
 
diff --git a/tunnelrpc/pogs/tunnelrpc.go b/tunnelrpc/pogs/tunnelrpc.go
index 2e24112d..4f5280e4 100644
--- a/tunnelrpc/pogs/tunnelrpc.go
+++ b/tunnelrpc/pogs/tunnelrpc.go
@@ -47,11 +47,11 @@ type RegistrationOptions struct {
 	Version              string
 	OS                   string `capnp:"os"`
 	ExistingTunnelPolicy tunnelrpc.ExistingTunnelPolicy
-	// PoolName             string `capnp:"poolName"`       // TODO - see issue #2
-	Tags          []Tag
-	ConnectionID  uint8  `capnp:"connectionId"`
-	OriginLocalIP string `capnp:"originLocalIp"`
-	// IsAutoupdated        bool   `capnp:"isAutoupdated"`  // TODO - see issue #2
+	PoolName             string `capnp:"poolName"`
+	Tags                 []Tag
+	ConnectionID         uint8  `capnp:"connectionId"`
+	OriginLocalIP        string `capnp:"originLocalIp"`
+	IsAutoupdated        bool   `capnp:"isAutoupdated"`
 }
 
 func MarshalRegistrationOptions(s tunnelrpc.RegistrationOptions, p *RegistrationOptions) error {