olsrd.git
7 years agoAdd support for 'HELLO' command sent to zebra on connect/reconnect
Vasilis Tsiligiannis [Fri, 1 Jun 2012 14:36:21 +0000 (17:36 +0300)]
Add support for 'HELLO' command sent to zebra on connect/reconnect

7 years agoDo not patch tests on Quagga 0.99.21
Vasilis Tsiligiannis [Fri, 1 Jun 2012 14:26:36 +0000 (17:26 +0300)]
Do not patch tests on Quagga 0.99.21

7 years agoRemove Quagga 0.99.18 patch
Vasilis Tsiligiannis [Fri, 1 Jun 2012 14:25:26 +0000 (17:25 +0300)]
Remove Quagga 0.99.18 patch

7 years agosgw: update gw_def_finished_ipv{4,6} determination
Ferry Huberts [Thu, 31 May 2012 11:02:41 +0000 (13:02 +0200)]
sgw: update gw_def_finished_ipv{4,6} determination

...to be inline with their comments

They did read strange. Now they're the same as the comments,
with the ! implementing the semantics of 'finished'.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agolinux: net: fix some typos
Ferry Huberts [Thu, 31 May 2012 12:34:37 +0000 (14:34 +0200)]
linux: net: fix some typos

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoolsr_switch: add -DNO_OLDNAMES to CFLAGS
Ferry Huberts [Wed, 30 May 2012 13:42:26 +0000 (15:42 +0200)]
olsr_switch: add -DNO_OLDNAMES to CFLAGS

To make mingw cross compilation on Fedora 17 work.

[CC] ohs_cmd.c
In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/sys/stat.h:14:0,
                 from ohs_cmd.c:54:
/usr/i686-w64-mingw32/sys-root/mingw/include/io.h:313:15: error: conflicting types for 'closesocket'
In file included from ../../src/olsr_types.h:90:0,
                 from olsr_host_switch.h:45,
                 from ohs_cmd.c:42:
/usr/i686-w64-mingw32/sys-root/mingw/include/winsock2.h:998:34: note: previous declaration of 'closesocket' was here
make: *** [ohs_cmd.o] Error 1
make: *** [switch] Error 2

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agowin32: only declare struct timespec when needed
Ferry Huberts [Wed, 30 May 2012 13:47:22 +0000 (15:47 +0200)]
win32: only declare struct timespec when needed

To make mingw cross compilation on Fedora 17 work.

[CC] src/common/autobuf.c
In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/time.h:277:0,
                 from src/defs.h:54,
                 from src/common/autobuf.h:47,
                 from src/common/autobuf.c:42:
/usr/i686-w64-mingw32/sys-root/mingw/include/sys/timeb.h:90:8: error: redefinition of 'struct timespec'
In file included from src/defs.h:46:0,
                 from src/common/autobuf.h:47,
                 from src/common/autobuf.c:42:
./src/win32/sys/time.h:82:8: note: originally defined here

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agodefs: only define ARRAYSIZE when needed
Ferry Huberts [Wed, 30 May 2012 13:46:06 +0000 (15:46 +0200)]
defs: only define ARRAYSIZE when needed

To make mingw cross compilation on Fedora 17 work.

In file included from src/common/autobuf.h:47:0,
                 from src/common/autobuf.c:42:
src/defs.h:103:0: error: "ARRAYSIZE" redefined [-Werror]
In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/windef.h:137:0,
                 from /usr/i686-w64-mingw32/sys-root/mingw/include/windows.h:69,
                 from /usr/i686-w64-mingw32/sys-root/mingw/include/winsock2.h:23,
                 from ./src/win32/sys/time.h:47,
                 from src/defs.h:46,
                 from src/common/autobuf.h:47,
                 from src/common/autobuf.c:42:
/usr/i686-w64-mingw32/sys-root/mingw/include/winnt.h:483:0: note: this is the location of the previous definition

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years ago(android/README) added Android build instructions
Hans-Christoph Steiner [Thu, 31 May 2012 19:25:51 +0000 (15:25 -0400)]
(android/README) added Android build instructions

7 years agoAdd support for new zebra protocol version used by Quagga 0.99.21
Vasilis Tsiligiannis [Thu, 31 May 2012 06:37:26 +0000 (08:37 +0200)]
Add support for new zebra protocol version used by Quagga 0.99.21

