From: Zbigniew Jędrzejewski-Szmek Date: Fri, 29 Apr 2022 13:49:25 +0000 (+0200) Subject: libsystemd-network: do not split messages in half X-Git-Tag: v251-rc2~46^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a94baa6c70326db636f182d8e5c2042f97ffb81;p=thirdparty%2Fsystemd.git libsystemd-network: do not split messages in half This makes grepping for the messages unnecessarily painful. --- diff --git a/src/libsystemd-network/dhcp-packet.c b/src/libsystemd-network/dhcp-packet.c index d1a1cf57f3d..ce40ad5c323 100644 --- a/src/libsystemd-network/dhcp-packet.c +++ b/src/libsystemd-network/dhcp-packet.c @@ -144,14 +144,12 @@ int dhcp_packet_verify_headers(DHCPPacket *packet, size_t len, bool checksum, ui hdrlen = packet->ip.ihl * 4; if (hdrlen < 20) return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), - "ignoring packet: IPv4 IHL (%zu bytes) " - "smaller than minimum (20 bytes)", + "ignoring packet: IPv4 IHL (%zu bytes) smaller than minimum (20 bytes)", hdrlen); if (len < hdrlen) return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), - "ignoring packet: packet (%zu bytes) " - "smaller than expected (%zu) by IP header", + "ignoring packet: packet (%zu bytes) smaller than expected (%zu) by IP header", len, hdrlen); /* UDP */ @@ -162,14 +160,12 @@ int dhcp_packet_verify_headers(DHCPPacket *packet, size_t len, bool checksum, ui if (len < hdrlen + be16toh(packet->udp.len)) return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), - "ignoring packet: packet (%zu bytes) " - "smaller than expected (%zu) by UDP header", + "ignoring packet: packet (%zu bytes) smaller than expected (%zu) by UDP header", len, hdrlen + be16toh(packet->udp.len)); if (be16toh(packet->udp.dest) != port) return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), - "ignoring packet: to port %u, which " - "is not the DHCP client port (%u)", + "ignoring packet: to port %u, which is not the DHCP client port (%u)", be16toh(packet->udp.dest), port); /* checksums - computing these is relatively expensive, so only do it