olsrd.git
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 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 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 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>
6 years agoBranch v0.6.6
Ferry Huberts [Fri, 19 Apr 2013 08:52:26 +0000 (10:52 +0200)]
Branch v0.6.6

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoUpdate version after branch of v0.6.6
Ferry Huberts [Fri, 19 Apr 2013 08:52:26 +0000 (10:52 +0200)]
Update version after branch of v0.6.6

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: use olsrd-version prefix for files in the tarballs
Ferry Huberts [Mon, 11 Feb 2013 16:10:23 +0000 (17:10 +0100)]
release: use olsrd-version prefix for files in the tarballs

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoremove pthread usage as much as possible
Ferry Huberts [Thu, 18 Apr 2013 19:05:19 +0000 (21:05 +0200)]
remove pthread usage as much as possible

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agomDNS: remove from Makefile PTHREAD useless dependency
Saverio Proto [Thu, 18 Apr 2013 19:03:39 +0000 (21:03 +0200)]
mDNS: remove from Makefile PTHREAD useless dependency

6 years agoplugin: dot_draw: readme: replaced a b0rken link
Bastian Bittorf [Thu, 18 Apr 2013 14:09:17 +0000 (16:09 +0200)]
plugin: dot_draw: readme: replaced a b0rken link

6 years agoplugin: dot_draw: readme: make it clear, that it only opens an IPv4-socket, so a...
Bastian Bittorf [Thu, 18 Apr 2013 13:58:45 +0000 (15:58 +0200)]
plugin: dot_draw: readme: make it clear, that it only opens an IPv4-socket, so a 'telnet ::1 2004' is not possible

