systemd Journal: More UTF-8 fixes.

Display string fields as Unicode. Add more missing fields.

Change-Id: I55f878ace7ccd6a66e3bac1e3fd2e388045ae3d8
Reviewed-on: https://code.wireshark.org/review/30765
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 88 insertions, 58 deletions

diff --git a/epan/dissectors/packet-systemd-journal.c b/epan/dissectors/packet-systemd-journal.c
index 8902619f5a..8f0dbda716 100644
--- a/epan/dissectors/packet-systemd-journal.c
+++ b/epan/dissectors/packet-systemd-journal.c
@@ -98,11 +98,16 @@ static int hf_sj_object_exe = -1;
 static int hf_sj_object_cmdline = -1;
 static int hf_sj_object_audit_session = -1;
 static int hf_sj_object_audit_loginuid = -1;
+static int hf_sj_object_cap_effective = -1;
+static int hf_sj_object_selinux_context = -1;
 static int hf_sj_object_systemd_cgroup = -1;
 static int hf_sj_object_systemd_session = -1;
 static int hf_sj_object_systemd_owner_uid = -1;
 static int hf_sj_object_systemd_unit = -1;
 static int hf_sj_object_systemd_user_unit = -1;
+static int hf_sj_object_systemd_slice = -1;
+static int hf_sj_object_systemd_user_slice = -1;
+static int hf_sj_object_systemd_invocation_id = -1;
 
 static int hf_sj_cursor = -1;
 static int hf_sj_realtime_timestamp = -1;
