site: named_for_us: Introduce NAME_MATCHES

[secnet.git] / site.c

diff --git a/site.c b/site.c
index a91d6c91cd86aa6681b932df5a1d5ed7339a5374..b9ebc4bab77eebfe8a4fb56b2b6fc0f775995f43 100644 (file)
--- a/site.c
+++ b/site.c
@@ -1828,9 +1828,15 @@ static bool_t named_for_us(struct site *st, const struct buffer_if *buf_in,
 {
     struct buffer_if buf[1];
     buffer_readonly_clone(buf,buf_in);
+
+#define NAME_MATCHES(lr) \
+    name_matches(&m->lr, st->lr##name)
+
     return unpick_msg(st,type,buf,m)
-       && name_matches(&m->remote,st->remotename)
-       && name_matches(&m->local,st->localname);
+       && NAME_MATCHES(remote)
+       && NAME_MATCHES(local );
+
+#undef NAME_MATCHES
 }
 
 static bool_t we_have_priority(struct site *st, const struct msg *m) {