diff options
| author | Jan Moskyto Matejka <mq@ucw.cz> | 2017-04-26 12:30:22 +0200 |
|---|---|---|
| committer | Jan Moskyto Matejka <mq@ucw.cz> | 2017-04-26 12:30:22 +0200 |
| commit | 69fddac0525b1b0c940d778a161ed3a0a742ed6f (patch) | |
| tree | 3fd1d68a1dc84f6d14bd6705fe3505be1483d4ee /proto | |
| parent | 93a3661c15c612e1de807524649482765b2c2702 (diff) | |
| parent | b29499996bbc1612a63a7e715bb53a8abf0940e3 (diff) | |
Merge branch 'int-new' of gitlab.labs.nic.cz:labs/bird into int-new
Diffstat (limited to 'proto')
| -rw-r--r-- | proto/rpki/rpki.c | 2 | ||||
| -rw-r--r-- | proto/static/config.Y | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/proto/rpki/rpki.c b/proto/rpki/rpki.c index 5459d9c3..349d2f70 100644 --- a/proto/rpki/rpki.c +++ b/proto/rpki/rpki.c @@ -903,7 +903,7 @@ rpki_postconfig(struct proto_config *CF) } static void -rpki_copy_config(struct proto_config *dest, struct proto_config *src) +rpki_copy_config(struct proto_config *dest UNUSED, struct proto_config *src UNUSED) { /* FIXME: Should copy transport */ } diff --git a/proto/static/config.Y b/proto/static/config.Y index 6643ba69..66ae3c98 100644 --- a/proto/static/config.Y +++ b/proto/static/config.Y @@ -36,7 +36,10 @@ static_nexthop_new(void) static void static_route_finish(void) -{ } +{ + if (net_type_match(this_srt->net, NB_DEST) == !this_srt->dest) + cf_error("Unexpected or missing nexthop/type"); +} CF_DECLS @@ -119,6 +122,7 @@ stat_route: this_srt->via = $3; this_srt->mls = $5; } + | stat_route0 { this_srt->dest = RTD_NONE; } | stat_route0 DROP { this_srt->dest = RTD_BLACKHOLE; } | stat_route0 REJECT { this_srt->dest = RTD_UNREACHABLE; } | stat_route0 BLACKHOLE { this_srt->dest = RTD_BLACKHOLE; } |