olsrd.git
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>
6 years agopud: enable 32/64 bit cross compilation for the java build
Ferry Huberts [Tue, 5 Feb 2013 11:37:41 +0000 (12:37 +0100)]
pud: enable 32/64 bit cross compilation for the java build

It also build a C library...

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agomake: fix typos in 'enable 32/64 bit cross compilation' commit
Ferry Huberts [Tue, 5 Feb 2013 11:42:26 +0000 (12:42 +0100)]
make: fix typos in 'enable 32/64 bit cross compilation' commit

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: remove some 'unused' code from sgw script
Ferry Huberts [Mon, 4 Feb 2013 12:17:43 +0000 (13:17 +0100)]
gateway: remove some 'unused' code from sgw script

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agopud: pull in nmealib v1.0.4
Ferry Huberts [Mon, 4 Feb 2013 10:24:21 +0000 (11:24 +0100)]
pud: pull in nmealib v1.0.4

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agomake: enable 32/64 bit cross compilation
Ferry Huberts [Mon, 4 Feb 2013 10:11:22 +0000 (11:11 +0100)]
make: enable 32/64 bit cross compilation

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoMerge branch 'release-0.6.5'
Ferry Huberts [Thu, 31 Jan 2013 12:42:07 +0000 (13:42 +0100)]
Merge branch 'release-0.6.5'

* release-0.6.5:
  main: fix pidfile compilation on windows
  main: add -pidfile command line option
  gateway: always select a new gateway when threshold != 0
  gateway: fix stable count dampening in gw_default_timer
  android: fix the path of the tunnel node in the /dev tree
  gateway: fix a revert problem
  Revert "linux: name is required to be non-null in olsr_os_cleanup_iptunnel"

6 years agomain: fix pidfile compilation on windows
Ferry Huberts [Thu, 31 Jan 2013 12:33:53 +0000 (13:33 +0100)]
main: fix pidfile compilation on windows

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agomain: fix pidfile compilation on windows
Ferry Huberts [Thu, 31 Jan 2013 12:33:53 +0000 (13:33 +0100)]
main: fix pidfile compilation on windows

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agomain: add -pidfile command line option
Ferry Huberts [Wed, 30 Jan 2013 12:31:08 +0000 (13:31 +0100)]
main: add -pidfile command line option

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: always select a new gateway when threshold != 0
Ferry Huberts [Thu, 31 Jan 2013 11:20:29 +0000 (12:20 +0100)]
gateway: always select a new gateway when threshold != 0

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agomain: add -pidfile command line option
Ferry Huberts [Wed, 30 Jan 2013 12:31:08 +0000 (13:31 +0100)]
main: add -pidfile command line option

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: always select a new gateway when threshold != 0
Ferry Huberts [Thu, 31 Jan 2013 11:20:29 +0000 (12:20 +0100)]
gateway: always select a new gateway when threshold != 0

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: reverse semantics of two variables
Ferry Huberts [Wed, 30 Jan 2013 10:56:48 +0000 (11:56 +0100)]
gateway: reverse semantics of two variables

