]> git.ipfire.org Git - thirdparty/bird.git/log
thirdparty/bird.git
6 years agoError in version guessing v2.0.1
Ondrej Filip [Tue, 16 Jan 2018 13:36:46 +0000 (14:36 +0100)] 
Error in version guessing

6 years agoAdd note to NEWS
Ondrej Zajicek (work) [Tue, 16 Jan 2018 13:18:57 +0000 (14:18 +0100)] 
Add note to NEWS

6 years agoNotice about RFC 8212 added
Ondrej Filip [Tue, 16 Jan 2018 09:45:03 +0000 (10:45 +0100)] 
Notice about RFC 8212 added

6 years agoBGP: Require explicit import and export policies for EBGP channels
Ondrej Zajicek (work) [Tue, 16 Jan 2018 03:14:49 +0000 (04:14 +0100)] 
BGP: Require explicit import and export policies for EBGP channels

To comply with RFC 8212 requirements.

6 years agoNEWS and version update
Ondrej Zajicek (work) [Sun, 14 Jan 2018 20:52:58 +0000 (21:52 +0100)] 
NEWS and version update

6 years agoKRT: Fix direct routes for BSD
Ondrej Zajicek (work) [Sun, 14 Jan 2018 13:30:38 +0000 (14:30 +0100)] 
KRT: Fix direct routes for BSD

Old way to set direct routes is to use local IP as gateway, but that does
not work properly on newer FreeBSDs. Now we use sockaddr_dl containing
interface index as gateway.

6 years agoUse non-fatal asserts even for regular build
Ondrej Zajicek (work) [Wed, 10 Jan 2018 15:17:37 +0000 (16:17 +0100)] 
Use non-fatal asserts even for regular build

6 years agoNest: Allow modification of channels inherited from templates
Ondrej Zajicek (work) [Tue, 9 Jan 2018 17:42:22 +0000 (18:42 +0100)] 
Nest: Allow modification of channels inherited from templates

Multiple definitions of same channels are forbidden, but inherited
channel can be redefined. In such case channel options are merged.

6 years agoMoved freebsd cflags and ldflags to configure
Jan Maria Matejka [Tue, 9 Jan 2018 15:46:00 +0000 (16:46 +0100)] 
Moved freebsd cflags and ldflags to configure

6 years agoNest: Fix filter reconfiguration
Ondrej Zajicek (work) [Tue, 9 Jan 2018 13:36:11 +0000 (14:36 +0100)] 
Nest: Fix filter reconfiguration

Function filter_same() must be called with arguments in proper order,
otherwise it breaks the new filter, causing crash during route
processing.

6 years agoFilter: Handle undefined BGP paths as empty
Ondrej Zajicek (work) [Wed, 3 Jan 2018 14:44:05 +0000 (15:44 +0100)] 
Filter: Handle undefined BGP paths as empty

The same is already done for clists. Also fixes defined() to work
properly for paths and clists.

6 years agoMerge branch 'master' into int-new
Ondrej Zajicek (work) [Tue, 2 Jan 2018 15:59:59 +0000 (16:59 +0100)] 
Merge branch 'master' into int-new

6 years agoBGP: Fix unknown attribute handling
Ondrej Zajicek (work) [Tue, 2 Jan 2018 15:57:45 +0000 (16:57 +0100)] 
BGP: Fix unknown attribute handling

6 years agoBGP: Fix graceful restart timer
Ondrej Zajicek (work) [Tue, 2 Jan 2018 13:30:08 +0000 (14:30 +0100)] 
BGP: Fix graceful restart timer

Should use remote value, not local value.

6 years agoRemove libhistory check
Ondrej Zajicek (work) [Tue, 2 Jan 2018 13:11:59 +0000 (14:11 +0100)] 
Remove libhistory check

According to GNU Readline developers, if we link with libreadline then
there is no need to link with libhistory at all.

6 years agoMinor fix in documentation
Ondrej Zajicek (work) [Wed, 20 Dec 2017 23:16:52 +0000 (00:16 +0100)] 
Minor fix in documentation

6 years agoFix build without limited protocol set
Ondrej Zajicek (work) [Mon, 18 Dec 2017 22:15:07 +0000 (23:15 +0100)] 
Fix build without limited protocol set

