olsrd.git
5 years agosgw: track the up status of an egress interface
Ferry Huberts [Wed, 29 Oct 2014 13:00:41 +0000 (14:00 +0100)]
sgw: track the up status of an egress interface

We need this later.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agosgw: track the interface index of an egress interface
Ferry Huberts [Wed, 29 Oct 2014 12:52:38 +0000 (13:52 +0100)]
sgw: track the interface index of an egress interface

We need this later.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agosgw: add egress file reader
Ferry Huberts [Fri, 31 Oct 2014 11:26:05 +0000 (12:26 +0100)]
sgw: add egress file reader

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agosgw: add egress file reader settings
Ferry Huberts [Wed, 29 Oct 2014 10:22:55 +0000 (11:22 +0100)]
sgw: add egress file reader settings

* SmartGatewayEgressFile: the file with egress bandwidths and network
  configurations.
* SmartGatewayEgressFilePeriod: the period on which to check & process
  the SmartGatewayEgressFile.

The egress file reader will be added later on.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agosgw: store table & rule numbers in the sgw_egress_if structure
Ferry Huberts [Fri, 31 Oct 2014 11:11:49 +0000 (12:11 +0100)]
sgw: store table & rule numbers in the sgw_egress_if structure

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agosgw: move 'struct sgw_egress_if' type into a separate include file
Ferry Huberts [Tue, 28 Oct 2014 13:18:47 +0000 (14:18 +0100)]
sgw: move 'struct sgw_egress_if' type into a separate include file

Some egress types will be added later on and the global types file
doesn't really need the types anyway.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agotxtinfo: fix formatting in ipc_print_sgw
Ferry Huberts [Wed, 12 Nov 2014 10:41:54 +0000 (11:41 +0100)]
txtinfo: fix formatting in ipc_print_sgw

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agosgw: fix deserialize_gw_speed
Ferry Huberts [Mon, 10 Nov 2014 12:14:57 +0000 (13:14 +0100)]
sgw: fix deserialize_gw_speed

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agoMerge branch 'release-0.6.7'
Ferry Huberts [Fri, 24 Oct 2014 17:17:58 +0000 (19:17 +0200)]
Merge branch 'release-0.6.7'

* release-0.6.7:
  release: fix up the CHANGELOG
  Update version after release of v0.6.7.1
  Release v0.6.7.1

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agorelease: fix up the CHANGELOG
Ferry Huberts [Fri, 24 Oct 2014 17:15:53 +0000 (19:15 +0200)]
release: fix up the CHANGELOG

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agoUpdate version after release of v0.6.7.1
Henning Rogge [Fri, 24 Oct 2014 16:42:22 +0000 (18:42 +0200)]
Update version after release of v0.6.7.1

Signed-off-by: Henning Rogge <hrogge@gmail.com>
5 years agoRelease v0.6.7.1 v0.6.7.1
Henning Rogge [Fri, 24 Oct 2014 16:42:14 +0000 (18:42 +0200)]
Release v0.6.7.1

Signed-off-by: Henning Rogge <hrogge@gmail.com>
5 years agodyn gw plugin - add PingCmd parameter
Nico Geyso [Fri, 24 Oct 2014 09:13:47 +0000 (11:13 +0200)]
dyn gw plugin - add PingCmd parameter

Add possibilty to set PingCmd by config. This is useful for instance
if you do want to set an interface or execute your own script. See
README_DYN_GW for an example. Branched of v0.6.6.2.

5 years agoMerge branch 'release-0.6.7'
Ferry Huberts [Fri, 24 Oct 2014 07:56:58 +0000 (09:56 +0200)]
Merge branch 'release-0.6.7'

* release-0.6.7:
  jsoninfo: fix indentation
  txtinfo: ensure null termination of string buffer
  txtinfo: duplicate code in branch

5 years agojsoninfo: fix indentation
Ferry Huberts [Fri, 24 Oct 2014 07:53:50 +0000 (09:53 +0200)]
jsoninfo: fix indentation

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agotxtinfo: ensure null termination of string buffer
Ferry Huberts [Fri, 24 Oct 2014 07:51:41 +0000 (09:51 +0200)]
txtinfo: ensure null termination of string buffer

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agotxtinfo: duplicate code in branch
Ferry Huberts [Fri, 24 Oct 2014 07:48:52 +0000 (09:48 +0200)]
txtinfo: duplicate code in branch

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agoMerge branch 'release-0.6.7'
Ferry Huberts [Fri, 24 Oct 2014 07:34:18 +0000 (09:34 +0200)]
Merge branch 'release-0.6.7'

