Ferry Huberts [Wed, 22 Aug 2012 11:15:20 +0000 (13:15 +0200)]
gateway: formatting
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Reviewed-by: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
Ferry Huberts [Wed, 22 Aug 2012 10:40:42 +0000 (12:40 +0200)]
gateway: reorder functions to reflect order in header
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Reviewed-by: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
Ferry Huberts [Fri, 24 Aug 2012 08:25:40 +0000 (10:25 +0200)]
gateway: clarify header with extra comments and ordering
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Reviewed-by: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
Ferry Huberts [Tue, 21 Aug 2012 13:05:36 +0000 (15:05 +0200)]
sgwdynspeed: make sure to update the smart gw netmask
when the uplink and/or downlink speeds change, because the smart gw
netmask carries the uplink and downlink speeds that are advertised
to other nodes
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 21 Aug 2012 13:02:14 +0000 (15:02 +0200)]
gateway: move refresh_smartgw_netmask to exported functions section
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 21 Aug 2012 13:01:48 +0000 (15:01 +0200)]
gateway: export refresh_smartgw_netmask function
we need it when we adjust the uplink and/or downlink speeds
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Henning Rogge [Wed, 15 Aug 2012 16:00:55 +0000 (18:00 +0200)]
Merge branch 'master' into stable
Ferry Huberts [Thu, 9 Aug 2012 20:16:40 +0000 (22:16 +0200)]
PUD: nmealib: use fully qualified path to ldconfig
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 8 Aug 2012 12:31:58 +0000 (14:31 +0200)]
linux: rework usage of defines w.r.t. IPv6 tunnel
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 8 Aug 2012 12:05:52 +0000 (14:05 +0200)]
linux: name is required to be non-null in olsr_os_cleanup_iptunnel
Mainly to get rid of TUNNEL_ENDPOINT_IF and TUNNEL_ENDPOINT_IF6
usage here.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 8 Aug 2012 12:25:17 +0000 (14:25 +0200)]
linux: consolidate os_ip4_tunnel and os_ip6_tunnel
the code was almost the same, so merge the functions
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 26 Jul 2012 14:15:21 +0000 (16:15 +0200)]
pud: add SmartGatewayWeightExitLink and SmartGatewayWeightEtx
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 3 Aug 2012 09:16:41 +0000 (11:16 +0200)]
gateway: add exit link weighing
Only performed when the weighing factors are set
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 1 Aug 2012 10:30:41 +0000 (12:30 +0200)]
gateway: calculate with uint64_t i.s.o. olsr_linkcost
The next change needs larger numbers
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 3 Aug 2012 09:12:22 +0000 (11:12 +0200)]
cfg: add SmartGateway weighing parameters
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 3 Aug 2012 17:57:46 +0000 (19:57 +0200)]
pud: cfg: mark BMF interface as non-persistent
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 3 Aug 2012 17:53:30 +0000 (19:53 +0200)]
bmf: allow marking the BMF network interface as non-persistent
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
harald [Wed, 1 Aug 2012 15:29:25 +0000 (17:29 +0200)]
tc_set.c duplicate_set.c: small bug-fix - case ipv6 - ipwidth 30-->39
Ferry Huberts [Mon, 30 Jul 2012 13:07:08 +0000 (15:07 +0200)]
gateway: rename a variable
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 30 Jul 2012 13:04:09 +0000 (15:04 +0200)]
gateway: make smart gateway threshold parameter work properly.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 30 Jul 2012 11:07:52 +0000 (13:07 +0200)]
gateway: add helper function gw_default_calc_threshold
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 30 Jul 2012 09:19:32 +0000 (11:19 +0200)]
gateway: improve gw_default_update_handler a bit
protect against a null pointer deref
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 27 Jul 2012 10:24:56 +0000 (12:24 +0200)]
gateway: update logic of gw_default_delete_handler
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Hans-Christoph Steiner [Tue, 31 Jul 2012 17:42:35 +0000 (13:42 -0400)]
jsoninfo: fix crash in /interfaces when olsrd is using a net interface that is not up
Ferry Huberts [Wed, 25 Jul 2012 19:18:24 +0000 (21:18 +0200)]
pud: ignore zero bandwidth/uni-directional link gateways
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 25 Jul 2012 19:17:35 +0000 (21:17 +0200)]
gateway: fix deserialisation of 0 in deserialize_gw_speed
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 25 Jul 2012 16:30:09 +0000 (18:30 +0200)]
gateway: ignore zero bandwidth and uni-directional links
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 25 Jul 2012 16:28:16 +0000 (18:28 +0200)]
gateway: ignore unreachable gateways
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 24 Jul 2012 15:42:58 +0000 (17:42 +0200)]
gateway: reset bandwidth to zero when no link speed is advertised
in olsr_update_gateway_entry
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 24 Jul 2012 15:33:57 +0000 (17:33 +0200)]
gateway: minor simplification to olsr_set_inet_gateway
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 24 Jul 2012 15:33:11 +0000 (17:33 +0200)]
gateway: minor simplification to olsr_delete_gateway_entry
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 24 Jul 2012 15:32:39 +0000 (17:32 +0200)]
gateway: remove an unused variable in olsr_update_gateway_entry
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 24 Jul 2012 15:32:17 +0000 (17:32 +0200)]
gateway: minor simplification to olsr_trigger_gatewayloss_check
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 24 Jul 2012 15:30:24 +0000 (17:30 +0200)]
gateway: add some asserts on gw_handler
Ferry Huberts [Tue, 24 Jul 2012 15:29:28 +0000 (17:29 +0200)]
gateway: initialise all variables in olsr_init_gateways
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 24 Jul 2012 15:28:52 +0000 (17:28 +0200)]
gateway: add and update lots of comments
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 24 Jul 2012 15:26:08 +0000 (17:26 +0200)]
gateway: introduce OLSR_IP_ADDR_2_HNA_PTR helper
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 19 Jul 2012 15:00:32 +0000 (17:00 +0200)]
gateway: simplify and inline olsr_find_gateway_entry
node2gateway already takes care of NULL
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 18 Jul 2012 16:40:51 +0000 (18:40 +0200)]
gateway: simplify deserialize_gw_speed
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 18 Jul 2012 16:40:31 +0000 (18:40 +0200)]
gateway: remove some unused code in refresh_smartgw_netmask
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 18 Jul 2012 13:53:19 +0000 (15:53 +0200)]
gateway: reorder functions
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 18 Jul 2012 13:28:46 +0000 (15:28 +0200)]
gateway: add some comments
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 18 Jul 2012 08:42:41 +0000 (10:42 +0200)]
gateway: make olsr_find_gateway_entry static
it is only used in gateway.c
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 18 Jul 2012 08:40:18 +0000 (10:40 +0200)]
gateway: make olsr_trigger_inetgw_selection
it is only used in gateway.c
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 18 Jul 2012 08:38:47 +0000 (10:38 +0200)]
gateway: make refresh_smartgw_netmask static
it is only used with gateway.c
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 21 Jun 2012 13:25:48 +0000 (15:25 +0200)]
gateway: let init and cleanup functions take the name as parameter
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 17 Jul 2012 13:36:20 +0000 (15:36 +0200)]
gateway: minor simplification
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 17 Jul 2012 13:35:35 +0000 (15:35 +0200)]
gateway: add some comments
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 17 Jul 2012 11:04:02 +0000 (13:04 +0200)]
gateway: add some comments
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 17 Jul 2012 11:03:49 +0000 (13:03 +0200)]
gateway: fixup includes
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 17 Jul 2012 11:01:50 +0000 (13:01 +0200)]
gateway: split variable declarations
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 17 Jul 2012 11:01:23 +0000 (13:01 +0200)]
gateway: use the same 'ifdef linux' and the header and source file
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 17 Jul 2012 11:01:00 +0000 (13:01 +0200)]
gateway: remove an unused include
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 17 Jul 2012 10:55:22 +0000 (12:55 +0200)]
gateway: make olsr_gw_default_lookup_gateway function static
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 17 Jul 2012 10:50:14 +0000 (12:50 +0200)]
gateway: shift up the #ifdef linux
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 17 Jul 2012 10:50:34 +0000 (12:50 +0200)]
gateway: initialise variables in the declaration order
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 31 May 2012 12:37:22 +0000 (14:37 +0200)]
gateway: reorder functions
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Lars Kruse [Tue, 24 Jul 2012 14:31:05 +0000 (16:31 +0200)]
bugfix: set_nameservice_float() writes a float, not a double.
as reported in http://olsr.org/bugs/view.php?id=33 I noticed that the timeout
parameter of the namespace plugin is _almost_ ignored.
The simple cause is a type mismatch (double/float).
Attached you find the trivial patch that solves the problem for me.
Ferry Huberts [Tue, 24 Jul 2012 13:51:53 +0000 (15:51 +0200)]
android: port linux make 'prefix' work
So that
make NDK_BASE="<some path>/android-ndk-r8" \
OS="android" \
DESTDIR="$(pwd)/dist" \
DEBUG=0 \
OPTIMIZE="-O2" \
build_all install_all
works again
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 20 Jul 2012 08:31:50 +0000 (10:31 +0200)]
pud: statically link nmealib if PUD_NMEALIB_STATICALLY_LINKED is defined
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 20 Jul 2012 07:59:40 +0000 (09:59 +0200)]
pud: nmealib: also build a static library
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Hans-Christoph Steiner [Thu, 19 Jul 2012 20:36:53 +0000 (16:36 -0400)]
android: update comment describing build command line for correctness
Ferry Huberts [Thu, 19 Jul 2012 20:17:20 +0000 (22:17 +0200)]
man: fix a minor issue in the man page
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 18 Jul 2012 16:28:48 +0000 (18:28 +0200)]
gateway: only advertise linkspeed when the link is bi-directional
Uni-directional links produce all kinds of funky network behaviour.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 19 Jul 2012 07:46:48 +0000 (09:46 +0200)]
gateway: fix serialize_gw_speed
Values over
320000000 would serialize to 0, which is not correct,
since they should be clipped to the maximum value of the
serialization range.
v2: unchanged, sent with another patch
v3: values
100000000 and
200000000 would result in an exponent of 8,
which is out-of-range for the exponent.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 19 Jul 2012 07:34:06 +0000 (09:34 +0200)]
pud: nmealib: increase the number of satellites
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 17 Jul 2012 13:38:56 +0000 (15:38 +0200)]
gateway: fix lazy gateway selection
Only an increase in the number of gateway nodes was seen as a network
in flux. A decrease in the number of gateway nodes was not taken into
account.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 18 Jul 2012 08:37:36 +0000 (10:37 +0200)]
main: fix a typo
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 16 Jul 2012 15:25:05 +0000 (17:25 +0200)]
httpinfo: position: also show satellite information when available
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 16 Jul 2012 16:00:40 +0000 (18:00 +0200)]
pud: posavg: make sure to put track, mtrack and magvar in the cumulative
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 16 Jul 2012 15:59:51 +0000 (17:59 +0200)]
pud: posavg: don't add an angle if it is not present
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 16 Jul 2012 15:56:39 +0000 (17:56 +0200)]
pud: posavg: minor simplification
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 16 Jul 2012 15:55:57 +0000 (17:55 +0200)]
pud: posavg: fix typo in calculateAngle
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 16 Jul 2012 13:41:44 +0000 (15:41 +0200)]
pud: include nmealib v1.0.1
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 16 Jul 2012 09:14:47 +0000 (11:14 +0200)]
pud: fix angle averaging
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 16 Jul 2012 10:32:07 +0000 (12:32 +0200)]
pud: switch to syslog logging on successful loading of plugin
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 16 Jul 2012 09:44:52 +0000 (11:44 +0200)]
pud: allow logging to syslog
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 16 Jul 2012 09:43:11 +0000 (11:43 +0200)]
pud: simplify pudError a bit
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 16 Jul 2012 09:25:47 +0000 (11:25 +0200)]
pud: hook up the nmea library error callback
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 16 Jul 2012 08:57:04 +0000 (10:57 +0200)]
pud: minor simplification to receiver
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 16 Jul 2012 08:04:18 +0000 (10:04 +0200)]
pud: upgrade doxygen configuration files
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 16 Jul 2012 07:23:47 +0000 (09:23 +0200)]
pud: it's 'Magnetic Variation', not 'Magnetic Variance'
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 16 Jul 2012 08:04:44 +0000 (10:04 +0200)]
pud: fix some comments
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Sat, 14 Jul 2012 11:21:37 +0000 (13:21 +0200)]
pud: adjust to new nmealib
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 13 Jul 2012 16:14:22 +0000 (18:14 +0200)]
pud: include nmealib v1.0.0
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Sat, 14 Jul 2012 11:57:00 +0000 (13:57 +0200)]
pud: remove inlining from wireformat library
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Sat, 14 Jul 2012 09:59:40 +0000 (11:59 +0200)]
pud: minor simplification in posAvg
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Sat, 14 Jul 2012 09:50:44 +0000 (11:50 +0200)]
httpinfo: update includes for pud
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Sat, 14 Jul 2012 09:46:30 +0000 (11:46 +0200)]
httpinfo: update pud signal descriptions
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Sat, 14 Jul 2012 09:43:39 +0000 (11:43 +0200)]
httpinfo: minor simplification in pud body function
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Sat, 14 Jul 2012 09:42:38 +0000 (11:42 +0200)]
httpinfo: decrease pud nodeId buffer size
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 13 Jul 2012 15:31:19 +0000 (17:31 +0200)]
httpinfo: replace all "N.A."s by a static string
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 13 Jul 2012 15:29:50 +0000 (17:29 +0200)]
httpinfo: add some comments
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 13 Jul 2012 15:29:31 +0000 (17:29 +0200)]
httpinfo: also print smask
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 13 Jul 2012 15:29:08 +0000 (17:29 +0200)]
httpinfo: split table start and nodeId
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 13 Jul 2012 15:22:58 +0000 (17:22 +0200)]
httpinfo: properly close the table row on the position tab
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 13 Jul 2012 15:17:41 +0000 (17:17 +0200)]
httpinfo: also show the position on the 'All' tab
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 13 Jul 2012 15:17:24 +0000 (17:17 +0200)]
httpinfo: change the default zoom level on OpenStreetMap
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 13 Jul 2012 15:16:58 +0000 (17:16 +0200)]
httpinfo: put the position table in a paragraph
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 13 Jul 2012 15:16:10 +0000 (17:16 +0200)]
httpinfo: update 'PUD plugin not loaded' message formatting
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>