6 years agoMinor fixes for debug mode
Ondrej Zajicek (work) [Sat, 16 Dec 2017 15:31:43 +0000 (16:31 +0100)] 
Minor fixes for debug mode

6 years agoNetlink: Fix memory leak
Ondrej Zajicek (work) [Fri, 15 Dec 2017 23:42:56 +0000 (00:42 +0100)] 
Netlink: Fix memory leak

6 years agoMinor cleanups
Ondrej Zajicek (work) [Thu, 14 Dec 2017 21:15:01 +0000 (22:15 +0100)] 
Minor cleanups

6 years agoMinor cleanup
Ondrej Zajicek (work) [Thu, 14 Dec 2017 20:52:07 +0000 (21:52 +0100)] 
Minor cleanup

6 years agoUse git describe for BIRD version
Ondrej Zajicek (work) [Wed, 13 Dec 2017 18:18:30 +0000 (19:18 +0100)] 
Use git describe for BIRD version

Based on patch from Pavel Tvrdik

6 years agoBGP: Fix non-transitive ext communities
Ondrej Zajicek (work) [Wed, 13 Dec 2017 14:57:44 +0000 (15:57 +0100)] 
BGP: Fix non-transitive ext communities

6 years agoNetlink: Use linpool instead of static buffer
Ondrej Zajicek (work) [Wed, 13 Dec 2017 14:26:29 +0000 (15:26 +0100)] 
Netlink: Use linpool instead of static buffer

6 years agoLib: Minor fix
Ondrej Zajicek (work) [Wed, 13 Dec 2017 13:49:55 +0000 (14:49 +0100)] 
Lib: Minor fix

6 years agoMerge branch 'int-new' of gitlab.labs.nic.cz:labs/bird into int-new
Jan Maria Matejka [Wed, 13 Dec 2017 09:29:10 +0000 (10:29 +0100)] 
Merge branch 'int-new' of gitlab.labs.nic.cz:labs/bird into int-new

6 years agoDoc: Fixed misc sgml bugs, no content change
Jan Maria Matejka [Wed, 13 Dec 2017 09:28:50 +0000 (10:28 +0100)] 
Doc: Fixed misc sgml bugs, no content change

6 years agoLib: Save/restore state for linpools
Ondrej Zajicek (work) [Tue, 12 Dec 2017 18:51:36 +0000 (19:51 +0100)] 
Lib: Save/restore state for linpools

Also change linpool.current ptr to really point to thr current chunk.

6 years agoFix some minor issues
Ondrej Zajicek (work) [Tue, 12 Dec 2017 14:56:31 +0000 (15:56 +0100)] 
Fix some minor issues

6 years agoMinor CI tweak
Ondrej Zajicek (work) [Tue, 12 Dec 2017 14:22:01 +0000 (15:22 +0100)] 
Minor CI tweak

6 years agoRemoved '--enable-ipv6' reference.
Ondrej Filip [Tue, 12 Dec 2017 09:43:56 +0000 (10:43 +0100)] 
Removed '--enable-ipv6' reference.

6 years agoRevive FIB and kernel MPLS code
Ondrej Zajicek (work) [Mon, 11 Dec 2017 23:05:49 +0000 (00:05 +0100)] 
Revive FIB and kernel MPLS code

6 years agoChanges to be able to build 2.0.0 v2.0.0
Ondrej Filip [Mon, 11 Dec 2017 08:36:21 +0000 (09:36 +0100)] 
Changes to be able to build 2.0.0

6 years agoNEWS and version update
Ondrej Zajicek (work) [Mon, 11 Dec 2017 01:05:35 +0000 (02:05 +0100)] 
NEWS and version update

6 years agoKRT: Fix bug in multipath handling
Ondrej Zajicek (work) [Mon, 11 Dec 2017 00:04:15 +0000 (01:04 +0100)] 
KRT: Fix bug in multipath handling

6 years agoDoc: Documentation update
Ondrej Zajicek (work) [Sun, 10 Dec 2017 21:47:38 +0000 (22:47 +0100)] 
Doc: Documentation update

6 years agoSwitchoff for MPLS in kernel.
Maria Jan Matejka [Mon, 25 Sep 2017 11:00:05 +0000 (13:00 +0200)] 
Switchoff for MPLS in kernel.

6 years agoLib: Check size of nets
Ondrej Zajicek (work) [Sun, 10 Dec 2017 12:18:36 +0000 (13:18 +0100)] 
Lib: Check size of nets

