olsrd.git
6 years agoMerge branch 'release-0.6.6'
Ferry Huberts [Sat, 17 Aug 2013 09:15:34 +0000 (11:15 +0200)]
Merge branch 'release-0.6.6'

* release-0.6.6:
  Update version after release of v0.6.6
  Release v0.6.6
  Fix build break for MinGW compilation on Fedora 19. Still throws a lot of warnings
  jsoninfo: ensure output is wrapped in curly braces.
  pud: fix readIPAddress function
  Makefile: fix builddata when building from tarball
  build: only print the md5 hash in hash_source.sh
  build: really _ignore_ builddata.c when hashing sources
  pud: nmealib: _nmea_parse_time not parsing hsec when given "hhmmss" format
  txtinfo: update README file

Conflicts:
CHANGELOG
Makefile
gui/win32/Inst/installer.nsi
gui/win32/Main/Frontend.rc
lib/txtinfo/README_TXTINFO
make/hash_source.sh

6 years agoMerge branch 'release-0.6.5'
Ferry Huberts [Sat, 17 Aug 2013 09:06:37 +0000 (11:06 +0200)]
Merge branch 'release-0.6.5'

* release-0.6.5:
  Update version after release of v0.6.5.5
  Release v0.6.5.5
  Fix build break for MinGW compilation on Fedora 19. Still throws a lot of warnings
  jsoninfo: ensure output is wrapped in curly braces.
  pud: fix readIPAddress function
  Makefile: fix builddata when building from tarball
  build: only print the md5 hash in hash_source.sh
  build: really _ignore_ builddata.c when hashing sources
  Update version after release of v0.6.5.4
  Release v0.6.5.4
  pud: nmealib: _nmea_parse_time not parsing hsec when given "hhmmss" format
  txtinfo: prevent buffer overflow

Conflicts:
Makefile
gui/win32/Inst/installer.nsi
gui/win32/Main/Frontend.rc
make/hash_source.sh

6 years agoUpdate version after release of v0.6.6
Henning Rogge [Sat, 17 Aug 2013 09:03:40 +0000 (11:03 +0200)]
Update version after release of v0.6.6

Signed-off-by: Henning Rogge <hrogge@googlemail.com>
6 years agoRelease v0.6.6 v0.6.6
Henning Rogge [Sat, 17 Aug 2013 09:03:40 +0000 (11:03 +0200)]
Release v0.6.6

Signed-off-by: Henning Rogge <hrogge@googlemail.com>
6 years agoUpdate version after release of v0.6.5.5
Henning Rogge [Sat, 17 Aug 2013 08:55:51 +0000 (10:55 +0200)]
Update version after release of v0.6.5.5

Signed-off-by: Henning Rogge <hrogge@googlemail.com>
6 years agoRelease v0.6.5.5 v0.6.5.5
Henning Rogge [Sat, 17 Aug 2013 08:55:44 +0000 (10:55 +0200)]
Release v0.6.5.5

Signed-off-by: Henning Rogge <hrogge@googlemail.com>
6 years agoFix build break for MinGW compilation on Fedora 19.
Henning Rogge [Sat, 17 Aug 2013 08:28:17 +0000 (10:28 +0200)]
Fix build break for MinGW compilation on Fedora 19.
Still throws a lot of warnings

6 years agoFix build break for MinGW compilation on Fedora 19.
Henning Rogge [Sat, 17 Aug 2013 08:28:17 +0000 (10:28 +0200)]
Fix build break for MinGW compilation on Fedora 19.
Still throws a lot of warnings

6 years agoFix build break for MinGW compilation on Fedora 19.
Henning Rogge [Sat, 17 Aug 2013 08:28:17 +0000 (10:28 +0200)]
Fix build break for MinGW compilation on Fedora 19.
Still throws a lot of warnings

6 years agohttpinfo: center the header row of the smart gateway tables
Ferry Huberts [Fri, 16 Aug 2013 08:35:33 +0000 (10:35 +0200)]
httpinfo: center the header row of the smart gateway tables

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agojsoninfo: ensure output is wrapped in curly braces.
Scott Kidder [Thu, 15 Aug 2013 17:06:23 +0000 (10:06 -0700)]
jsoninfo: ensure output is wrapped in curly braces.

