X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Fjournal-def.h;h=7e407a416cb1ca1674202c1162cddcc745d91d46;hp=ab4988037cc5ad6cee0516a32809ba7fba9476ff;hb=244692cbfb46df5ff79d07da8fb848a1165bd2fb;hpb=14d10188de1fd58e663d73683a400d8d7dc67dba

diff --git a/src/journal/journal-def.h b/src/journal/journal-def.h
index ab4988037..7e407a416 100644
--- a/src/journal/journal-def.h
+++ b/src/journal/journal-def.h
@@ -27,6 +27,13 @@
 
 #include "macro.h"
 
+/*
+ * If you change this file you probably should also change its documentation:
+ *
+ * http://www.freedesktop.org/wiki/Software/systemd/journal-files
+ *
+ */
+
 typedef struct Header Header;
 
 typedef struct ObjectHeader ObjectHeader;
@@ -42,17 +49,17 @@ typedef struct TagObject TagObject;
 typedef struct EntryItem EntryItem;
 typedef struct HashItem HashItem;
 
-typedef struct FSPRGHeader FSPRGHeader;
+typedef struct FSSHeader FSSHeader;
 
 /* Object types */
 enum {
         OBJECT_UNUSED,
-        OBJECT_DATA,               /* !!! */
+        OBJECT_DATA,
         OBJECT_FIELD,
         OBJECT_ENTRY,
         OBJECT_DATA_HASH_TABLE,
         OBJECT_FIELD_HASH_TABLE,
-        OBJECT_ENTRY_ARRAY,        /* !!! */
+        OBJECT_ENTRY_ARRAY,
         OBJECT_TAG,
         _OBJECT_TYPE_MAX
 };
@@ -62,15 +69,15 @@ enum {
         OBJECT_COMPRESSED = 1
 };
 
-_packed_ struct ObjectHeader {
+struct ObjectHeader {
         uint8_t type;
         uint8_t flags;
         uint8_t reserved[6];
         le64_t size;
         uint8_t payload[];
-};
+} _packed_;
 
-_packed_ struct DataObject {
+struct DataObject {
         ObjectHeader object;
         le64_t hash;
         le64_t next_hash_offset;
@@ -79,22 +86,22 @@ _packed_ struct DataObject {
         le64_t entry_array_offset;
         le64_t n_entries;
         uint8_t payload[];
-};
+} _packed_;
 
-_packed_ struct FieldObject {
+struct FieldObject {
         ObjectHeader object;
         le64_t hash;
         le64_t next_hash_offset;
         le64_t head_data_offset;
         uint8_t payload[];
-};
+} _packed_;
 
-_packed_ struct EntryItem {
+struct EntryItem {
         le64_t object_offset;
         le64_t hash;
-};
+} _packed_;
 
-_packed_ struct EntryObject {
+struct EntryObject {
         ObjectHeader object;
         le64_t seqnum;
         le64_t realtime;
@@ -102,32 +109,32 @@ _packed_ struct EntryObject {
         sd_id128_t boot_id;
         le64_t xor_hash;
         EntryItem items[];
-};
+} _packed_;
 
-_packed_ struct HashItem {
+struct HashItem {
         le64_t head_hash_offset;
         le64_t tail_hash_offset;
-};
+} _packed_;
 
-_packed_ struct HashTableObject {
+struct HashTableObject {
         ObjectHeader object;
         HashItem items[];
-};
+} _packed_;
 
-_packed_ struct EntryArrayObject {
+struct EntryArrayObject {
         ObjectHeader object;
         le64_t next_entry_array_offset;
         le64_t items[];
-};
+} _packed_;
 
 #define TAG_LENGTH (256/8)
 
-_packed_ struct TagObject {
+struct TagObject {
         ObjectHeader object;
-        uint64_t seqnum;
-        uint64_t epoch;
+        le64_t seqnum;
+        le64_t epoch;
         uint8_t tag[TAG_LENGTH]; /* SHA-256 HMAC */
-};
+} _packed_;
 
 union Object {
         ObjectHeader object;
@@ -140,9 +147,10 @@ union Object {
 };
 
 enum {
-        STATE_OFFLINE,
-        STATE_ONLINE,
-        STATE_ARCHIVED
+        STATE_OFFLINE = 0,
+        STATE_ONLINE = 1,
+        STATE_ARCHIVED = 2,
+        _STATE_MAX
 };
 
 /* Header flags */
@@ -151,12 +159,12 @@ enum {
 };
 
 enum {
-        HEADER_COMPATIBLE_AUTHENTICATED = 1
+        HEADER_COMPATIBLE_SEALED = 1
 };
 
 #define HEADER_SIGNATURE ((char[]) { 'L', 'P', 'K', 'S', 'H', 'H', 'R', 'H' })
 
-_packed_ struct Header {
+struct Header {
         uint8_t signature[8]; /* "LPKSHHRH" */
         le32_t compatible_flags;
         le32_t incompatible_flags;
@@ -168,9 +176,9 @@ _packed_ struct Header {
         sd_id128_t seqnum_id;
         le64_t header_size;
         le64_t arena_size;
-        le64_t data_hash_table_offset;     /* for looking up data objects */
+        le64_t data_hash_table_offset;
         le64_t data_hash_table_size;
-        le64_t field_hash_table_offset;     /* for looking up field objects */
+        le64_t field_hash_table_offset;
         le64_t field_hash_table_size;
         le64_t tail_object_offset;
         le64_t n_objects;
@@ -187,20 +195,22 @@ _packed_ struct Header {
         /* Added in 189 */
         le64_t n_tags;
         le64_t n_entry_arrays;
-};
 
-#define FSPRG_HEADER_SIGNATURE ((char[]) { 'K', 'S', 'H', 'H', 'R', 'H', 'L', 'P' })
+        /* Size: 224 */
+} _packed_;
+
+#define FSS_HEADER_SIGNATURE ((char[]) { 'K', 'S', 'H', 'H', 'R', 'H', 'L', 'P' })
 
-_packed_ struct FSPRGHeader {
+struct FSSHeader {
         uint8_t signature[8]; /* "KSHHRHLP" */
         le32_t compatible_flags;
         le32_t incompatible_flags;
         sd_id128_t machine_id;
         sd_id128_t boot_id;    /* last writer */
         le64_t header_size;
-        le64_t fsprg_start_usec;
-        le64_t fsprg_interval_usec;
-        le16_t secpar;
+        le64_t start_usec;
+        le64_t interval_usec;
+        le16_t fsprg_secpar;
         le16_t reserved[3];
-        le64_t state_size;
-};
+        le64_t fsprg_state_size;
+} _packed_;