To make it more readable

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: do not use bitwise operators for logic conditions
Ferry Huberts [Wed, 30 Jan 2013 10:35:21 +0000 (11:35 +0100)]
gateway: do not use bitwise operators for logic conditions

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: fix stable count dampening in gw_default_timer
Ferry Huberts [Wed, 30 Jan 2013 10:16:45 +0000 (11:16 +0100)]
gateway: fix stable count dampening in gw_default_timer

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: rename some variables to make it more readable
Ferry Huberts [Wed, 30 Jan 2013 10:10:22 +0000 (11:10 +0100)]
gateway: rename some variables to make it more readable

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: improve comments of gw_default_weigh_costs a bit
Ferry Huberts [Wed, 30 Jan 2013 09:49:13 +0000 (10:49 +0100)]
gateway: improve comments of gw_default_weigh_costs a bit

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: simplify gw_default_calc_threshold
Ferry Huberts [Wed, 30 Jan 2013 09:48:40 +0000 (10:48 +0100)]
gateway: simplify gw_default_calc_threshold

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: fix stable count dampening in gw_default_timer
Ferry Huberts [Wed, 30 Jan 2013 10:16:45 +0000 (11:16 +0100)]
gateway: fix stable count dampening in gw_default_timer

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: find_interfaceName only works in multi-gateway mode
Ferry Huberts [Tue, 29 Jan 2013 11:10:07 +0000 (12:10 +0100)]
gateway: find_interfaceName only works in multi-gateway mode

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: also set (update) the gateway when costs have changed
Ferry Huberts [Tue, 29 Jan 2013 11:08:07 +0000 (12:08 +0100)]
gateway: also set (update) the gateway when costs have changed

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: add some comments
Ferry Huberts [Thu, 17 Jan 2013 16:14:41 +0000 (17:14 +0100)]
gateway: add some comments

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: allow advertisement of zero bandwidth
Ferry Huberts [Tue, 29 Jan 2013 13:54:34 +0000 (14:54 +0100)]
gateway: allow advertisement of zero bandwidth

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoandroid: fix the path of the tunnel node in the /dev tree
Ferry Huberts [Thu, 17 Jan 2013 09:01:21 +0000 (10:01 +0100)]
android: fix the path of the tunnel node in the /dev tree

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agopud: use the proper __ANDROID__ define
Ferry Huberts [Thu, 17 Jan 2013 09:01:36 +0000 (10:01 +0100)]
pud: use the proper __ANDROID__ define

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoandroid: fix the path of the tunnel node in the /dev tree
Ferry Huberts [Thu, 17 Jan 2013 09:01:21 +0000 (10:01 +0100)]
android: fix the path of the tunnel node in the /dev tree

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: minor speed improvement in gw_default_choose_gateway
Ferry Huberts [Wed, 16 Jan 2013 20:24:46 +0000 (21:24 +0100)]
gateway: minor speed improvement in gw_default_choose_gateway

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: fix 'eligible' conditions in gw_default_choose_gateway
Ferry Huberts [Wed, 16 Jan 2013 18:11:10 +0000 (19:11 +0100)]
gateway: fix 'eligible' conditions in gw_default_choose_gateway

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: use standard macro to loop over the gateway tree in olsr_cleanup_gateways
Ferry Huberts [Wed, 16 Jan 2013 16:37:11 +0000 (17:37 +0100)]
gateway: use standard macro to loop over the gateway tree in olsr_cleanup_gateways

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: remove 2 unneeded asserts
Ferry Huberts [Wed, 16 Jan 2013 13:56:59 +0000 (14:56 +0100)]
gateway: remove 2 unneeded asserts

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: update some comments
Ferry Huberts [Wed, 16 Jan 2013 13:55:59 +0000 (14:55 +0100)]
gateway: update some comments

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: minor improvement to get_unused_iptunnel_name
Ferry Huberts [Wed, 16 Jan 2013 13:55:36 +0000 (14:55 +0100)]
gateway: minor improvement to get_unused_iptunnel_name

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agopud: minor update to getBestUplinkGateway
Ferry Huberts [Wed, 16 Jan 2013 17:40:33 +0000 (18:40 +0100)]
pud: minor update to getBestUplinkGateway

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agopud: minor update resulting from the previous revert
Ferry Huberts [Wed, 16 Jan 2013 17:03:43 +0000 (18:03 +0100)]
pud: minor update resulting from the previous revert

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoRevert "pud: the best uplink gateway is the same as the current (smart) gateway"
Ferry Huberts [Wed, 16 Jan 2013 16:50:45 +0000 (17:50 +0100)]
Revert "pud: the best uplink gateway is the same as the current (smart) gateway"

This reverts commit 6a4cdd2a1b2727caca1b643f9b06571eb5e01292.