6 years agopud: fix readIPAddress function
Ferry Huberts [Thu, 15 Aug 2013 21:11:04 +0000 (23:11 +0200)]
pud: fix readIPAddress function

It would also set the port instead of only the IP address, thereby
opening up the possibility to lose the port if the address is set
after the port.

Reported-by: shkdee
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agojsoninfo: ensure output is wrapped in curly braces.
Scott Kidder [Thu, 15 Aug 2013 17:06:23 +0000 (10:06 -0700)]
jsoninfo: ensure output is wrapped in curly braces.

6 years agopud: fix readIPAddress function
Ferry Huberts [Thu, 15 Aug 2013 21:11:04 +0000 (23:11 +0200)]
pud: fix readIPAddress function

It would also set the port instead of only the IP address, thereby
opening up the possibility to lose the port if the address is set
after the port.

Reported-by: shkdee
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agojsoninfo: ensure output is wrapped in curly braces.
Scott Kidder [Thu, 15 Aug 2013 17:06:23 +0000 (10:06 -0700)]
jsoninfo: ensure output is wrapped in curly braces.

6 years agopud: fix readIPAddress function
Ferry Huberts [Thu, 15 Aug 2013 21:11:04 +0000 (23:11 +0200)]
pud: fix readIPAddress function

It would also set the port instead of only the IP address, thereby
opening up the possibility to lose the port if the address is set
after the port.

Reported-by: shkdee
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agobuild: hash_source.sh: specify the mktemp template
Ferry Huberts [Thu, 15 Aug 2013 19:59:22 +0000 (21:59 +0200)]
build: hash_source.sh: specify the mktemp template

Mac OSX is a bit backward in this regard

Reported-by: Scott Kidder <kidder.scott@gmail.com>
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agosgwdynspeed: install configuration files under ETCDIR
Ferry Huberts [Wed, 31 Jul 2013 13:01:31 +0000 (15:01 +0200)]
sgwdynspeed: install configuration files under ETCDIR

Now that we changed ETCDIR to /etc/olsrd/

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agopud: install configuration files under ETCDIR
Ferry Huberts [Wed, 31 Jul 2013 13:01:17 +0000 (15:01 +0200)]
pud: install configuration files under ETCDIR

Now that we changed ETCDIR to /etc/olsrd/

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoMove the configuration files into /etc/olsrd/
Ferry Huberts [Wed, 31 Jul 2013 12:56:51 +0000 (14:56 +0200)]
Move the configuration files into /etc/olsrd/

The openwrt files were NOT touched.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agomake: fixup bashisms in hash_source.sh
Ferry Huberts [Wed, 24 Jul 2013 12:01:50 +0000 (14:01 +0200)]
make: fixup bashisms in hash_source.sh

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agosgw: minor comment fixup
Ferry Huberts [Fri, 12 Jul 2013 11:07:23 +0000 (13:07 +0200)]
sgw: minor comment fixup

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agosgw: move cost calculation into it own unit
Ferry Huberts [Fri, 12 Jul 2013 08:27:12 +0000 (10:27 +0200)]
sgw: move cost calculation into it own unit

I'm going to reuse the code in another project

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agocfgfile: no more magic numbers for RtTable* defaults
Ferry Huberts [Thu, 11 Jul 2013 13:22:12 +0000 (15:22 +0200)]
cfgfile: no more magic numbers for RtTable* defaults

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agobuild: only re-generate src/builddata.c when needed
Ferry Huberts [Thu, 11 Jul 2013 10:11:17 +0000 (12:11 +0200)]
build: only re-generate src/builddata.c when needed

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoMakefile: fix builddata when building from tarball
Ferry Huberts [Wed, 10 Jul 2013 15:50:38 +0000 (17:50 +0200)]
Makefile: fix builddata when building from tarball

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agobuild: only print the md5 hash in hash_source.sh
Ferry Huberts [Wed, 10 Jul 2013 16:00:52 +0000 (18:00 +0200)]
build: only print the md5 hash in hash_source.sh