* release-0.6.7:
  plugins: add a comment to clarify strange behaviour
  txtinfo: set_plugin_boolean stores into an int
  jsoninfo: set_plugin_boolean stores into an int
  android: fix build on 32 bit platform (see 0295e11)
  android: use the machine specific NDK instead of always the 32bit variant

5 years agoplugins: add a comment to clarify strange behaviour
Ferry Huberts [Fri, 24 Oct 2014 07:24:51 +0000 (09:24 +0200)]
plugins: add a comment to clarify strange behaviour

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agotxtinfo: set_plugin_boolean stores into an int
Nico Geyso [Fri, 24 Oct 2014 07:29:07 +0000 (09:29 +0200)]
txtinfo: set_plugin_boolean stores into an int

Signed-off-by: Nico Geyso <nico.geyso@fu-berlin.de>
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agojsoninfo: set_plugin_boolean stores into an int
Nico Geyso [Fri, 24 Oct 2014 07:31:27 +0000 (09:31 +0200)]
jsoninfo: set_plugin_boolean stores into an int

Signed-off-by: Nico Geyso <nico.geyso@fu-berlin.de>
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agosgwdynspeed: fix strto* result checking for out-of-range situations
Ferry Huberts [Tue, 21 Oct 2014 11:35:33 +0000 (13:35 +0200)]
sgwdynspeed: fix strto* result checking for out-of-range situations

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agopud: fix strto* result checking for out-of-range situations
Ferry Huberts [Tue, 21 Oct 2014 11:35:24 +0000 (13:35 +0200)]
pud: fix strto* result checking for out-of-range situations

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agoconfig parser: minor improvement for SmartGatewayEgressInterfaces
Ferry Huberts [Mon, 20 Oct 2014 09:43:28 +0000 (11:43 +0200)]
config parser: minor improvement for SmartGatewayEgressInterfaces

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agoandroid: fix build on 32 bit platform (see 0295e11)
Ferry Huberts [Fri, 22 Aug 2014 10:32:29 +0000 (12:32 +0200)]
android: fix build on 32 bit platform (see 0295e11)

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agoandroid: use the machine specific NDK instead of always the 32bit variant
Ferry Huberts [Fri, 15 Aug 2014 14:38:49 +0000 (16:38 +0200)]
android: use the machine specific NDK instead of always the 32bit variant

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agosgw: cost calculation can now directly account for interface up/down status
Ferry Huberts [Thu, 9 Oct 2014 09:36:57 +0000 (11:36 +0200)]
sgw: cost calculation can now directly account for interface up/down status

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agosgw: make sure gw->ipv6 is always set for a new gateway
Ferry Huberts [Wed, 15 Oct 2014 09:01:25 +0000 (11:01 +0200)]
sgw: make sure gw->ipv6 is always set for a new gateway

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agosgw: export multi_gateway_mode method
Ferry Huberts [Wed, 20 Aug 2014 12:37:01 +0000 (14:37 +0200)]
sgw: export multi_gateway_mode method

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agosgw: move add/remove of ifchange handler to better place
Ferry Huberts [Thu, 2 Oct 2014 09:41:34 +0000 (11:41 +0200)]
sgw: move add/remove of ifchange handler to better place

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agolinux: fix a typo
Ferry Huberts [Mon, 6 Oct 2014 10:42:53 +0000 (12:42 +0200)]
linux: fix a typo

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agoMerge branch 'release-0.6.7'
Ferry Huberts [Mon, 6 Oct 2014 10:09:20 +0000 (12:09 +0200)]
Merge branch 'release-0.6.7'

* release-0.6.7:
  Update version after release of v0.6.7
  Release v0.6.7
  Missing patch of header files for "Add boolean ipv6only parameter to txtinfo and jsoninfo"
  Add boolean ipv6only parameter to txtinfo and jsoninfo

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agoUpdate version after release of v0.6.7
Henning Rogge [Sun, 5 Oct 2014 10:35:56 +0000 (12:35 +0200)]
Update version after release of v0.6.7

