olsrd.git
6 years agojsoninfo: get kernel module for a given interface using /sys/class/net/wlan0/device...
Hans-Christoph Steiner [Fri, 8 Jun 2012 00:13:10 +0000 (20:13 -0400)]
jsoninfo: get kernel module for a given interface using /sys/class/net/wlan0/device/driver/module

6 years agojsoninfo: noFork should be a boolean
Hans-Christoph Steiner [Fri, 8 Jun 2012 00:12:20 +0000 (20:12 -0400)]
jsoninfo: noFork should be a boolean

6 years agojsoninfo: downcase plugin keys since they can have any case, and convert int/long...
Hans-Christoph Steiner [Fri, 8 Jun 2012 00:04:22 +0000 (20:04 -0400)]
jsoninfo: downcase plugin keys since they can have any case, and convert int/long values to JSON int

6 years agojsoninfo: fully implement MID report with arrays of addresses and subarrays of aliases
Hans-Christoph Steiner [Thu, 7 Jun 2012 22:59:38 +0000 (18:59 -0400)]
jsoninfo: fully implement MID report with arrays of addresses and subarrays of aliases

6 years agojsoninfo: convert comma insertion logic to be based on depth, to support arrays in...
Hans-Christoph Steiner [Thu, 7 Jun 2012 22:26:22 +0000 (18:26 -0400)]
jsoninfo: convert comma insertion logic to be based on depth, to support arrays in arrays

6 years agojsoninfo: list IPC connection accept rules in a JSON array
Hans-Christoph Steiner [Thu, 7 Jun 2012 20:20:01 +0000 (16:20 -0400)]
jsoninfo: list IPC connection accept rules in a JSON array

6 years agojsoninfo: simplify parsing by removing the "data": [] array surrounding the data
Hans-Christoph Steiner [Thu, 7 Jun 2012 20:19:13 +0000 (16:19 -0400)]
jsoninfo: simplify parsing by removing the "data": [] array surrounding the data

6 years agojsoninfo: clean up comments and debug stuff
Hans-Christoph Steiner [Wed, 6 Jun 2012 18:48:24 +0000 (14:48 -0400)]
jsoninfo: clean up comments and debug stuff

6 years agojsoninfo: rename the two MTU data points for clarity
Hans-Christoph Steiner [Wed, 6 Jun 2012 18:10:53 +0000 (14:10 -0400)]
jsoninfo: rename the two MTU data points for clarity

6 years agoRevert "linux: add support for common (autoconf) make variables (v3)"
Ferry Huberts [Thu, 7 Jun 2012 22:33:08 +0000 (00:33 +0200)]
Revert "linux: add support for common (autoconf) make variables (v3)"

This reverts commit 9b5949f7ac8ce5b2829a1101e9fdda53aae94042.

Pushed by accident.

6 years agoPUD: posFile: do not use nanosecond stat information
Ferry Huberts [Wed, 6 Jun 2012 15:01:59 +0000 (17:01 +0200)]
PUD: posFile: do not use nanosecond stat information

It poses problems for OpenWRT builds and is not really needed
since we enforce a minimum poll interval of 1 second.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: posFile: use case insensitive regular expression matching
Ferry Huberts [Wed, 6 Jun 2012 14:58:50 +0000 (16:58 +0200)]
PUD: posFile: use case insensitive regular expression matching

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: posFile: fix leaking regexComment on error path
Ferry Huberts [Wed, 6 Jun 2012 14:58:17 +0000 (16:58 +0200)]
PUD: posFile: fix leaking regexComment on error path

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: posFile: add comments
Ferry Huberts [Wed, 6 Jun 2012 14:57:48 +0000 (16:57 +0200)]
PUD: posFile: add comments

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: don't use 'struct sockaddr *' when not needed
Ferry Huberts [Wed, 6 Jun 2012 10:27:24 +0000 (12:27 +0200)]
PUD: don't use 'struct sockaddr *' when not needed

