Merge branch 'master' into master

ws/menderclient/model.go

@@ -0,0 +1,20 @@
+// Copyright 2021 Northern.tech AS
+//
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+
+package menderclient
+
+const (
+	MessageTypeMenderClientCheckUpdate   = "check-update"
+	MessageTypeMenderClientSendInventory = "send-inventory"
+)

ws/portforward/model.go

@@ -0,0 +1,28 @@
+// Copyright 2021 Northern.tech AS
+//
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+
+package portforward
+
+const (
+	MessageTypePortForwardNew  = "new"
+	MessageTypePortForwardStop = "stop"
+	MessageTypePortForward     = "forward"
+)
+
+const (
+	PropertyPortForwardConnectionID = "connection_id"
+	PropertyPortForwardRemoteHost   = "remote_host"
+	PropertyPortForwardRemotePort   = "remote_port"
+	PropertyPortForwardProtocol     = "protocol"
+)

ws/protomsg.go

@@ -1,4 +1,4 @@
-// Copyright 2020 Northern.tech AS
+// Copyright 2021 Northern.tech AS
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
@@ -26,6 +26,10 @@ const (
 	ProtoTypeShell
 	// ProtoTypeFileTransfer is used for file transfer from/to the device.
 	ProtoTypeFileTransfer
+	// ProtoTypePortForward is used for port-forwarding connections to the device.
+	ProtoTypePortForward
+	// ProtoTypeMenderClient is used for communication with the Mender client.
+	ProtoTypeMenderClient
 )
 
 // ProtoHdr provides the info about what the ProtoMsg contains and