6 years agoLib: Fix macro/keyword collisions
Ondrej Zajicek (work) [Sun, 10 Dec 2017 12:16:31 +0000 (13:16 +0100)] 
Lib: Fix macro/keyword collisions

Old code breaks with some versions of bison

6 years agoSeveral minor fixes
Ondrej Zajicek (work) [Sat, 9 Dec 2017 23:55:34 +0000 (00:55 +0100)] 
Several minor fixes

6 years agoFilter: Remove old BGP path mask syntax from tests
Ondrej Zajicek (work) [Fri, 8 Dec 2017 16:31:33 +0000 (17:31 +0100)] 
Filter: Remove old BGP path mask syntax from tests

6 years agoBGP: Link check just for single-hop
Ondrej Zajicek (work) [Fri, 8 Dec 2017 16:00:47 +0000 (17:00 +0100)] 
BGP: Link check just for single-hop

6 years agoDocs: Update to v2.0
Jan Maria Matejka [Wed, 27 Sep 2017 14:55:09 +0000 (16:55 +0200)] 
Docs: Update to v2.0

6 years agoEnable ECMP and Link detection by default
Ondrej Zajicek (work) [Fri, 8 Dec 2017 14:59:44 +0000 (15:59 +0100)] 
Enable ECMP and Link detection by default

ECMP is not enabled on BSD, where it is not supported by BIRD.

6 years agoNest: Minor formatting changes
Ondrej Zajicek (work) [Fri, 8 Dec 2017 14:16:47 +0000 (15:16 +0100)] 
Nest: Minor formatting changes

6 years agoBGP: Fix IPv6 MPLS/VPN multicast SAFI
Ondrej Zajicek (work) [Fri, 8 Dec 2017 13:00:36 +0000 (14:00 +0100)] 
BGP: Fix IPv6 MPLS/VPN multicast SAFI

6 years agoBGP: Autoconfigure BGP next hops from preferred addresses
Ondrej Zajicek (work) [Fri, 8 Dec 2017 01:26:17 +0000 (02:26 +0100)] 
BGP: Autoconfigure BGP next hops from preferred addresses

6 years agoMerge commit '1e8721e2aeccfbc3f533e8b8abc07582cee77e9a' into int-new
Ondrej Zajicek (work) [Thu, 7 Dec 2017 20:54:47 +0000 (21:54 +0100)] 
Merge commit '1e8721e2aeccfbc3f533e8b8abc07582cee77e9a' into int-new

6 years agoMerge commit '7b2c5f3d2826e3175bf31b1c36056c9efc587a2b' into int-new
Ondrej Zajicek (work) [Thu, 7 Dec 2017 17:35:46 +0000 (18:35 +0100)] 
Merge commit '7b2c5f3d2826e3175bf31b1c36056c9efc587a2b' into int-new

6 years agoMerge commit '98bb80a243b58c43453e9be69d19d0350286549c' into int-new
Ondrej Zajicek (work) [Thu, 7 Dec 2017 16:41:09 +0000 (17:41 +0100)] 
Merge commit '98bb80a243b58c43453e9be69d19d0350286549c' into int-new

6 years agoBSD: Fix in the last commit
Ondrej Zajicek (work) [Thu, 7 Dec 2017 13:21:38 +0000 (14:21 +0100)] 
BSD: Fix in the last commit

6 years agoTimers: Revert temporary names and remove old timer.h
Ondrej Zajicek (work) [Tue, 28 Nov 2017 16:43:20 +0000 (17:43 +0100)] 
Timers: Revert temporary names and remove old timer.h

6 years agoTimers: Fix TBF and some last remains
Ondrej Zajicek (work) [Tue, 28 Nov 2017 16:06:10 +0000 (17:06 +0100)] 
Timers: Fix TBF and some last remains

6 years agoBabel: More changes and bugfixes
Ondrej Zajicek (work) [Tue, 28 Nov 2017 14:11:41 +0000 (15:11 +0100)] 
Babel: More changes and bugfixes

Several changes and bugfixes in Babel, namely:

- Exported route parameters stored directly in route table entry
- Exported non-babel routes no longer stored in per-entry route list
- Route update, selection and retraction simplified and fixed
- Route feasibility is evalualated per update and stored with route
- Unreachable route handling fixed, based on hold interval
- Added 'show babel routes' command