just use 'void *'

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: nwif: remove unused setting of address variable for IPv6 case
Ferry Huberts [Wed, 6 Jun 2012 17:16:09 +0000 (19:16 +0200)]
PUD: nwif: remove unused setting of address variable for IPv6 case

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: nwif: remove unused olsr interfaces list
Ferry Huberts [Wed, 6 Jun 2012 16:57:58 +0000 (18:57 +0200)]
PUD: nwif: remove unused olsr interfaces list

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: nwif: make the tx socket binding work for IPv6
Ferry Huberts [Tue, 5 Jun 2012 20:44:41 +0000 (22:44 +0200)]
PUD: nwif: make the tx socket binding work for IPv6

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: nwif: make setting ttl on tx socket work for IPv6
Ferry Huberts [Tue, 5 Jun 2012 20:41:27 +0000 (22:41 +0200)]
PUD: nwif: make setting ttl on tx socket work for IPv6

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: nwif: make joining the multicast group on the rx socket creation work for IPv6
Ferry Huberts [Tue, 5 Jun 2012 20:42:32 +0000 (22:42 +0200)]
PUD: nwif: make joining the multicast group on the rx socket creation work for IPv6

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: nwif: fix indenting
Ferry Huberts [Tue, 5 Jun 2012 20:37:29 +0000 (22:37 +0200)]
PUD: nwif: fix indenting

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: nwif: only evaluatie IPv4 and IPv6 addresses
Ferry Huberts [Tue, 5 Jun 2012 20:37:13 +0000 (22:37 +0200)]
PUD: nwif: only evaluatie IPv4 and IPv6 addresses

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: nwif: make sure {r,t}xNonOlsr interfaces are of the right IP version
Ferry Huberts [Tue, 5 Jun 2012 20:35:09 +0000 (22:35 +0200)]
PUD: nwif: make sure {r,t}xNonOlsr interfaces are of the right IP version

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: nwif: use interface address to detect whether it's an olsr interface
Ferry Huberts [Tue, 5 Jun 2012 20:31:58 +0000 (22:31 +0200)]
PUD: nwif: use interface address to detect whether it's an olsr interface

more reliable

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: nwif: txTtl must be an int
Ferry Huberts [Tue, 5 Jun 2012 20:22:59 +0000 (22:22 +0200)]
PUD: nwif: txTtl must be an int

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: nwif: create a downlink socket for the same IP version as the configured uplink...
Ferry Huberts [Tue, 5 Jun 2012 19:40:17 +0000 (21:40 +0200)]
PUD: nwif: create a downlink socket for the same IP version as the configured uplink address

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: nwif: hand the interface address to create{R,T}xInterface
Ferry Huberts [Tue, 5 Jun 2012 19:36:00 +0000 (21:36 +0200)]
PUD: nwif: hand the interface address to create{R,T}xInterface

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: nwif: hand rxMcAddr to createRxInterface and createRxSocket
Ferry Huberts [Tue, 5 Jun 2012 19:17:08 +0000 (21:17 +0200)]
PUD: nwif: hand rxMcAddr to createRxInterface and createRxSocket

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: nwif: reorder some variables
Ferry Huberts [Tue, 5 Jun 2012 13:42:26 +0000 (15:42 +0200)]
PUD: nwif: reorder some variables

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: nwif: use the correct address size in rx and downlink socket binding
Ferry Huberts [Mon, 4 Jun 2012 08:05:41 +0000 (10:05 +0200)]
PUD: nwif: use the correct address size in rx and downlink socket binding

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: nwif: add a documentation tag
Ferry Huberts [Tue, 5 Jun 2012 19:41:21 +0000 (21:41 +0200)]
PUD: nwif: add a documentation tag

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: pud: make IPv6 work in sendToAllTxInterfaces
Ferry Huberts [Mon, 4 Jun 2012 07:39:57 +0000 (09:39 +0200)]
PUD: pud: make IPv6 work in sendToAllTxInterfaces

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: pud: remove unused sender fields from packetReceivedFromDownlink
Ferry Huberts [Sun, 3 Jun 2012 12:04:25 +0000 (14:04 +0200)]
PUD: pud: remove unused sender fields from packetReceivedFromDownlink

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: receiver: make uplink work with IPv6
Ferry Huberts [Mon, 4 Jun 2012 07:38:05 +0000 (09:38 +0200)]
PUD: receiver: make uplink work with IPv6

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: receiver: do not touch olsr_cnf->pud_position when HTTPINFO_PUD is not defined
Ferry Huberts [Wed, 6 Jun 2012 10:43:04 +0000 (12:43 +0200)]
PUD: receiver: do not touch olsr_cnf->pud_position when HTTPINFO_PUD is not defined