7 years agoMakefile: WARNINGS: add -Wunused-parameter
Ferry Huberts [Tue, 29 May 2012 11:04:18 +0000 (13:04 +0200)]
Makefile: WARNINGS: add -Wunused-parameter

-Wunused-parameter
  Warn whenever a function parameter is unused aside from its declaration.

  To suppress this warning use the unused attribute.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoMakefile: WARNINGS: add -Wtrampolines
Ferry Huberts [Tue, 29 May 2012 10:55:22 +0000 (12:55 +0200)]
Makefile: WARNINGS: add -Wtrampolines

-Wtrampolines
  Warn about trampolines generated for pointers to nested functions.

  A trampoline is a small piece of data or code that is created at run
  time on the stack when the address of a nested function is taken, and
  is used to call the nested function indirectly.  For some targets, it
  is made up of data only and thus requires no special treatment.  But,
  for most targets, it is made up of code and thus requires the stack
  to be made executable in order for the program to work properly.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoMakefile: WARNINGS: add -Wjump-misses-init
Ferry Huberts [Tue, 29 May 2012 10:12:05 +0000 (12:12 +0200)]
Makefile: WARNINGS: add -Wjump-misses-init

-Wjump-misses-init (C, Objective-C only)
  Warn if a "goto" statement or a "switch" statement jumps forward
  across the initialization of a variable, or jumps backward to a
  label after the variable has been initialized.  This only warns
  about variables which are initialized when they are declared.
  This warning is only supported for C and Objective C; in C++ this
  sort of branch is an error in any case.

  -Wjump-misses-init is included in -Wc++-compat. It can be disabled
  with the -Wno-jump-misses-init option.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoMakefile: WARNINGS: add -Wlogical-op
Ferry Huberts [Tue, 29 May 2012 10:09:32 +0000 (12:09 +0200)]
Makefile: WARNINGS: add -Wlogical-op

-Wlogical-op
  Warn about suspicious uses of logical operators in expressions.
  This includes using logical operators in contexts where a
  bit-wise operator is likely to be expected.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoMakefile: WARNINGS: add -Wundef
Ferry Huberts [Tue, 29 May 2012 10:03:54 +0000 (12:03 +0200)]
Makefile: WARNINGS: add -Wundef

-Wundef
  Warn if an undefined identifier is evaluated in an #if directive.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoMakefile: WARNINGS: add -Wsync-nand
Ferry Huberts [Tue, 29 May 2012 09:51:29 +0000 (11:51 +0200)]
Makefile: WARNINGS: add -Wsync-nand

-Wsync-nand (C and C++ only)
  Warn when "__sync_fetch_and_nand" and "__sync_nand_and_fetch"
  built-in functions are used.  These functions changed semantics
  in GCC 4.4.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoMakefile: WARNINGS: add -Wswitch-default
Ferry Huberts [Tue, 29 May 2012 12:23:13 +0000 (14:23 +0200)]
Makefile: WARNINGS: add -Wswitch-default

-Wswitch-default
  Warn whenever a "switch" statement does not have a "default" case.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoMakefile: WARNINGS: add -Winit-self
Ferry Huberts [Tue, 29 May 2012 08:48:27 +0000 (10:48 +0200)]
Makefile: WARNINGS: add -Winit-self

-Winit-self (C, C++, Objective-C and Objective-C++ only)
   Warn about uninitialized variables which are initialized
   with themselves.  Note this option can only be used with
   the -Wuninitialized option.

   For example, GCC will warn about "i" being uninitialized
   in the following snippet only when -Winit-self has been
   specified:

           int f()
           {
             int i = i;
             return i;
           }

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoMakefile: WARNINGS: add -Wformat-y2k
Ferry Huberts [Tue, 29 May 2012 08:42:34 +0000 (10:42 +0200)]
Makefile: WARNINGS: add -Wformat-y2k

-Wformat-y2k
  If -Wformat is specified, also warn about "strftime" formats
  which may yield only a two-digit year.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoMakefile: WARNINGS: add -Wformat-security
Ferry Huberts [Tue, 29 May 2012 08:40:47 +0000 (10:40 +0200)]
Makefile: WARNINGS: add -Wformat-security