Some md5sum programs print in the format
  md5_hash -

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agobuild: really _ignore_ builddata.c when hashing sources
Ferry Huberts [Wed, 10 Jul 2013 15:56:51 +0000 (17:56 +0200)]
build: really _ignore_ builddata.c when hashing sources

Somehow the -v got dropped

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoMakefile: fix builddata when building from tarball
Ferry Huberts [Wed, 10 Jul 2013 15:50:38 +0000 (17:50 +0200)]
Makefile: fix builddata when building from tarball

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agobuild: only print the md5 hash in hash_source.sh
Ferry Huberts [Wed, 10 Jul 2013 16:00:52 +0000 (18:00 +0200)]
build: only print the md5 hash in hash_source.sh

Some md5sum programs print in the format
  md5_hash -

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agobuild: really _ignore_ builddata.c when hashing sources
Ferry Huberts [Wed, 10 Jul 2013 15:56:51 +0000 (17:56 +0200)]
build: really _ignore_ builddata.c when hashing sources

Somehow the -v got dropped

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoMakefile: fix builddata when building from tarball
Ferry Huberts [Wed, 10 Jul 2013 15:50:38 +0000 (17:50 +0200)]
Makefile: fix builddata when building from tarball

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agobuild: only print the md5 hash in hash_source.sh
Ferry Huberts [Wed, 10 Jul 2013 16:00:52 +0000 (18:00 +0200)]
build: only print the md5 hash in hash_source.sh

Some md5sum programs print in the format
  md5_hash -

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agobuild: really _ignore_ builddata.c when hashing sources
Ferry Huberts [Wed, 10 Jul 2013 15:56:51 +0000 (17:56 +0200)]
build: really _ignore_ builddata.c when hashing sources

Somehow the -v got dropped

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agolinux: fix 'add -rdynamic to linker options for debug builds'
Ferry Huberts [Tue, 9 Jul 2013 14:40:12 +0000 (16:40 +0200)]
linux: fix 'add -rdynamic to linker options for debug builds'

I moved some code around before committing and lost the ifeq DEBUG test

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agolinux: add -rdynamic to linker options for debug builds
Ferry Huberts [Tue, 9 Jul 2013 14:34:55 +0000 (16:34 +0200)]
linux: add -rdynamic to linker options for debug builds

This will make sure that all symbols are kept in the libraries and
executables, so that backtraces will have proper names

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoMakefile: add cfgparser_install and cfgparser_clean targets
Ferry Huberts [Tue, 25 Jun 2013 09:31:10 +0000 (11:31 +0200)]
Makefile: add cfgparser_install and cfgparser_clean targets

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoFix segfault in cfgparser standalone executable
Henning Rogge [Tue, 25 Jun 2013 09:03:24 +0000 (11:03 +0200)]
Fix segfault in cfgparser standalone executable

6 years agotxtinfo: mention the /sgw command in the README
Ferry Huberts [Tue, 18 Jun 2013 14:36:28 +0000 (16:36 +0200)]
txtinfo: mention the /sgw command in the README

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agocfgfile: don't hard-code defaults in texts
Ferry Huberts [Wed, 12 Jun 2013 16:15:17 +0000 (18:15 +0200)]
cfgfile: don't hard-code defaults in texts

Also improve some formatting and refrain from using < and > since
the generated text can be shown on a webpage (in HTML these characters
are reserved).

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agotxtinfo: add sgw command
Ferry Huberts [Tue, 11 Jun 2013 16:00:57 +0000 (18:00 +0200)]
txtinfo: add sgw command

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agohttpinfo: add smart gateway information tab
Ferry Huberts [Tue, 11 Jun 2013 14:33:51 +0000 (16:33 +0200)]
httpinfo: add smart gateway information tab

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoquagga: add some parentheses
Ferry Huberts [Tue, 11 Jun 2013 07:53:27 +0000 (09:53 +0200)]
quagga: add some parentheses

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoUpdate version after release of v0.6.5.4
Henning Rogge [Thu, 16 May 2013 16:37:09 +0000 (18:37 +0200)]
Update version after release of v0.6.5.4

