test: send trailing newlines in notify messages in TEST-50-DISSECT

It seems the failing test in https://github.com/systemd/systemd/issues/37626
is due to MONOTONIC_USEC= being somehow lost. Add a trailing newline when
sending messages with socat, hopefully ensuring it is delivered and read.

src/libsystemd-network/dhcp6-option.c

@@ -210,6 +210,10 @@ bool dhcp6_option_can_request(uint16_t option) {
         case SD_DHCP6_OPTION_V6_DOTS_ADDRESS:
         case SD_DHCP6_OPTION_IPV6_ADDRESS_ANDSF:
         case SD_DHCP6_OPTION_V6_DNR:
+        case SD_DHCP6_OPTION_REGISTERED_DOMAIN:
+        case SD_DHCP6_OPTION_FORWARD_DIST_MANAGER:
+        case SD_DHCP6_OPTION_REVERSE_DIST_MANAGER:
+        case SD_DHCP6_OPTION_ADDR_REG_ENABLE:
                 return true;
         default:
                 return false;

src/libsystemd-network/dhcp6-protocol.h

@@ -98,6 +98,8 @@ typedef enum DHCP6MessageType {
         DHCP6_MESSAGE_DISCONNECT                = 33, /* RFC 8156 */
         DHCP6_MESSAGE_STATE                     = 34, /* RFC 8156 */
         DHCP6_MESSAGE_CONTACT                   = 35, /* RFC 8156 */
+        DHCP6_MESSAGE_ADDR_REG_INFORM           = 36, /* RFC 9686 */
+        DHCP6_MESSAGE_ADDR_REG_REPLY            = 37, /* RFC 9686 */
         _DHCP6_MESSAGE_TYPE_MAX,
         _DHCP6_MESSAGE_TYPE_INVALID             = -EINVAL,
 } DHCP6MessageType;

src/libsystemd/meson.build

@@ -275,6 +275,10 @@ libsystemd_tests += [
                 'sources' : files('sd-journal/test-journal-append.c'),
                 'type' : 'manual',
         },
+        {
+                'sources' : files('sd-journal/test-journal-dump.c'),
+                'type' : 'manual',
+        },
         {
                 'sources' : files('sd-journal/test-journal-verify.c'),
                 'timeout' : 90,

src/libsystemd/sd-journal/journal-file.c

@@ -46,11 +46,11 @@
 #include "user-util.h"
 #include "xattr-util.h"
 
-#define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*sizeof(HashItem))
-#define DEFAULT_FIELD_HASH_TABLE_SIZE (333ULL*sizeof(HashItem))
+#define DEFAULT_DATA_HASH_TABLE_SIZE 2047U
+#define DEFAULT_FIELD_HASH_TABLE_SIZE 1023U
 
-#define DEFAULT_COMPRESS_THRESHOLD (512ULL)
-#define MIN_COMPRESS_THRESHOLD (8ULL)
+#define DEFAULT_COMPRESS_THRESHOLD 512U
+#define MIN_COMPRESS_THRESHOLD 8U
 
 /* This is the minimum journal file size */
 #define JOURNAL_FILE_SIZE_MIN (512 * U64_KB)             /* 512 KiB */
@@ -1286,15 +1286,14 @@ static int journal_file_setup_data_hash_table(JournalFile *f) {
            beyond 75% fill level. Calculate the hash table size for
            the maximum file size based on these metrics. */
 
-        s = (f->metrics.max_size * 4 / 768 / 3) * sizeof(HashItem);
-        if (s < DEFAULT_DATA_HASH_TABLE_SIZE)
-                s = DEFAULT_DATA_HASH_TABLE_SIZE;
+        s = MAX(f->metrics.max_size * 4 / 768 / 3,
+                DEFAULT_DATA_HASH_TABLE_SIZE);
 
-        log_debug("Reserving %"PRIu64" entries in data hash table.", s / sizeof(HashItem));
+        log_debug("Reserving %"PRIu64" entries in data hash table.", s);
 
         r = journal_file_append_object(f,
                                        OBJECT_DATA_HASH_TABLE,
-                                       offsetof(Object, hash_table.items) + s,
+                                       offsetof(Object, hash_table.items) + s * sizeof(HashItem),
                                        &o, &p);
         if (r < 0)
                 return r;
@@ -1302,7 +1301,7 @@ static int journal_file_setup_data_hash_table(JournalFile *f) {
         memzero(o->hash_table.items, s);
 
         f->header->data_hash_table_offset = htole64(p + offsetof(Object, hash_table.items));
-        f->header->data_hash_table_size = htole64(s);
+        f->header->data_hash_table_size = htole64(s * sizeof(HashItem));
 
         return 0;
 }
@@ -1319,19 +1318,19 @@ static int journal_file_setup_field_hash_table(JournalFile *f) {
          * number should grow very slowly only */
 
         s = DEFAULT_FIELD_HASH_TABLE_SIZE;
-        log_debug("Reserving %"PRIu64" entries in field hash table.", s / sizeof(HashItem));
+        log_debug("Reserving %"PRIu64" entries in field hash table.", s);
 
         r = journal_file_append_object(f,
                                        OBJECT_FIELD_HASH_TABLE,
-                                       offsetof(Object, hash_table.items) + s,
+                                       offsetof(Object, hash_table.items) + s * sizeof(HashItem),
                                        &o, &p);
         if (r < 0)
                 return r;
 
-        memzero(o->hash_table.items, s);
+        memzero(o->hash_table.items, s * sizeof(HashItem));
 
         f->header->field_hash_table_offset = htole64(p + offsetof(Object, hash_table.items));
-        f->header->field_hash_table_size = htole64(s);
+        f->header->field_hash_table_size = htole64(s * sizeof(HashItem));
 
         return 0;
 }

src/libsystemd/sd-journal/test-journal-dump.c

@@ -0,0 +1,46 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+
+#include "errno-util.h"
+#include "journal-file.h"
+#include "log.h"
+#include "main-func.h"
+#include "pager.h"
+#include "strv.h"
+
+static int run(int argc, char *argv[]) {
+        int r = 0;
+        unsigned n = 0;
+
+        _cleanup_(mmap_cache_unrefp) MMapCache *m = mmap_cache_new();
+        assert_se(m);
+
+        pager_open(/* flags= */ 0);
+
+        STRV_FOREACH(s, strv_skip(argv, 1)) {
+                JournalFile *f = NULL;
+
+                int k = journal_file_open(
+                                /* fd= */ -EBADF,
+                                *s,
+                                O_RDONLY,
+                                /* file_flags= */ 0,
+                                0666,
+                                /* compress_threshold_bytes= */ UINT64_MAX,
+                                /* metrics= */ NULL,
+                                m,
+                                /* template= */ NULL,
+                                &f);
+                if (k < 0)
+                        RET_GATHER(r, log_error_errno(k, "Failed to open %s, continuing: %m", *s));
+
+                if (n++ > 0)
+                        puts("");
+
+                journal_file_print_header(f);
+                journal_file_close(f);
+        }
+
+        return r;
+}
+
+DEFINE_MAIN_FUNCTION(run);

src/resolve/resolved-dns-delegate.h

@@ -4,7 +4,7 @@
 #include "list.h"
 #include "resolved-forward.h"
 
-#define DELEGATE_SEARCH_DOMAINS_MAX 256
+#define DELEGATE_SEARCH_DOMAINS_MAX 1024
 #define DELEGATE_DNS_SERVERS_MAX 256
 
 /* A DnsDelegate object is used to manage additional, explicitly configured unicast DNS lookup scopes,

src/resolve/resolved-link.h

@@ -9,7 +9,7 @@
 #include "resolve-util.h"
 #include "resolved-forward.h"
 
-#define LINK_SEARCH_DOMAINS_MAX 256
+#define LINK_SEARCH_DOMAINS_MAX 1024
 #define LINK_DNS_SERVERS_MAX 256
 
 typedef struct LinkAddress {

src/resolve/resolved-manager.h

@@ -15,7 +15,7 @@
 #include "resolved-etc-hosts.h"
 #include "resolved-forward.h"
 
-#define MANAGER_SEARCH_DOMAINS_MAX 256
+#define MANAGER_SEARCH_DOMAINS_MAX 1024
 #define MANAGER_DNS_SERVERS_MAX 256
 
 typedef struct Manager {

src/systemd/sd-dhcp6-protocol.h

@@ -166,8 +166,12 @@ enum {
         SD_DHCP6_OPTION_V6_DOTS_RI                 = 141, /* RFC 8973 */
         SD_DHCP6_OPTION_V6_DOTS_ADDRESS            = 142, /* RFC 8973 */
         SD_DHCP6_OPTION_IPV6_ADDRESS_ANDSF         = 143, /* RFC 6153 */
-        SD_DHCP6_OPTION_V6_DNR                     = 144  /* RFC 9463 */
-        /* option codes 145-65535 are unassigned */
+        SD_DHCP6_OPTION_V6_DNR                     = 144, /* RFC 9463 */
+        SD_DHCP6_OPTION_REGISTERED_DOMAIN          = 145, /* RFC 9527 */
+        SD_DHCP6_OPTION_FORWARD_DIST_MANAGER       = 146, /* RFC 9527 */
+        SD_DHCP6_OPTION_REVERSE_DIST_MANAGER       = 147, /* RFC 9527 */
+        SD_DHCP6_OPTION_ADDR_REG_ENABLE            = 148  /* RFC 9686 */
+        /* option codes 149-65535 are unassigned */
 };
 
 _SD_END_DECLARATIONS;

test/units/TEST-50-DISSECT.dissect.sh

@@ -653,12 +653,12 @@ NotifyAccess=all
 ExecStart=bash -x -c ' \
     trap '"'"' \
         now=\$\$(grep "^now" /proc/timer_list | cut -d" " -f3 | rev | cut -c 4- | rev); \
-        printf "RELOADING=1\\nMONOTONIC_USEC=\$\${now}" | socat -t 5 - UNIX-SENDTO:\$\$NOTIFY_SOCKET; \
+        printf "RELOADING=1\\nMONOTONIC_USEC=\$\${now}\\n" | socat -t 5 - UNIX-SENDTO:\$\$NOTIFY_SOCKET; \
         (ls /etc | grep marker) >/tmp/markers/50i; \
         (cat /usr/lib/os-release) >>/tmp/markers/50i; \
-        echo -n "READY=1" | socat -t 5 - UNIX-SENDTO:\$\$NOTIFY_SOCKET; \
+        echo "READY=1" | socat -t 5 - UNIX-SENDTO:\$\$NOTIFY_SOCKET; \
     '"'"' SIGHUP; \
-    echo -n "READY=1" | socat -t 5 - UNIX-SENDTO:\$\$NOTIFY_SOCKET; \
+    echo "READY=1" | socat -t 5 - UNIX-SENDTO:\$\$NOTIFY_SOCKET; \
     while true; do sleep 1; done; \
 '
 EOF
@@ -688,12 +688,12 @@ NotifyAccess=all
 ExecStart=bash -x -c ' \
     trap '"'"' \
         now=\$\$(grep "^now" /proc/timer_list | cut -d" " -f3 | rev | cut -c 4- | rev); \
-        printf "RELOADING=1\\nMONOTONIC_USEC=\$\${now}" | socat -t 5 - UNIX-SENDTO:\$\$NOTIFY_SOCKET; \
+        printf "RELOADING=1\\nMONOTONIC_USEC=\$\${now}\\n" | socat -t 5 - UNIX-SENDTO:\$\$NOTIFY_SOCKET; \
         (ls /etc | grep marker) >/tmp/markers/50j; \
         (cat /usr/lib/os-release) >>/tmp/markers/50j; \
-        echo -n "READY=1" | socat -t 5 - UNIX-SENDTO:\$\$NOTIFY_SOCKET; \
+        echo "READY=1" | socat -t 5 - UNIX-SENDTO:\$\$NOTIFY_SOCKET; \
     '"'"' SIGHUP; \
-    echo -n "READY=1" | socat -t 5 - UNIX-SENDTO:\$\$NOTIFY_SOCKET; \
+    echo "READY=1" | socat -t 5 - UNIX-SENDTO:\$\$NOTIFY_SOCKET; \
     while true; do sleep 1; done; \
 '
 EOF
@@ -718,12 +718,12 @@ NotifyAccess=all
 ExecStart=bash -x -c ' \
     trap '"'"' \
         now=\$\$(grep "^now" /proc/timer_list | cut -d" " -f3 | rev | cut -c 4- | rev); \
-        printf "RELOADING=1\\nMONOTONIC_USEC=\$\${now}" | socat -t 5 - UNIX-SENDTO:\$\$NOTIFY_SOCKET; \
+        printf "RELOADING=1\\nMONOTONIC_USEC=\$\${now}\\n" | socat -t 5 - UNIX-SENDTO:\$\$NOTIFY_SOCKET; \
         (ls /etc | grep marker) >/tmp/markers/50k; \
         (cat /usr/lib/os-release) >>/tmp/markers/50k; \
-        echo -n "READY=1" | socat -t 5 - UNIX-SENDTO:\$\$NOTIFY_SOCKET; \
+        echo "READY=1" | socat -t 5 - UNIX-SENDTO:\$\$NOTIFY_SOCKET; \
     '"'"' SIGHUP; \
-    echo -n "READY=1" | socat -t 5 - UNIX-SENDTO:\$\$NOTIFY_SOCKET; \
+    echo "READY=1" | socat -t 5 - UNIX-SENDTO:\$\$NOTIFY_SOCKET; \
     while true; do sleep 1; done; \
 '
 EOF