Hans-Christoph Steiner [Thu, 10 May 2012 02:54:22 +0000 (22:54 -0400)]
convert 'gateways' to JSON
Hans-Christoph Steiner [Thu, 10 May 2012 02:09:44 +0000 (22:09 -0400)]
rename 'msValid' JSON key to 'validityTime' for clarity
Hans-Christoph Steiner [Thu, 10 May 2012 02:08:58 +0000 (22:08 -0400)]
output any combo of commands as a JSON array (except 'olsrd.conf' which is the conf file format)
Hans-Christoph Steiner [Thu, 10 May 2012 02:07:25 +0000 (22:07 -0400)]
add 'plugins' and 'config' method to output info parsed from olsrd.conf as JSON
Hans-Christoph Steiner [Thu, 10 May 2012 02:03:38 +0000 (22:03 -0400)]
add 'olsrd.conf' method to give complete, generated olsrd.conf contents (i.e. txtinfo's /config)
Hans-Christoph Steiner [Thu, 10 May 2012 01:58:55 +0000 (21:58 -0400)]
convert abuf_json_int() to write out long ints to represent all the int types used in olsrd
Ferry Huberts [Wed, 9 May 2012 13:00:34 +0000 (15:00 +0200)]
PUD: speed up postion file parsing
By avoiding 2 memcpy's
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 9 May 2012 12:27:33 +0000 (14:27 +0200)]
PUD: update cached mtime right after position file was successfully opened
This updates the cached mtime earlier so that the file will
not be read again until it has been changed (to prevent
repeatedly reading a file with errors)
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 9 May 2012 06:34:55 +0000 (08:34 +0200)]
PUD: do not read position file if it did not change
To prepare for reading it off a timer.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 9 May 2012 06:41:33 +0000 (08:41 +0200)]
jsoninfo: fix a warning
src/olsrd_jsoninfo.c:605:18: error: variable ‘is_first’ set but not used [-Werror=unused-but-set-variable]
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Hans-Christoph Steiner [Wed, 9 May 2012 04:31:14 +0000 (00:31 -0400)]
if requesting all status, then return everything as a JSON array
Hans-Christoph Steiner [Wed, 9 May 2012 04:32:41 +0000 (00:32 -0400)]
converted 'mid' to JSON
Hans-Christoph Steiner [Wed, 9 May 2012 04:32:19 +0000 (00:32 -0400)]
converted 'hna' to JSON
Hans-Christoph Steiner [Wed, 9 May 2012 03:38:40 +0000 (23:38 -0400)]
converted 'topology' to JSON
Hans-Christoph Steiner [Wed, 9 May 2012 03:37:06 +0000 (23:37 -0400)]
converted 'routes' to JSON
Hans-Christoph Steiner [Tue, 8 May 2012 22:38:42 +0000 (18:38 -0400)]
converted 'links' to JSON
Hans-Christoph Steiner [Tue, 8 May 2012 21:58:33 +0000 (17:58 -0400)]
merged 'twohop' into 'neighbors' and converted to full JSON
Hans-Christoph Steiner [Tue, 8 May 2012 21:18:56 +0000 (17:18 -0400)]
renamed abuf_json_key_* functions to abuf_json_* for clarity: all data needs a key
Hans-Christoph Steiner [Tue, 8 May 2012 21:18:06 +0000 (17:18 -0400)]
added 'gateways', 'twohop', and 'interfaces' to 'status' command, replacing old 'all' command
Hans-Christoph Steiner [Mon, 7 May 2012 02:11:46 +0000 (22:11 -0400)]
converted 'interfaces' to JSON
Hans-Christoph Steiner [Mon, 7 May 2012 01:49:30 +0000 (21:49 -0400)]
always output VTIME validity time info
Hans-Christoph Steiner [Mon, 7 May 2012 01:31:28 +0000 (21:31 -0400)]
laid out JSON functions and converted to printing JSON headers and footers
Hans-Christoph Steiner [Sun, 6 May 2012 02:44:09 +0000 (22:44 -0400)]
made naming consistent across commands, macros, variables, and functions
Hans-Christoph Steiner [Sun, 6 May 2012 02:43:41 +0000 (22:43 -0400)]
ran "astyle --style=linux --indent=spaces=2" and manually laid out code
Hans-Christoph Steiner [Sun, 6 May 2012 00:52:10 +0000 (20:52 -0400)]
change default port to 9090 (which is used for JSON-RPC)
Hans-Christoph Steiner [Sun, 6 May 2012 00:51:50 +0000 (20:51 -0400)]
copy txtinfo plugin to create template for new jsoninfo plugin
Hans-Christoph Steiner [Wed, 9 May 2012 03:39:37 +0000 (23:39 -0400)]
included MinGW build instructions for Windows/Win32
Hans-Christoph Steiner [Fri, 13 Apr 2012 20:50:13 +0000 (16:50 -0400)]
updated Linux ad-hoc setup script to associate to existing cells rather than only a hard-coded BSSID
Hans-Christoph Steiner [Thu, 12 Apr 2012 02:12:41 +0000 (22:12 -0400)]
also try configuring ad-hoc after interface is up, if not already in ad-hoc mode (some hardware requires this)
Hans-Christoph Steiner [Sat, 4 Feb 2012 02:53:02 +0000 (21:53 -0500)]
first working script to setup wifi interface into ad-hoc mode for olsrd on GNU/Linux
Hans-Christoph Steiner [Wed, 4 Apr 2012 23:30:54 +0000 (19:30 -0400)]
updated Android build to use "gcc --sysroot" technique, first available in NDKr4
Hans-Christoph Steiner [Wed, 4 Apr 2012 23:03:15 +0000 (19:03 -0400)]
updated 'android/regex/' source directly from Android's sources (also OpenBSD-derived)
Henning Rogge [Sat, 5 May 2012 11:08:54 +0000 (13:08 +0200)]
Fix problem with network byte order in secure plugin
see http://olsr.org/bugs/view.php?id=20
Henning Rogge [Sat, 5 May 2012 11:05:46 +0000 (13:05 +0200)]
Use __ANDROID__ instead of "android" for preprocessor
Henning Rogge [Sat, 5 May 2012 10:57:07 +0000 (12:57 +0200)]
Removed LINUX_NETLINK_ROUTING define and the old ioctl based route setting
see http://olsr.org/bugs/view.php?id=31
Henning Rogge [Sat, 5 May 2012 10:33:41 +0000 (12:33 +0200)]
Applied patch by Hans-Christoph Steiner
see http://olsr.org/bugs/view.php?id=30
Henning Rogge [Sat, 5 May 2012 10:29:33 +0000 (12:29 +0200)]
Applied patch by Hans-Christoph Steiner
See http://olsr.org/bugs/view.php?id=28
Henning Rogge [Sat, 5 May 2012 10:26:16 +0000 (12:26 +0200)]
Applied patch by Hans-Christoph Steiner
see http://olsr.org/bugs/view.php?id=26
Henning Rogge [Sat, 5 May 2012 10:22:45 +0000 (12:22 +0200)]
Applied patch by Hans-Christoph Steiner
see http://olsr.org/bugs/view.php?id=23
Henning Rogge [Sat, 5 May 2012 10:12:04 +0000 (12:12 +0200)]
Applied change by Hans-Christoph Steiner <hans@eds.org>
see http://olsr.org/bugs/view.php?id=25
Ferry Huberts [Thu, 3 May 2012 09:53:17 +0000 (11:53 +0200)]
olsr_switch: do not build unnecessarily
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 May 2012 11:18:32 +0000 (13:18 +0200)]
PUD: add SmartGatewayPeriod/SmartGatewayStableCount to config
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 May 2012 10:14:23 +0000 (12:14 +0200)]
smart gateway: make period and stable count configurable
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 May 2012 08:37:00 +0000 (10:37 +0200)]
smart gateway: move GW_DEFAULT_* defines into olsr_cfg.h
To prepare for making these configuration parameters
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 May 2012 10:52:41 +0000 (12:52 +0200)]
cfgparser: make sure olsrd_parse_cnf is used consistently
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 1 May 2012 11:27:18 +0000 (13:27 +0200)]
tas: remove unused forward declaration of olsrd_plugin_register_param
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 24 Apr 2012 12:50:08 +0000 (13:50 +0100)]
README-Olsr-Extensions: fixup text for SmartGatewayThreshold
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 24 Apr 2012 10:47:19 +0000 (12:47 +0200)]
Makefile: pud make invocations are silent now
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 24 Apr 2012 10:43:37 +0000 (12:43 +0200)]
Makefile: split out clean of plugins into separate targets
Otherwise repeated plugin builds are unnecessarily slow.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 24 Apr 2012 10:31:49 +0000 (12:31 +0200)]
smart gateway: replace magic numbers for threshold by defines
Also improve the error message on validation error
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 23 Apr 2012 08:27:58 +0000 (10:27 +0200)]
PUD: when building from a snapshot, do not complain about git
Just set the version to 'Unknown'.
Also, move getting the version into the 'ifdef linux' block.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 23 Apr 2012 06:56:04 +0000 (08:56 +0200)]
PUD: generate and provide version in/from Makefile
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 19 Apr 2012 09:56:57 +0000 (11:56 +0200)]
PUD: do not use deduplication in the downlink path
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 19 Apr 2012 09:55:53 +0000 (11:55 +0200)]
PUD: check type after length in downlink path
So that we just skip over unsupported downlink messages
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 19 Apr 2012 09:26:33 +0000 (11:26 +0200)]
PUD: fix infinite loop on downlink receive errors
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 19 Apr 2012 07:32:16 +0000 (09:32 +0200)]
PUD: check downlink header fields in correct order
The length field comes before the IPv6 flag.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 17 Apr 2012 10:31:02 +0000 (12:31 +0200)]
PUD: update configuration file
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 13 Apr 2012 12:43:30 +0000 (14:43 +0200)]
PUD: add positionFile plugin parameter
You can now define a (GPS) position in a file and let the PUD
plugin read the file on startup to determine its position.
This is useful for nodes with a fixed position.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 12 Apr 2012 13:39:07 +0000 (15:39 +0200)]
PUD: add some includes
To appease eclipse.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 17 Apr 2012 12:40:31 +0000 (14:40 +0200)]
Revert "PUD: packetReceivedFromOlsr should be unregistered on stop"
This reverts commit
9b434d5d4aaefbccca0a31dffd3545955b31b518.
It introduces a segfault and it appears that nobody else calls
the olsr_parser_remove_function function.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 13 Apr 2012 12:48:22 +0000 (14:48 +0200)]
Makefile: sort pud position in global makefile
To ensure the list is in sorted order again.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 10 Apr 2012 08:14:32 +0000 (10:14 +0200)]
PUD: the NMEA library has moved
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 6 Apr 2012 09:40:46 +0000 (11:40 +0200)]
PUD: replace rt.jar file with ee.j2se.jar
We now use an API-only jar file which is much smaller and
has a more permissive license (APL 2.0) than the OpenJDK
rt.jar file (GPLv2 with classpath exception).
Note that this jar file is only used at build time, it
is _not_ included in any of the binaries. Please refer
to the lib/pud/wireformat-java/README for an explantion.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Henning Rogge [Fri, 6 Apr 2012 06:43:42 +0000 (08:43 +0200)]
Do not commit pud version, it changes every build
Henning Rogge [Fri, 6 Apr 2012 06:37:14 +0000 (08:37 +0200)]
Remove PUD-plugin from build_all on linux
Ferry Huberts [Thu, 5 Apr 2012 10:27:03 +0000 (12:27 +0200)]
PUD: destroyState was removed in
c33a5bb
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 2 Apr 2012 09:00:50 +0000 (11:00 +0200)]
Merge branch 'pud' into stable
* pud: (239 commits)
PUD: remove pointless mutex from state
PUD: remove pointless mutex from receiver
PUD: remove pointless mutex from dedup
PUD: include compiler.h where needed
PUD: make sure horizontal distance is an absolute number
PUD: remove debug code
PUD: allow output pointers to be NULL in determineStateWithHysteresis
PUD: when gateway changed, always update it on the uplink
PUD: fix validity time on uplink and reduce lock contention window
PUD: consistent use of external state and resulting update interval
PUD: rename a field of TransmitGpsInformation
PUD: pull condition out of doImmediateTransmit
PUD: fix updating substate related information in transmitGpsInformation
PUD: cleanup includes
PUD: update doxygen files
PUD: split position and gateway paths
PUD: move state code into its own source files
PUD: do not change state on unknown movement
PUD: only reference external state once in txToAllOlsrInterfaces
PUD: split position and gateway state
...
Markus Kittenberger [Sun, 1 Apr 2012 07:04:01 +0000 (09:04 +0200)]
small fix for SetIpForward cmdline option
Markus Kittenberger [Sat, 31 Mar 2012 15:48:40 +0000 (17:48 +0200)]
do not restore proc values which required no changes on startup
Henning Rogge [Sat, 31 Mar 2012 10:56:19 +0000 (13:56 +0300)]
Add config option SetIpForward to allow preventing manipulation of ip_forward proc variable
Ferry Huberts [Wed, 28 Mar 2012 16:17:22 +0000 (18:17 +0200)]
PUD: remove pointless mutex from state
The mutex is pointless because there is no
multi-threading in olsr.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 27 Mar 2012 15:03:11 +0000 (17:03 +0200)]
PUD: remove pointless mutex from receiver
The mutex is pointless because there is no
multi-threading in olsr.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 27 Mar 2012 14:48:26 +0000 (16:48 +0200)]
PUD: remove pointless mutex from dedup
The mutex is pointless because there is no
multi-threading in olsr.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Mar 2012 11:09:24 +0000 (12:09 +0100)]
PUD: include compiler.h where needed
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Mar 2012 11:04:26 +0000 (12:04 +0100)]
PUD: make sure horizontal distance is an absolute number
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Mar 2012 10:28:30 +0000 (11:28 +0100)]
PUD: remove debug code
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Mar 2012 10:18:29 +0000 (11:18 +0100)]
PUD: allow output pointers to be NULL in determineStateWithHysteresis
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Mar 2012 10:10:47 +0000 (11:10 +0100)]
PUD: when gateway changed, always update it on the uplink
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Mar 2012 10:03:39 +0000 (11:03 +0100)]
PUD: fix validity time on uplink and reduce lock contention window
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Mar 2012 09:34:35 +0000 (10:34 +0100)]
PUD: consistent use of external state and resulting update interval
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 14 Mar 2012 12:28:56 +0000 (13:28 +0100)]
PUD: rename a field of TransmitGpsInformation
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 14 Mar 2012 12:28:29 +0000 (13:28 +0100)]
PUD: pull condition out of doImmediateTransmit
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 14 Mar 2012 12:27:07 +0000 (13:27 +0100)]
PUD: fix updating substate related information in transmitGpsInformation
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 14 Mar 2012 09:33:43 +0000 (10:33 +0100)]
PUD: cleanup includes
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 14 Mar 2012 08:47:31 +0000 (09:47 +0100)]
PUD: update doxygen files
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 13 Mar 2012 11:59:32 +0000 (12:59 +0100)]
PUD: split position and gateway paths
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 13 Mar 2012 14:48:14 +0000 (15:48 +0100)]
PUD: move state code into its own source files
and add mutex to state to prepare for splitting
the position and gateway paths in the receiver
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 13 Mar 2012 09:34:09 +0000 (10:34 +0100)]
PUD: do not change state on unknown movement
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 13 Mar 2012 14:55:14 +0000 (15:55 +0100)]
PUD: only reference external state once in txToAllOlsrInterfaces
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 13 Mar 2012 14:47:01 +0000 (15:47 +0100)]
PUD: split position and gateway state
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 12 Mar 2012 13:27:16 +0000 (14:27 +0100)]
PUD: put state initialisation in it own function
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 12 Mar 2012 09:09:58 +0000 (10:09 +0100)]
PUD: add gateway hysteresis configuration parameters
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 8 Mar 2012 22:47:18 +0000 (23:47 +0100)]
PUD: fix clearMovementType
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 8 Mar 2012 19:33:48 +0000 (20:33 +0100)]
PUD: rename TimedTxInterface enum values
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 8 Mar 2012 19:25:50 +0000 (20:25 +0100)]
PUD: rename MovementState enum values
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 8 Mar 2012 22:46:48 +0000 (23:46 +0100)]
PUD: rename TristateBoolean enum values
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 6 Mar 2012 15:37:39 +0000 (16:37 +0100)]
PUD: move state determination into its own function
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 6 Mar 2012 14:37:21 +0000 (15:37 +0100)]
PUD: rename a struct field
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 6 Mar 2012 14:34:38 +0000 (15:34 +0100)]
PUD: move getting transmitGpsInformation fields to just before they're used
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 6 Mar 2012 14:25:54 +0000 (15:25 +0100)]
PUD: determine the best gateway on a regular schedule
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Repositories / olsrd.git / log