Signed-off-by: Henning Rogge <hrogge@gmail.com>
5 years agoRelease v0.6.7 v0.6.7
Henning Rogge [Sun, 5 Oct 2014 10:35:41 +0000 (12:35 +0200)]
Release v0.6.7

Signed-off-by: Henning Rogge <hrogge@gmail.com>
5 years agoconf parser: fix a warning
Ferry Huberts [Thu, 2 Oct 2014 20:37:33 +0000 (22:37 +0200)]
conf parser: fix a warning

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
5 years agolinux: olsr_if_isup: fix return code in error path
Ferry Huberts [Wed, 1 Oct 2014 14:48:23 +0000 (16:48 +0200)]
linux: olsr_if_isup: fix return code in error path

Now it really returns false when an interface does not exist.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoMissing patch of header files for "Add boolean ipv6only parameter to txtinfo and...
Saverio Proto [Fri, 29 Aug 2014 09:48:33 +0000 (11:48 +0200)]
Missing patch of header files for "Add boolean ipv6only parameter to txtinfo and jsoninfo"

6 years agoAdd boolean ipv6only parameter to txtinfo and jsoninfo
Henning Rogge [Sun, 24 Aug 2014 11:07:58 +0000 (13:07 +0200)]
Add boolean ipv6only parameter to txtinfo and jsoninfo

6 years agoandroid: fix build on 32 bit platform (see 0295e11)
Ferry Huberts [Fri, 22 Aug 2014 10:32:29 +0000 (12:32 +0200)]
android: fix build on 32 bit platform (see 0295e11)

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoMerge branch 'linux-routes.v1'
Ferry Huberts [Fri, 22 Aug 2014 09:42:19 +0000 (11:42 +0200)]
Merge branch 'linux-routes.v1'

* linux-routes.v1:
  linux: export the olsr_new_netlink_route function
  linux: make it possible to add/remove blackhole routes
  linux: add 'scope' parameter to olsr_new_netlink_route function
  linux: add 'flags' parameter to olsr_new_netlink_route function
  linux: do not try to set routes with negative metric
  linux: fix type of af_family
  linux: fix using tables >= 256
  linux: increase the netlink buffer size

6 years agoandroid: use the machine specific NDK instead of always the 32bit variant
Ferry Huberts [Fri, 15 Aug 2014 14:38:49 +0000 (16:38 +0200)]
android: use the machine specific NDK instead of always the 32bit variant

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoBranch v0.6.7
Ferry Huberts [Fri, 22 Aug 2014 09:39:37 +0000 (11:39 +0200)]
Branch v0.6.7

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoUpdate version after branch of v0.6.7
Ferry Huberts [Fri, 22 Aug 2014 09:39:37 +0000 (11:39 +0200)]
Update version after branch of v0.6.7

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoMerge remote-tracking branch 'olsr/openbsd'
Ferry Huberts [Fri, 22 Aug 2014 09:28:26 +0000 (11:28 +0200)]
Merge remote-tracking branch 'olsr/openbsd'

* olsr/openbsd:
  Install openbsd/olsrd.rcd to /etc/rc.d/olsrd.
  Remove linux-isms from Makefile
  An rc.d file for OpenBSD
  Adjusted OpenBSD installation paths

6 years agoCHANGELOG: add a note about the configuration files
Ferry Huberts [Thu, 21 Aug 2014 09:48:35 +0000 (11:48 +0200)]
CHANGELOG: add a note about the configuration files

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agolinux: export the olsr_new_netlink_route function
Ferry Huberts [Wed, 13 Aug 2014 15:51:36 +0000 (17:51 +0200)]
linux: export the olsr_new_netlink_route function

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agolinux: make it possible to add/remove blackhole routes
Ferry Huberts [Wed, 13 Aug 2014 15:51:12 +0000 (17:51 +0200)]
linux: make it possible to add/remove blackhole routes

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agolinux: add 'scope' parameter to olsr_new_netlink_route function
Ferry Huberts [Wed, 13 Aug 2014 15:47:57 +0000 (17:47 +0200)]
linux: add 'scope' parameter to olsr_new_netlink_route function

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agolinux: add 'flags' parameter to olsr_new_netlink_route function
Ferry Huberts [Wed, 13 Aug 2014 15:45:48 +0000 (17:45 +0200)]
linux: add 'flags' parameter to olsr_new_netlink_route function

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agolinux: do not try to set routes with negative metric
Ferry Huberts [Wed, 13 Aug 2014 10:03:44 +0000 (12:03 +0200)]
linux: do not try to set routes with negative metric

