) (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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yxf6d3scbz423H; Mon, 17 Feb 2025 23:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739835065; 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=3Peubqchxjhk+U/B5CCNX/NOZMLNwxm41pAbVqwwlNc=; b=gNm9XCgq/8HP1a3kwEFA3oWNTxsMAHDn+dd1J2ySllMk3OfDQhxgbIBooOMqKtyC+cy3vp o/DhXuJGRgFE5pxmcQP95k8Yv11jUathlCC6T0jlmSIDY+D076zIk2qK2OBfEtJvjHg2JE rPs2F/LtFgg5EBbfPY/HdE2N3a63K6foB1NBrqR6k3KHFyWKdBZ3G9RyZSRnsm9tAMezWs jZ6bzgsFXTJpJFaHqmOSKibdNC9zlMXYeKIqRA4axTw1NkqJaFaA1lbMcfP8FTLF+RY5Jt Fn5YV5lO/Nt90Nw2tjwN1r0O2BE0EsryXA2/Vl/Et4Lp2IETnAJS9Ymz82MBIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739835065; a=rsa-sha256; cv=none; b=iOZZFrDZYpKbQDdxH8aYECjJEWmpq0inGAtju8sC76b7P0h7lvASeP6f8HTIhGE3X+Xuv9 4qCd+8AlSa69GIACb26DuzFsYrQqh4VfrV1+iEdFs4+64Lwj1E+BrrGQKH86LjhZ+99LJM NvaUv5bGkg+S4X0lQlPptX6zF3IKUL1ICpvrPXcRkA67DiPhOI5VeKZI7LAED0UKO3OryW gzDLJgLPZDz68P75F4FdR13kX8W6w7skRC8jFKvQa+aIC4MR1F2qTHbYZ7cDgDC07t0bqe JLZ7sR9yjFxA76EWf9WHUbLbrxfYR/TjCIQdCsChOHNuTMJkJL894oXWMix1lw== 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=1739835065; 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=3Peubqchxjhk+U/B5CCNX/NOZMLNwxm41pAbVqwwlNc=; b=ZWKA5OP+UbXedZA985HoIiKpwlF8Ww0SmR+fI1j0iR307tvPGp8LLrIx27sAS4D1RTM6U5 xE2Z9D1OPtz+3sn3Gq6JBJbCyKpzZmcmYdZauDBnuSYFjHKxaE8VWVq8p/z52QnvYC5KSs RxzcwqRvJC6bfyyQ9LkMRx9KtOcIcLo/sdRgswP+trhQzcLIWORqffDO9Cuk8VMt25rOcs ae94xRuNOfUOKM3x1FoIo+7Nbcek1PUh+5mgue3I7mcmoMy5g58z7g8bqq7mg+HcK1n56Q UkngeFjwAZItpjGS2ctPYbqnZUN2VSieE87EklmqGquTBTDyv2t3rUq+Yede6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yxf6d31d8zvSq; Mon, 17 Feb 2025 23:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51HNV5mU067243; Mon, 17 Feb 2025 23:31:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51HNV5OK067240; Mon, 17 Feb 2025 23:31:05 GMT (envelope-from git) Date: Mon, 17 Feb 2025 23:31:05 GMT Message-Id: <202502172331.51HNV5OK067240@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff <glebius@FreeBSD.org> Subject: git: e71fff28550b - main - tools/ipbroadcast: make it compilable with modern compiler List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: <mailto:dev-commits-src-main+help@freebsd.org> List-Post: <mailto:dev-commits-src-main@freebsd.org> List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org> X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e71fff28550bb0256851835b271acfac4bae59f1 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=e71fff28550bb0256851835b271acfac4bae59f1 commit e71fff28550bb0256851835b271acfac4bae59f1 Author: Gleb Smirnoff <glebius@FreeBSD.org> AuthorDate: 2025-02-17 23:28:52 +0000 Commit: Gleb Smirnoff <glebius@FreeBSD.org> CommitDate: 2025-02-17 23:28:52 +0000 tools/ipbroadcast: make it compilable with modern compiler --- tools/regression/netinet/ipbroadcast/ipbroadcast.c | 29 +++++++--------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/tools/regression/netinet/ipbroadcast/ipbroadcast.c b/tools/regression/netinet/ipbroadcast/ipbroadcast.c index 6177ce964749..9315ebe2b6ad 100644 --- a/tools/regression/netinet/ipbroadcast/ipbroadcast.c +++ b/tools/regression/netinet/ipbroadcast/ipbroadcast.c @@ -91,9 +91,6 @@ usage(void) fprintf(stderr, "-p: Set local and remote port (default: %d)\n", DEFAULT_PORT); fprintf(stderr, "-R: Use raw IP (protocol %d)\n", IPPROTO_ZEROHOP); -#if 0 - fprintf(stderr, "-r: Fill datagram with random bytes\n"); -#endif fprintf(stderr, "-s: Set IP_SENDSRCADDR to <srcaddr>\n"); fprintf(stderr, "-t: Set IP_TTL to <ttl>\n"); @@ -109,10 +106,8 @@ main(int argc, char *argv[]) struct msghdr msg; struct sockaddr_in dsin; struct sockaddr_in laddr; - struct sockaddr_dl *sdl; struct cmsghdr *cmsgp; struct in_addr dstaddr; - struct in_addr *srcaddrp; char *ifname; char *laddr_s; char *srcaddr_s; @@ -121,7 +116,6 @@ main(int argc, char *argv[]) int dobroadcast; int dontroute; int doonesbcast; - int dorandom; int dorawip; size_t buflen; ssize_t nbytes; @@ -136,7 +130,6 @@ main(int argc, char *argv[]) dobroadcast = 0; dontroute = 0; doonesbcast = 0; - dorandom = 0; dorawip = 0; ifname = NULL; @@ -150,7 +143,7 @@ main(int argc, char *argv[]) buflen = DEFAULT_PAYLOAD_SIZE; progname = basename(argv[0]); - while ((ch = getopt(argc, argv, "1A:bBdi:l:p:Rrs:t:")) != -1) { + while ((ch = getopt(argc, argv, "1A:bBdi:l:p:Rs:t:")) != -1) { switch (ch) { case '1': doonesbcast = 1; @@ -179,9 +172,6 @@ main(int argc, char *argv[]) case 'R': dorawip = 1; break; - case 'r': - dorandom = 1; - break; case 's': srcaddr_s = optarg; break; @@ -311,8 +301,9 @@ main(int argc, char *argv[]) cmsgp->cmsg_len = CMSG_LEN(sizeof(struct in_addr)); cmsgp->cmsg_level = IPPROTO_IP; cmsgp->cmsg_type = IP_SENDSRCADDR; - srcaddrp = (struct in_addr *)CMSG_DATA(cmsgp); - srcaddrp->s_addr = inet_addr(srcaddr_s); + memcpy(CMSG_DATA(cmsgp), + &(struct in_addr){ inet_addr(srcaddr_s) }, + sizeof(struct in_addr)); } if (ifname != NULL) { @@ -327,13 +318,11 @@ main(int argc, char *argv[]) fprintf(stderr, "DEBUG: cmsgp->cmsg_len is %d\n", cmsgp->cmsg_len); #endif - - sdl = (struct sockaddr_dl *)CMSG_DATA(cmsgp); - memset(sdl, 0, sizeof(struct sockaddr_dl)); - sdl->sdl_family = AF_LINK; - sdl->sdl_len = sizeof(struct sockaddr_dl); - sdl->sdl_index = if_nametoindex(ifname); - + memcpy(CMSG_DATA(cmsgp), &(struct sockaddr_dl){ + .sdl_family = AF_LINK, + .sdl_len = sizeof(struct sockaddr_dl), + .sdl_index = if_nametoindex(ifname) }, + sizeof(struct sockaddr_dl)); #ifdef DIAGNOSTIC fprintf(stderr, "DEBUG: sdl->sdl_family is %d\n", sdl->sdl_family);