From b221e456a84a0ed82434f7e961fedc71b05aedff Mon Sep 17 00:00:00 2001
From: Danilo Mitera <d.mitera@avsystem.com>
Date: Mon, 30 Dec 2019 10:38:48 +0100
Subject: [PATCH] fix changing ip for the same client

---
 src/Cedar/NativeStack.c | 2 +-
 src/Cedar/Session.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Cedar/NativeStack.c b/src/Cedar/NativeStack.c
index f73bb3d3..4bec28de 100644
--- a/src/Cedar/NativeStack.c
+++ b/src/Cedar/NativeStack.c
@@ -526,7 +526,7 @@ void NsGenMacAddress(void *dest, char *mac_address_seed, char *device_name)
 	Zero(tmp, sizeof(tmp));
 
 	StrCat(tmp, sizeof(tmp), mac_address_seed);
-	StrCat(tmp, sizeof(tmp), "@");
+	StrCat(tmp, sizeof(tmp), "@55");
 	StrCat(tmp, sizeof(tmp), device_name);
 
 	Trim(tmp);
diff --git a/src/Cedar/Session.c b/src/Cedar/Session.c
index ed1d349e..e1621436 100644
--- a/src/Cedar/Session.c
+++ b/src/Cedar/Session.c
@@ -2337,7 +2337,7 @@ SESSION *NewServerSessionEx(CEDAR *cedar, CONNECTION *c, HUB *h, char *username,
 
 		GetMachineName(machine, sizeof(machine));
 
-		Format(tmp, sizeof(tmp), "%s@%s@%u", machine, h->Name, s->UniqueId);
+		Format(tmp, sizeof(tmp), "%s@%s@%s", username, machine, h->Name);
 
 		StrUpper(tmp);
 		Trim(tmp);