Makes no sense.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agolinux: fix type of af_family
Ferry Huberts [Wed, 13 Aug 2014 09:45:19 +0000 (11:45 +0200)]
linux: fix type of af_family

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agolinux: fix using tables >= 256
Ferry Huberts [Fri, 15 Aug 2014 13:36:30 +0000 (15:36 +0200)]
linux: fix using tables >= 256

Mirror what iproute2 does.

An exception is made for Android: RTA_TABLE is not available in the
current required Android version and we don't want to bump it.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agolinux: increase the netlink buffer size
Ferry Huberts [Wed, 13 Aug 2014 09:33:34 +0000 (11:33 +0200)]
linux: increase the netlink buffer size

Mirror what iproute2 does.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agosgw: multi-sgw mode is only supported on IPv4
Ferry Huberts [Tue, 19 Aug 2014 07:35:30 +0000 (09:35 +0200)]
sgw: multi-sgw mode is only supported on IPv4

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoREADME: improve the smart gateway text a bit
Ferry Huberts [Fri, 15 Aug 2014 12:27:43 +0000 (14:27 +0200)]
README: improve the smart gateway text a bit

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoInstall openbsd/olsrd.rcd to /etc/rc.d/olsrd.
David Dahlberg [Fri, 15 Aug 2014 10:53:54 +0000 (12:53 +0200)]
Install openbsd/olsrd.rcd to /etc/rc.d/olsrd.

As I am no Makefile expert, I am pretty sure you don't like
my changes. Please modify it to your likings, so that the result
will stay the same.

If going the OBSD-specific path, it should be installed -m 555.

6 years agoRemove linux-isms from Makefile
David Dahlberg [Fri, 15 Aug 2014 10:51:08 +0000 (12:51 +0200)]
Remove linux-isms from Makefile

BSD rmdir does not know "--ignore-fail-on-non-empty"
The rationale for this switch is not to stop make, if
rmdir returns nonzero. So "|| true" will do the job also.

6 years agoAn rc.d file for OpenBSD
David Dahlberg [Fri, 15 Aug 2014 10:43:49 +0000 (12:43 +0200)]
An rc.d file for OpenBSD

6 years agoAdjusted OpenBSD installation paths
David Dahlberg [Fri, 15 Aug 2014 10:41:50 +0000 (12:41 +0200)]
Adjusted OpenBSD installation paths

Installation goes to /usr/local except for /etc.

6 years agoconf: ensure the egress interface names have a valid length
Ferry Huberts [Fri, 15 Aug 2014 10:04:47 +0000 (12:04 +0200)]
conf: ensure the egress interface names have a valid length

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogui: fix 'warning: multiple common of ...' warnings
Ferry Huberts [Fri, 15 Aug 2014 07:56:03 +0000 (09:56 +0200)]
gui: fix 'warning: multiple common of ...' warnings

Show up on gcc 4.8.3

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agop2pd: fir compile warning, initialise ipHeader
Ferry Huberts [Sat, 9 Aug 2014 10:33:22 +0000 (12:33 +0200)]
p2pd: fir compile warning, initialise ipHeader

When compiling with the address sanitiser, got

[CC] src/p2pd.c
src/p2pd.c: In function ‘DoP2pd’:
src/p2pd.c:629:18: warning: ‘ipHeader’ may be used uninitialized in this function [-Wmaybe-uninitialized]
   nwords = header->ip_hl << 1;
                  ^
