tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-09-25 19:08:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: avoid shadowing issues which some compilers won't accept

Browse Source 
ok djm

OpenBSD-Commit-ID: 1e89572397dda83433d58c4fa6333a08f51170d4
This commit is contained in:
deraadt@openbsd.org 2024-06-07 13:23:30 +00:00 committed by Damien Miller
parent 3ad4cd9eec
commit fa7d7a667f
No known key found for this signature in database
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
srclimit.c
View File

@ -44,7 +44,7 @@ static char *penalty_exempt;
static struct child_info { static struct child_info {
int id; int id;
struct xaddr addr; struct xaddr addr;
} *child; } *children;
/* /*
* Penalised addresses, active entries here prohibit connections until expired. * Penalised addresses, active entries here prohibit connections until expired.
@ -114,9 +114,9 @@ srclimit_init(int max, int persource, int ipv4len, int ipv6len,
max, persource, ipv4len, ipv6len); max, persource, ipv4len, ipv6len);
if (max <= 0) if (max <= 0)
fatal("%s: invalid number of sockets: %d", __func__, max); fatal("%s: invalid number of sockets: %d", __func__, max);
child = xcalloc(max_children, sizeof(*child)); children = xcalloc(max_children, sizeof(*children));
for (i = 0; i < max_children; i++) for (i = 0; i < max_children; i++)
child[i].id = -1; children[i].id = -1;
RB_INIT(&penalties_by_addr); RB_INIT(&penalties_by_addr);
RB_INIT(&penalties_by_expiry); RB_INIT(&penalties_by_expiry);
} }
@ -142,10 +142,10 @@ srclimit_check_allow(int sock, int id)
first_unused = max_children; first_unused = max_children;
/* Count matching entries and find first unused one. */ /* Count matching entries and find first unused one. */
for (i = 0; i < max_children; i++) { for (i = 0; i < max_children; i++) {
if (child[i].id == -1) { if (children[i].id == -1) {
if (i < first_unused) if (i < first_unused)
first_unused = i; first_unused = i;
} else if (addr_cmp(&child[i].addr, &xb) == 0) { } else if (addr_cmp(&children[i].addr, &xb) == 0) {
count++; count++;
} }
} }
@ -168,8 +168,8 @@ srclimit_check_allow(int sock, int id)
return 0; return 0;
/* Connection allowed, store masked address. */ /* Connection allowed, store masked address. */
child[first_unused].id = id; children[first_unused].id = id;
memcpy(&child[first_unused].addr, &xb, sizeof(xb)); memcpy(&children[first_unused].addr, &xb, sizeof(xb));
return 1; return 1;
} }
@ -184,8 +184,8 @@ srclimit_done(int id)
debug("%s: id %d", __func__, id); debug("%s: id %d", __func__, id);
/* Clear corresponding state entry. */ /* Clear corresponding state entry. */
for (i = 0; i < max_children; i++) { for (i = 0; i < max_children; i++) {
if (child[i].id == id) { if (children[i].id == id) {
child[i].id = -1; children[i].id = -1;
return; return;
} }
} }