Merge remote-tracking branch 'origin/file-share' into android-integration

# Conflicts:
#	client/android/client.go
#	client/internal/connect.go
#	client/internal/engine.go

shared/signal/client/client.go

@@ -49,6 +49,7 @@ type Credential struct {
 type CredentialPayload struct {
 	Type            proto.Body_Type
 	WgListenPort    int
+	FiledropPort    uint16
 	Credential      *Credential
 	RosenpassPubKey []byte
 	RosenpassAddr   string
@@ -76,6 +77,7 @@ func MarshalCredential(myKey wgtypes.Key, remoteKey string, p CredentialPayload)
 		Type:           p.Type,
 		Payload:        fmt.Sprintf("%s:%s", p.Credential.UFrag, p.Credential.Pwd),
 		WgListenPort:   uint32(p.WgListenPort),
+		FiledropPort:   uint32(p.FiledropPort),
 		NetBirdVersion: version.NetbirdVersion(),
 		RosenpassConfig: &proto.RosenpassConfig{
 			RosenpassPubKey:     p.RosenpassPubKey,