6 years ago[hotfix] plugin: httpinfo: in case of an unrecoverable error ("could not initialize...
Bastian Bittorf [Thu, 18 Apr 2013 13:47:41 +0000 (15:47 +0200)]
[hotfix] plugin: httpinfo: in case of an unrecoverable error ("could not initialize HTTP socket") exit for returnvalue != 0

6 years agoarprefresh: add a note about VLANs and IPv6
Ferry Huberts [Thu, 18 Apr 2013 13:04:22 +0000 (15:04 +0200)]
arprefresh: add a note about VLANs and IPv6

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoarprefresh: do not process IPv6 packets when in IPv4 mode
Ferry Huberts [Thu, 18 Apr 2013 13:01:31 +0000 (15:01 +0200)]
arprefresh: do not process IPv6 packets when in IPv4 mode

Because the code assumes IPv4.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoarprefresh: remove a comment
Ferry Huberts [Thu, 18 Apr 2013 07:27:23 +0000 (09:27 +0200)]
arprefresh: remove a comment

What is in the comment is already in the socket filter

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoarprefresh: use the ARRAYSIZE macro
Ferry Huberts [Thu, 18 Apr 2013 07:22:43 +0000 (09:22 +0200)]
arprefresh: use the ARRAYSIZE macro

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoarprefresh: document the BPF program to make it readable
Ferry Huberts [Thu, 18 Apr 2013 07:14:39 +0000 (09:14 +0200)]
arprefresh: document the BPF program to make it readable

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoarprefresh: fix some spelling
Ferry Huberts [Wed, 17 Apr 2013 19:48:56 +0000 (21:48 +0200)]
arprefresh: fix some spelling

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoMerge branch 'release-0.6.5'
Ferry Huberts [Mon, 15 Apr 2013 09:21:05 +0000 (11:21 +0200)]
Merge branch 'release-0.6.5'

* release-0.6.5:
  pud: set local loopback for multicast tx
  main: use /dev/urandom by default

6 years agopud: set local loopback for multicast tx
Ferry Huberts [Wed, 3 Apr 2013 12:48:48 +0000 (14:48 +0200)]
pud: set local loopback for multicast tx

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agopud: set local loopback for multicast tx
Ferry Huberts [Wed, 3 Apr 2013 12:48:48 +0000 (14:48 +0200)]
pud: set local loopback for multicast tx

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agomain: use /dev/urandom by default
Ferry Huberts [Wed, 27 Mar 2013 17:57:09 +0000 (13:57 -0400)]
main: use /dev/urandom by default

Reading /dev/random blocks when the system doesn't have enough
entropy. Reading /dev/urandom doesn't block and is presumed to be
good enough for our purposes

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agomain: use /dev/urandom by default
Ferry Huberts [Wed, 27 Mar 2013 17:57:09 +0000 (13:57 -0400)]
main: use /dev/urandom by default

Reading /dev/random blocks when the system doesn't have enough
entropy. Reading /dev/urandom doesn't block and is presumed to be
good enough for our purposes

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agopud: nmealib: fixup the previous commit
Ferry Huberts [Tue, 12 Mar 2013 16:34:47 +0000 (17:34 +0100)]
pud: nmealib: fixup the previous commit

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: nmealib: fix parsing of date in GPRMC
Ferry Huberts [Tue, 12 Mar 2013 16:16:25 +0000 (17:16 +0100)]
PUD: nmealib: fix parsing of date in GPRMC

It appears that the field is optional/can be empty and that parsing
such an empty field would fail.

Signed-off-by: Ferry Huberts <f.huberts@mindef.nl>
6 years agoMerge branch 'release-0.6.5'
Ferry Huberts [Thu, 28 Feb 2013 16:42:51 +0000 (17:42 +0100)]
Merge branch 'release-0.6.5'

* release-0.6.5:
  gateway: work around kernel IPIP module initialisation bug
  pud: better detection of java jdk
  pud: detect the java include directory

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: work around kernel IPIP module initialisation bug
Ferry Huberts [Thu, 28 Feb 2013 16:15:56 +0000 (17:15 +0100)]
gateway: work around kernel IPIP module initialisation bug

First reported by Daniel.
I've reworked his approach to retry deeper in the call chain
in order to deal with the problem where it actually occurs.

Reported-by: Daniel <daniel@makrotopia.org>
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agopud: better detection of java jdk
Ferry Huberts [Thu, 28 Feb 2013 15:53:34 +0000 (16:53 +0100)]
pud: better detection of java jdk

It failed on Debian Squeeze 64 bits

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agopud: better detection of java jdk
Ferry Huberts [Thu, 28 Feb 2013 15:53:34 +0000 (16:53 +0100)]
pud: better detection of java jdk

It failed on Debian Squeeze 64 bits

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agopud: detect the java include directory
Ferry Huberts [Thu, 14 Feb 2013 17:13:22 +0000 (18:13 +0100)]
pud: detect the java include directory

Fedora and Debian have this in different locations

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agodoc: make the documentation generation commands a bit more verbose
Ferry Huberts [Thu, 28 Feb 2013 10:41:49 +0000 (11:41 +0100)]
doc: make the documentation generation commands a bit more verbose

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: fix overlap in success/fail IPIP tunnel init
Ferry Huberts [Wed, 27 Feb 2013 08:27:02 +0000 (09:27 +0100)]
gateway: fix overlap in success/fail IPIP tunnel init

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: work around kernel IPIP module initialisation bug
Ferry Huberts [Tue, 26 Feb 2013 12:30:58 +0000 (13:30 +0100)]
gateway: work around kernel IPIP module initialisation bug

First reported by Daniel.
I've reworked his approach to retry deeper in the call chain
in order to deal with the problem where it actually occurs.

Reported-by: Daniel <daniel@makrotopia.org>
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoMerge branch 'release-0.6.5'
Ferry Huberts [Mon, 25 Feb 2013 19:08:20 +0000 (20:08 +0100)]
Merge branch 'release-0.6.5'

# By Henning Rogge (2) and others
# Via Henning Rogge
* release-0.6.5:
  Update version after release of v0.6.5.2
  Release v0.6.5.2
  olsrd-quagga: Fix memory leak when adding and deleting routes
  main: fix the check on inet_pton return value because it returns 1 on success.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoUpdate version after release of v0.6.5.2
Henning Rogge [Mon, 25 Feb 2013 18:26:47 +0000 (19:26 +0100)]
Update version after release of v0.6.5.2

Signed-off-by: Henning Rogge <hrogge@googlemail.com>
6 years agoUpdate version after release of v0.6.5.2
Henning Rogge [Mon, 25 Feb 2013 18:26:47 +0000 (19:26 +0100)]
Update version after release of v0.6.5.2

Signed-off-by: Henning Rogge <hrogge@googlemail.com>
6 years agoRelease v0.6.5.2 v0.6.5.2
Henning Rogge [Mon, 25 Feb 2013 18:26:41 +0000 (19:26 +0100)]
Release v0.6.5.2

Signed-off-by: Henning Rogge <hrogge@googlemail.com>
6 years agoolsrd-quagga: Fix memory leak when adding and deleting routes
Vasilis Tsiligiannis [Fri, 15 Feb 2013 13:18:31 +0000 (15:18 +0200)]
olsrd-quagga: Fix memory leak when adding and deleting routes

6 years agoquagga plugin routes additional
equinox [Fri, 15 Feb 2013 20:52:22 +0000 (21:52 +0100)]
quagga plugin routes additional

This patch fixes the quagga plugin ExportRoutes parameter. When this
argument is set to 'additional' the plugin wouldn't call the orignial
addroute/delroute functions. Now the original functions get called after
a successful call to the quagga addroute/delroute functions.
I also updated the docomentation which know uses the right keyword (both
vs. additional)

Signed-off-by: Christian Pointner <equinox@chaos-at-home.org>
Signed-off-by: Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
6 years agomain: fix the check on inet_pton return value because it returns 1 on success.
Saverio Proto [Fri, 22 Feb 2013 11:03:10 +0000 (12:03 +0100)]
main: fix the check on inet_pton return value because it returns 1 on success.

This bug was introduced in commit b3f05653fc085193504218e47458891acf7c495d and it was preventing olsrd from working in IPv6 mode.

6 years agomain: fix the check on inet_pton return value because it returns 1 on success.
Saverio Proto [Fri, 22 Feb 2013 11:03:10 +0000 (12:03 +0100)]
main: fix the check on inet_pton return value because it returns 1 on success.

This bug was introduced in commit b3f05653fc085193504218e47458891acf7c495d and it was preventing olsrd from working in IPv6 mode.

6 years agomake: ensure win32 install respects DESTDIR
Ferry Huberts [Wed, 20 Feb 2013 11:47:37 +0000 (12:47 +0100)]
make: ensure win32 install respects DESTDIR

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agop2pd: supported on Android
Ferry Huberts [Wed, 20 Feb 2013 10:52:46 +0000 (11:52 +0100)]
p2pd: supported on Android

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agomdns: supported on Android
Ferry Huberts [Wed, 20 Feb 2013 10:54:24 +0000 (11:54 +0100)]
mdns: supported on Android

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agomdns: fix three alignment warnings
Ferry Huberts [Wed, 20 Feb 2013 11:18:52 +0000 (12:18 +0100)]
mdns: fix three alignment warnings

src/NetworkInterfaces.c: In function 'CreateRouterElectionSocket':
src/NetworkInterfaces.c:288:16: error: cast increases required alignment of target type [-Werror=cast-align]
src/NetworkInterfaces.c: In function 'CreateHelloSocket':
src/NetworkInterfaces.c:383:16: error: cast increases required alignment of target type [-Werror=cast-align]
src/mdns.c: In function 'ip_checksum':
src/mdns.c:94:18: error: cast increases required alignment of target type [-Werror=cast-align]

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agomdns: don't use non-standard ushot type
Ferry Huberts [Wed, 20 Feb 2013 11:20:43 +0000 (12:20 +0100)]
mdns: don't use non-standard ushot type

src/mdns.c: In function 'ip_checksum':
src/mdns.c:94:19: error: 'ushort' undeclared (first use in this function)

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agomdns: fix container_of pointer arith
Ferry Huberts [Wed, 20 Feb 2013 11:09:21 +0000 (12:09 +0100)]
mdns: fix container_of pointer arith

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agomake: only install sgw related files when sgw is supported
Ferry Huberts [Wed, 20 Feb 2013 10:31:56 +0000 (11:31 +0100)]
make: only install sgw related files when sgw is supported

Which is for Linux and Android

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agomain: fix 2 minor warnings for win64 build on debian squeeze
Ferry Huberts [Wed, 20 Feb 2013 10:18:42 +0000 (11:18 +0100)]
main: fix 2 minor warnings for win64 build on debian squeeze

src/main.c: In function ‘writePidFile’:
src/main.c:237: warning: format ‘%d’ expects type ‘int’, but argument 4 has type ‘pid_t’
src/main.c:241: warning: format ‘%d’ expects type ‘int’, but argument 4 has type ‘pid_t’

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoRevert "pud: update nmealib 32/64 cross compilation"
Ferry Huberts [Wed, 20 Feb 2013 09:44:49 +0000 (10:44 +0100)]
Revert "pud: update nmealib 32/64 cross compilation"

This reverts commit d19b7f869ca25c559e68e185ce2c8a1e999504de.
It breaks the Android build.

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