Maria Matejka
4628a117d9
Merge commit 'v2.13.1-186-g761649e6' into thread-next
2024-01-28 14:38:43 +01:00
Maria Matejka
761649e66b
Merge commit 'v2.13.1-141-g4f806813' into mq-merge-step-2
2024-01-28 14:29:16 +01:00
Maria Matejka
8d2ec536d9
Merge commit 'v2.13.1-183-g2b05844c' into thread-next
2024-01-28 14:28:17 +01:00
Maria Matejka
2b05844cfb
Merge commit 'v2.13.1-139-gc9d1ebbd' into mq-merge-step-2
2024-01-28 14:28:09 +01:00
Maria Matejka
7a4314ee02
Merge commit 'v2.13.1-133-g7cc3d300' into mq-merge-step-2
2024-01-28 14:20:45 +01:00
Maria Matejka
6a80214fb3
BGP: fixed MPLS label stack receiving bug
...
Introduced in 515df18da7
2024-01-28 13:16:25 +01:00
Maria Matejka
57b5eb5cbd
Merge commit 'v2.13.1-162-g5bf25678' into thread-next
2024-01-27 19:01:06 +01:00
Maria Matejka
5bf2567853
Merge commit 'v2.13.1-125-g90b9e871' into mq-merge-step-2
2024-01-26 23:29:17 +01:00
Maria Matejka
365ea12ea1
MPLS Subsystem Proper Locking
...
Added also some debug lines if debug is on.
2024-01-26 14:42:44 +01:00
Maria Matejka
e711a991d4
MPLS: FEC Map moved from protocol to MPLS channel
2024-01-08 13:03:25 +01:00
Maria Matejka
8558e666e0
Merge branch 'mq-aggregator-for-v3' into thread-next
2023-11-09 17:38:31 +01:00
Maria Matejka
87e2ba8c84
Merge commit '8f5511da' into mq-aggregator-for-v3
2023-11-09 16:53:45 +01:00
Maria Matejka
219dc0fdb5
Merge branch 'mq-aggregator-for-v3' into thread-next
2023-11-09 16:53:34 +01:00
Maria Matejka
f434eb3865
Merge commit 'd8130da8' into mq-aggregator-for-v3
2023-11-09 16:36:54 +01:00
Maria Matejka
5098430748
Merge branch 'mq-aggregator-for-v3' into thread-next
2023-11-09 16:00:32 +01:00
Maria Matejka
29ffc62b76
Merge commit 'e915f99e' into mq-aggregator-for-v3
2023-11-09 16:00:09 +01:00
Maria Matejka
3ccf890e58
Merge branch 'mq-aggregator-for-v3' into thread-next
2023-11-09 15:58:41 +01:00
Maria Matejka
45ffbb4d76
Merge commit '81a20ca5' into mq-aggregator-for-v3
2023-11-09 15:50:39 +01:00
Maria Matejka
00e40a6b80
Merge branch 'mq-aggregator-for-v3' into thread-next
2023-11-09 15:20:13 +01:00
Maria Matejka
b979c6ce6e
Merge commit 'bcff3ae7' into mq-aggregator-for-v3
2023-11-09 11:06:07 +01:00
Maria Matejka
515df18da7
Merge branch 'mq-aggregator-for-v3' into thread-next
2023-11-08 22:24:33 +01:00
Maria Matejka
4c07f33261
Merge commit '9d456d53' into mq-aggregator-for-v3
2023-11-08 22:14:58 +01:00
Maria Matejka
49ee823f82
Merge branch 'mq-aggregator-for-v3' into thread-next
2023-11-08 22:14:19 +01:00
Maria Matejka
cac866d5eb
Merge commit '15c86ed0' into mq-aggregator-for-v3
2023-11-08 21:56:58 +01:00
Maria Matejka
c6fba7d7e6
Merge branch 'thread-next' into HEAD
2023-11-02 14:43:15 +01:00
Katerina Kubecova
9680bf68e4
Automatic ROA reloads on channel import
...
This includes updating OSPF, Pipe and RIP to enable partial route reload
directly from the protocols' internal tables.
2023-11-02 14:37:27 +01:00
Maria Matejka
f90f2ed680
Merge branch 'mq-aggregator-for-v3' into thread-next
2023-11-01 18:08:49 +01:00
Maria Matejka
29e3a86ad1
Merge commit '21213be5' into mq-aggregator-for-v3
2023-11-01 17:49:12 +01:00
Maria Matejka
d8463ca7d9
Merge branch 'mq-aggregator-for-v3' into thread-next
2023-11-01 17:48:00 +01:00
Maria Matejka
dd0f3940d3
Merge commit '8ad9c4bb' into mq-aggregator-for-v3
2023-11-01 17:46:52 +01:00
Maria Matejka
f32e53d7b1
Merge branch 'mq-aggregator-for-v3' into thread-next
2023-11-01 17:44:37 +01:00
Maria Matejka
5f166f6782
Aggregator: fixed route source unlocking on shutdown and withdraw
2023-11-01 17:25:29 +01:00
Maria Matejka
11faa7d36b
Merge branch 'mq-aggregator-for-v3' into HEAD
2023-11-01 10:58:44 +01:00
Maria Matejka
8917f16e4b
Merge branch 'mq-aggregator-for-v3' into HEAD
2023-11-01 10:58:31 +01:00
Maria Matejka
b958228953
Aggregator: Fixed bugs in filter usage
2023-11-01 10:57:43 +01:00
Maria Matejka
c103b51fca
Aggregator: Expressed most of the attribute logic in filter language
2023-11-01 10:15:16 +01:00
Maria Matejka
e8dcc62ecd
Merge commit 'ba91f4c831f057b81104d1453f99b012c01f9c9e' into thread-next
2023-10-31 16:54:58 +01:00
Igor Putovny
f42c118aa7
Basic route aggregation
...
Add a new protocol offering route aggregation.
User can specify list of route attributes in the configuration file and
run route aggregation on the export side of the pipe protocol. Routes are
sorted and for every group of equivalent routes new route is created and
exported to the routing table. It is also possible to specify filter
which will run for every route before aggregation.
Furthermore, it will be possible to set attributes of new routes
according to attributes of the aggregated routes.
This is a work in progress.
Original work by Igor Putovny, subsequent cleanups and finalization by
Maria Matejka.
This is a split-commit of the neighboring aggregator branch
with a bit improved lvalue handling, to have easier merge into v3.
2023-10-31 16:40:46 +01:00
Maria Matejka
ba91f4c831
Filters: allowing to return any number of values
2023-10-31 16:40:46 +01:00
Maria Matejka
fc3f07fdc3
Merge commit '407eb388b7082b52921e93476c8ff1a98fe3b873' into thread-next
2023-10-31 10:28:01 +01:00
Maria Matejka
407eb388b7
Filter: predefined variables for specific blocks
...
This is a split-commit of the neighboring aggregator branch
with a bit improved lvalue handling, to have easier merge into v3.
2023-10-30 13:10:37 +01:00
Maria Matejka
ddf698ec99
Renamed nest/rt.h back to nest/route.h
...
Some [redacted] (yes, myself) had a really bad idea
to rename nest/route.h to nest/rt.h while refactoring
some data structures out of it.
This led to unnecessarily complex problems with
merging updates from v2. Reverting this change
to make my life a bit easier.
At least it needed only one find-sed command:
find -name '*.[chlY]' -type f -exec sed -i 's#nest/rt.h#nest/route.h#' '{}' +
2023-10-29 16:29:26 +01:00
Maria Matejka
c5f6dc8142
Merge commit '0a729b50' into thread-next
...
This merge was particularly difficult. I finally resorted to delete the
symbol scope active flag altogether and replace its usage by other
means.
Also I had to update custom route attribute registration to fit
both the scope updates in v2 and the data model in v3.
2023-10-29 15:42:46 +01:00
Maria Matejka
737807c118
Merge commit 'bb8e2824' into thread-next
2023-10-29 00:56:06 +02:00
Maria Matejka
1a49a4aea8
Merge commit 'fc9d471b' into thread-next
...
Conflicts:
conf/cf-lex.l
conf/conf.h
filter/config.Y
filter/data.c
filter/data.h
2023-10-28 23:42:21 +02:00
Maria Matejka
0ba22509a8
Merge commit '51f2e7af' into thread-next
...
Conflicts:
conf/cf-lex.l
conf/conf.h
conf/confbase.Y
filter/config.Y
nest/config.Y
nest/proto.c
nest/rt-table.c
proto/bgp/bgp.c
sysdep/unix/main.c
2023-10-27 18:29:31 +02:00
Maria Matejka
da52d66177
Merge commit '58efa944' into thread-next
...
Conflicts:
conf/cf-lex.l
conf/conf.h
conf/confbase.Y
conf/gen_keywords.m4
conf/gen_parser.m4
filter/config.Y
nest/config.Y
proto/bgp/config.Y
proto/static/config.Y
Keywords and attributes are split to separate namespaces, to avoid
collisions between regular keyword use and attribute overlay.
2023-10-25 14:41:11 +02:00
Maria Matejka
6c85016dd4
Merge commit 'aa70e14c' into thread-next
2023-10-24 09:34:06 +02:00
Maria Matejka
7efa3bac4f
Merge commit 'cce48c6c' into thread-next
2023-10-13 14:02:21 +02:00
Maria Matejka
cdb95c2858
Merge commit 'f411a19b' into thread-next
2023-10-13 13:46:04 +02:00
