d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libalias: Restructure - Cleanup and Use for links

Browse Source 
Factor out a common idiom to return found links.

MFC after:	1 week
Differential Revision: https://reviews.freebsd.org/D30573
This commit is contained in:
Lutz Donnerhacke 2021-05-26 11:03:07 +02:00
parent d541903438
commit d4ab07d2ae
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sys/netinet/libalias/alias_db.c
View File

@ -535,6 +535,8 @@ static u_short GetSocket(struct libalias *, u_short, int *, int);
static void CleanupAliasData(struct libalias *); static void CleanupAliasData(struct libalias *);
static void CleanupLink(struct libalias *, struct alias_link **); static void CleanupLink(struct libalias *, struct alias_link **);
static void DeleteLink(struct alias_link **); static void DeleteLink(struct alias_link **);
static struct alias_link *
UseLink(struct libalias *, struct alias_link *);
static struct alias_link * static struct alias_link *
ReLink(struct alias_link *, ReLink(struct alias_link *,
@ -839,6 +841,15 @@ CleanupLink(struct libalias *la, struct alias_link **lnk)
TAILQ_INSERT_TAIL(&la->checkExpire, (*lnk), list_expire); TAILQ_INSERT_TAIL(&la->checkExpire, (*lnk), list_expire);
} }
static struct alias_link *
UseLink(struct libalias *la, struct alias_link *lnk)
{
CleanupLink(la, &lnk);
if (lnk != NULL)
lnk->timestamp = LibAliasTime;
return (lnk);
}
static void static void
DeleteLink(struct alias_link **plnk) DeleteLink(struct alias_link **plnk)
{ {
@ -1119,10 +1130,7 @@ _SearchLinkOut(struct libalias *la, struct in_addr src_addr,
i = StartPointOut(src_addr, dst_addr, src_port, dst_port, link_type); i = StartPointOut(src_addr, dst_addr, src_port, dst_port, link_type);
LIST_FOREACH(lnk, &la->linkTableOut[i], list_out) { LIST_FOREACH(lnk, &la->linkTableOut[i], list_out) {
OUTGUARD; OUTGUARD;
CleanupLink(la, &lnk); return (UseLink(la, lnk));
if (lnk != NULL)
lnk->timestamp = LibAliasTime;
return (lnk);
} }
return (NULL); return (NULL);
@ -1242,12 +1250,8 @@ _FindLinkIn(struct libalias *la, struct in_addr dst_addr,
LIST_FOREACH(lnk, &la->linkTableIn[start_point], list_in) { LIST_FOREACH(lnk, &la->linkTableIn[start_point], list_in) {
INGUARD; INGUARD;
if (lnk->dst_addr.s_addr == dst_addr.s_addr if (lnk->dst_addr.s_addr == dst_addr.s_addr
&& lnk->dst_port == dst_port) { && lnk->dst_port == dst_port)
CleanupLink(la, &lnk); return (UseLink(la, lnk));
if (lnk != NULL)
lnk->timestamp = LibAliasTime;
return (lnk);
}
} }
} else { } else {
LIST_FOREACH(lnk, &la->linkTableIn[start_point], list_in) { LIST_FOREACH(lnk, &la->linkTableIn[start_point], list_in) {
@ -1615,8 +1619,7 @@ FindPptpOutByCallId(struct libalias *la, struct in_addr src_addr,
lnk->src_port == src_call_id) lnk->src_port == src_call_id)
break; break;
CleanupLink(la, &lnk); return (UseLink(la, lnk));
return (lnk);
} }
struct alias_link * struct alias_link *
@ -1636,8 +1639,7 @@ FindPptpOutByPeerCallId(struct libalias *la, struct in_addr src_addr,
lnk->dst_port == dst_call_id) lnk->dst_port == dst_call_id)
break; break;
CleanupLink(la, &lnk); return (UseLink(la, lnk));
return (lnk);
} }
struct alias_link * struct alias_link *
@ -1655,8 +1657,7 @@ FindPptpInByCallId(struct libalias *la, struct in_addr dst_addr,
lnk->dst_port == dst_call_id) lnk->dst_port == dst_call_id)
break; break;
CleanupLink(la, &lnk); return (UseLink(la, lnk));
return (lnk);
} }
struct alias_link * struct alias_link *