@@ -226,11 +231,16 @@ static void init_jf_to_hf_map(void) {
         { hf_sj_object_cmdline, "OBJECT_CMDLINE=" },
         { hf_sj_object_audit_session, "OBJECT_AUDIT_SESSION=" },
         { hf_sj_object_audit_loginuid, "OBJECT_AUDIT_LOGINUID=" },
+        { hf_sj_object_cap_effective, "OBJECT_CAP_EFFECTIVE=" },
+        { hf_sj_object_selinux_context, "OBJECT_SELINUX_CONTEXT=" },
         { hf_sj_object_systemd_cgroup, "OBJECT_SYSTEMD_CGROUP=" },
         { hf_sj_object_systemd_session, "OBJECT_SYSTEMD_SESSION=" },
         { hf_sj_object_systemd_owner_uid, "OBJECT_SYSTEMD_OWNER_UID=" },
         { hf_sj_object_systemd_unit, "OBJECT_SYSTEMD_UNIT=" },
         { hf_sj_object_systemd_user_unit, "OBJECT_SYSTEMD_USER_UNIT=" },
+        { hf_sj_object_systemd_slice, "OBJECT_SYSTEMD_SLICE=" },
+        { hf_sj_object_systemd_user_slice, "OBJECT_SYSTEMD_USER_SLICE=" },
+        { hf_sj_object_systemd_invocation_id, "OBJECT_SYSTEMD_INVOCATION_ID=" },
 
         { hf_sj_cursor, "__CURSOR=" },
         { hf_sj_realtime_timestamp, "__REALTIME_TIMESTAMP=" },
@@ -417,11 +427,11 @@ proto_register_systemd_journal(void)
     static hf_register_info hf[] = {
         { &hf_sj_message,
           { "Message", "systemd_journal.message",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_message_id,
           { "Message ID", "systemd_journal.message_id",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_priority,
           { "Priority", "systemd_journal.priority",
@@ -429,7 +439,7 @@ proto_register_systemd_journal(void)
         },
         { &hf_sj_code_file,
           { "Code file", "systemd_journal.code_file",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_code_line,
           { "Code line", "systemd_journal.code_line",
@@ -437,7 +447,7 @@ proto_register_systemd_journal(void)
         },
         { &hf_sj_code_func,
           { "Code func", "systemd_journal.code_func",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_errno,
           { "Errno", "systemd_journal.errno",
@@ -449,7 +459,7 @@ proto_register_systemd_journal(void)
         },
         { &hf_sj_syslog_identifier,
           { "Syslog identifier", "systemd_journal.syslog_id",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_syslog_pid,
           { "Syslog PID", "systemd_journal.syslog_pid",
@@ -470,19 +480,19 @@ proto_register_systemd_journal(void)
         },
         { &hf_sj_comm,
           { "Command name", "systemd_journal.comm",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_exe,
           { "Executable path", "systemd_journal.exe",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_cmdline,
           { "Command line", "systemd_journal.cmdline",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_cap_effective,
           { "Effective capability", "systemd_journal.cap_effective",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_audit_session,
           { "Audit session", "systemd_journal.audit_session",
@@ -495,19 +505,19 @@ proto_register_systemd_journal(void)
 
         { &hf_sj_systemd_cgroup,
           { "Systemd cgroup", "systemd_journal.systemd_cgroup",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_systemd_slice,
           { "Systemd slice", "systemd_journal.systemd_slice",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_systemd_unit,
           { "Systemd unit", "systemd_journal.systemd_unit",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_systemd_user_unit,
           { "Systemd user unit", "systemd_journal.systemd_user_unit",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_systemd_session,
           { "Systemd session", "systemd_journal.systemd_session",
@@ -520,7 +530,7 @@ proto_register_systemd_journal(void)
 
         { &hf_sj_selinux_context,
           { "SELinux context", "systemd_journal.selinux_context",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_source_realtime_timestamp,
           { "Source realtime timestamp", "systemd_journal.source_realtime_timestamp",
@@ -528,61 +538,61 @@ proto_register_systemd_journal(void)
         },
         { &hf_sj_boot_id,
           { "Boot ID", "systemd_journal.boot_id",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_machine_id,
           { "Machine ID", "systemd_journal.machine_id",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_systemd_invocation_id,
           { "Systemd invocation ID", "systemd_journal.systemd_invocation_id",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_hostname,
           { "Hostname", "systemd_journal.hostname",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_transport,
           { "Transport", "systemd_journal.transport",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_stream_id,
           { "Stream ID", "systemd_journal.stream_id",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_line_break,
           { "Line break", "systemd_journal.line_break",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
 
         { &hf_sj_kernel_device,
           { "Kernel device", "systemd_journal.kernel_device",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_kernel_subsystem,
           { "Kernel subsystem", "systemd_journal.kernel_subsystem",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_udev_sysname,
           { "Device tree name", "systemd_journal.udev_sysname",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_udev_devnode,
           { "Device tree node", "systemd_journal.udev_devnode",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_udev_devlink,
           { "Device tree symlink", "systemd_journal.udev_devlink",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
 
         { &hf_sj_coredump_unit,
           { "Coredump unit", "systemd_journal.coredump_unit",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_coredump_user_unit,
           { "Coredump user unit", "systemd_journal.coredump_user_unit",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_object_pid,
           { "Object PID", "systemd_journal.object_pid",
@@ -598,15 +608,15 @@ proto_register_systemd_journal(void)
         },
         { &hf_sj_object_comm,
           { "Object command name", "systemd_journal.object_comm",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_object_exe,
           { "Object executable path", "systemd_journal.object_exe",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_object_cmdline,
           { "Object command line", "systemd_journal.object_cmdline",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_object_audit_session,
           { "Object audit session", "systemd_journal.object_audit_session",
@@ -616,9 +626,17 @@ proto_register_systemd_journal(void)
           { "Object audit login UID", "systemd_journal.object_audit_loginuid",
             FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
         },
+        { &hf_sj_object_cap_effective,
+          { "Object effective capability", "systemd_journal.object_cap_effective",
+            FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
+        },
+        { &hf_sj_object_selinux_context,
+          { "Object SELinux context", "systemd_journal.object_selinux_context",
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
+        },
         { &hf_sj_object_systemd_cgroup,
           { "Object systemd cgroup", "systemd_journal.object_systemd_cgroup",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_object_systemd_session,
           { "Object systemd session", "systemd_journal.object_systemd_session",
@@ -630,16 +648,28 @@ proto_register_systemd_journal(void)
         },
         { &hf_sj_object_systemd_unit,
           { "Object systemd unit", "systemd_journal.object_systemd_unit",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_object_systemd_user_unit,
           { "Object systemd user unit", "systemd_journal.object_systemd_user_unit",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
+        },
+        { &hf_sj_object_systemd_slice,
+          { "Object systemd slice", "systemd_journal.object_systemd_slice",
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
+        },
+        { &hf_sj_object_systemd_user_slice,
+          { "Object systemd user slice", "systemd_journal.object_systemd_user_slice",
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
+        },
+        { &hf_sj_object_systemd_invocation_id,
+          { "Object systemd invocation ID", "systemd_journal.object_systemd_invocation_id",
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
 
         { &hf_sj_cursor,
           { "Cursor", "systemd_journal.cursor",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_realtime_timestamp,
           { "Realtime Timestamp", "systemd_journal.realtime_timestamp",
@@ -652,11 +682,11 @@ proto_register_systemd_journal(void)
 
         { &hf_sj_journal_name,
           { "Journal name", "systemd_journal.journal_name",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_journal_path,
           { "Journal path", "systemd_journal.journal_path",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_current_use,
           { "Current use", "systemd_journal.current_use",
@@ -664,7 +694,7 @@ proto_register_systemd_journal(void)
         },
         { &hf_sj_current_use_pretty,
           { "Human readable current use", "systemd_journal.current_use_pretty",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_max_use,
           { "Max use", "systemd_journal.max_use",
@@ -672,7 +702,7 @@ proto_register_systemd_journal(void)
         },
         { &hf_sj_max_use_pretty,
           { "Human readable max use", "systemd_journal.max_use_pretty",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_disk_keep_free,
           { "Disk keep free", "systemd_journal.disk_keep_free",
@@ -680,7 +710,7 @@ proto_register_systemd_journal(void)
         },
         { &hf_sj_disk_keep_free_pretty,
           { "Human readable disk keep free", "systemd_journal.disk_keep_free_pretty",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_disk_available,
           { "Disk available", "systemd_journal.disk_available",
@@ -688,7 +718,7 @@ proto_register_systemd_journal(void)
         },
         { &hf_sj_disk_available_pretty,
           { "Human readable disk available", "systemd_journal.disk_available_pretty",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_limit,
           { "Limit", "systemd_journal.limit",
@@ -696,7 +726,7 @@ proto_register_systemd_journal(void)
         },
         { &hf_sj_limit_pretty,
           { "Human readable limit", "systemd_journal.limit_pretty",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_available,
           { "Available", "systemd_journal.available",
@@ -704,11 +734,11 @@ proto_register_systemd_journal(void)
         },
         { &hf_sj_available_pretty,
           { "Human readable available", "systemd_journal.available_pretty",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_result,
           { "Result", "systemd_journal.result",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_source_monotonic_timestamp,
           { "Source monotonic timestamp", "systemd_journal.source_monotonic_timestamp",
@@ -724,23 +754,23 @@ proto_register_systemd_journal(void)
         },
         { &hf_sj_audit_field_apparmor,
           { "Audit field AppArmor", "systemd_journal.audit_field_apparmor",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_audit_field_operation,
           { "Audit field operation", "systemd_journal.audit_field_operation",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_audit_field_profile,
           { "Audit field profile", "systemd_journal.audit_field_profile",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_audit_field_name,
           { "Audit field name", "systemd_journal.audit_field_name",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_seat_id,
           { "Seat ID", "systemd_journal.seat_id",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_kernel_usec,
           { "Kernel microseconds", "systemd_journal.kernel_usec",
@@ -756,7 +786,7 @@ proto_register_systemd_journal(void)
         },
         { &hf_sj_user_id,
           { "User ID", "systemd_journal.user_id",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_leader,
           { "Leader", "systemd_journal.leader",
@@ -764,19 +794,19 @@ proto_register_systemd_journal(void)
         },
         { &hf_sj_job_type,
           { "Job type", "systemd_journal.job_type",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_job_result,
           { "Job result", "systemd_journal.job_result",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_user_invocation_id,
           { "User invocation ID", "systemd_journal.user_invocation_id",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_systemd_user_slice,
           { "Systemd user slice", "systemd_journal.systemd_user_slice",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
 
         { &hf_sj_binary_data_len,
@@ -789,19 +819,19 @@ proto_register_systemd_journal(void)
         },
         { &hf_sj_unkown_field_name,
           { "Field name", "systemd_journal.field.name",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_unkown_field_value,
           { "Field value", "systemd_journal.field.value",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_unkown_field_data,
           { "Field data", "systemd_journal.field.data",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_sj_unhandled_field_type,
           { "Field data", "systemd_journal.unhandled_field_type",
-            FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
+            FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
         }
     };