olsrd.git
4 years agocfg: minor fixup to printing of SmartGatewayPolicyRoutingScript
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>
4 years agosgw: policy script: fix cosmetic rebase issue of the previous commit
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>
4 years agosgw: policy script: minor improvement
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>
4 years agosgw: policy script: move some declarations
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>
4 years agosgw: policy script: fix some comparisons
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>
4 years agosgw: policy script: fix error reports when too many arguments
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>
4 years agosgw: do not program routes on interfaces that are not up
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>
4 years agoMerge branch 'release-0.9.0'
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

4 years agoquagga: restore socket status on error paths in zclient_read function
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>
4 years agoquagga: zero-out the extra allocated buffer size
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>
4 years agocookie: fix loop invariant assert and exit on cookie exhaustion
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>
4 years agoconf: clean up interface names on config file read failure
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>
4 years agoquagga: zero-out the extra allocated buffer size
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>
4 years agoMerge branch 'release-0.9.0'
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

4 years agosgw: fix EOL stripping of the egress 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>
4 years agosgwdynspeed: let the out block close the file
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>
4 years agoMerge branch 'release-0.9.0'
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

4 years agosgw: properly open and stat the egress file
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>
4 years agosgw: do not clear egress data in the read race
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>
4 years agosgw: properly close the egress file
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>
4 years agosgw: remove unneeded check against 0 for cached timestamp
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>
4 years agosgw: cache the correct timestamp
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>
4 years agosgw: cache timestamp of egress file earlier
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>
4 years agosgwdynspeed: cache the correct timestamp
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>
4 years agosgwdynspeed: properly close the speed file
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>
4 years agosgwdynspeed: increase the resolution of the cached timestamp
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>
4 years agosgwdynspeed: clear the cached timestamp when the speed file can't be read
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>
4 years agopud: cache the correct timestamp
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>
4 years agopud: minor fix in the function reading the position file
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>
4 years agopud: increase the resolution of the cached timestamp of the position file
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>
4 years agopud: clear the cached timestamp when the position file can't be read
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>
4 years agoegressFile: use a define for the line length
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>
4 years agoMerge branch 'release-0.9.0'
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

4 years agosgw: add SmartGatewayMaxCostMaxEtx configuration setting
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>
4 years agofiles: minor improvement to config file generation script
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>
4 years agofiles: regenerate the generated default full configuration
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>
4 years agoMerge branch 'release-0.9.0'
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

4 years agotxtinfo: similar fix as the previous commit
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>
4 years agojsoninfo: fix a Coverity warning
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>
4 years agosgw: add SmartGatewayMaxCostMaxEtx configuration setting
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>
4 years agofiles: minor improvement to config file generation script
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>
4 years agomake: add NOSTRIP option
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>
5 years agotxtinfo: similar fix as the previous commit
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>
5 years agojsoninfo: fix a Coverity warning
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>
5 years agoMerge branch 'release-0.9.0'
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>
5 years agoMerge branch 'release-0.6.8'
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>
5 years agoFixup CHANGELOG file v0.6.8-eol
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>
5 years agoUpdate version after release of v0.9.0.3
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>
5 years agoRelease v0.9.0.3 v0.9.0.3
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>
5 years agoUpdate version after release of v0.6.8.1
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>
5 years agoRelease v0.6.8.1 v0.6.8.1
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>
5 years agoHandle interface broadcast/multicast address zero
Henning Rogge [Thu, 3 Sep 2015 17:46:54 +0000 (19:46 +0200)]
Handle interface broadcast/multicast address zero

5 years agoHandle interface broadcast/multicast address zero
Henning Rogge [Thu, 3 Sep 2015 17:46:54 +0000 (19:46 +0200)]
Handle interface broadcast/multicast address zero

5 years agoHandle interface broadcast/multicast address zero
Henning Rogge [Thu, 3 Sep 2015 17:46:54 +0000 (19:46 +0200)]
Handle interface broadcast/multicast address zero

5 years agofiles: regenerate the generated default full configuration
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>
5 years agoMerge branch 'release-0.9.0'
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

5 years agoMakefile.osx: create .dylibs
Alex Dunn [Wed, 8 Jul 2015 17:05:00 +0000 (10:05 -0700)]
Makefile.osx: create .dylibs