Overall, it fixes some issues with proper propagation of triggered
updates, making Babel convergence after topology change almost
instant.

6 years agoBabel: Fix handling of seqno requests
Ondrej Zajicek (work) [Wed, 8 Nov 2017 13:35:52 +0000 (14:35 +0100)] 
Babel: Fix handling of seqno requests

Old behavior has several deficiencies compared to standard behavior
(no triggered updates for replies, no retransmissions, ...).

6 years agoBabel: Fix handling of IPv4 retractions
Ondrej Zajicek (work) [Wed, 8 Nov 2017 13:15:11 +0000 (14:15 +0100)] 
Babel: Fix handling of IPv4 retractions

Babel TLV parsing code rejected IPv4 retractions without next-hop,
although next-hop is needed just for regular updates.

6 years agoBabel: Remove babel_proto ptr from babel_entry
Ondrej Zajicek (work) [Fri, 27 Oct 2017 10:20:58 +0000 (12:20 +0200)] 
Babel: Remove babel_proto ptr from babel_entry

6 years agoBabel: Fix hello timeout for short hello intervals
Ondrej Zajicek (work) [Wed, 25 Oct 2017 15:59:57 +0000 (17:59 +0200)] 
Babel: Fix hello timeout for short hello intervals

6 years agoBabel: Revamp cost computation and run route selection when cost change
Ondrej Zajicek (work) [Wed, 25 Oct 2017 15:14:08 +0000 (17:14 +0200)] 
Babel: Revamp cost computation and run route selection when cost change

Also fix several minor bugs and add 'limit' option for k-out-of-j
link sensing strategy. Change default from 8-of-16 to 12-of-16.
Change IHU expiry factor from 1.5 to 3.5 (as in RFC 6126).

6 years agoBabel: Fix unicast seqno requests
Ondrej Zajicek (work) [Fri, 13 Oct 2017 21:46:41 +0000 (23:46 +0200)] 
Babel: Fix unicast seqno requests

6 years agoBabel: Avoid batch seqno updates
Ondrej Zajicek (work) [Fri, 13 Oct 2017 17:34:34 +0000 (19:34 +0200)] 
Babel: Avoid batch seqno updates

6 years agoBabel: Fix Hello and IHU expiration
Ondrej Zajicek (work) [Fri, 13 Oct 2017 17:33:42 +0000 (19:33 +0200)] 
Babel: Fix Hello and IHU expiration

6 years agoBabel: Update to new timers
Ondrej Zajicek (work) [Fri, 13 Oct 2017 10:34:08 +0000 (12:34 +0200)] 
Babel: Update to new timers

6 years agoSysdep: Remove old timer code
Ondrej Zajicek (work) [Wed, 21 Jun 2017 13:38:11 +0000 (15:38 +0200)] 
Sysdep: Remove old timer code

6 years agoNest: Update to new timers
Ondrej Zajicek (work) [Wed, 21 Jun 2017 12:43:49 +0000 (14:43 +0200)] 
Nest: Update to new timers

6 years agoBGP: Update to new timers
Ondrej Zajicek (work) [Wed, 21 Jun 2017 12:14:51 +0000 (14:14 +0200)] 
BGP: Update to new timers

6 years agoOSPF: Update to new timers
Ondrej Zajicek (work) [Tue, 20 Jun 2017 16:03:06 +0000 (18:03 +0200)] 
OSPF: Update to new timers

Note that recurrent timers are currently limited to ~1 hour.

6 years agoTimers: Add typecast to unit-converting macros
Ondrej Zajicek (work) [Tue, 20 Jun 2017 13:55:39 +0000 (15:55 +0200)] 
Timers: Add typecast to unit-converting macros

6 years agoRIP: Update to new timers
Ondrej Zajicek (work) [Tue, 20 Jun 2017 12:30:44 +0000 (14:30 +0200)] 
RIP: Update to new timers

6 years agoRAdv: Update to new timers
Ondrej Zajicek (work) [Wed, 14 Jun 2017 15:02:11 +0000 (17:02 +0200)] 
RAdv: Update to new timers

6 years agoRPKI: Update to new timers
Ondrej Zajicek (work) [Wed, 14 Jun 2017 14:32:15 +0000 (16:32 +0200)] 
RPKI: Update to new timers