-Wformat-security
   If -Wformat is specified, also warn about uses of format
   functions that represent possible security problems.  At
   present, this warns about calls to "printf" and "scanf"
   functions where the format string is not a string literal
   and there are no format arguments, as in "printf (foo);".
   This may be a security hole if the format string came from
   untrusted input and contains %n. (This is currently a subset
   of what -Wformat-nonliteral warns about, but in future warnings
   may be added to -Wformat-security that are not included in
   -Wformat-nonliteral.)

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoMakefile: WARNINGS: add -Wdouble-promotion
Ferry Huberts [Tue, 29 May 2012 08:32:06 +0000 (10:32 +0200)]
Makefile: WARNINGS: add -Wdouble-promotion

-Wdouble-promotion (C, C++, Objective-C and Objective-C++ only)
   Give a warning when a value of type "float" is implicitly promoted to
   "double".  CPUs with a 32-bit "single-precision" floating-point unit
   implement "float" in hardware, but emulate "double" in software.  On
   such a machine, doing computations using "double" values is much more
   expensive because of the overhead required for software emulation.

   It is easy to accidentally do computations with "double" because
   floating-point literals are implicitly of type "double".
   For example, in:

           float area(float radius)
           {
              return 3.14159 * radius * radius;
           }

   the compiler will perform the entire computation with "double"
   because the floating-point literal is a "double".

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agowin32: fix uninitialized variable when building with DEBUG=0 OPTIMIZE=-O2
Ferry Huberts [Tue, 29 May 2012 13:09:41 +0000 (15:09 +0200)]
win32: fix uninitialized variable when building with DEBUG=0 OPTIMIZE=-O2

src/win32/compat.c: In function 'inet_ntop':
src/win32/compat.c:437:25: error: 'best.len' may be used uninitialized in this function [-Werror=uninitialized]
src/win32/compat.c:403:5: note: 'best.len' was declared here

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoCosmetic changes to patch at txtinfo plugin that prints version string
Saverio Proto [Fri, 25 May 2012 12:04:12 +0000 (14:04 +0200)]
Cosmetic changes to patch at txtinfo plugin that prints version string

7 years agotxtinfo plugin: query /version URL to have olsrd version printed out
Saverio Proto [Thu, 24 May 2012 14:35:40 +0000 (16:35 +0200)]
txtinfo plugin: query /version URL to have olsrd version printed out

7 years agoPUD: fix printf based warning
Ferry Huberts [Thu, 24 May 2012 16:37:00 +0000 (18:37 +0200)]
PUD: fix printf based warning

As pointed out by Henning (and later Saverio).
My compiler didn't catch this (strange).

Signed-off-by: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agohttpinfo: fix a segfault when PUD is not loaded
Ferry Huberts [Thu, 24 May 2012 07:36:51 +0000 (09:36 +0200)]
httpinfo: fix a segfault when PUD is not loaded

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agohttpinfo: duplicate nmea_INFO_has_field: avoid nmealib dependency
Ferry Huberts [Thu, 24 May 2012 07:16:16 +0000 (09:16 +0200)]
httpinfo: duplicate nmea_INFO_has_field: avoid nmealib dependency

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agohttpinfo: add position information tab
Ferry Huberts [Wed, 23 May 2012 07:52:52 +0000 (09:52 +0200)]
httpinfo: add position information tab

When the PUD plugin is loaded, displays the position
information obtained from the PUD plugin, otherwise
no position information is shown.

As the PUD plugin is only available on Linux, the tab
is (also) only available on Linux.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoPUD: improve build integration of nmealib
Ferry Huberts [Wed, 16 May 2012 15:10:04 +0000 (17:10 +0200)]
PUD: improve build integration of nmealib

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoPUD: import nmealib v0.6.9
Ferry Huberts [Wed, 16 May 2012 15:09:47 +0000 (17:09 +0200)]
PUD: import nmealib v0.6.9

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoPUD: remove eclipse project files
Ferry Huberts [Wed, 16 May 2012 12:31:27 +0000 (14:31 +0200)]
PUD: remove eclipse project files

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoolsrd: fix 'No break at the end of case' eclipse warnings
Ferry Huberts [Wed, 16 May 2012 12:11:05 +0000 (14:11 +0200)]
olsrd: fix 'No break at the end of case' eclipse warnings

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoolsrd: fix gui/win32 ignores
Ferry Huberts [Wed, 16 May 2012 12:15:42 +0000 (14:15 +0200)]
olsrd: fix gui/win32 ignores