Signed-off-by: Henning Rogge <hrogge@googlemail.com>
6 years agoRelease v0.6.5.4 v0.6.5.4
Henning Rogge [Thu, 16 May 2013 16:37:09 +0000 (18:37 +0200)]
Release v0.6.5.4

Signed-off-by: Henning Rogge <hrogge@googlemail.com>
6 years agopud: nmealib: _nmea_parse_time not parsing hsec when given "hhmmss" format
Ferry Huberts [Mon, 13 May 2013 07:35:42 +0000 (09:35 +0200)]
pud: nmealib: _nmea_parse_time not parsing hsec when given "hhmmss" format

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agopud: nmealib: _nmea_parse_time not parsing hsec when given "hhmmss" format
Ferry Huberts [Mon, 13 May 2013 07:35:42 +0000 (09:35 +0200)]
pud: nmealib: _nmea_parse_time not parsing hsec when given "hhmmss" format

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agopud: nmealib: _nmea_parse_time not parsing hsec when given "hhmmss" format
Ferry Huberts [Mon, 13 May 2013 07:35:42 +0000 (09:35 +0200)]
pud: nmealib: _nmea_parse_time not parsing hsec when given "hhmmss" format

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agotxtinfo: update README file
Saverio Proto [Fri, 10 May 2013 15:38:36 +0000 (17:38 +0200)]
txtinfo: update README file

6 years agotxtinfo: update README file
Saverio Proto [Fri, 10 May 2013 15:38:36 +0000 (17:38 +0200)]
txtinfo: update README file

6 years agopud: wireformat: java: also add a Git-Descriptor manifest header
Ferry Huberts [Tue, 7 May 2013 12:13:15 +0000 (14:13 +0200)]
pud: wireformat: java: also add a Git-Descriptor manifest header

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agopud: wireformat: java: rename Git-SHA1 manifest header to Git-SHA
Ferry Huberts [Tue, 7 May 2013 12:12:33 +0000 (14:12 +0200)]
pud: wireformat: java: rename Git-SHA1 manifest header to Git-SHA

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agopud: wireformat-java: Makefile: also clean up the generated headers
Ferry Huberts [Fri, 3 May 2013 10:18:06 +0000 (12:18 +0200)]
pud: wireformat-java: Makefile: also clean up the generated headers

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoMerge branch 'release-0.6.6'
Ferry Huberts [Fri, 3 May 2013 09:20:41 +0000 (11:20 +0200)]
Merge branch 'release-0.6.6'

* release-0.6.6:
  txtinfo: prevent buffer overflow

6 years agotxtinfo: prevent buffer overflow
Ferry Huberts [Fri, 3 May 2013 09:19:40 +0000 (11:19 +0200)]
txtinfo: prevent buffer overflow

Reported-by: Saverio Proto <zioproto@gmail.com>
Tested-by: Saverio Proto <zioproto@gmail.com>
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agotxtinfo: prevent buffer overflow
Ferry Huberts [Fri, 3 May 2013 09:19:40 +0000 (11:19 +0200)]
txtinfo: prevent buffer overflow

Reported-by: Saverio Proto <zioproto@gmail.com>
Tested-by: Saverio Proto <zioproto@gmail.com>
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoMerge branch 'release-0.6.6'
Ferry Huberts [Wed, 24 Apr 2013 09:06:28 +0000 (11:06 +0200)]
Merge branch 'release-0.6.6'

* release-0.6.6:
  release: also check against the Makefile version when branching
  release: checkVersionIncrementing: optionally allow equal versions
  release: only report that master changed when it was actually changed
  release: do not update the version on master when it's already higher
  release: refactor the checkVersionIncrementing function
  release: update some comments
  release: fix the list of generated files

6 years agoMerge branch 'release-0.6.5'
Ferry Huberts [Wed, 24 Apr 2013 09:06:25 +0000 (11:06 +0200)]
Merge branch 'release-0.6.5'

* release-0.6.5:
  release: also check against the Makefile version when branching
  release: checkVersionIncrementing: optionally allow equal versions
  release: only report that master changed when it was actually changed
  release: do not update the version on master when it's already higher
  release: refactor the checkVersionIncrementing function
  release: update some comments
  release: fix the list of generated files