because that field isn't there in that case.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfg: clear nodeIdBinary.set in setNodeId
Ferry Huberts [Wed, 6 Jun 2012 13:46:40 +0000 (15:46 +0200)]
PUD: cfg: clear nodeIdBinary.set in setNodeId

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfg: return default port when addr is NULL in getOlsrSockaddrPort
Ferry Huberts [Wed, 6 Jun 2012 13:46:04 +0000 (15:46 +0200)]
PUD: cfg: return default port when addr is NULL in getOlsrSockaddrPort

Also, do nothing in setOlsrSockaddrPort if addr is NULL

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfg: use in_port_t when dealing with ports
Ferry Huberts [Wed, 6 Jun 2012 13:34:28 +0000 (15:34 +0200)]
PUD: cfg: use in_port_t when dealing with ports

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfg: simplify getOlsrSockaddrPortAddress function further
Ferry Huberts [Wed, 6 Jun 2012 12:15:37 +0000 (14:15 +0200)]
PUD: cfg: simplify getOlsrSockaddrPortAddress function further

and add setOlsrSockaddrPort

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfg: reorder uplink/downlink functions
Ferry Huberts [Mon, 4 Jun 2012 14:28:12 +0000 (16:28 +0200)]
PUD: cfg: reorder uplink/downlink functions

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfg: fix a comment
Ferry Huberts [Mon, 4 Jun 2012 14:27:39 +0000 (16:27 +0200)]
PUD: cfg: fix a comment

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfg: review and simplify
Ferry Huberts [Mon, 4 Jun 2012 14:16:10 +0000 (16:16 +0200)]
PUD: cfg: review and simplify

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfg: replace 'Configured %s' by 'Value of parameter %s'
Ferry Huberts [Mon, 4 Jun 2012 12:26:10 +0000 (14:26 +0200)]
PUD: cfg: replace 'Configured %s' by 'Value of parameter %s'

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfg: remove pointless comments of setters
Ferry Huberts [Mon, 4 Jun 2012 12:08:50 +0000 (14:08 +0200)]
PUD: cfg: remove pointless comments of setters

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfg: use readBool
Ferry Huberts [Mon, 4 Jun 2012 11:52:34 +0000 (13:52 +0200)]
PUD: cfg: use readBool

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfg: use readUS
Ferry Huberts [Mon, 4 Jun 2012 11:03:10 +0000 (13:03 +0200)]
PUD: cfg: use readUS

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfg: use readIPAddress in configuration
Ferry Huberts [Mon, 4 Jun 2012 10:44:20 +0000 (12:44 +0200)]
PUD: cfg: use readIPAddress in configuration

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfg: move getOlsrSockaddrPortAddress into netTools.h
Ferry Huberts [Mon, 4 Jun 2012 07:52:38 +0000 (09:52 +0200)]
PUD: cfg: move getOlsrSockaddrPortAddress into netTools.h

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfgTools: add read{Bool,UC,US,IPAddress}
Ferry Huberts [Mon, 4 Jun 2012 09:43:41 +0000 (11:43 +0200)]
PUD: cfgTools: add read{Bool,UC,US,IPAddress}

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfgTools: errno is not set by strto* functions, so don't use it
Ferry Huberts [Tue, 5 Jun 2012 19:49:09 +0000 (21:49 +0200)]
PUD: cfgTools: errno is not set by strto* functions, so don't use it

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfgTools: review
Ferry Huberts [Mon, 4 Jun 2012 09:32:07 +0000 (11:32 +0200)]
PUD: cfgTools: review

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfgTools: move read{ULL,Double} into configTools
Ferry Huberts [Mon, 4 Jun 2012 07:52:11 +0000 (09:52 +0200)]
PUD: cfgTools: move read{ULL,Double} into configTools

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfg: simplify isMulticast function
Ferry Huberts [Mon, 4 Jun 2012 07:15:18 +0000 (09:15 +0200)]
PUD: cfg: simplify isMulticast function