We really only want to take into account the exit link bandwidth and
ignore the OLSR path to it.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: fix 2 small typos in a comment
Ferry Huberts [Fri, 11 Jan 2013 14:12:18 +0000 (15:12 +0100)]
gateway: fix 2 small typos in a comment

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agopud: update documentation about smart gateway changes
Ferry Huberts [Thu, 10 Jan 2013 15:01:10 +0000 (16:01 +0100)]
pud: update documentation about smart gateway changes

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agopud: only forward downlinked messages when the smart gateway system is enabled
Ferry Huberts [Thu, 10 Jan 2013 14:58:50 +0000 (15:58 +0100)]
pud: only forward downlinked messages when the smart gateway system is enabled

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agopud: there is no hard dependency on smart gateway
Ferry Huberts [Thu, 10 Jan 2013 14:49:58 +0000 (15:49 +0100)]
pud: there is no hard dependency on smart gateway

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agopud: the best uplink gateway is the same as the current (smart) gateway
Ferry Huberts [Thu, 10 Jan 2013 14:48:55 +0000 (15:48 +0100)]
pud: the best uplink gateway is the same as the current (smart) gateway

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agojson_info: do not loop forever on smart gateway egress interfaces
Ferry Huberts [Thu, 10 Jan 2013 13:04:05 +0000 (14:04 +0100)]
json_info: do not loop forever on smart gateway egress interfaces

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: properly set the egress interface names
Ferry Huberts [Thu, 10 Jan 2013 13:10:28 +0000 (14:10 +0100)]
gateway: properly set the egress interface names

They were set to egress_xx instead of to the configured names

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: use tnl_(4|6) tunnel names instead of tnl(4|6)_
Ferry Huberts [Wed, 9 Jan 2013 14:27:37 +0000 (15:27 +0100)]
gateway: use tnl_(4|6) tunnel names instead of tnl(4|6)_

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: fix a revert problem
Ferry Huberts [Wed, 9 Jan 2013 12:57:50 +0000 (13:57 +0100)]
gateway: fix a revert problem

Did not notice that a line got doubled.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: fix a revert problem
Ferry Huberts [Wed, 9 Jan 2013 12:57:50 +0000 (13:57 +0100)]
gateway: fix a revert problem

Did not notice that a line got doubled.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: use SmartGatewayAlwaysRemoveServerTunnel configuration parameter
Ferry Huberts [Wed, 9 Jan 2013 11:55:39 +0000 (12:55 +0100)]
gateway: use SmartGatewayAlwaysRemoveServerTunnel configuration parameter

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agocfgparser: add SmartGatewayAlwaysRemoveServerTunnel configuration parameter
Ferry Huberts [Wed, 9 Jan 2013 12:41:12 +0000 (13:41 +0100)]
cfgparser: add SmartGatewayAlwaysRemoveServerTunnel configuration parameter

So that we can have the server tunnel (tunl0) removed on olsrd
shutdown, by setting the parameter to true.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: cleanup the server tunnel later
Ferry Huberts [Wed, 9 Jan 2013 10:53:49 +0000 (11:53 +0100)]
gateway: cleanup the server tunnel later

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: do not show (bogus) errors
Ferry Huberts [Tue, 8 Jan 2013 12:55:15 +0000 (13:55 +0100)]
gateway: do not show (bogus) errors

In add mode (of the policy rule) we first remove rules.
This can show errors when the rules did not yet exist.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoRevert "linux: name is required to be non-null in olsr_os_cleanup_iptunnel"
Ferry Huberts [Wed, 9 Jan 2013 10:33:58 +0000 (11:33 +0100)]
Revert "linux: name is required to be non-null in olsr_os_cleanup_iptunnel"

This reverts commit f72ba167eb3f6c01b15edbb2efddd8a3950067f1.

It causes failures to add tunnels.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoRevert "linux: name is required to be non-null in olsr_os_cleanup_iptunnel"
Ferry Huberts [Wed, 9 Jan 2013 10:33:58 +0000 (11:33 +0100)]
Revert "linux: name is required to be non-null in olsr_os_cleanup_iptunnel"

This reverts commit f72ba167eb3f6c01b15edbb2efddd8a3950067f1.

It causes failures to add tunnels.

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