6 years agoMerge branch 'release-0.6.4'
Ferry Huberts [Wed, 24 Apr 2013 09:06:13 +0000 (11:06 +0200)]
Merge branch 'release-0.6.4'

* release-0.6.4:
  release: also check against the Makefile version when branching
  release: checkVersionIncrementing: optionally allow equal versions
  release: only report that master changed when it was actually changed
  release: do not update the version on master when it's already higher
  release: refactor the checkVersionIncrementing function
  release: update some comments
  release: fix the list of generated files
  build: ignore builddata.c when hashing sources
  Remove mercurial ignore file; we use git
  release: use olsrd-version prefix for files in the tarballs
  Fix multicast join for IPv6

6 years agorelease: also check against the Makefile version when branching
Ferry Huberts [Wed, 24 Apr 2013 09:03:40 +0000 (11:03 +0200)]
release: also check against the Makefile version when branching

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: checkVersionIncrementing: optionally allow equal versions
Ferry Huberts [Wed, 24 Apr 2013 08:19:12 +0000 (10:19 +0200)]
release: checkVersionIncrementing: optionally allow equal versions

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: also check against the Makefile version when branching
Ferry Huberts [Wed, 24 Apr 2013 09:03:40 +0000 (11:03 +0200)]
release: also check against the Makefile version when branching

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: checkVersionIncrementing: optionally allow equal versions
Ferry Huberts [Wed, 24 Apr 2013 08:19:12 +0000 (10:19 +0200)]
release: checkVersionIncrementing: optionally allow equal versions

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: also check against the Makefile version when branching
Ferry Huberts [Wed, 24 Apr 2013 09:03:40 +0000 (11:03 +0200)]
release: also check against the Makefile version when branching

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: checkVersionIncrementing: optionally allow equal versions
Ferry Huberts [Wed, 24 Apr 2013 08:19:12 +0000 (10:19 +0200)]
release: checkVersionIncrementing: optionally allow equal versions

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: only report that master changed when it was actually changed
Ferry Huberts [Wed, 24 Apr 2013 07:37:09 +0000 (09:37 +0200)]
release: only report that master changed when it was actually changed

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: do not update the version on master when it's already higher
Ferry Huberts [Wed, 24 Apr 2013 07:36:10 +0000 (09:36 +0200)]
release: do not update the version on master when it's already higher

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: refactor the checkVersionIncrementing function
Ferry Huberts [Wed, 24 Apr 2013 07:15:51 +0000 (09:15 +0200)]
release: refactor the checkVersionIncrementing function

To return a success/fail value.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: update some comments
Ferry Huberts [Wed, 24 Apr 2013 07:32:48 +0000 (09:32 +0200)]
release: update some comments

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: fix the list of generated files
Ferry Huberts [Wed, 24 Apr 2013 07:51:59 +0000 (09:51 +0200)]
release: fix the list of generated files

Copy/Paste typo

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: only report that master changed when it was actually changed
Ferry Huberts [Wed, 24 Apr 2013 07:37:09 +0000 (09:37 +0200)]
release: only report that master changed when it was actually changed

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: do not update the version on master when it's already higher
Ferry Huberts [Wed, 24 Apr 2013 07:36:10 +0000 (09:36 +0200)]
release: do not update the version on master when it's already higher

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: refactor the checkVersionIncrementing function
Ferry Huberts [Wed, 24 Apr 2013 07:15:51 +0000 (09:15 +0200)]
release: refactor the checkVersionIncrementing function

To return a success/fail value.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: update some comments
Ferry Huberts [Wed, 24 Apr 2013 07:32:48 +0000 (09:32 +0200)]
release: update some comments

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: fix the list of generated files
Ferry Huberts [Wed, 24 Apr 2013 07:51:59 +0000 (09:51 +0200)]
release: fix the list of generated files

Copy/Paste typo

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: only report that master changed when it was actually changed
Ferry Huberts [Wed, 24 Apr 2013 07:37:09 +0000 (09:37 +0200)]
release: only report that master changed when it was actually changed

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: do not update the version on master when it's already higher
Ferry Huberts [Wed, 24 Apr 2013 07:36:10 +0000 (09:36 +0200)]
release: do not update the version on master when it's already higher

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: refactor the checkVersionIncrementing function
Ferry Huberts [Wed, 24 Apr 2013 07:15:51 +0000 (09:15 +0200)]
release: refactor the checkVersionIncrementing function