and inline it

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfg: simplify getOlsrSockaddrPortAddress function
Ferry Huberts [Mon, 4 Jun 2012 07:07:49 +0000 (09:07 +0200)]
PUD: cfg: simplify getOlsrSockaddrPortAddress function

and inline it

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfg: remove unused function getOlsrSockAddrAndPortAddresses
Ferry Huberts [Mon, 4 Jun 2012 07:04:30 +0000 (09:04 +0200)]
PUD: cfg: remove unused function getOlsrSockAddrAndPortAddresses

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfg: refactor uplinkAddr functions
Ferry Huberts [Mon, 4 Jun 2012 07:04:10 +0000 (09:04 +0200)]
PUD: cfg: refactor uplinkAddr functions

use olsr_sockaddr properly

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfg: refactor txMcAddr functions
Ferry Huberts [Mon, 4 Jun 2012 07:03:33 +0000 (09:03 +0200)]
PUD: cfg: refactor txMcAddr functions

use olsr_sockaddr properly

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfg: refactor rxMcAddr functions
Ferry Huberts [Mon, 4 Jun 2012 07:02:22 +0000 (09:02 +0200)]
PUD: cfg: refactor rxMcAddr functions

use olsr_sockaddr properly

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfg: make RxAllowedSourceIpAddress use union olsr_sockaddr
Ferry Huberts [Sun, 3 Jun 2012 12:03:19 +0000 (14:03 +0200)]
PUD: cfg: make RxAllowedSourceIpAddress use union olsr_sockaddr

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: cfg: do max count check on rxAllowedSourceIpAddressesCount earlier
Ferry Huberts [Sun, 3 Jun 2012 09:42:45 +0000 (11:42 +0200)]
PUD: cfg: do max count check on rxAllowedSourceIpAddressesCount earlier

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agosgwdynspeed: do not use nanosecond stat information
Ferry Huberts [Wed, 6 Jun 2012 15:06:35 +0000 (17:06 +0200)]
sgwdynspeed: do not use nanosecond stat information

It poses problems for OpenWRT builds and is not really needed
since we enforce a minimum poll interval of 1 second.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agosgwdynspeed: no need to report regcomp error strings
Ferry Huberts [Wed, 6 Jun 2012 15:05:19 +0000 (17:05 +0200)]
sgwdynspeed: no need to report regcomp error strings

When they fail, there is a programming error.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agosgwdynspeed: errno is not set by strtoul function, so don't use it
Ferry Huberts [Wed, 6 Jun 2012 15:04:04 +0000 (17:04 +0200)]
sgwdynspeed: errno is not set by strtoul function, so don't use it

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agosgwdynspeed: add asserts to readUL
Ferry Huberts [Wed, 6 Jun 2012 15:03:08 +0000 (17:03 +0200)]
sgwdynspeed: add asserts to readUL

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agolinux: add support for common (autoconf) make variables (v3)
Ferry Huberts [Thu, 7 Jun 2012 14:10:00 +0000 (16:10 +0200)]
linux: add support for common (autoconf) make variables (v3)

Variables: prefix, libdir, sbindir, datarootdir

