Ondrej Zajicek
a485fd2909
Merge commit 'f48fa14214301382b2e6b134788a7506b61b664f' into integrated
...
Conflicts:
nest/rt-table.c
proto/bgp/attrs.c
proto/bgp/packets.c
proto/ospf/ospf.c
proto/rip/rip.c
proto/static/static.c
sysdep/unix/krt.c
2014-04-29 17:23:38 +02:00
Ondrej Zajicek
37c2153457
Merge commit '0bb4e37db317a1290bad24fe430cac6569a9bd8c' into integrated
...
Conflicts:
sysdep/linux/netlink.c
2014-04-29 16:32:08 +02:00
Ondrej Zajicek
b1c680a680
Merge commit '2b3d52aa421ae1c31e30107beefd82fddbb42854' into integrated
2014-04-29 16:25:09 +02:00
Ondrej Zajicek
f47914c8a8
Merge commit '0aeac9cb7f9887374ce0258c8653f9518529bf08' into integrated
...
Conflicts:
configure.in
lib/printf.c
proto/ospf/config.Y
proto/ospf/hello.c
proto/ospf/iface.c
proto/ospf/ospf.h
2014-04-29 16:17:09 +02:00
Ondrej Zajicek
51e37fbb40
Merge commit '8931425d02dd8656b48142f608d3119ab6f4a96f' into integrated
...
Conflicts:
nest/rt-table.c
2014-04-29 16:05:47 +02:00
Ondrej Zajicek
1a74af87ef
Merge commit 'f8cc7396cf25328b002394bbd7af679188b03370' into integrated
2014-04-29 15:19:05 +02:00
Ondrej Zajicek
455539ba1b
Merge commit 'e7c2380260f20a4a3587b47df97879ef91c69774' into integrated
2014-04-29 15:16:32 +02:00
Ondrej Zajicek
2187708520
Merge commit '6a8d3f1c1ffbd964e4d11b452c73e1ea70310af3' into integrated
...
Conflicts:
configure.in
lib/socket.h
nest/protocol.h
2014-04-29 13:00:14 +02:00
Ondrej Zajicek
abb93d9846
Merge commit '2a0130f94d2304e316f0ffad8e52fce094559782' into integrated
2014-04-29 12:52:34 +02:00
Ondrej Zajicek
283c7dfada
Merge branch 'master' into add-path
2013-11-25 18:42:47 +01:00
Ondrej Zajicek
90eb5e7a8b
Use ISO 8601 timeformats by default.
2013-11-25 13:44:07 +01:00
Ondrej Zajicek
e237b28a4d
Changes primary addr selection on BSD to respect SIOCGIFADDR ioctl() result.
...
Thanks to Alexander V. Chernikov for the original patch.
2013-11-25 01:21:39 +01:00
Ondrej Zajicek
736e143fa5
Merge branch 'master' into add-path
...
Conflicts:
filter/filter.c
nest/proto.c
nest/rt-table.c
proto/bgp/bgp.h
proto/bgp/config.Y
2013-11-23 11:50:34 +01:00
Ondrej Zajicek
56027b5cbd
Minor fix in log_commit() w.r.t. changes in BFD branch.
2013-11-22 21:58:43 +01:00
Ondrej Zajicek
0aeac9cb7f
Merge commit 'origin/bfd'
2013-11-22 02:48:44 +01:00
Ondrej Zajicek
8931425d02
Fixes problem with RIP on multiple ifaces on BSD.
...
RIP sockets for multiple ifaces collided, because we cannot bind to
a specific iface on BSD. Workarounded by SO_REUSEPORT.
Thanks to Eugene M. Zheganin for the bugreport.
2013-11-22 02:12:21 +01:00
Ondrej Zajicek
1ec522538f
BFD protocol, ready for release.
...
Supports OSPF and BGP and also statically configured sessions.
2013-11-19 22:33:48 +01:00
Ondrej Zajicek
f8cc7396cf
Forces KRT rescan on syncer startup with multi syncer config.
...
Thanks to Sergey Popovich for the patch.
2013-10-15 10:57:57 +02:00
Ondrej Filip
1cd198cf52
Flag -f "run in foreground" added as requested by a package maintainter.
2013-10-05 22:45:08 +02:00
Ondrej Zajicek
0e175f9f0f
Fixes some BFD bugs and makes logging thread-safe.
2013-10-05 20:12:28 +02:00
Ondrej Zajicek
e7c2380260
Implements PID file support.
...
Thanks to Thierry Fournier for the original patch.
2013-10-05 19:30:12 +02:00
Ondrej Zajicek
6a8d3f1c1f
BFD work in progress.
...
Now it compiles and mostly works.
2013-09-16 23:57:40 +02:00
Ondrej Zajicek
2a0130f94d
Fixes a bug in kernel extended attribute processing.
...
The bug caused that krt_prefsrc attribute was not processed when a route
received from a kernel protocol was exported to another kernel protocol.
Thanks to Sergey Popovich for a bugreport.
2013-09-10 13:01:22 +02:00
Ondrej Zajicek
bf139664aa
Initial BFD commit, work in progress.
2013-09-10 12:09:36 +02:00
Ondrej Zajicek
4e48b4bb4c
Merge commit 'f8e8fcfabeb206287065f48e800743b0aa797cc2' into integrated
...
Conflicts:
conf/confbase.Y
2013-07-31 18:43:23 +02:00
Ondrej Zajicek
a013bd08e3
Merge commit 'ac5745134847c044b21c311e5ab11d92d05bacc1' into integrated
2013-07-31 18:36:55 +02:00
Ondrej Zajicek
ed5c7b636e
Merge commit 'a0b176e3b2b50d3a30574afa927e0ee8ef65be68' into integrated
2013-07-31 18:36:26 +02:00
Ondrej Zajicek
6477b8f10c
Merge commit 'c6964c305b425b98aaf0492806a28b578d799d83' into integrated
...
Conflicts:
sysdep/bsd/krt-sock.c
sysdep/linux/netlink.c
sysdep/unix/krt.h
2013-07-31 17:39:16 +02:00
Ondrej Zajicek
6abc22f4b0
Merge commit '6ac4f87a2d661c739e55a63577e7bccf696c7abd' into integrated
...
Conflicts:
lib/socket.h
proto/ospf/config.Y
proto/ospf/iface.c
proto/ospf/ospf.h
proto/rip/rip.c
sysdep/bsd/sysio.h
sysdep/linux/sysio.h
sysdep/unix/io.c
2013-07-31 16:29:34 +02:00
Ondrej Zajicek
9cf24ba8e7
Merge commit 'ef4a50be10c6dd0abffd957132cd146029c3d79d' into integrated
...
Conflicts:
lib/ipv6.h
nest/config.Y
proto/ospf/config.Y
proto/rip/rip.c
sysdep/bsd/sysio.h
sysdep/linux/sysio.h
sysdep/unix/io.c
2013-07-30 23:48:07 +02:00
Ondrej Zajicek
1103b32e83
Allows to define constants of all filter types.
2013-07-25 22:33:57 +02:00
Ondrej Zajicek
508d936078
Implements eval command and minor CLI cleanups.
...
Implemented eval command can be used to evaluate expressions.
The patch also documents echo command and allows to use log classes
instead of integer as a mask for echo.
2013-07-25 13:15:32 +02:00
Ondrej Zajicek
a0b176e3b2
Fixes header file name.
...
Thanks to Fritz Grimpen for the patch.
2013-07-24 14:20:46 +02:00
Ondrej Zajicek
354496ace8
Some fixes for TTL security.
2013-07-11 13:50:44 +02:00
Ondrej Zajicek
c6964c305b
Makes krt.c much more readable.
2013-07-04 18:02:22 +02:00
Ondrej Zajicek
3de342dae1
Adapts BSD sysdep code for integrated branch.
...
Thanks to Alexander V. Chernikov for the original patch.
2013-06-28 00:57:22 +02:00
Ondrej Zajicek
70e212f913
Implements TTL security for OSPF and RIP.
...
Interfaces for OSPF and RIP could be configured to use (and request)
TTL 255 for traffic to direct neighbors.
Thanks to Simon Dickhoven for the original patch for RIPng.
2013-06-25 15:39:44 +02:00
Ondrej Zajicek
ef4a50be10
Better packet priority and traffic class handling.
...
Implements support for IPv6 traffic class, sets higher priority for OSPF
and RIP outgoing packets by default and allows to configure ToS/DS/TClass
IP header field and the local priority of outgoing packets.
2013-06-24 16:37:30 +02:00
Ondrej Zajicek
0596b3dbf9
Merge commit '13d4dd138d5dc6c884ded280f9244fac707c4f32' into integrated
2013-01-13 00:44:39 +01:00
Ondrej Zajicek
c570200d39
Merge commit 'c93c02088a026b83f452fbd260135ba4c8da7ecf' into integrated
2013-01-13 00:36:29 +01:00
Ondrej Zajicek
debc0e45fd
Merge commit '0343d066dab077d1391640c53198199b16bef993' into integrated
2013-01-12 23:40:00 +01:00
Ondrej Zajicek
f53e2a31d6
Merge commit '48cf5e84e6ed17578e4ad43c5ef54d6ff7d825c4' into integrated
2013-01-12 22:13:22 +01:00
Ondrej Zajicek
a92cf57dd6
Implements undo command and optional timeout for configuration
...
Several new configure command variants:
configure undo - undo last reconfiguration
configure timeout - configure with scheduled undo if not confirmed in timeout
configure confirm - confirm last configuration
configure check - just parse and validate config file
2012-12-26 12:40:48 +01:00
Ondrej Zajicek
cf98be7b67
Allows rejected routes to be kept and examined.
...
When 'import keep rejected' protocol option is activated, routes
rejected by the import filter are kept in the routing table, but they
are hidden and not propagated to other protocols. It is possible to
examine them using 'show route rejected'.
2012-11-10 14:26:13 +01:00
Ondrej Zajicek
0343d066da
Fixes a bug in primary IP selection.
2012-08-29 12:42:49 +02:00
Ondrej Zajicek
094d2bdb79
Implements ADD-PATH extension for BGP.
...
Allows to send and receive multiple routes for one network by one BGP
session. Also contains necessary core changes to support this (routing
tables accepting several routes for one network from one protocol).
It needs some more cleanup before merging to the master branch.
2012-08-14 16:46:43 +02:00
Ondrej Zajicek
c4b76d7b19
Rename sk_new() to avoid name collision with OpenSSL.
2012-07-18 19:35:30 +02:00
Ondrej Zajicek
4be266a983
Implements wildcard matching in config file include.
...
Also fixes some minor bugs in include.
Thanks Kelly Cochran for suggestion and draft patch.
2012-07-18 19:29:33 +02:00
Ondrej Zajicek
3f03288514
Temporary integrated commit.
2012-06-23 15:17:50 +02:00
Ondrej Zajicek
ed6c144066
Temporary integrated commit.
...
This one mostly merges patches from Alexander Chernikov.
2012-06-23 10:13:32 +02:00