To return a success/fail value.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: update some comments
Ferry Huberts [Wed, 24 Apr 2013 07:32:48 +0000 (09:32 +0200)]
release: update some comments

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: fix the list of generated files
Ferry Huberts [Wed, 24 Apr 2013 07:51:59 +0000 (09:51 +0200)]
release: fix the list of generated files

Copy/Paste typo

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoMerge branch 'release-0.6.6'
Ferry Huberts [Tue, 23 Apr 2013 14:30:38 +0000 (16:30 +0200)]
Merge branch 'release-0.6.6'

* release-0.6.6:
  gateway: proactively take down 'expensive' gateways
  gateway: add SmartGatewayTakeDownPercentage configuration parameter
  gateway: introduce and use removeGatewayFromList function
  gateway: always deal with 64bit scaled path costs
  build: move build data into its own include file
  build: ignore builddata.c when hashing sources
  Remove mercurial ignore file; we use git
  Fix setsockopt for setting Traffic Class in IPv6

6 years agoMerge branch 'release-0.6.5'
Ferry Huberts [Tue, 23 Apr 2013 14:25:14 +0000 (16:25 +0200)]
Merge branch 'release-0.6.5'

* release-0.6.5:
  build: ignore builddata.c when hashing sources
  Remove mercurial ignore file; we use git
  Update version after release of v0.6.5.3
  Release v0.6.5.3
  Fix setsockopt for setting Traffic Class in IPv6

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoRevert "Update version after release of v0.6.5.3"
Ferry Huberts [Tue, 23 Apr 2013 14:15:14 +0000 (16:15 +0200)]
Revert "Update version after release of v0.6.5.3"

This reverts commit 484e7b87dacfda5b20d38a90dda448518d9c93d3.

6 years agobuild: ignore builddata.c when hashing sources
Ferry Huberts [Mon, 22 Apr 2013 13:39:20 +0000 (15:39 +0200)]
build: ignore builddata.c when hashing sources

Not ignoring it is actually incorrect; it contains generated
meta-data about the sources.

If we don't ignore it then the hash will be different every time
for the same source tree.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoRemove mercurial ignore file; we use git
Ferry Huberts [Mon, 22 Apr 2013 12:09:10 +0000 (14:09 +0200)]
Remove mercurial ignore file; we use git

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agobuild: ignore builddata.c when hashing sources
Ferry Huberts [Mon, 22 Apr 2013 13:39:20 +0000 (15:39 +0200)]
build: ignore builddata.c when hashing sources

Not ignoring it is actually incorrect; it contains generated
meta-data about the sources.

If we don't ignore it then the hash will be different every time
for the same source tree.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoRemove mercurial ignore file; we use git
Ferry Huberts [Mon, 22 Apr 2013 12:09:10 +0000 (14:09 +0200)]
Remove mercurial ignore file; we use git

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoUpdate version after release of v0.6.5.3
Henning Rogge [Tue, 23 Apr 2013 13:59:40 +0000 (15:59 +0200)]
Update version after release of v0.6.5.3

Signed-off-by: Henning Rogge <hrogge@googlemail.com>
6 years agoUpdate version after release of v0.6.5.3
Henning Rogge [Tue, 23 Apr 2013 13:59:40 +0000 (15:59 +0200)]
Update version after release of v0.6.5.3

Signed-off-by: Henning Rogge <hrogge@googlemail.com>
6 years agoRelease v0.6.5.3 v0.6.5.3
Henning Rogge [Tue, 23 Apr 2013 13:59:34 +0000 (15:59 +0200)]
Release v0.6.5.3

