Create separate handles for encoding and decoding msgpack

hashicorp · Nov 21, 2023 · d7c087e · d7c087e
1 parent d1c58bb
commit d7c087e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/client/rpc_client.go b/client/rpc_client.go
@@ -125,6 +125,15 @@ func NewRPCClient(addr string) (*RPCClient, error) {
 	return ClientFromConfig(&conf)
 }
 
+func (c *Config) newMsgpackHandle() *codec.MsgpackHandle {
+	return &codec.MsgpackHandle{
+		WriteExt: true,
+		BasicHandle: codec.BasicHandle{
+			TimeNotBuiltin: !c.MsgpackUseNewTimeFormat,
+		},
+	}
+}
+
 // ClientFromConfig is used to create a new RPC client given the
 // configuration object. This will return a client, or an error if
 // the connection could not be established.
@@ -150,14 +159,8 @@ func ClientFromConfig(c *Config) (*RPCClient, error) {
 		dispatch:   make(map[uint64]seqHandler),
 		shutdownCh: make(chan struct{}),
 	}
-	handle := &codec.MsgpackHandle{
-		WriteExt: true,
-		BasicHandle: codec.BasicHandle{
-			TimeNotBuiltin: !c.MsgpackUseNewTimeFormat,
-		},
-	}
-	client.dec = codec.NewDecoder(client.reader, handle)
-	client.enc = codec.NewEncoder(client.writer, handle)
+	client.dec = codec.NewDecoder(client.reader, c.newMsgpackHandle())
+	client.enc = codec.NewEncoder(client.writer, c.newMsgpackHandle())
 	go client.listen()
 
 	// Do the initial handshake

diff --git a/cmd/serf/command/agent/ipc.go b/cmd/serf/command/agent/ipc.go
@@ -372,6 +372,15 @@ func (i *AgentIPC) isStopped() bool {
 	return atomic.LoadUint32(&i.stop) == 1
 }
 
+func (i *AgentIPC) newMsgpackHandle() *codec.MsgpackHandle {
+	return &codec.MsgpackHandle{
+		WriteExt: true,
+		BasicHandle: codec.BasicHandle{
+			TimeNotBuiltin: !i.msgpackUseNewTimeFormat,
+		},
+	}
+}
+
 // listen is a long running routine that listens for new clients
 func (i *AgentIPC) listen() {
 	for {
@@ -395,14 +404,8 @@ func (i *AgentIPC) listen() {
 			eventStreams:   make(map[uint64]*eventStream),
 			pendingQueries: make(map[uint64]*serf.Query),
 		}
-		handle := &codec.MsgpackHandle{
-			WriteExt: true,
-			BasicHandle: codec.BasicHandle{
-				TimeNotBuiltin: !i.msgpackUseNewTimeFormat,
-			},
-		}
-		client.dec = codec.NewDecoder(client.reader, handle)
-		client.enc = codec.NewEncoder(client.writer, handle)
+		client.dec = codec.NewDecoder(client.reader, i.newMsgpackHandle())
+		client.enc = codec.NewEncoder(client.writer, i.newMsgpackHandle())
 
 		// Register the client
 		i.Lock()