Shim/Release is completely removed on a clean

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoolsrd: split out ignores
Ferry Huberts [Wed, 16 May 2012 10:46:27 +0000 (12:46 +0200)]
olsrd: split out ignores

Move all ignores into their relevant directories.
This makes it much clearer, and as a minor benefit also
speeds up git a bit.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoolsrd: cleanup ignores
Ferry Huberts [Wed, 16 May 2012 10:27:34 +0000 (12:27 +0200)]
olsrd: cleanup ignores

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agocontrib: netsimpcap: fix ignore/add missing bin directory
Ferry Huberts [Wed, 16 May 2012 10:13:56 +0000 (12:13 +0200)]
contrib: netsimpcap: fix ignore/add missing bin directory

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agocontrib: netsimpcap: do not override library path
Ferry Huberts [Wed, 16 May 2012 10:10:40 +0000 (12:10 +0200)]
contrib: netsimpcap: do not override library path

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoMakefile: add sgwdynspeed
Ferry Huberts [Wed, 16 May 2012 09:56:30 +0000 (11:56 +0200)]
Makefile: add sgwdynspeed

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoPUD: add sgwdynspeed to configuration
Ferry Huberts [Tue, 15 May 2012 12:46:07 +0000 (14:46 +0200)]
PUD: add sgwdynspeed to configuration

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agosgwdynspeed: build it by default on linux
Ferry Huberts [Tue, 15 May 2012 12:45:37 +0000 (14:45 +0200)]
sgwdynspeed: build it by default on linux

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agosgwdynspeed: add plugin
Ferry Huberts [Tue, 15 May 2012 08:03:29 +0000 (10:03 +0200)]
sgwdynspeed: add plugin

This plugins provides a means to dynamically adjust the
smartgateway upstream and downstream bandwidths.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoPUD: remove unneeded ignore
Ferry Huberts [Tue, 15 May 2012 12:46:27 +0000 (14:46 +0200)]
PUD: remove unneeded ignore

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoPUD: pull in nmealib v0.6.8
Ferry Huberts [Fri, 11 May 2012 17:27:33 +0000 (19:27 +0200)]
PUD: pull in nmealib v0.6.8

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agolicense: add a note about nmealib
Ferry Huberts [Fri, 11 May 2012 16:58:19 +0000 (18:58 +0200)]
license: add a note about nmealib

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoPUD: always use /usr/lib for libraries
Ferry Huberts [Fri, 11 May 2012 13:54:29 +0000 (15:54 +0200)]
PUD: always use /usr/lib for libraries

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoRevert "linux: use /usr/lib64 on 64bit machines if it exists"
Ferry Huberts [Fri, 11 May 2012 13:52:19 +0000 (15:52 +0200)]
Revert "linux: use /usr/lib64 on 64bit machines if it exists"

This reverts commit 217d1b74c2b54549a47c1f2e5c7cc44ebc9b33d4.

7 years agojsoninfo: remove unused variable
Ferry Huberts [Fri, 11 May 2012 08:17:50 +0000 (10:17 +0200)]
jsoninfo: remove unused variable

src/olsrd_jsoninfo.c: In function ‘ipc_print_gateways’:
src/olsrd_jsoninfo.c:678:23: warning: unused variable ‘lqbuf’ [-Wunused-variable]

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoMakefile: build pud too on Linux
Ferry Huberts [Thu, 10 May 2012 12:30:01 +0000 (14:30 +0200)]
Makefile: build pud too on Linux

The nmealib library is now included, so the
build is self-contained

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoPUD: add nmealib to build
Ferry Huberts [Thu, 10 May 2012 19:34:07 +0000 (21:34 +0200)]
PUD: add nmealib to build

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoPUD: include nmealib v0.6.7
Ferry Huberts [Thu, 10 May 2012 09:47:45 +0000 (11:47 +0200)]
PUD: include nmealib v0.6.7

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoPUD: do not install headers by default
Ferry Huberts [Thu, 10 May 2012 11:26:11 +0000 (13:26 +0200)]
PUD: do not install headers by default

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoPUD: use /usr/lib64 on 64bit machines if it exists
Ferry Huberts [Thu, 10 May 2012 19:31:56 +0000 (21:31 +0200)]
PUD: use /usr/lib64 on 64bit machines if it exists

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agolinux: use /usr/lib64 on 64bit machines if it exists
Ferry Huberts [Thu, 10 May 2012 11:11:29 +0000 (13:11 +0200)]
linux: use /usr/lib64 on 64bit machines if it exists

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agojsoninfo: convert costs to ints, ditch get_linkcost_text() calls, replace infinite...
Hans-Christoph Steiner [Fri, 11 May 2012 02:26:41 +0000 (22:26 -0400)]
jsoninfo: convert costs to ints, ditch get_linkcost_text() calls, replace infinite with *_COST_BROKEN