5 years agoMerge branch 'release-0.9.0'
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>
5 years agoFix CHANGELOG
Ferry Huberts [Tue, 30 Jun 2015 15:04:14 +0000 (17:04 +0200)]
Fix CHANGELOG

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agoUpdate version after release of v0.9.0.2
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>
5 years agoRelease v0.9.0.2 v0.9.0.2
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>
5 years agorelease: fix release script
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>
5 years agoMerge branch 'release-0.9.0'
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>
5 years agotxtinfo: fix a crash when there are no gateways
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>
5 years agojsoninfo: fix a crash when there are no gateways
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>
5 years agoconf: lock_file is derived config.
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>
5 years agotxtinfo: fix a crash when there are no gateways
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>
5 years agojsoninfo: fix a crash when there are no gateways
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>
5 years agoconf: lock_file is derived config.
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>
5 years agoUpdate version after release of v0.9.0.1
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>
5 years agoRelease v0.9.0.1 v0.9.0.1
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>
5 years agoMerge branch 'release-0.9.0'
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.

5 years agotxtinfo: 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>
5 years agojsoninfo: do not output smart-gateway info when not enabled.
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>
5 years agoMerge branch 'release-0.6.8'
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

5 years agoneighbors: 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>
5 years agoMerge branch 'release-0.9.0'
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>
5 years agoneighbors: 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>
5 years agoUpdate version after release of v0.9.0
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>
5 years agoRelease v0.9.0 v0.9.0
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>
5 years agoUpdate version after branch of v0.9.0
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>
5 years agoBranch v0.9.0
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>
5 years agoMerge branch 'release-0.6.8'
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>
5 years agoMerge branch 'release-0.6.7'
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>
5 years agoautobuf: fix warning in Windows release builds
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>
5 years agorelease: stricter matching of release tags
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>
5 years agoplugins: fix precompiled syntax
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>
5 years agoplugins: use previous definition of struct udphdr on Android
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>
5 years agoplugins: fix build on some glibc systems
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>
5 years agoplugins: fix build with musl
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>
5 years agopud: doc: update the documentation
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>
5 years agosgw: do not send zero bandwidth sgw HNAs by default
Ferry Huberts [Fri, 8 May 2015 08:03:36 +0000 (10:03 +0200)]
sgw: do not send zero bandwidth sgw HNAs by default

Previously, setting the uplink and/or downlink speed to zero would
cause zero bandwidth HNAs to be sent.

This patch ensures that these HNAs will not be sent, only after the
bandwidth was non-zero and it has become zero will these HNAs be sent
(so only in the 'unannounce' window of the previous patch).

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agosgw: send sgw HNAs with zero bandwidth after local gw has gone away
Ferry Huberts [Fri, 8 May 2015 08:00:00 +0000 (10:00 +0200)]
sgw: send sgw HNAs with zero bandwidth after local gw has gone away

This is to improve sgw convergence speed in the mesh.

sgw HNAs with zero bandwidth are sent after the local default gateway
has gone away (it's bandwidth has become zero on either the uplink,
downlink or both) or its interface has gone down or disappeared.

These HNAs are only sent during the next 'HNA period' after which the
sending of these HNAs stops; this is the 'unannounce' window.

Each of the zero bandwidth HNAs has an adjusted vtime so that the actual
timeout of the original HNA on the receiver side doesn't change (within
the bound of the normal jittering of sending the HNAs).

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agosgw: immediately remove sgw HNAs with zero bandwidth
Ferry Huberts [Wed, 6 May 2015 12:04:44 +0000 (14:04 +0200)]
sgw: immediately remove sgw HNAs with zero bandwidth

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agosgw: do not write uplink/downlink speed directly
Ferry Huberts [Fri, 8 May 2015 07:55:53 +0000 (09:55 +0200)]
sgw: do not write uplink/downlink speed directly

So that we can keep a boolean on whether the speed is zero, which
is needed in a later patch.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agoifnet: also store the HNA validity time in msec
Ferry Huberts [Fri, 1 May 2015 14:44:32 +0000 (16:44 +0200)]
ifnet: also store the HNA validity time in msec

For performance reasons in a later patch.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agosgw: update the status file when a sgw HNA is removed (multi-sgw mode only)
Ferry Huberts [Fri, 8 May 2015 12:09:31 +0000 (14:09 +0200)]
sgw: update the status file when a sgw HNA is removed (multi-sgw mode only)

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agosgw: implement HNA expiry
Ferry Huberts [Fri, 8 May 2015 11:30:34 +0000 (13:30 +0200)]
sgw: implement HNA expiry

HNA expiry wasn't implemented, making sgw in a dynamic
environment "rather" problematic.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agosgw: sgw HNAs are not considered normal HNAs during processing
Ferry Huberts [Fri, 8 May 2015 11:11:03 +0000 (13:11 +0200)]
sgw: sgw HNAs are not considered normal HNAs during processing

This has always been the case, just make it explicit.

Note that the sgw HNAs are kept in a (separate) avl tree,
while normal HNAs are kept in a (different) hash table.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agosgw: fix a typo in an assert
Ferry Huberts [Thu, 7 May 2015 13:06:04 +0000 (15:06 +0200)]
sgw: fix a typo in an assert

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>