chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-journal: properly parse cursor strings
[elogind.git]
/
src
/
journal
/
journal-def.h
diff --git
a/src/journal/journal-def.h
b/src/journal/journal-def.h
index af22e178225ae894461990274091b8c88d160a48..8f00176bd70c04dc0a9713eb38ee3f8069ecc471 100644
(file)
--- a/
src/journal/journal-def.h
+++ b/
src/journal/journal-def.h
@@
-42,17
+42,17
@@
typedef struct TagObject TagObject;
typedef struct EntryItem EntryItem;
typedef struct HashItem HashItem;
typedef struct EntryItem EntryItem;
typedef struct HashItem HashItem;
-typedef struct FS
PRGHeader FSPRG
Header;
+typedef struct FS
SHeader FSS
Header;
/* Object types */
enum {
OBJECT_UNUSED,
/* Object types */
enum {
OBJECT_UNUSED,
- OBJECT_DATA,
+ OBJECT_DATA,
/* !!! */
OBJECT_FIELD,
OBJECT_ENTRY,
OBJECT_DATA_HASH_TABLE,
OBJECT_FIELD_HASH_TABLE,
OBJECT_FIELD,
OBJECT_ENTRY,
OBJECT_DATA_HASH_TABLE,
OBJECT_FIELD_HASH_TABLE,
- OBJECT_ENTRY_ARRAY,
+ OBJECT_ENTRY_ARRAY,
/* !!! */
OBJECT_TAG,
_OBJECT_TYPE_MAX
};
OBJECT_TAG,
_OBJECT_TYPE_MAX
};
@@
-124,6
+124,8
@@
_packed_ struct EntryArrayObject {
_packed_ struct TagObject {
ObjectHeader object;
_packed_ struct TagObject {
ObjectHeader object;
+ uint64_t seqnum;
+ uint64_t epoch;
uint8_t tag[TAG_LENGTH]; /* SHA-256 HMAC */
};
uint8_t tag[TAG_LENGTH]; /* SHA-256 HMAC */
};
@@
-138,9
+140,10
@@
union Object {
};
enum {
};
enum {
- STATE_OFFLINE,
- STATE_ONLINE,
- STATE_ARCHIVED
+ STATE_OFFLINE = 0,
+ STATE_ONLINE = 1,
+ STATE_ARCHIVED = 2,
+ _STATE_MAX
};
/* Header flags */
};
/* Header flags */
@@
-149,7
+152,7
@@
enum {
};
enum {
};
enum {
- HEADER_COMPATIBLE_
AUTHENTICAT
ED = 1
+ HEADER_COMPATIBLE_
SEAL
ED = 1
};
#define HEADER_SIGNATURE ((char[]) { 'L', 'P', 'K', 'S', 'H', 'H', 'R', 'H' })
};
#define HEADER_SIGNATURE ((char[]) { 'L', 'P', 'K', 'S', 'H', 'H', 'R', 'H' })
@@
-173,8
+176,8
@@
_packed_ struct Header {
le64_t tail_object_offset;
le64_t n_objects;
le64_t n_entries;
le64_t tail_object_offset;
le64_t n_objects;
le64_t n_entries;
- le64_t tail_seqnum;
- le64_t head_seqnum;
+ le64_t tail_
entry_
seqnum;
+ le64_t head_
entry_
seqnum;
le64_t entry_array_offset;
le64_t head_entry_realtime;
le64_t tail_entry_realtime;
le64_t entry_array_offset;
le64_t head_entry_realtime;
le64_t tail_entry_realtime;
@@
-182,20
+185,25
@@
_packed_ struct Header {
/* Added in 187 */
le64_t n_data;
le64_t n_fields;
/* Added in 187 */
le64_t n_data;
le64_t n_fields;
+ /* Added in 189 */
+ le64_t n_tags;
+ le64_t n_entry_arrays;
+
+ /* Size: 224 */
};
};
-#define FS
PRG
_HEADER_SIGNATURE ((char[]) { 'K', 'S', 'H', 'H', 'R', 'H', 'L', 'P' })
+#define FS
S
_HEADER_SIGNATURE ((char[]) { 'K', 'S', 'H', 'H', 'R', 'H', 'L', 'P' })
-_packed_ struct FS
PRG
Header {
+_packed_ struct FS
S
Header {
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;
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];
le16_t reserved[3];
- le64_t state_size;
+ le64_t
fsprg_
state_size;
};
};