6 years agoKernel: Update to new timers
Ondrej Zajicek (work) [Wed, 14 Jun 2017 11:15:35 +0000 (13:15 +0200)] 
Kernel: Update to new timers

6 years agoTimers: Show sub-second times in some protocol outputs
Ondrej Zajicek (work) [Tue, 13 Jun 2017 14:52:21 +0000 (16:52 +0200)] 
Timers: Show sub-second times in some protocol outputs

6 years agoTimers: Fix tests after timer change
Ondrej Zajicek (work) [Tue, 13 Jun 2017 13:55:13 +0000 (15:55 +0200)] 
Timers: Fix tests after timer change

6 years agoPrintf: Add support for microsecond times
Ondrej Zajicek (work) [Tue, 13 Jun 2017 13:41:49 +0000 (15:41 +0200)] 
Printf: Add support for microsecond times

Use '%t' in bsnprintf() for microsecond times (in btime) with variable
sub-second precision.

6 years agoTimers: Parse and format functions for microsecond times
Ondrej Zajicek (work) [Tue, 6 Jun 2017 14:47:30 +0000 (16:47 +0200)] 
Timers: Parse and format functions for microsecond times

Date/time output (e.g. in logs, show commands) can use %f to specify
subsecond time. By default, millisecond precision is used in output.

6 years agoTimers: Replace old timers with microsecond timers
Ondrej Zajicek (work) [Thu, 1 Jun 2017 10:33:20 +0000 (12:33 +0200)] 
Timers: Replace old timers with microsecond timers

The old timer interface is still kept, but implemented by new timers. The
plan is to switch from the old inteface to the new interface, then clean
it up.

6 years agoTimers: Integrate microsecond timers to the main loop
Ondrej Zajicek (work) [Wed, 31 May 2017 13:46:04 +0000 (15:46 +0200)] 
Timers: Integrate microsecond timers to the main loop

6 years agoTimers: Split microsecond timers from BFD code to lib
Ondrej Zajicek (work) [Tue, 30 May 2017 17:12:35 +0000 (19:12 +0200)] 
Timers: Split microsecond timers from BFD code to lib

6 years agoBSD: Minor fix of penultimate commit
Ondrej Zajicek (work) [Thu, 7 Dec 2017 12:44:00 +0000 (13:44 +0100)] 
BSD: Minor fix of penultimate commit

6 years agoKRT: Minor fix of last commit
Ondrej Zajicek (work) [Thu, 7 Dec 2017 12:28:24 +0000 (13:28 +0100)] 
KRT: Minor fix of last commit

6 years agoNest: Maintain separate IPv4, IPv6 and LLv6 preferred addresses
Ondrej Zajicek (work) [Thu, 7 Dec 2017 12:06:01 +0000 (13:06 +0100)] 
Nest: Maintain separate IPv4, IPv6 and LLv6 preferred addresses

Also redesign preferred address selection and update protocols to use
appropriate preferred address.

Based on a previous work by Jan Maria Matejka.

6 years agoBabel: Parse flags in Hello TLV
Ondrej Zajicek (work) [Tue, 28 Nov 2017 18:33:33 +0000 (19:33 +0100)] 
Babel: Parse flags in Hello TLV

RFC6126bis introduces a flags field for the Hello TLV, and adds a unicast flag
that is used to signify that a hello was sent as unicast. This adds parsing of
the flags field and ignores such unicast hellos, which preserves compatibility
until we can add a proper implementation of the unicast hello mechanism.

Thanks to Toke Hoiland-Jorgensen for the patch.

6 years agoFilter test: typo fix
Jan Maria Matejka [Thu, 9 Nov 2017 14:04:05 +0000 (15:04 +0100)] 
Filter test: typo fix

6 years agoBabel: Interface address irrelevant for interface pattern matching.
Jan Maria Matejka [Tue, 22 Aug 2017 11:47:01 +0000 (13:47 +0200)] 
Babel: Interface address irrelevant for interface pattern matching.

6 years agoIface address debug dump fix
Jan Moskyto Matejka [Mon, 21 Aug 2017 12:14:07 +0000 (14:14 +0200)] 
Iface address debug dump fix

6 years agoOSPF: Add option to disable OSPFv3-AF
Ondrej Zajicek (work) [Tue, 10 Oct 2017 14:07:54 +0000 (16:07 +0200)] 
OSPF: Add option to disable OSPFv3-AF