7 years agojsoninfo: document the existing command set
Hans-Christoph Steiner [Fri, 11 May 2012 02:06:45 +0000 (22:06 -0400)]
jsoninfo: document the existing command set

7 years agowindows: add olsr_switch.exe to ignores
Ferry Huberts [Thu, 10 May 2012 15:42:29 +0000 (17:42 +0200)]
windows: add olsr_switch.exe to ignores

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agowindows: fix warning
Ferry Huberts [Thu, 10 May 2012 15:39:22 +0000 (17:39 +0200)]
windows: fix warning

src/main.c: In function 'olsr_create_lock_file':
src/main.c:132:17: error: variable 'lock' set but not used [-Werror=unused-but-set-variable]

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agowindows: remove -mno-cygwin option from CFLAGS
Ferry Huberts [Thu, 10 May 2012 15:10:29 +0000 (17:10 +0200)]
windows: remove -mno-cygwin option from CFLAGS

It is no longer supported in newer MinGW gcc versions

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoRevert "smart gateway: add SmartGatewaySpeedFile{,Period} parameters"
Ferry Huberts [Thu, 10 May 2012 13:42:33 +0000 (15:42 +0200)]
Revert "smart gateway: add SmartGatewaySpeedFile{,Period} parameters"

This reverts commit a330275c50ca93ba7195b4600a1672907d320832.

7 years agoRevert "smart gateway: hook up SmartGatewaySpeedFile{,Period} parameters"
Ferry Huberts [Thu, 10 May 2012 13:42:22 +0000 (15:42 +0200)]
Revert "smart gateway: hook up SmartGatewaySpeedFile{,Period} parameters"

This reverts commit 159e3ef28f74922995927b00c6525320149b3b91.

7 years agoRevert "smart gateway: install default speed configuration file"
Ferry Huberts [Thu, 10 May 2012 13:42:13 +0000 (15:42 +0200)]
Revert "smart gateway: install default speed configuration file"

This reverts commit 0f2768e768f9495773233fe172c9f29042226eee.

7 years agoRevert "PUD: add SmartGatewaySpeedFile{,Period} to config"
Ferry Huberts [Thu, 10 May 2012 13:41:47 +0000 (15:41 +0200)]
Revert "PUD: add SmartGatewaySpeedFile{,Period} to config"

This reverts commit 952aa9a5e488f2ca12d52b8919cf82df394fdaf1.

7 years agoPUD: add SmartGatewaySpeedFile{,Period} to config
Ferry Huberts [Wed, 2 May 2012 11:30:13 +0000 (13:30 +0200)]
PUD: add SmartGatewaySpeedFile{,Period} to config

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agosmart gateway: install default speed configuration file
Ferry Huberts [Thu, 10 May 2012 09:10:07 +0000 (11:10 +0200)]
smart gateway: install default speed configuration file

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agosmart gateway: hook up SmartGatewaySpeedFile{,Period} parameters
Ferry Huberts [Wed, 9 May 2012 14:04:53 +0000 (16:04 +0200)]
smart gateway: hook up SmartGatewaySpeedFile{,Period} parameters

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agosmart gateway: add SmartGatewaySpeedFile{,Period} parameters
Ferry Huberts [Wed, 2 May 2012 11:27:54 +0000 (13:27 +0200)]
smart gateway: add SmartGatewaySpeedFile{,Period} parameters

To prepare for makeing the smart gateway uplink and downlink
settings dynamic.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoconvert 'gateways' to JSON
Hans-Christoph Steiner [Thu, 10 May 2012 02:54:22 +0000 (22:54 -0400)]
convert 'gateways' to JSON

7 years agorename 'msValid' JSON key to 'validityTime' for clarity
Hans-Christoph Steiner [Thu, 10 May 2012 02:09:44 +0000 (22:09 -0400)]
rename 'msValid' JSON key to 'validityTime' for clarity

