From nobody Wed Apr 6 23:46:28 2022 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 45ACE1A844B4; Wed, 6 Apr 2022 23:46:29 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KYh442THlz4R9B; Wed, 6 Apr 2022 23:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649288788; 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=xnWzAbfFPJ1oFU+oFrn3YG54f6CgCdi1f1MhFAEx/ok=; b=GGe6MlkiOUARwzP03nDOD7RUTCfp8iDPMvjYt1D2tBJ7AAdZiXoABJyDwLk6uYgf6VY/uG IuB/i+EJV5q0mbPNg1bUxsP7R3kO+yfQYo8z+P6qt6JVZTn/Suy4V81hSllNSU4WlyXzq9 lDQs0dVNpJM+CVU2wkXL9cZhlrgYs8uFmX8lAcwW0cJyJgpxh3YP2NvtqRuv4/E+eugJYm 5SNewrMyxNdnCBNXpT2ee2oSdh9+xQ0NtBzOJqWywixnVl/wYGVUMy/t8mhTJuPSWglbqq l3V7N7/ibqmRM1bpAKNc4uttMgU7isF2AkNrNXJEjmI5URJz1z+KkcfZFlyRUg== 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 2969624CB1; Wed, 6 Apr 2022 23:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 236NkSOJ009275; Wed, 6 Apr 2022 23:46:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 236NkS4e009274; Wed, 6 Apr 2022 23:46:28 GMT (envelope-from git) Date: Wed, 6 Apr 2022 23:46:28 GMT Message-Id: <202204062346.236NkS4e009274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 6454d0c8cb5c - main - libalias: Remove unused variables. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6454d0c8cb5ca1771fa0826998764687add3d1f7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649288788; 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=xnWzAbfFPJ1oFU+oFrn3YG54f6CgCdi1f1MhFAEx/ok=; b=Sgo6y7w+JSsJDhBdf7+efqQX1npq2EaUCg8UXQfkSBYhxQf3vIhuYEyYxg05sLe/yuXvnH 1qX06a9qqujopZPQCv4Qa+Tx2QZ5JbEEynWQHrDVgrMoqBmrrMpqWmef5UEqdzSk9/Ufs1 cWkRf01137xhRmT5/3YP7Ipi816N4mcRb4mNeNLP9QsngQ3RKdpdgZoZ6ATDASXmLePzSu iXq7oixMj82t8W9hVY3RL2/i1hLhIQ1rvQiBw/OnaJopp25qhdL77lpptv44rJbzQ8nnzZ HEVSRJb1xZSLv6JA4gCSWslnU+gOMyYdG4gLyn3kMXt1BbN1kIBLDSE1SBWBug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649288788; a=rsa-sha256; cv=none; b=hvmgzN1n9hPC8vKhV5iYfrxSVskV7+OAIGPS8foGiiby3HengQtkhYeBf8C91UqgvUSOg9 ePRG82fZVsCROIQjMD8GCWJlOYZXeUbsi1oUS9i1yy5wK538lAx+tduwysFBOi2tkP/26L oWwARhqRWDDNAcdetqrd7393OuAZi8mibA5R1H9AshZFvKaqEU8e4CVw1z9bqt444tHb0G ErqMuQ+mVh61BkVQJgE/KQetWbeIGNlh2Fy0u8ovtEw3Hzqf+Kg4HXd7CnCnP4ez2JUJRL 0UIo3e6cdKqnak9J8hnHzl/LbwjvxPVvCSuKWAm4M6CSaSUe7sR8yQbXgzVrOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6454d0c8cb5ca1771fa0826998764687add3d1f7 commit 6454d0c8cb5ca1771fa0826998764687add3d1f7 Author: John Baldwin AuthorDate: 2022-04-06 23:45:29 +0000 Commit: John Baldwin CommitDate: 2022-04-06 23:45:29 +0000 libalias: Remove unused variables. --- sys/netinet/libalias/alias.c | 11 +++++------ sys/netinet/libalias/alias_sctp.c | 6 ------ sys/netinet/libalias/alias_skinny.c | 2 -- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/sys/netinet/libalias/alias.c b/sys/netinet/libalias/alias.c index 37f5bd5a1db1..8a7760f93b6e 100644 --- a/sys/netinet/libalias/alias.c +++ b/sys/netinet/libalias/alias.c @@ -843,7 +843,6 @@ UdpAliasOut(struct libalias *la, struct ip *pip, int maxpacketsize, int create) u_short dest_port; u_short proxy_server_port; int proxy_type; - int error; LIBALIAS_LOCK_ASSERT(la); @@ -910,7 +909,7 @@ UdpAliasOut(struct libalias *la, struct ip *pip, int maxpacketsize, int create) alias_port = GetAliasPort(lnk); /* Walk out chain. */ - error = find_handler(OUT, UDP, la, pip, &ad); + find_handler(OUT, UDP, la, pip, &ad); /* If UDP checksum is not zero, adjust since source port is */ /* being aliased and source address is being altered */ @@ -960,7 +959,7 @@ TcpAliasIn(struct libalias *la, struct ip *pip) struct in_addr proxy_address; u_short alias_port; u_short proxy_port; - int accumulate, error; + int accumulate; /* * The init of MANY vars is a bit below, but aliashandlepptpin @@ -979,7 +978,7 @@ TcpAliasIn(struct libalias *la, struct ip *pip) }; /* Walk out chain. */ - error = find_handler(IN, TCP, la, pip, &ad); + find_handler(IN, TCP, la, pip, &ad); alias_address = GetAliasAddress(lnk); original_address = GetOriginalAddress(lnk); @@ -1066,7 +1065,7 @@ TcpAliasIn(struct libalias *la, struct ip *pip) static int TcpAliasOut(struct libalias *la, struct ip *pip, int maxpacketsize, int create) { - int proxy_type, error; + int proxy_type; u_short dest_port; u_short proxy_server_port; size_t dlen; @@ -1148,7 +1147,7 @@ TcpAliasOut(struct libalias *la, struct ip *pip, int maxpacketsize, int create) TcpMonitorOut(tc->th_flags, lnk); /* Walk out chain. */ - error = find_handler(OUT, TCP, la, pip, &ad); + find_handler(OUT, TCP, la, pip, &ad); /* Adjust TCP checksum since source port is being aliased * and source address is being altered */ diff --git a/sys/netinet/libalias/alias_sctp.c b/sys/netinet/libalias/alias_sctp.c index b88ad2b28ca8..8dc432ef6307 100644 --- a/sys/netinet/libalias/alias_sctp.c +++ b/sys/netinet/libalias/alias_sctp.c @@ -1504,16 +1504,10 @@ RmGlobalIPAddresses(struct sctp_nat_msg *sm, struct sctp_nat_assoc *assoc, int d struct sctp_asconf_addrv4_param *asconf_ipv4_param; struct sctp_paramhdr *param; struct sctp_GlobalAddress *G_Addr, *G_Addr_tmp; - struct in_addr g_addr; int bytes_left; int param_size; int param_count; - if (direction == SN_TO_GLOBAL) - g_addr = sm->ip_hdr->ip_dst; - else - g_addr = sm->ip_hdr->ip_src; - bytes_left = sm->chunk_length; param_count = 1; param = sm->sctpchnk.Asconf; diff --git a/sys/netinet/libalias/alias_skinny.c b/sys/netinet/libalias/alias_skinny.c index 31b33696fc20..8c933ba74b4a 100644 --- a/sys/netinet/libalias/alias_skinny.c +++ b/sys/netinet/libalias/alias_skinny.c @@ -274,13 +274,11 @@ alias_skinny_opnrcvch_ack(struct libalias *la, struct OpenReceiveChannelAck *opn { struct in_addr null_addr; struct alias_link *opnrcv_lnk; - u_int32_t localPort; (void)lnk; (void)direction; *localIpAddr = (u_int32_t)opnrcvch_ack->ipAddr; - localPort = opnrcvch_ack->port; null_addr.s_addr = INADDR_ANY; opnrcv_lnk = FindUdpTcpOut(la, pip->ip_src, null_addr,