src/p2pd.c:663:14: note: ‘ipHeader’ was declared here
   struct ip *ipHeader;         /* The IP header inside the captured IP packet */
              ^

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agobuild: add address santizer, compile with SANITIZE_ADDRESS=1
Ferry Huberts [Sat, 9 Aug 2014 10:13:49 +0000 (12:13 +0200)]
build: add address santizer, compile with SANITIZE_ADDRESS=1

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agobuild: gui: do not overwrite the LDFLAGS but append to it
Ferry Huberts [Sat, 9 Aug 2014 10:10:42 +0000 (12:10 +0200)]
build: gui: do not overwrite the LDFLAGS but append to it

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agotxtinfo: only listen on IPv6 when running under IPv6
Patrick Grimm [Thu, 10 Jul 2014 16:41:28 +0000 (18:41 +0200)]
txtinfo: only listen on IPv6 when running under IPv6

When the IPV6_V6ONLY flag is not set then olsrd running on IPv6
will listen on both IPv6 and IPv4 ports. A subsequent process
running on IPv4 can't listen on the same IPv4 port.

Signed-off-by: Patrick Grimm <patrick@lunatiki.de>
6 years agojsoninfo: only listen on IPv6 when running under IPv6
Patrick Grimm [Thu, 10 Jul 2014 16:41:27 +0000 (18:41 +0200)]
jsoninfo: only listen on IPv6 when running under IPv6

When the IPV6_V6ONLY flag is not set then olsrd running on IPv6
will listen on both IPv6 and IPv4 ports. A subsequent process
running on IPv4 can't listen on the same IPv4 port.

Signed-off-by: Patrick Grimm <patrick@lunatiki.de>
6 years agogw: change the costs type to signed 64bits
Ferry Huberts [Fri, 13 Jun 2014 09:34:32 +0000 (11:34 +0200)]
gw: change the costs type to signed 64bits

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoFix a signed/unsigned warning
Ferry Huberts [Fri, 13 Jun 2014 08:56:31 +0000 (10:56 +0200)]
Fix a signed/unsigned warning

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoSupport for FIB metric configuration, other than 2
Teco Boot [Wed, 11 Jun 2014 20:57:05 +0000 (22:57 +0200)]
Support for FIB metric configuration, other than 2

With multiple gateways, the default gateway routes need uniqueness.
Having a unique metric is a natural way to configure.
Metrics on exit link interface can be set with for example pppd configuration
or ifmetric tool.
With more than two exit link interfaces or default route next_hops, olsrd
would need a higher metric than current hard-coded value: 2.

New parameter: FIBMetricDefault
Defaults to existing behavior: 2

Metric range is unsigned 32-bit.

6 years agopud: nmealib: NMEA String Length Override Support
Ferry Huberts [Wed, 11 Jun 2014 08:56:27 +0000 (10:56 +0200)]
pud: nmealib: NMEA String Length Override Support

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoRevert "Fix for win32 compiling with i686-w64-mingw32-gcc on ubuntu"
Ferry Huberts [Tue, 10 Jun 2014 07:57:20 +0000 (09:57 +0200)]
Revert "Fix for win32 compiling with i686-w64-mingw32-gcc on ubuntu"

This reverts commit a36245314b1874b940037d3e486796d1a623dd78.

It breaks the windows builds on Debian Squeeze

6 years agoAdd LQ/NLQ/ETX to neighbor table debug output
Henning Rogge [Mon, 9 Jun 2014 07:37:45 +0000 (09:37 +0200)]
Add LQ/NLQ/ETX to neighbor table debug output

6 years agoMake link debug output source a bit more readable
Henning Rogge [Mon, 9 Jun 2014 07:25:21 +0000 (09:25 +0200)]
Make link debug output source a bit more readable

