libgnunetchat

commit c0540336f547a289e6d18f9ea9d9ae0c0693ef2b
parent 944584ce524d3ac5fcab5074239bddc83cb1109e
Author: Jacki <jacki@thejackimonster.de>
Date:   Mon,  6 Jan 2025 01:10:00 +0100

Fix build issues due to latest adjustments on epoch identifiers

Signed-off-by: Jacki <jacki@thejackimonster.de>

Diffstat:
M
tools/gnunet_messenger_uml.c
 | 
43
++++++++++++++++++-------------------------

1 file changed, 18 insertions(+), 25 deletions(-)
diff --git a/tools/gnunet_messenger_uml.c b/tools/gnunet_messenger_uml.c
@@ -265,46 +265,39 @@ message_callback (void *cls,
       break;
     case GNUNET_MESSENGER_KIND_ANNOUNCEMENT:
       printf(
-        ",\n  \"announcement\":\"%s\"",
-        GNUNET_sh2s(&(message->body.announcement.announcement))
+        ",\n  \"identifier\":\"%s\"",
+        GNUNET_sh2s(&(message->body.announcement.identifier.hash))
       );
 
-      if (!GNUNET_is_zero(&(message->body.announcement.group)))
-        printf(
-          ",\n  \"group\":\"%s\"",
-          GNUNET_sh2s(&(message->body.announcement.group))
-        );
+      printf(
+        ",\n  \"group\":\"%s\"",
+        (message->body.announcement.identifier.code.group_bit? "Y" : "N")
+      );
       break;
     case GNUNET_MESSENGER_KIND_SECRET:
       printf(
-        ",\n  \"announcement\":\"%s\"",
-        GNUNET_sh2s(&(message->body.secret.announcement))
+        ",\n  \"identifier\":\"%s\"",
+        GNUNET_sh2s(&(message->body.secret.identifier.hash))
       );
       break;
     case GNUNET_MESSENGER_KIND_REVOLUTION:
       printf(
-        ",\n  \"announcement\":\"%s\"",
-        GNUNET_sh2s(&(message->body.revolution.announcement))
+        ",\n  \"identifier\":\"%s\"",
+        GNUNET_sh2s(&(message->body.revolution.identifier.hash))
       );
-
-      if (!GNUNET_is_zero(&(message->body.revolution.group)))
-        printf(
-          ",\n  \"group\":\"%s\"",
-          GNUNET_sh2s(&(message->body.revolution.group))
-        );
       break;
     case GNUNET_MESSENGER_KIND_GROUP:
       printf(
-        ",\n  \"announcement\":\"%s\"",
-        GNUNET_sh2s(&(message->body.group.announcement))
+        ",\n  \"identifier\":\"%s\"",
+        GNUNET_sh2s(&(message->body.group.identifier.hash))
       );
-
-      if (!GNUNET_is_zero(&(message->body.group.group)))
-        printf(
-          ",\n  \"group\":\"%s\"",
-          GNUNET_sh2s(&(message->body.group.group))
-        );
       break;
+	case GNUNET_MESSENGER_KIND_AUTHORIZATION:
+      printf(
+        ",\n  \"identifier\":\"%s\"",
+        GNUNET_sh2s(&(message->body.authorization.identifier.hash))
+      );
+	  break;
     default:
       break;
   }