olsrd.git
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>
6 years agogateway: ignore errors in remove-before-add rule removals
Ferry Huberts [Mon, 7 Jan 2013 15:06:50 +0000 (16:06 +0100)]
gateway: ignore errors in remove-before-add rule removals

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: remove policy rules before adding them
Ferry Huberts [Mon, 7 Jan 2013 14:42:19 +0000 (15:42 +0100)]
gateway: remove policy rules before adding them

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: fix copy/paste mistake in setting up the egress rules
Ferry Huberts [Mon, 7 Jan 2013 14:24:59 +0000 (15:24 +0100)]
gateway: fix copy/paste mistake in setting up the egress rules

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: minor indentation fixes in the gateway script
Ferry Huberts [Mon, 7 Jan 2013 10:48:00 +0000 (11:48 +0100)]
gateway: minor indentation fixes in the gateway script

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: the gateway policy script really is a bash script
Ferry Huberts [Mon, 7 Jan 2013 10:47:36 +0000 (11:47 +0100)]
gateway: the gateway policy script really is a bash script

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: fix policy script permissions checking
Ferry Huberts [Mon, 7 Jan 2013 08:48:56 +0000 (09:48 +0100)]
gateway: fix policy script permissions checking

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoFixed debug output of Scheduler polling interval
Henning Rogge [Thu, 20 Dec 2012 08:34:37 +0000 (09:34 +0100)]
Fixed debug output of Scheduler polling interval

6 years agogateway: also adjust the IPv6 gateway list in olsr_update_gateway_entry
Ferry Huberts [Thu, 13 Dec 2012 12:58:41 +0000 (13:58 +0100)]
gateway: also adjust the IPv6 gateway list in olsr_update_gateway_entry

This was forgotten in 4249b3f

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: add an assert to prevent an 'unused' warning
Ferry Huberts [Thu, 13 Dec 2012 12:57:25 +0000 (13:57 +0100)]
gateway: add an assert to prevent an 'unused' warning

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: remove 2 superfluous asserts
Ferry Huberts [Thu, 13 Dec 2012 12:57:01 +0000 (13:57 +0100)]
gateway: remove 2 superfluous asserts

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoMerge branch 'multigw'
Ferry Huberts [Thu, 13 Dec 2012 12:32:30 +0000 (13:32 +0100)]
Merge branch 'multigw'

* multigw: (25 commits)
  kernel_route: olsr_os_inetgw_tunnel_route now needs the table explicitly
  gateway: convert some defines into inline functions
  gateway: enable multi-gateway mode
  gateway: introduce and use MULTI_GW_MODE define
  gateway: setup/cleanup multi-gateway mode during startup/shutdown of olsrd
  gateway: setup and clear table specific default routes in/for multi-gateway mode
  gateway: use fixed tunnel names in/for multi-gateway mode
  gateway: initialise the egress interface names in/for multi-gateway mode
  gateway: initialise a set of fixed tunnel names in/for multi-gateway mode
  gateway: add SmartGatewayPolicyRoutingScript configuration parameter
  gateway: add SmartGatewayMarkOffset{Egress,Tunnels} configuration parameters
  gateway: add SmartGatewayEgressInterfaces configuration parameter
  gateway: use SmartGatewayUseCount setting the the gateway lists
  gateway: add SmartGatewayUseCount configuration parameter
  gateway: remove the worst gateway before adding new one
  gateway: let the gateway code determine the tunnel name
  kernel_route: olsr_os_inetgw_tunnel_route can now take the table
  json_info: only output smart gateway info on Linux
  gateway: keep track of the active gateways in a list
  gateway: add gateway_list.{c,h}
  ...

6 years agokernel_route: olsr_os_inetgw_tunnel_route now needs the table explicitly
Ferry Huberts [Thu, 13 Dec 2012 12:30:42 +0000 (13:30 +0100)]
kernel_route: olsr_os_inetgw_tunnel_route now needs the table explicitly

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Reviewed-by: Henning Rogge <hrogge@googlemail.com>
6 years agogateway: convert some defines into inline functions
Ferry Huberts [Thu, 13 Dec 2012 11:51:57 +0000 (12:51 +0100)]
gateway: convert some defines into inline functions

And inline some other defines.