6 years agoFix for win32 compiling with i686-w64-mingw32-gcc on ubuntu
Yury Popov [Sat, 7 Jun 2014 20:15:43 +0000 (00:15 +0400)]
Fix for win32 compiling with i686-w64-mingw32-gcc on ubuntu
modified:   .gitignore - allowing win32 libregex.a contrib
modified:   Makefile.inc - requires for Windows VistaOrHigher wireless interface detection
modified:   lib/httpinfo/* - Fixing admin tab crashing and values update in webif ( ADMIN_INTERFACE=1 )
modified:   lib/nameservice/Makefile - Adding regex library for Win32
new file:   lib/nameservice/contrib/libregex.a - I copied it from VLC contrib. It is here http://download.videolan.org/pub/videolan/contrib/i686-w64-mingw32/vlc-contrib-i686-w64-mingw32-latest.tar.bz2
modified:   src/cfgparser/* - Fix for gui compiling/running with VS2008
modified:   src/win32/compat.c - inet_aton is required
modified:   src/win32/compat.h - Is this redifinition required? it produces error for me : src/win32/compat.c:481:1: error: expected declaration specifiers or ‘...’ before ‘(’ token
modified:   src/win32/ifnet.c
Added Windows VistaOrHigher additional wireless interface detection.
Added ability to see wireless interface names and guids with "olsrd.exe -d 2 -int" command. I think it is useful because it is hard to work with just interface id on Windows. It is also required for my project http://meshr.net

6 years agoMerge tag 'v0.6.6.2'
Ferry Huberts [Mon, 2 Jun 2014 13:01:24 +0000 (15:01 +0200)]
Merge tag 'v0.6.6.2'

OLSRd release 0.6.6.2

* tag 'v0.6.6.2':
  Release v0.6.6.2
  Fix strange coding in the 'long headers' fix
  jsoninfo: HTTP headers with CORS (if requested)
  Hotfix for very long http headers also for jsoninfo
  Hotfix for much too long http headers
  Fix some spelling mistakes
  Fix processing error for fragmented hellos
  neighbor table: fix crash in olsr_print_neighbor_table on MinGW
  tok: improve the nmea_calc_crc function a bit

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoMerge tag 'v0.6.5.6'
Ferry Huberts [Mon, 2 Jun 2014 12:59:31 +0000 (14:59 +0200)]
Merge tag 'v0.6.5.6'

OLSRd release 0.6.5.6

* tag 'v0.6.5.6':
  Release v0.6.5.6
  Fix strange coding in the 'long headers' fix
  jsoninfo: HTTP headers with CORS (if requested)
  Hotfix for very long http headers also for jsoninfo
  Hotfix for much too long http headers
  Fix some spelling mistakes
  Fix processing error for fragmented hellos
  neighbor table: fix crash in olsr_print_neighbor_table on MinGW
  tok: improve the nmea_calc_crc function a bit

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoRelease v0.6.6.2 v0.6.6.2
Henning Rogge [Mon, 2 Jun 2014 10:15:27 +0000 (12:15 +0200)]
Release v0.6.6.2

Signed-off-by: Henning Rogge <hrogge@gmail.com>
6 years agoRelease v0.6.5.6 v0.6.5.6
Henning Rogge [Mon, 2 Jun 2014 10:13:48 +0000 (12:13 +0200)]
Release v0.6.5.6

Signed-off-by: Henning Rogge <hrogge@gmail.com>
6 years agohttpinfo: the position timestamp month is zero based
Ferry Huberts [Tue, 20 May 2014 11:32:00 +0000 (13:32 +0200)]
httpinfo: the position timestamp month is zero based

So increment it to make it human-readable

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoFix strange coding in the 'long headers' fix
Ferry Huberts [Tue, 20 May 2014 11:52:31 +0000 (13:52 +0200)]
Fix strange coding in the 'long headers' fix

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoFix strange coding in the 'long headers' fix
Ferry Huberts [Tue, 20 May 2014 11:52:31 +0000 (13:52 +0200)]
Fix strange coding in the 'long headers' fix

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoFix strange coding in the 'long headers' fix
Ferry Huberts [Tue, 20 May 2014 11:52:31 +0000 (13:52 +0200)]
Fix strange coding in the 'long headers' fix

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agojsoninfo: HTTP headers with CORS (if requested)
Alessio Caiazza [Fri, 16 May 2014 10:53:15 +0000 (12:53 +0200)]
jsoninfo: HTTP headers with CORS (if requested)

The new "httpheaders" parameter prepends HTTP headers to the reply.
If not set it will default to "no" and have the same behaviour as before.
Cross-origin resource sharing headers (CORS) are included in reply allowing the
json retrieval by javascript applications not served by olsrd itself.
This will allow to easily develop js applications running directly in the
browser.

Reviewed-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agojsoninfo: HTTP headers with CORS (if requested)
Alessio Caiazza [Fri, 16 May 2014 10:53:15 +0000 (12:53 +0200)]
jsoninfo: HTTP headers with CORS (if requested)

The new "httpheaders" parameter prepends HTTP headers to the reply.
If not set it will default to "no" and have the same behaviour as before.
Cross-origin resource sharing headers (CORS) are included in reply allowing the
json retrieval by javascript applications not served by olsrd itself.
This will allow to easily develop js applications running directly in the
browser.

Reviewed-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agojsoninfo: HTTP headers with CORS (if requested)
Alessio Caiazza [Fri, 16 May 2014 10:53:15 +0000 (12:53 +0200)]
jsoninfo: HTTP headers with CORS (if requested)

The new "httpheaders" parameter prepends HTTP headers to the reply.
If not set it will default to "no" and have the same behaviour as before.
Cross-origin resource sharing headers (CORS) are included in reply allowing the
json retrieval by javascript applications not served by olsrd itself.
This will allow to easily develop js applications running directly in the
browser.

Reviewed-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agopud: disable distribution of position updates over OLSR when olsrTtl is 0
Ferry Huberts [Wed, 14 May 2014 16:52:48 +0000 (18:52 +0200)]
pud: disable distribution of position updates over OLSR when olsrTtl is 0

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoHotfix for very long http headers also for jsoninfo
Alessio Caiazza [Wed, 14 May 2014 20:45:33 +0000 (22:45 +0200)]
Hotfix for very long http headers also for jsoninfo

6 years agoHotfix for very long http headers also for jsoninfo
Alessio Caiazza [Wed, 14 May 2014 20:45:33 +0000 (22:45 +0200)]
Hotfix for very long http headers also for jsoninfo

6 years agoHotfix for very long http headers also for jsoninfo
Alessio Caiazza [Wed, 14 May 2014 20:45:33 +0000 (22:45 +0200)]
Hotfix for very long http headers also for jsoninfo

6 years agoHotfix for much too long http headers
Henning Rogge [Tue, 13 May 2014 19:23:36 +0000 (21:23 +0200)]
Hotfix for much too long http headers

6 years agoHotfix for much too long http headers
Henning Rogge [Tue, 13 May 2014 19:23:36 +0000 (21:23 +0200)]
Hotfix for much too long http headers

6 years agoFix stupid mistake, don't know why gcc didn't complained locally
Henning Rogge [Tue, 13 May 2014 19:20:33 +0000 (21:20 +0200)]
Fix stupid mistake, don't know why gcc didn't complained locally

6 years agoHotfix for very long http headers
Henning Rogge [Tue, 13 May 2014 19:16:09 +0000 (21:16 +0200)]
Hotfix for very long http headers

6 years agopud: nmealib: fix return value of nmea_parser_init
Ferry Huberts [Thu, 1 May 2014 16:00:41 +0000 (18:00 +0200)]
pud: nmealib: fix return value of nmea_parser_init

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoRevert "Use strscpy instead of strcpy"
Ferry Huberts [Fri, 25 Apr 2014 08:30:30 +0000 (10:30 +0200)]
Revert "Use strscpy instead of strcpy"

This reverts commit bb4eea09a13bdb27bb9e26ae3498db9ae416ad37.

It loses the line-feeds.
Can be demonstrated by retrieving the output from txtinfo with
for example
  echo "/sgw" | nc 127.0.0.1 2006

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agop2pd: fix recomputeIPv4HeaderChecksum function
Ferry Huberts [Wed, 23 Apr 2014 12:39:33 +0000 (14:39 +0200)]
p2pd: fix recomputeIPv4HeaderChecksum function

There was a missing htons when putting the recomputed checksum
into the IP header

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoFix copypaste error
Henning Rogge [Tue, 22 Apr 2014 12:21:34 +0000 (14:21 +0200)]
Fix copypaste error

6 years agoClean before compile when using Openwrt olsrd-stable-git makefile
Henning Rogge [Tue, 22 Apr 2014 12:17:20 +0000 (14:17 +0200)]
Clean before compile when using Openwrt olsrd-stable-git makefile

6 years agoSmooth LQ calculation if link suddenly breaks.
Henning Rogge [Tue, 22 Apr 2014 12:17:02 +0000 (14:17 +0200)]
Smooth LQ calculation if link suddenly breaks.

6 years agoUse strscpy instead of strcpy
Henning Rogge [Thu, 17 Apr 2014 12:03:08 +0000 (14:03 +0200)]
Use strscpy instead of strcpy