Signed-off-by: Henning Rogge <hrogge@googlemail.com>
6 years agogateway: proactively take down 'expensive' gateways
Ferry Huberts [Tue, 23 Apr 2013 13:54:57 +0000 (15:54 +0200)]
gateway: proactively take down 'expensive' gateways

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: add SmartGatewayTakeDownPercentage configuration parameter
Ferry Huberts [Fri, 19 Apr 2013 11:12:46 +0000 (13:12 +0200)]
gateway: add SmartGatewayTakeDownPercentage configuration parameter

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: introduce and use removeGatewayFromList function
Ferry Huberts [Tue, 23 Apr 2013 13:49:48 +0000 (15:49 +0200)]
gateway: introduce and use removeGatewayFromList function

To reduce code duplication.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: always deal with 64bit scaled path costs
Ferry Huberts [Tue, 23 Apr 2013 12:45:26 +0000 (14:45 +0200)]
gateway: always deal with 64bit scaled path costs

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agobuild: move build data into its own include file
Ferry Huberts [Mon, 22 Apr 2013 12:09:58 +0000 (14:09 +0200)]
build: move build data into its own include file

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agobuild: ignore builddata.c when hashing sources
Ferry Huberts [Mon, 22 Apr 2013 13:39:20 +0000 (15:39 +0200)]
build: ignore builddata.c when hashing sources

Not ignoring it is actually incorrect; it contains generated
meta-data about the sources.

If we don't ignore it then the hash will be different every time
for the same source tree.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoRemove mercurial ignore file; we use git
Ferry Huberts [Mon, 22 Apr 2013 12:09:10 +0000 (14:09 +0200)]
Remove mercurial ignore file; we use git

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoFix setsockopt for setting Traffic Class in IPv6
Ronald in 't Velt [Fri, 19 Apr 2013 16:51:49 +0000 (18:51 +0200)]
Fix setsockopt for setting Traffic Class in IPv6

HiOLSR-developers,

For your consideration:

Setting Traffic Class (the counterpart of TOS in IPv4) on OLSR IPv6 packets is currently broken.
The code does not distinguish between the IPv4 and IPv6 cases, but it should, as the required
'level' and 'optname' arguments to setsockopt differ.

I tested this patch by monitoring OLSR IPv6 packets with 'tcpdump -v': it appears to be working.

Note this is for Linux only.

This is my modest contribution to Dave Täht's quest to fix "TOS setting" in IPv6 :-)
See: http://www.bufferbloat.net/issues/249

Thanks,
Ronald

Signed-off-by: Ronald in 't Velt <velt@xs4all.nl>
6 years agoFix setsockopt for setting Traffic Class in IPv6
Ronald in 't Velt [Fri, 19 Apr 2013 16:51:49 +0000 (18:51 +0200)]
Fix setsockopt for setting Traffic Class in IPv6

HiOLSR-developers,

For your consideration:

Setting Traffic Class (the counterpart of TOS in IPv4) on OLSR IPv6 packets is currently broken.
The code does not distinguish between the IPv4 and IPv6 cases, but it should, as the required
'level' and 'optname' arguments to setsockopt differ.

I tested this patch by monitoring OLSR IPv6 packets with 'tcpdump -v': it appears to be working.

Note this is for Linux only.

This is my modest contribution to Dave Täht's quest to fix "TOS setting" in IPv6 :-)
See: http://www.bufferbloat.net/issues/249

Thanks,
Ronald

Signed-off-by: Ronald in 't Velt <velt@xs4all.nl>
6 years agoFix setsockopt for setting Traffic Class in IPv6
Ronald in 't Velt [Fri, 19 Apr 2013 16:51:49 +0000 (18:51 +0200)]
Fix setsockopt for setting Traffic Class in IPv6

HiOLSR-developers,

For your consideration:

Setting Traffic Class (the counterpart of TOS in IPv4) on OLSR IPv6 packets is currently broken.
The code does not distinguish between the IPv4 and IPv6 cases, but it should, as the required
'level' and 'optname' arguments to setsockopt differ.

I tested this patch by monitoring OLSR IPv6 packets with 'tcpdump -v': it appears to be working.

Note this is for Linux only.

This is my modest contribution to Dave Täht's quest to fix "TOS setting" in IPv6 :-)
See: http://www.bufferbloat.net/issues/249

Thanks,
Ronald

Signed-off-by: Ronald in 't Velt <velt@xs4all.nl>