From nobody Wed May 27 09:03:35 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gQNvX2DBCz6fhDh for ; Wed, 27 May 2026 09:03:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gQNvW2HtPz3X59 for ; Wed, 27 May 2026 09:03:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779872615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zuNj5Nv0aY+79y6BWm6LBvfqzQWpFOdIBcby8TEgcts=; b=X2H2bGckvr0skjVnGTOpUcjE2X7AkPv5Ey8LD2jsXVlFUzdwglhZw0orzJwrumTgtywshi bGiDZCsedW5vrjwzl4r8fW/Eohng1nk3gRbbOz4xJyfeXspvLhCwMF5w3l4qVP0MjLim5Y Uc79MCwVBp7Cm1yEk9vVnXUfuHXbdAEg/1Mxi6mfJW0DK83PyZo6zxp35BJgyURQ4Wy8hd iZhhSsMArifNQb3j+KlScGIhdM4RQF5XZwqwHoqwEhRuT2ChtBMNDar3r93GeZDdPg7WXp KYBRI97ou6RIx7kJ/Cxz4/CRI9MDlLiaudHHXSHzQhBRFZ7Jh5dq0oWZu2Tbzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779872615; a=rsa-sha256; cv=none; b=R9uhJ8Ns/kNeCv106q1HotsoXyIZ0/D9buzi77k+9zx5fpfyzpgASTtdfnGrqy5ppUoNLi 1z2EAh7bP1LcUV5ZODpvNwtboAvygFBDWrutQ75fC6NEs+QAzzFwacGg9+gmWxd9gKhnoK BRamrWr3M7IJOWmchHtQ/ZM5xIp30l0lVCYwDB4WJA+bT6h2cMYfhf1WojkUxpocyYJFpT yE7yNpMu8l9oYSlVeQqfN6v/uLaqEAk++araEFzkC/arae+yxaAEx6nx3eAkHbfTaqxHNL M2vPGBXwd6AOm4G8YM53s6vOwrOLKutef71NJS+akNhkK8ZLaZP/eps13I8rBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779872615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zuNj5Nv0aY+79y6BWm6LBvfqzQWpFOdIBcby8TEgcts=; b=hHuMfH+XErbZUO8nVmRtmeRgHTDinWC5CbbZa5ft9hE24y3SJ/DLd5+DeZu0dCIBhC3XxE 2gVbk1PUvMfb3ABlSoEXsy2Uv0NYaTqEjUmp2y/pcYyW/+jOKVOf2vOK0ExV7+siVO9yZ7 +1EafEG8qhTRB/SL4KMDkogQ5ONsbGDZiDdWfHufgD3EUMhMnmopYuFYHamleQl0ZgRmI2 zk62Ww9H4AZ7PgazYkdbynhoUzysv4YBD06YcZ+mElfcQEIiIRN5wxDAGJt2e4g39KXQsP BMrDuRWBZjWums2YayIY/gO8Y0zvBEESTc4lzlMjIrIlgl2qApBaJcw2jzqpRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQNvW1t0fzsdG for ; Wed, 27 May 2026 09:03:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26372 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 27 May 2026 09:03:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 1f784851fcb3 - stable/15 - tftpd: Simplify packet drop macro List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1f784851fcb32614564cb46cdf2307035065c140 Auto-Submitted: auto-generated Date: Wed, 27 May 2026 09:03:35 +0000 Message-Id: <6a16b367.26372.5ce10787@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1f784851fcb32614564cb46cdf2307035065c140 commit 1f784851fcb32614564cb46cdf2307035065c140 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-22 17:57:35 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-27 09:03:21 +0000 tftpd: Simplify packet drop macro The first argument is always the function name, for which we can simply use __func__. This leaves only the optional return value, so we can use a single variadic macro instead of two nearly-identical copies. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D57076 (cherry picked from commit 76c3387024b40c2e28ed2d1bb64b3a14371c3c0b) --- libexec/tftpd/tftp-io.c | 51 ++++++++++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/libexec/tftpd/tftp-io.c b/libexec/tftpd/tftp-io.c index 3384071d6df2..3697c13f358f 100644 --- a/libexec/tftpd/tftp-io.c +++ b/libexec/tftpd/tftp-io.c @@ -69,17 +69,12 @@ static struct errmsg { { -1, NULL } }; -#define DROPPACKET(s) \ +#define DROPPACKET(...) \ if (packetdroppercentage != 0 && \ - arc4random()%100 < packetdroppercentage) { \ - tftp_log(LOG_DEBUG, "Artificial packet drop in %s", s); \ - return; \ - } -#define DROPPACKETn(s,n) \ - if (packetdroppercentage != 0 && \ - arc4random()%100 < packetdroppercentage) { \ - tftp_log(LOG_DEBUG, "Artificial packet drop in %s", s); \ - return (n); \ + arc4random() % 100 < packetdroppercentage) { \ + tftp_log(LOG_DEBUG, "Artificial packet drop in %s", \ + __func__); \ + return __VA_ARGS__; \ } const char * @@ -104,7 +99,7 @@ send_packet(int peer, uint16_t block, char *pkt, int size) int t = 1; for (i = 0; i < 12 ; i++) { - DROPPACKETn("send_packet", 0); + DROPPACKET(0); if (sendto(peer, pkt, size, 0, (struct sockaddr *)&peer_sock, peer_sock.ss_len) == size) { @@ -144,7 +139,7 @@ send_error(int peer, int error) if (debug & DEBUG_PACKETS) tftp_log(LOG_DEBUG, "Sending ERROR %d", error); - DROPPACKET("send_error"); + DROPPACKET(); tp = (struct tftphdr *)buf; tp->th_opcode = htons((u_short)ERROR); @@ -179,12 +174,12 @@ send_wrq(int peer, char *filename, char *mode) size_t len; int n, size; - if (debug & DEBUG_PACKETS) + if (debug & DEBUG_PACKETS) { tftp_log(LOG_DEBUG, "Sending WRQ: filename: '%s', mode '%s'", - filename, mode - ); + filename, mode); + } - DROPPACKETn("send_wrq", 0); + DROPPACKET(0); tp = (struct tftphdr *)buf; tp->th_opcode = htons((u_short)WRQ); @@ -209,7 +204,7 @@ send_wrq(int peer, char *filename, char *mode) n = sendto(peer, buf, size, 0, (struct sockaddr *)&peer_sock, peer_sock.ss_len); if (n != size) { - tftp_log(LOG_ERR, "send_wrq: %s", strerror(errno)); + tftp_log(LOG_ERR, "%s: %m", __func__); return (1); } return (0); @@ -230,12 +225,12 @@ send_rrq(int peer, char *filename, char *mode) size_t len; int n, size; - if (debug & DEBUG_PACKETS) + if (debug & DEBUG_PACKETS) { tftp_log(LOG_DEBUG, "Sending RRQ: filename: '%s', mode '%s'", - filename, mode - ); + filename, mode); + } - DROPPACKETn("send_rrq", 0); + DROPPACKET(0); tp = (struct tftphdr *)buf; tp->th_opcode = htons((u_short)RRQ); @@ -262,7 +257,7 @@ send_rrq(int peer, char *filename, char *mode) n = sendto(peer, buf, size, 0, (struct sockaddr *)&peer_sock, peer_sock.ss_len); if (n != size) { - tftp_log(LOG_ERR, "send_rrq: %d %s", n, strerror(errno)); + tftp_log(LOG_ERR, "%s: %m", __func__); return (1); } return (0); @@ -285,7 +280,7 @@ send_oack(int peer) if (debug & DEBUG_PACKETS) tftp_log(LOG_DEBUG, "Sending OACK"); - DROPPACKETn("send_oack", 0); + DROPPACKET(0); /* * Send back an options acknowledgement (only the ones with @@ -299,8 +294,8 @@ send_oack(int peer) if (options[i].o_reply != NULL) { n = snprintf(bp, size, "%s%c%s", options[i].o_type, 0, options[i].o_reply); - bp += n+1; - size -= n+1; + bp += n + 1; + size -= n + 1; if (size < 0) { tftp_log(LOG_ERR, "oack: buffer overflow"); exit(1); @@ -331,7 +326,7 @@ send_ack(int fp, uint16_t block) if (debug & DEBUG_PACKETS) tftp_log(LOG_DEBUG, "Sending ACK for block %d", block); - DROPPACKETn("send_ack", 0); + DROPPACKET(0); tp = (struct tftphdr *)buf; tp->th_opcode = htons((u_short)ACK); @@ -361,7 +356,7 @@ send_data(int peer, uint16_t block, char *data, int size) tftp_log(LOG_DEBUG, "Sending DATA packet %d of %d bytes", block, size); - DROPPACKETn("send_data", 0); + DROPPACKET(0); pkt = (struct tftphdr *)buf; @@ -408,7 +403,7 @@ receive_packet(int peer, char *data, int size, struct sockaddr_storage *from, fromlen = sizeof(*pfrom); n = recvfrom(peer, data, size, 0, (struct sockaddr *)pfrom, &fromlen); - DROPPACKETn("receive_packet", RP_TIMEOUT); + DROPPACKET(RP_TIMEOUT); if (n < 0) { /* No idea what could have happened if it isn't a timeout */