From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Sun, 24 Jul 2022 18:08:02 +0000 (+0200)
Subject: Merge branch 'master' into backport
X-Git-Tag: v3.0-alpha1~163^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e484f8d2977186f6d97213827a66847738d2c31;p=thirdparty%2Fbird.git

Merge branch 'master' into backport
---

2e484f8d2977186f6d97213827a66847738d2c31
diff --cc proto/bgp/attrs.c
index 2f6cf6404,0d2116b78..a56aeb197
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@@ -1676,11 -1711,13 +1718,12 @@@ bgp_free_prefix(struct bgp_channel *c, 
   */
  
  int
 -bgp_preexport(struct channel *C, rte **new, struct linpool *pool UNUSED)
 +bgp_preexport(struct channel *C, rte *e)
  {
 -  rte *e = *new;
 -  struct proto *SRC = e->attrs->src->proto;
 -  struct bgp_channel *c = (struct bgp_channel *) C;
 +  struct proto *SRC = e->src->proto;
    struct bgp_proto *p = (struct bgp_proto *) C->proto;
    struct bgp_proto *src = (SRC->proto == &proto_bgp) ? (struct bgp_proto *) SRC : NULL;
++  struct bgp_channel *c = (struct bgp_channel *) C;
  
    /* Reject our routes */
    if (src == p)