v1: by Hans-Christoph Steiner
v2: by Ferry Huberts
v3: add mandir

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: install example position config file in DOCDIR_OLSRD
Ferry Huberts [Thu, 7 Jun 2012 12:37:16 +0000 (14:37 +0200)]
PUD: install example position config file in DOCDIR_OLSRD

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: quote paths in Makefile
Ferry Huberts [Thu, 7 Jun 2012 12:01:29 +0000 (14:01 +0200)]
PUD: quote paths in Makefile

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: wireformat-java: rework Makefile
Ferry Huberts [Thu, 7 Jun 2012 09:31:46 +0000 (11:31 +0200)]
PUD: wireformat-java: rework Makefile

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: wireformat: rework Makefile
Ferry Huberts [Thu, 7 Jun 2012 09:11:08 +0000 (11:11 +0200)]
PUD: wireformat: rework Makefile

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoPUD: nmealib: rework Makefile
Ferry Huberts [Thu, 7 Jun 2012 09:10:59 +0000 (11:10 +0200)]
PUD: nmealib: rework Makefile

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agosgwdynspeed: install example speed config file in DOCDIR_OLSRD
Ferry Huberts [Thu, 7 Jun 2012 08:00:37 +0000 (10:00 +0200)]
sgwdynspeed: install example speed config file in DOCDIR_OLSRD

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoMakefile: add INCLUDEDIR and DOCDIR_OLSRD
Ferry Huberts [Thu, 7 Jun 2012 08:02:59 +0000 (10:02 +0200)]
Makefile: add INCLUDEDIR and DOCDIR_OLSRD

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agojsoninfo: add the possibility of loading a UUID from a file specified in olsrd.conf
Hans-Christoph Steiner [Tue, 5 Jun 2012 23:59:52 +0000 (19:59 -0400)]
jsoninfo: add the possibility of loading a UUID from a file specified in olsrd.conf

6 years agojsoninfo: get lots of info from /sys/class/net/wlan0/* for the /interfaces report
Hans-Christoph Steiner [Tue, 5 Jun 2012 23:22:18 +0000 (19:22 -0400)]
jsoninfo: get lots of info from /sys/class/net/wlan0/* for the /interfaces report

6 years ago0.6.3 Release OLSRD_0_6_3
Henning Rogge [Tue, 5 Jun 2012 18:20:07 +0000 (20:20 +0200)]
0.6.3 Release

6 years agojsoninfo: updated README with new /runtime and /startup scheme
Hans-Christoph Steiner [Tue, 5 Jun 2012 17:46:10 +0000 (13:46 -0400)]
jsoninfo: updated README with new /runtime and /startup scheme

6 years agoolsrd-quagga: Fix indentation of source files
Vasilis Tsiligiannis [Tue, 5 Jun 2012 12:42:16 +0000 (15:42 +0300)]
olsrd-quagga: Fix indentation of source files

6 years agoolsrd-quagga: Fix 'maybe-uninitialized' warnings
Vasilis Tsiligiannis [Tue, 5 Jun 2012 12:41:20 +0000 (15:41 +0300)]
olsrd-quagga: Fix 'maybe-uninitialized' warnings

6 years agoolsrd-quagga: Exit if unsupported packet version is selected
Vasilis Tsiligiannis [Tue, 5 Jun 2012 12:40:07 +0000 (15:40 +0300)]
olsrd-quagga: Exit if unsupported packet version is selected

6 years agoMakefile: take pud and sgwdynspeed out of default compile
Ferry Huberts [Sun, 3 Jun 2012 18:57:38 +0000 (20:57 +0200)]
Makefile: take pud and sgwdynspeed out of default compile

to sort out openwrt compilation issues

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoFix type in gtk gui
Henning Rogge [Sun, 3 Jun 2012 08:14:56 +0000 (10:14 +0200)]
Fix type in gtk gui

6 years agojsoninfo: add example jsoninfo block to files/olsrd.conf.default.full
Hans-Christoph Steiner [Fri, 1 Jun 2012 23:44:18 +0000 (19:44 -0400)]
jsoninfo: add example jsoninfo block to files/olsrd.conf.default.full

6 years agojsoninfo: add /startup and /runtime groupings and wrap everything in a JSON block...
Hans-Christoph Steiner [Fri, 1 Jun 2012 23:43:35 +0000 (19:43 -0400)]
jsoninfo: add /startup and /runtime groupings and wrap everything in a JSON block with a timestamp

6 years agoandroid: fix minor error in README about the make command line
Hans-Christoph Steiner [Thu, 31 May 2012 21:02:55 +0000 (17:02 -0400)]
android: fix minor error in README about the make command line

6 years agoAdd missing declaration of zebra_hello()
Vasilis Tsiligiannis [Fri, 1 Jun 2012 14:37:01 +0000 (17:37 +0300)]
Add missing declaration of zebra_hello()

6 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

6 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

6 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

6 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>
6 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>
6 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>
6 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>
6 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>
6 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

6 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

6 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>
6 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>
6 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>
6 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>
6 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>