From eb880e024e913faffe69da3cb036880380d2eeb9 Mon Sep 17 00:00:00 2001 From: sawka Date: Thu, 7 Jul 2022 13:25:42 -0700 Subject: [PATCH] add hostname to init packet --- pkg/packet/packet.go | 1 + pkg/server/server.go | 2 +- pkg/shexec/shexec.go | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/packet/packet.go b/pkg/packet/packet.go index fe4c4990..0b72c12c 100644 --- a/pkg/packet/packet.go +++ b/pkg/packet/packet.go @@ -387,6 +387,7 @@ type InitPacketType struct { HomeDir string `json:"homedir,omitempty"` Env []string `json:"env,omitempty"` User string `json:"user,omitempty"` + HostName string `json:"hostname,omitempty"` NotFound bool `json:"notfound,omitempty"` UName string `json:"uname,omitempty"` RemoteId string `json:"remoteid,omitempty"` diff --git a/pkg/server/server.go b/pkg/server/server.go index 40ab29cc..6ebd2ad4 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -41,7 +41,7 @@ func (m *MServer) ProcessCommandPacket(pk packet.CommandPacketType) { cproc := m.ClientMap[ck] m.Lock.Unlock() if cproc == nil { - m.Sender.SendCmdError(ck, fmt.Errorf("no client proc for ck '%s'", ck)) + m.Sender.SendCmdError(ck, fmt.Errorf("no client proc for ck '%s', pk=%s", ck, packet.AsString(pk))) return } cproc.Input.SendPacket(pk) diff --git a/pkg/shexec/shexec.go b/pkg/shexec/shexec.go index 03d0ba6e..df740a81 100644 --- a/pkg/shexec/shexec.go +++ b/pkg/shexec/shexec.go @@ -1060,6 +1060,7 @@ func MakeInitPacket() *packet.InitPacketType { if user, _ := user.Current(); user != nil { initPacket.User = user.Username } + initPacket.HostName, _ = os.Hostname() return initPacket }