olsrd.git
5 years agotok: improve the nmea_calc_crc function a bit
Ferry Huberts [Mon, 2 Dec 2013 11:13:15 +0000 (12:13 +0100)]
tok: improve the nmea_calc_crc function a bit

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agopud: fix readIPAddress function
Ferry Huberts [Thu, 21 Nov 2013 09:35:47 +0000 (10:35 +0100)]
pud: fix readIPAddress function

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agomain: olsr_create_lock_file: fix return value check on 'open' call
Ferry Huberts [Fri, 8 Nov 2013 15:11:01 +0000 (16:11 +0100)]
main: olsr_create_lock_file: fix return value check on 'open' call

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agoMake sure to save/restore errno in signal handlers
Ferry Huberts [Fri, 8 Nov 2013 14:41:01 +0000 (15:41 +0100)]
Make sure to save/restore errno in signal handlers

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agopud: do the same fix as in the previous commit, now for i386
Ferry Huberts [Wed, 6 Nov 2013 15:05:41 +0000 (16:05 +0100)]
pud: do the same fix as in the previous commit, now for i386

sigh

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agopud: fix java detection in the wireformat java bindings (again)
Ferry Huberts [Wed, 6 Nov 2013 13:14:53 +0000 (14:14 +0100)]
pud: fix java detection in the wireformat java bindings (again)

Debian turns out to be a huge pain. Now I need to also check '-amd64'
since Wheezy changed it again... sigh...

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agoUpdate version after release of v0.6.6.1
Henning Rogge [Mon, 21 Oct 2013 15:56:55 +0000 (17:56 +0200)]
Update version after release of v0.6.6.1

Signed-off-by: Henning Rogge <hrogge@googlemail.com>
5 years agoRelease v0.6.6.1 v0.6.6.1
Henning Rogge [Mon, 21 Oct 2013 15:56:50 +0000 (17:56 +0200)]
Release v0.6.6.1

Signed-off-by: Henning Rogge <hrogge@googlemail.com>
5 years agoFix jsoninfo again after a regression which was introduced with
Manuel Munz [Fri, 23 Aug 2013 19:02:23 +0000 (21:02 +0200)]
Fix jsoninfo again after a regression which was introduced with
http://olsr.org/git/?p=olsrd.git;a=commit;h=8f633c9f54e179ce530291571a13b3b96d288bf4
For a discussion of the bug see http://olsr.org/bugs/view.php?id=40
 Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,

5 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>
5 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>
5 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

5 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.

5 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 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 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: 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 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 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 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 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>
6 years agopud: update nmealib 32/64 cross compilation
Ferry Huberts [Wed, 20 Feb 2013 09:30:30 +0000 (10:30 +0100)]
pud: update nmealib 32/64 cross compilation

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
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 agodyn_gw/dyn_gw_plain require /proc, remove from default build on non-Linux
Hans-Christoph Steiner [Thu, 14 Feb 2013 23:01:15 +0000 (18:01 -0500)]
dyn_gw/dyn_gw_plain require /proc, remove from default build on non-Linux

Leave it enabled for anyone who wants to manually 'make dyn_gw' for
platforms like FreeBSD which have an optional, Linux-compatible /proc

6 years agoupdate Commotion example olsrd.conf to represent current project state
Hans-Christoph Steiner [Thu, 14 Feb 2013 22:51:49 +0000 (17:51 -0500)]
update Commotion example olsrd.conf to represent current project state

6 years agoGNU/Linux: add service profile for 'ufw' firewall package
Hans-Christoph Steiner [Thu, 14 Feb 2013 22:44:14 +0000 (17:44 -0500)]
GNU/Linux: add service profile for 'ufw' firewall package

This profile file will make it easy to open the right port for olsrd when
using 'ufw'.  'ufw' is the default firewall for Ubuntu.

6 years agomake: add dyn_gw, mdns and p2pd to the Android SUBDIRS
Ferry Huberts [Thu, 14 Feb 2013 21:06:10 +0000 (22:06 +0100)]
make: add dyn_gw, mdns and p2pd to the Android SUBDIRS

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agomake: fix a type in the Linux SUBDIRS assignment
Ferry Huberts [Thu, 14 Feb 2013 21:05:11 +0000 (22:05 +0100)]
make: fix a type in the Linux SUBDIRS assignment

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agodyn_gw: remove bogus include
Ferry Huberts [Thu, 14 Feb 2013 21:18:14 +0000 (22:18 +0100)]
dyn_gw: remove bogus include

It prevents the plugin from being built on Android

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 agoMerge branch 'release-0.6.5'
Ferry Huberts [Mon, 11 Feb 2013 21:48:33 +0000 (22:48 +0100)]
Merge branch 'release-0.6.5'

# By Henning Rogge (2) and Ferry Huberts (1)
# Via Henning Rogge
* release-0.6.5:
  Update version after release of v0.6.5.1
  Release v0.6.5.1
  release: use olsrd-version prefix for files in the tarballs

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoUpdate version after release of v0.6.5.1
Henning Rogge [Mon, 11 Feb 2013 21:10:25 +0000 (22:10 +0100)]
Update version after release of v0.6.5.1

Signed-off-by: Henning Rogge <hrogge@googlemail.com>
6 years agoRelease v0.6.5.1 v0.6.5.1
Henning Rogge [Mon, 11 Feb 2013 21:10:19 +0000 (22:10 +0100)]
Release v0.6.5.1

Signed-off-by: Henning Rogge <hrogge@googlemail.com>
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 agoMerge branch 'release-0.6.5'
Ferry Huberts [Mon, 11 Feb 2013 08:28:25 +0000 (09:28 +0100)]
Merge branch 'release-0.6.5'

# By Henning Rogge
# Via Henning Rogge
* release-0.6.5:
  Update version after release of v0.6.5
  Release v0.6.5

6 years agoUpdate version after release of v0.6.5
Henning Rogge [Mon, 11 Feb 2013 08:18:02 +0000 (09:18 +0100)]
Update version after release of v0.6.5

Signed-off-by: Henning Rogge <hrogge@googlemail.com>
6 years agoRelease v0.6.5 v0.6.5
Henning Rogge [Mon, 11 Feb 2013 08:17:56 +0000 (09:17 +0100)]
Release v0.6.5

Signed-off-by: Henning Rogge <hrogge@googlemail.com>
6 years agoMerge branch 'release-0.6.5'
Ferry Huberts [Thu, 7 Feb 2013 11:50:50 +0000 (12:50 +0100)]
Merge branch 'release-0.6.5'

* release-0.6.5:
  Fix multicast join for IPv6

6 years agoFix multicast join for IPv6
Henning Rogge [Thu, 7 Feb 2013 11:26:14 +0000 (12:26 +0100)]
Fix multicast join for IPv6

6 years agoMerge branch 'master' of http://olsr.org/git/olsrd
Henning Rogge [Thu, 7 Feb 2013 11:26:30 +0000 (12:26 +0100)]
Merge branch 'master' of http://olsr.org/git/olsrd

6 years agoFix multicast join for IPv6
Henning Rogge [Thu, 7 Feb 2013 11:26:14 +0000 (12:26 +0100)]
Fix multicast join for IPv6

6 years agomake: ifdef fixups
Ferry Huberts [Tue, 5 Feb 2013 14:04:14 +0000 (15:04 +0100)]
make: ifdef fixups

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