From 8a129dee200f11f137ba85916aefbca7ec41517d Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 29 Oct 2016 17:13:04 +0200 Subject: [PATCH] reject: Inline putreject() into its only caller setrej() Signed-off-by: Markus Armbruster --- include/nat.h | 1 - src/lib/common/nat.c | 9 --------- src/lib/subs/rej.c | 5 ++++- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/include/nat.h b/include/nat.h index 93794e25..f233253a 100644 --- a/include/nat.h +++ b/include/nat.h @@ -184,7 +184,6 @@ extern int relations_with(natid, natid); extern int getrejects(natid them, struct natstr *np); extern int in_contact(natid, natid); extern void putrel(struct natstr *np, natid them, int relate); -extern void putreject(struct natstr *np, natid them, int how, int what); extern void agecontact(struct natstr *np); extern int influx(struct natstr *np); extern struct natstr *nat_reset(struct natstr *, natid, char *, char *, diff --git a/src/lib/common/nat.c b/src/lib/common/nat.c index eef71ccd..265a0401 100644 --- a/src/lib/common/nat.c +++ b/src/lib/common/nat.c @@ -121,15 +121,6 @@ putrel(struct natstr *np, natid them, int relate) np->nat_relate[them] = relate; } -void -putreject(struct natstr *np, natid them, int how, int what) -{ - if (how) - np->nat_rejects[them] |= what; - else - np->nat_rejects[them] &= ~what; -} - int influx(struct natstr *np) { diff --git a/src/lib/subs/rej.c b/src/lib/subs/rej.c index 8e4b0cdb..285d2b9f 100644 --- a/src/lib/subs/rej.c +++ b/src/lib/subs/rej.c @@ -138,6 +138,9 @@ setrej(natid us, natid them, int how, int what) if (CANT_HAPPEN(!np)) return; - putreject(np, them, how, what); + if (how) + np->nat_rejects[them] |= what; + else + np->nat_rejects[them] &= ~what; putnat(np); }