Henning doesn't seem to like defines ;-)

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Reviewed-by: Henning Rogge <hrogge@googlemail.com>
6 years agogateway: enable multi-gateway mode
Ferry Huberts [Tue, 4 Dec 2012 10:37:23 +0000 (11:37 +0100)]
gateway: enable multi-gateway mode

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Reviewed-by: Henning Rogge <hrogge@googlemail.com>
6 years agogateway: introduce and use MULTI_GW_MODE define
Ferry Huberts [Tue, 4 Dec 2012 12:37:17 +0000 (13:37 +0100)]
gateway: introduce and use MULTI_GW_MODE define

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Reviewed-by: Henning Rogge <hrogge@googlemail.com>
6 years agogateway: setup/cleanup multi-gateway mode during startup/shutdown of olsrd
Ferry Huberts [Tue, 4 Dec 2012 13:20:50 +0000 (14:20 +0100)]
gateway: setup/cleanup multi-gateway mode during startup/shutdown of olsrd

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Reviewed-by: Henning Rogge <hrogge@googlemail.com>
6 years agogateway: setup and clear table specific default routes in/for multi-gateway mode
Ferry Huberts [Tue, 4 Dec 2012 12:22:56 +0000 (13:22 +0100)]
gateway: setup and clear table specific default routes in/for multi-gateway mode

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Reviewed-by: Henning Rogge <hrogge@googlemail.com>
6 years agogateway: use fixed tunnel names in/for multi-gateway mode
Ferry Huberts [Tue, 4 Dec 2012 12:18:33 +0000 (13:18 +0100)]
gateway: use fixed tunnel names in/for multi-gateway mode

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Reviewed-by: Henning Rogge <hrogge@googlemail.com>
6 years agogateway: initialise the egress interface names in/for multi-gateway mode
Ferry Huberts [Tue, 4 Dec 2012 12:04:48 +0000 (13:04 +0100)]
gateway: initialise the egress interface names in/for multi-gateway mode

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Reviewed-by: Henning Rogge <hrogge@googlemail.com>
6 years agogateway: initialise a set of fixed tunnel names in/for multi-gateway mode
Ferry Huberts [Tue, 4 Dec 2012 12:03:53 +0000 (13:03 +0100)]
gateway: initialise a set of fixed tunnel names in/for multi-gateway mode

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Reviewed-by: Henning Rogge <hrogge@googlemail.com>
6 years agogateway: add SmartGatewayPolicyRoutingScript configuration parameter
Ferry Huberts [Tue, 4 Dec 2012 11:56:19 +0000 (12:56 +0100)]
gateway: add SmartGatewayPolicyRoutingScript configuration parameter

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Reviewed-by: Henning Rogge <hrogge@googlemail.com>
6 years agogateway: add SmartGatewayMarkOffset{Egress,Tunnels} configuration parameters
Ferry Huberts [Tue, 4 Dec 2012 11:48:14 +0000 (12:48 +0100)]
gateway: add SmartGatewayMarkOffset{Egress,Tunnels} configuration parameters

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Reviewed-by: Henning Rogge <hrogge@googlemail.com>
6 years agogateway: add SmartGatewayEgressInterfaces configuration parameter
Ferry Huberts [Tue, 4 Dec 2012 11:41:17 +0000 (12:41 +0100)]
gateway: add SmartGatewayEgressInterfaces configuration parameter

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Reviewed-by: Henning Rogge <hrogge@googlemail.com>
6 years agogateway: use SmartGatewayUseCount setting the the gateway lists
Ferry Huberts [Tue, 20 Nov 2012 11:07:53 +0000 (12:07 +0100)]
gateway: use SmartGatewayUseCount setting the the gateway lists

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Reviewed-by: Henning Rogge <hrogge@googlemail.com>
6 years agogateway: add SmartGatewayUseCount configuration parameter
Ferry Huberts [Tue, 4 Dec 2012 11:25:07 +0000 (12:25 +0100)]
gateway: add SmartGatewayUseCount configuration parameter

We can now configure multiple 'active' gateways (although we only
allow 1 for now until the functionality is complete).

Multiple active gateways are used to reduce breaking connections
in a dynamic network.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Reviewed-by: Henning Rogge <hrogge@googlemail.com>
6 years agogateway: remove the worst gateway before adding new one
Ferry Huberts [Tue, 4 Dec 2012 10:28:31 +0000 (11:28 +0100)]
gateway: remove the worst gateway before adding new one

when the gateway list is full, so that we never overrun
the list.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Reviewed-by: Henning Rogge <hrogge@googlemail.com>
6 years agogateway: let the gateway code determine the tunnel name
Ferry Huberts [Tue, 4 Dec 2012 09:50:35 +0000 (10:50 +0100)]
gateway: let the gateway code determine the tunnel name

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Reviewed-by: Henning Rogge <hrogge@googlemail.com>
6 years agokernel_route: olsr_os_inetgw_tunnel_route can now take the table
Ferry Huberts [Tue, 27 Nov 2012 12:33:31 +0000 (13:33 +0100)]
kernel_route: olsr_os_inetgw_tunnel_route can now take the table

as an optional parameter.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Reviewed-by: Henning Rogge <hrogge@googlemail.com>