6 years agoOSPF: Fix minor issue in TTL check
Ondrej Zajicek (work) [Mon, 9 Oct 2017 19:11:53 +0000 (21:11 +0200)] 
OSPF: Fix minor issue in TTL check

The TTL check must be done after instance ID dispatch to avoid warnings
when a physical iface is shared by multiple instances and some use TTL
security and some not.

6 years agoOSPF: Fix next hop calculation for PtP links in IPv4 OSPFv3-AF
Ondrej Zajicek (work) [Mon, 9 Oct 2017 18:36:14 +0000 (20:36 +0200)] 
OSPF: Fix next hop calculation for PtP links in IPv4 OSPFv3-AF

In such case, next hop has to be taken from Link-LSA like in broadcast
case, not from neighbor source address like in other PtP cases.

Also add some checks, comments and code cleanup.

6 years agoOSPF: Support of address families in OSPFv3
Ondrej Zajicek (work) [Sun, 8 Oct 2017 23:16:29 +0000 (01:16 +0200)] 
OSPF: Support of address families in OSPFv3

OSPFv3-AF can handle multiple topologies of diferent address families
(IPv4, IPv6, both unicast and multicast) using separate instances
distinguished by instance ID ranges.

6 years agoDoc: Update sgml2* tools
Ondrej Zajicek (work) [Tue, 10 Oct 2017 13:06:39 +0000 (15:06 +0200)] 
Doc: Update sgml2* tools

The old ones do not work on current Debian.

6 years agoDoc: Fix reference
Ondrej Zajicek (work) [Tue, 10 Oct 2017 11:27:03 +0000 (13:27 +0200)] 
Doc: Fix reference

6 years agoRAdv: Documentation for more specific routes
Michal 'vorner' Vaner [Tue, 19 Sep 2017 15:23:31 +0000 (17:23 +0200)] 
RAdv: Documentation for more specific routes

6 years agoRAdv: Change specific route options to be per-interface
Ondrej Zajicek (work) [Fri, 6 Oct 2017 10:22:18 +0000 (12:22 +0200)] 
RAdv: Change specific route options to be per-interface

And change default values of specific route options to be consistent with
values of default router options.

6 years agoRAdv: Support for more specific routes (RFC 4191)
Michal 'vorner' Vaner [Thu, 31 Aug 2017 13:40:23 +0000 (15:40 +0200)] 
RAdv: Support for more specific routes (RFC 4191)

The patch implements Default Router Preferences and More-Specific Routes
(RFC 4191) for RAdv protocol, allowing to announce router preference and
more specific routes in router advertisements. Routes can be exported to
RAdv like to regular routing protocols.

Some cleanups, bugfixes and other changes done by Ondrej Zajicek.

6 years agofilter: Allow assigning enums into extended attributes
Michal 'vorner' Vaner [Tue, 5 Sep 2017 13:50:00 +0000 (15:50 +0200)] 
filter: Allow assigning enums into extended attributes

They are internally ints, but they got refused as a wrong type. This
fixes setting of the BGP origin and is also needed for RA.

6 years agoBGP: Shutdown communication (RFC 8203)
Ondrej Zajicek (work) [Tue, 19 Sep 2017 17:55:37 +0000 (19:55 +0200)] 
BGP: Shutdown communication (RFC 8203)

The patch implements BGP Administrative Shutdown Communication (RFC 8203)
allowing BGP operators to pass messages related to BGP session
administrative shutdown/restart. It handles both transmit and receive of
shutdown messages. Messages are logged and may be displayed by show
protocol all command.

Thanks to Job Snijders for the basic patch.

6 years agoDocs: FIB iteration macros
Michal 'vorner' Vaner [Thu, 14 Sep 2017 10:31:15 +0000 (12:31 +0200)] 
Docs: FIB iteration macros

6 years agoDoc: Document 'empty' operator
Ondrej Zajicek (work) [Wed, 13 Sep 2017 11:10:50 +0000 (13:10 +0200)] 
Doc: Document 'empty' operator

Thanks to Alexander Zubkov for the notification.

6 years agoBackport some minor changes from int-new
Ondrej Zajicek (work) [Tue, 12 Sep 2017 14:33:29 +0000 (16:33 +0200)] 
Backport some minor changes from int-new