Ferry Huberts [Fri, 6 Nov 2015 14:22:10 +0000 (15:22 +0100)]
olsr_exit: protect against a NULL message
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 6 Nov 2015 14:21:53 +0000 (15:21 +0100)]
olsr_exit: protect against a NULL olsr_cnf
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 5 Nov 2015 16:35:14 +0000 (17:35 +0100)]
jsoninfo: also output SmartGatewayInstanceId
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 5 Nov 2015 21:01:26 +0000 (22:01 +0100)]
sgw: invoke the cleanup mode of the policy script on start and stop
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 5 Nov 2015 18:05:44 +0000 (19:05 +0100)]
sgw: policy script: log invocations and add cleanup mode
All non-cleanup invocations with addMode 'add' are logged into a log file.
In addMode 'add' the cleanup mode walks the invocations in the log file
in reverse order in order to undo them.
In addMode 'del' the cleanup mode just removes the log file.
In a later patch olsrd will invoke the cleanup mode before starting
installation of multi-gateway iptables and ip rules and after
removing multi-gateway iptables and ip rules.
This is useful when olsrd crashes and leaves behind multi-gateway
iptables and ip rules: the next start of olsrd will first cleanup
those before configuring new multi-gateway iptables and ip rules.
Also, manually invoking the cleanup mode will obviously do the
same.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 5 Nov 2015 17:49:18 +0000 (18:49 +0100)]
sgw: policy script: add the instance id to the script
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 5 Nov 2015 16:46:32 +0000 (17:46 +0100)]
sgw: add SmartGatewayInstanceId setting
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 6 Nov 2015 11:08:37 +0000 (12:08 +0100)]
cfg: fix printing of a few <not set> settings
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 6 Nov 2015 10:25:48 +0000 (11:25 +0100)]
dyn_gw: fix a mistake in
36111ca
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 5 Nov 2015 16:37:19 +0000 (17:37 +0100)]
cfg: minor fixup to printing of SmartGatewayPolicyRoutingScript
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 5 Nov 2015 17:24:30 +0000 (18:24 +0100)]
sgw: policy script: fix cosmetic rebase issue of the previous commit
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 5 Nov 2015 15:08:52 +0000 (16:08 +0100)]
sgw: policy script: minor improvement
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 5 Nov 2015 12:14:35 +0000 (13:14 +0100)]
sgw: policy script: move some declarations
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 5 Nov 2015 12:11:38 +0000 (13:11 +0100)]
sgw: policy script: fix some comparisons
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 5 Nov 2015 10:36:08 +0000 (11:36 +0100)]
sgw: policy script: fix error reports when too many arguments
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 4 Nov 2015 14:36:32 +0000 (15:36 +0100)]
sgw: do not program routes on interfaces that are not up
This doesn't work and then spams the log.
Discovered when the best (selected) egress interface was brought
down and olsrd tried to remove the routes on that interface
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Sun, 18 Oct 2015 18:17:58 +0000 (20:17 +0200)]
Merge branch 'release-0.9.0'
* release-0.9.0:
quagga: restore socket status on error paths in zclient_read function
quagga: zero-out the extra allocated buffer size
cookie: fix loop invariant assert and exit on cookie exhaustion
conf: clean up interface names on config file read failure
Ferry Huberts [Sat, 17 Oct 2015 20:41:29 +0000 (22:41 +0200)]
quagga: restore socket status on error paths in zclient_read function
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Oct 2015 17:57:47 +0000 (19:57 +0200)]
quagga: zero-out the extra allocated buffer size
Might fix a Coverity warning
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Sun, 18 Oct 2015 18:10:09 +0000 (20:10 +0200)]
cookie: fix loop invariant assert and exit on cookie exhaustion
Fixes a Coverity warning
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Oct 2015 12:41:59 +0000 (14:41 +0200)]
conf: clean up interface names on config file read failure
==12076==ERROR: LeakSanitizer: detected memory leaks
Direct leak of 7 byte(s) in 1 object(s) allocated from:
#0 0x499bba in __interceptor_malloc (/home/ferry/vcs/nbs/nbsolsrd/olsrd+0x499bba)
#1 0x5784cd in get_string_token src/cfgparser/oscan.lex:92
#2 0x578ef7 in yylex src/cfgparser/oscan.lex:185
#3 0x5699c4 in yyparse src/cfgparser/oparse.c:1686
#4 0x55e322 in olsrd_parse_cnf src/cfgparser/olsrd_conf.c:158
#5 0x4edf56 in olsrmain_load_config src/main.c:281
#6 0x4ee5e6 in main src/main.c:386
#7 0x7fd24079757f in __libc_start_main (/lib64/libc.so.6+0x2057f)
SUMMARY: AddressSanitizer: 7 byte(s) leaked in 1 allocation(s).
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Oct 2015 17:57:47 +0000 (19:57 +0200)]
quagga: zero-out the extra allocated buffer size
Might fix a Coverity warning
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Oct 2015 17:28:35 +0000 (19:28 +0200)]
Merge branch 'release-0.9.0'
* release-0.9.0:
sgw: fix EOL stripping of the egress file
sgwdynspeed: let the out block close the file
Ferry Huberts [Thu, 15 Oct 2015 17:28:03 +0000 (19:28 +0200)]
sgw: fix EOL stripping of the egress file
Fixes a Coverity warning
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Oct 2015 17:15:49 +0000 (19:15 +0200)]
sgwdynspeed: let the out block close the file
Fixes a Coverity warning
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Oct 2015 12:59:08 +0000 (14:59 +0200)]
Merge branch 'release-0.9.0'
* release-0.9.0:
sgw: properly open and stat the egress file
sgw: do not clear egress data in the read race
sgw: properly close the egress file
sgw: remove unneeded check against 0 for cached timestamp
sgw: cache the correct timestamp
sgw: cache timestamp of egress file earlier
sgwdynspeed: cache the correct timestamp
sgwdynspeed: properly close the speed file
sgwdynspeed: increase the resolution of the cached timestamp
sgwdynspeed: clear the cached timestamp when the speed file can't be read
pud: cache the correct timestamp
pud: minor fix in the function reading the position file
pud: increase the resolution of the cached timestamp of the position file
pud: clear the cached timestamp when the position file can't be read
egressFile: use a define for the line length
Ferry Huberts [Thu, 15 Oct 2015 10:49:05 +0000 (12:49 +0200)]
sgw: properly open and stat the egress file
Makes the handling the same as pud and sgwdynspeed handle their files.
Also fixes a Coverity warning.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Oct 2015 10:24:15 +0000 (12:24 +0200)]
sgw: do not clear egress data in the read race
This section of code can race but we'll just try again in the next
cycle, so there is no need to clear the egress data.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Oct 2015 10:47:11 +0000 (12:47 +0200)]
sgw: properly close the egress file
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Oct 2015 10:44:00 +0000 (12:44 +0200)]
sgw: remove unneeded check against 0 for cached timestamp
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Oct 2015 09:58:44 +0000 (11:58 +0200)]
sgw: cache the correct timestamp
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Oct 2015 09:53:36 +0000 (11:53 +0200)]
sgw: cache timestamp of egress file earlier
Before we go into the reading loop, because we assume that the
contents of the valid is valid. And when it's not valid then the
timestamp of the file has to change before we should try to read
it again.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Oct 2015 09:58:17 +0000 (11:58 +0200)]
sgwdynspeed: cache the correct timestamp
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Oct 2015 08:39:12 +0000 (10:39 +0200)]
sgwdynspeed: properly close the speed file
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Oct 2015 10:40:13 +0000 (12:40 +0200)]
sgwdynspeed: increase the resolution of the cached timestamp
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 14 Oct 2015 11:28:19 +0000 (13:28 +0200)]
sgwdynspeed: clear the cached timestamp when the speed file can't be read
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Oct 2015 09:57:39 +0000 (11:57 +0200)]
pud: cache the correct timestamp
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Oct 2015 08:38:26 +0000 (10:38 +0200)]
pud: minor fix in the function reading the position file
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Oct 2015 10:38:29 +0000 (12:38 +0200)]
pud: increase the resolution of the cached timestamp of the position file
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 14 Oct 2015 11:16:12 +0000 (13:16 +0200)]
pud: clear the cached timestamp when the position file can't be read
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 14 Oct 2015 10:16:21 +0000 (12:16 +0200)]
egressFile: use a define for the line length
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Oct 2015 12:45:03 +0000 (14:45 +0200)]
Merge branch 'release-0.9.0'
* release-0.9.0:
sgw: add SmartGatewayMaxCostMaxEtx configuration setting
files: minor improvement to config file generation script
files: regenerate the generated default full configuration
Ferry Huberts [Tue, 13 Oct 2015 10:42:21 +0000 (12:42 +0200)]
sgw: add SmartGatewayMaxCostMaxEtx configuration setting
SmartGatewayMaxCostMaxEtx: When a node advertises the maximum bandwidth
and its ETX is below the value of this setting then the resulting gateway
costs are equal to the ETX, otherwise the normal calculation of the
gateway costs applies (default is 2560).
This avoids instability in the mesh when a far-away node advertises
maximum bandwidth.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 13 Oct 2015 10:34:56 +0000 (12:34 +0200)]
files: minor improvement to config file generation script
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 3 Aug 2015 10:12:21 +0000 (12:12 +0200)]
files: regenerate the generated default full configuration
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 14 Oct 2015 07:42:20 +0000 (09:42 +0200)]
Merge branch 'release-0.9.0'
* release-0.9.0:
txtinfo: similar fix as the previous commit
jsoninfo: fix a Coverity warning
Ferry Huberts [Tue, 29 Sep 2015 11:36:42 +0000 (13:36 +0200)]
txtinfo: similar fix as the previous commit
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 29 Sep 2015 11:24:24 +0000 (13:24 +0200)]
jsoninfo: fix a Coverity warning
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 13 Oct 2015 10:42:21 +0000 (12:42 +0200)]
sgw: add SmartGatewayMaxCostMaxEtx configuration setting
SmartGatewayMaxCostMaxEtx: When a node advertises the maximum bandwidth
and its ETX is below the value of this setting then the resulting gateway
costs are equal to the ETX, otherwise the normal calculation of the
gateway costs applies (default is 2560).
This avoids instability in the mesh when a far-away node advertises
maximum bandwidth.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 13 Oct 2015 10:34:56 +0000 (12:34 +0200)]
files: minor improvement to config file generation script
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 5 Oct 2015 07:36:32 +0000 (09:36 +0200)]
make: add NOSTRIP option
We have olsrd crashing on us, but only the release (non-debug) build.
In order to be able to get more useable information from the segfault
we temporarily need symbols in the the binary. Add this option to do
just that.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 29 Sep 2015 11:36:42 +0000 (13:36 +0200)]
txtinfo: similar fix as the previous commit
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 29 Sep 2015 11:24:24 +0000 (13:24 +0200)]
jsoninfo: fix a Coverity warning
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 28 Sep 2015 08:10:13 +0000 (10:10 +0200)]
Merge branch 'release-0.9.0'
* release-0.9.0:
Update version after release of v0.9.0.3
Release v0.9.0.3
Handle interface broadcast/multicast address zero
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 28 Sep 2015 08:08:41 +0000 (10:08 +0200)]
Merge branch 'release-0.6.8'
* release-0.6.8:
Fixup CHANGELOG file
Update version after release of v0.6.8.1
Release v0.6.8.1
Handle interface broadcast/multicast address zero
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 28 Sep 2015 08:05:48 +0000 (10:05 +0200)]
Fixup CHANGELOG file
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Henning Rogge [Sun, 20 Sep 2015 12:22:27 +0000 (14:22 +0200)]
Update version after release of v0.9.0.3
Signed-off-by: Henning Rogge <hrogge@gmail.com>
Henning Rogge [Sun, 20 Sep 2015 12:22:23 +0000 (14:22 +0200)]
Release v0.9.0.3
Signed-off-by: Henning Rogge <hrogge@gmail.com>
Henning Rogge [Sun, 20 Sep 2015 12:16:04 +0000 (14:16 +0200)]
Update version after release of v0.6.8.1
Signed-off-by: Henning Rogge <hrogge@gmail.com>
Henning Rogge [Sun, 20 Sep 2015 12:15:43 +0000 (14:15 +0200)]
Release v0.6.8.1
Signed-off-by: Henning Rogge <hrogge@gmail.com>
Henning Rogge [Thu, 3 Sep 2015 17:46:54 +0000 (19:46 +0200)]
Handle interface broadcast/multicast address zero
Henning Rogge [Thu, 3 Sep 2015 17:46:54 +0000 (19:46 +0200)]
Handle interface broadcast/multicast address zero
Henning Rogge [Thu, 3 Sep 2015 17:46:54 +0000 (19:46 +0200)]
Handle interface broadcast/multicast address zero
Ferry Huberts [Mon, 3 Aug 2015 10:12:21 +0000 (12:12 +0200)]
files: regenerate the generated default full configuration
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 9 Jul 2015 06:32:09 +0000 (08:32 +0200)]
Merge branch 'release-0.9.0'
* release-0.9.0:
Makefile.osx: create .dylibs
Alex Dunn [Wed, 8 Jul 2015 17:05:00 +0000 (10:05 -0700)]
Makefile.osx: create .dylibs
Ferry Huberts [Tue, 30 Jun 2015 15:05:12 +0000 (17:05 +0200)]
Merge branch 'release-0.9.0'
* release-0.9.0:
Fix CHANGELOG
Update version after release of v0.9.0.2
Release v0.9.0.2
release: fix release script
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 30 Jun 2015 15:04:14 +0000 (17:04 +0200)]
Fix CHANGELOG
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Henning Rogge [Tue, 30 Jun 2015 15:00:50 +0000 (17:00 +0200)]
Update version after release of v0.9.0.2
Signed-off-by: Henning Rogge <hrogge@gmail.com>
Henning Rogge [Tue, 30 Jun 2015 15:00:31 +0000 (17:00 +0200)]
Release v0.9.0.2
Signed-off-by: Henning Rogge <hrogge@gmail.com>
Ferry Huberts [Tue, 30 Jun 2015 14:57:18 +0000 (16:57 +0200)]
release: fix release script
The tag matcher was too tight. The tightness is taken care of by the
grep regular expression.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 19 Jun 2015 16:36:55 +0000 (18:36 +0200)]
Merge branch 'release-0.9.0'
* release-0.9.0:
txtinfo: fix a crash when there are no gateways
jsoninfo: fix a crash when there are no gateways
conf: lock_file is derived config.
Update version after release of v0.9.0.1
Release v0.9.0.1
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 19 Jun 2015 16:13:31 +0000 (18:13 +0200)]
txtinfo: fix a crash when there are no gateways
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 19 Jun 2015 16:12:04 +0000 (18:12 +0200)]
jsoninfo: fix a crash when there are no gateways
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 19 Jun 2015 12:03:02 +0000 (14:03 +0200)]
conf: lock_file is derived config.
Hi!
We're running two OLSRd instances on our routers (one IPv4, one IPv6).
0.9.x breaks with that setup since there seems to be a bug that causes
the default lockfile name always set to be "olsrd-ipv4.lock".
This bug seems to have been introduced in
http://www.olsr.org/git/?p=olsrd.git;a=commitdiff;h=
089c78e208dcb0802ce93f47554a502ab8b77be5
olsrd_get_default_lockfile()
http://www.olsr.org/git/?p=olsrd.git;a=blob;f=src/cfgparser/olsrd_conf.c;h=
30e2829cfd1be2717fc25639a9cbdb0da5fea466;hb=
089c78e208dcb0802ce93f47554a502ab8b77be5#l976
always sees cnf->ip_version==AF_INET, as that's the default that was
just set in line 932.
Reported-by: Malte <freifunk@antenne.yagii.de>
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 19 Jun 2015 16:13:31 +0000 (18:13 +0200)]
txtinfo: fix a crash when there are no gateways
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 19 Jun 2015 16:12:04 +0000 (18:12 +0200)]
jsoninfo: fix a crash when there are no gateways
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 19 Jun 2015 12:03:02 +0000 (14:03 +0200)]
conf: lock_file is derived config.
Hi!
We're running two OLSRd instances on our routers (one IPv4, one IPv6).
0.9.x breaks with that setup since there seems to be a bug that causes
the default lockfile name always set to be "olsrd-ipv4.lock".
This bug seems to have been introduced in
http://www.olsr.org/git/?p=olsrd.git;a=commitdiff;h=
089c78e208dcb0802ce93f47554a502ab8b77be5
olsrd_get_default_lockfile()
http://www.olsr.org/git/?p=olsrd.git;a=blob;f=src/cfgparser/olsrd_conf.c;h=
30e2829cfd1be2717fc25639a9cbdb0da5fea466;hb=
089c78e208dcb0802ce93f47554a502ab8b77be5#l976
always sees cnf->ip_version==AF_INET, as that's the default that was
just set in line 932.
Reported-by: Malte <freifunk@antenne.yagii.de>
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Henning Rogge [Thu, 18 Jun 2015 17:21:54 +0000 (19:21 +0200)]
Update version after release of v0.9.0.1
Signed-off-by: Henning Rogge <hrogge@gmail.com>
Henning Rogge [Thu, 18 Jun 2015 17:21:49 +0000 (19:21 +0200)]
Release v0.9.0.1
Signed-off-by: Henning Rogge <hrogge@gmail.com>
Ferry Huberts [Thu, 18 Jun 2015 07:56:54 +0000 (09:56 +0200)]
Merge branch 'release-0.9.0'
* release-0.9.0:
txtinfo: jsoninfo: do not output smart-gateway info when not enabled.
jsoninfo: do not output smart-gateway info when not enabled.
Ferry Huberts [Tue, 16 Jun 2015 20:32:39 +0000 (22:32 +0200)]
txtinfo: jsoninfo: do not output smart-gateway info when not enabled.
Fixes a crash when smart-gateway is not enabled.
Reported-by: Anreas Brau <ab@andi95.de>
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 16 Jun 2015 20:32:26 +0000 (22:32 +0200)]
jsoninfo: do not output smart-gateway info when not enabled.
Fixes a crash when smart-gateway is not enabled.
Reported-by: Anreas Brau <ab@andi95.de>
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 15 Jun 2015 07:49:18 +0000 (09:49 +0200)]
Merge branch 'release-0.6.8'
* release-0.6.8:
neighbors: signal link changes when deleting a neighbor
Ferry Huberts [Sat, 13 Jun 2015 11:30:49 +0000 (13:30 +0200)]
neighbors: signal link changes when deleting a neighbor
Reported-by: Koen Swinters <Koen.Swinters@otnsystems.com>
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 15 Jun 2015 07:19:15 +0000 (09:19 +0200)]
Merge branch 'release-0.9.0'
* release-0.9.0:
neighbors: signal link changes when deleting a neighbor
Update version after release of v0.9.0
Release v0.9.0
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Sat, 13 Jun 2015 11:30:49 +0000 (13:30 +0200)]
neighbors: signal link changes when deleting a neighbor
Reported-by: Koen Swinters <Koen.Swinters@otnsystems.com>
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Henning Rogge [Sun, 7 Jun 2015 19:24:10 +0000 (21:24 +0200)]
Update version after release of v0.9.0
Signed-off-by: Henning Rogge <hrogge@gmail.com>
Henning Rogge [Sun, 7 Jun 2015 19:24:05 +0000 (21:24 +0200)]
Release v0.9.0
Signed-off-by: Henning Rogge <hrogge@gmail.com>
Ferry Huberts [Wed, 27 May 2015 13:36:12 +0000 (15:36 +0200)]
Update version after branch of v0.9.0
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 27 May 2015 13:36:12 +0000 (15:36 +0200)]
Branch v0.9.0
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 27 May 2015 13:23:11 +0000 (15:23 +0200)]
Merge branch 'release-0.6.8'
* release-0.6.8:
autobuf: fix warning in Windows release builds
release: stricter matching of release tags
tc: properly initialise the path_costs field in a new tc
pud: wireformat-java: improve java detection
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 27 May 2015 13:22:44 +0000 (15:22 +0200)]
Merge branch 'release-0.6.7'
* release-0.6.7:
Rename 'struct interface' to 'struct interface_olsr'
build: add some pud targets
build: uberclean must also remove builddata.txt
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 27 May 2015 13:02:35 +0000 (15:02 +0200)]
autobuf: fix warning in Windows release builds
Happens on Fedora 22 with GCC 5:
x86_64-w64-mingw32-gcc (GCC) 5.1.0
20150422 (Fedora MinGW 5.1.0-1.fc22)
src/common/autobuf.c: In function 'abuf_strftime':
src/common/autobuf.c:223:1: warning: assuming signed overflow does not occur when assuming that (X + c) >= X is always true [-Wstrict-overflow]
}
^
src/common/autobuf.c:92:6: warning: assuming signed overflow does not occur when assuming that (X + c) >= X is always true [-Wstrict-overflow]
if (new_size > autobuf->size) {
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 27 May 2015 12:15:41 +0000 (14:15 +0200)]
release: stricter matching of release tags
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Daniel Golle [Fri, 15 May 2015 19:47:25 +0000 (21:47 +0200)]
plugins: fix precompiled syntax
use '||' instead of 'or'
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Daniel Golle [Fri, 15 May 2015 19:38:57 +0000 (21:38 +0200)]
plugins: use previous definition of struct udphdr on Android
Test for __BIONIC__ as well.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Daniel Golle [Fri, 15 May 2015 19:32:35 +0000 (21:32 +0200)]
plugins: fix build on some glibc systems
The previous commit was made under the assumption that all
versions of glibc provides both definitions of struct udphdr.
This doesn't seem to be true, thus test for __GLIBC__ (which
is set by uClibc as well) to be on the safe side.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Daniel Golle [Fri, 15 May 2015 17:06:56 +0000 (19:06 +0200)]
plugins: fix build with musl
Introduce checks for __UCLIBC__ to compensate for
incompatible definitions of struct udphdr present in
different libc.
glibc provides both field nameing styles, afaik all
libcs except for uClibc provide the POSIX definition.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Ferry Huberts [Mon, 11 May 2015 13:56:48 +0000 (15:56 +0200)]
pud: doc: update the documentation
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Repositories / olsrd.git / log