7 years agooutput any combo of commands as a JSON array (except 'olsrd.conf' which is the conf...
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)

7 years agoadd 'plugins' and 'config' method to output info parsed from olsrd.conf as JSON
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

7 years agoadd 'olsrd.conf' method to give complete, generated olsrd.conf contents (i.e. txtinfo...
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)

7 years agoconvert abuf_json_int() to write out long ints to represent all the int types used...
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

7 years agoPUD: speed up postion file parsing
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>
7 years agoPUD: update cached mtime right after position file was successfully opened
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>
7 years agoPUD: do not read position file if it did not change
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>
7 years agojsoninfo: fix a warning
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>
7 years agoif requesting all status, then return everything as a JSON array
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

7 years agoconverted 'mid' to JSON
Hans-Christoph Steiner [Wed, 9 May 2012 04:32:41 +0000 (00:32 -0400)]
converted 'mid' to JSON

7 years agoconverted 'hna' to JSON
Hans-Christoph Steiner [Wed, 9 May 2012 04:32:19 +0000 (00:32 -0400)]
converted 'hna' to JSON

7 years agoconverted 'topology' to JSON
Hans-Christoph Steiner [Wed, 9 May 2012 03:38:40 +0000 (23:38 -0400)]
converted 'topology' to JSON

7 years agoconverted 'routes' to JSON
Hans-Christoph Steiner [Wed, 9 May 2012 03:37:06 +0000 (23:37 -0400)]
converted 'routes' to JSON

7 years agoconverted 'links' to JSON
Hans-Christoph Steiner [Tue, 8 May 2012 22:38:42 +0000 (18:38 -0400)]
converted 'links' to JSON

7 years agomerged 'twohop' into 'neighbors' and converted to full JSON
Hans-Christoph Steiner [Tue, 8 May 2012 21:58:33 +0000 (17:58 -0400)]
merged 'twohop' into 'neighbors' and converted to full JSON

7 years agorenamed abuf_json_key_* functions to abuf_json_* for clarity: all data needs a key
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

7 years agoadded 'gateways', 'twohop', and 'interfaces' to 'status' command, replacing old ...
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

7 years agoconverted 'interfaces' to JSON
Hans-Christoph Steiner [Mon, 7 May 2012 02:11:46 +0000 (22:11 -0400)]
converted 'interfaces' to JSON

7 years agoalways output VTIME validity time info
Hans-Christoph Steiner [Mon, 7 May 2012 01:49:30 +0000 (21:49 -0400)]
always output VTIME validity time info

7 years agolaid out JSON functions and converted to printing JSON headers and footers
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

7 years agomade naming consistent across commands, macros, variables, and functions
Hans-Christoph Steiner [Sun, 6 May 2012 02:44:09 +0000 (22:44 -0400)]
made naming consistent across commands, macros, variables, and functions

7 years agoran "astyle --style=linux --indent=spaces=2" and manually laid out code
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

7 years agochange default port to 9090 (which is used for JSON-RPC)
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)

7 years agocopy txtinfo plugin to create template for new jsoninfo plugin
Hans-Christoph Steiner [Sun, 6 May 2012 00:51:50 +0000 (20:51 -0400)]
copy txtinfo plugin to create template for new jsoninfo plugin

7 years agoincluded MinGW build instructions for Windows/Win32
Hans-Christoph Steiner [Wed, 9 May 2012 03:39:37 +0000 (23:39 -0400)]
included MinGW build instructions for Windows/Win32

7 years agoupdated Linux ad-hoc setup script to associate to existing cells rather than only...
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

7 years agoalso try configuring ad-hoc after interface is up, if not already in ad-hoc mode...
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)

7 years agofirst working script to setup wifi interface into ad-hoc mode for olsrd on GNU/Linux
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

7 years agoupdated Android build to use "gcc --sysroot" technique, first available in NDKr4
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

7 years agoupdated 'android/regex/' source directly from Android's sources (also OpenBSD-derived)
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)

7 years agoFix problem with network byte order in secure plugin
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

7 years agoUse __ANDROID__ instead of "android" for preprocessor
Henning Rogge [Sat, 5 May 2012 11:05:46 +0000 (13:05 +0200)]
Use __ANDROID__ instead of "android" for preprocessor