olsrd.git
6 years agogateway: fix stable count dampening in gw_default_timer
Ferry Huberts [Wed, 30 Jan 2013 10:16:45 +0000 (11:16 +0100)]
gateway: fix stable count dampening in gw_default_timer

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoandroid: fix the path of the tunnel node in the /dev tree
Ferry Huberts [Thu, 17 Jan 2013 09:01:21 +0000 (10:01 +0100)]
android: fix the path of the tunnel node in the /dev tree

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: fix a revert problem
Ferry Huberts [Wed, 9 Jan 2013 12:57:50 +0000 (13:57 +0100)]
gateway: fix a revert problem

Did not notice that a line got doubled.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoRevert "linux: name is required to be non-null in olsr_os_cleanup_iptunnel"
Ferry Huberts [Wed, 9 Jan 2013 10:33:58 +0000 (11:33 +0100)]
Revert "linux: name is required to be non-null in olsr_os_cleanup_iptunnel"

This reverts commit f72ba167eb3f6c01b15edbb2efddd8a3950067f1.

It causes failures to add tunnels.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agodoc: clean up the latex directory if empty
Ferry Huberts [Tue, 11 Dec 2012 14:05:17 +0000 (15:05 +0100)]
doc: clean up the latex directory if empty

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agopud: java make target is dependent on library make target
Ferry Huberts [Tue, 11 Dec 2012 10:56:34 +0000 (11:56 +0100)]
pud: java make target is dependent on library make target

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agopud: change java include path to generic java include path
Ferry Huberts [Tue, 11 Dec 2012 10:43:20 +0000 (11:43 +0100)]
pud: change java include path to generic java include path

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoBranch v0.6.5
Ferry Huberts [Mon, 10 Dec 2012 13:53:53 +0000 (14:53 +0100)]
Branch v0.6.5

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoMerge branch 'release-0.6.4' into mmmm
Ferry Huberts [Mon, 10 Dec 2012 13:52:57 +0000 (14:52 +0100)]
Merge branch 'release-0.6.4' into mmmm

* release-0.6.4:
  release: the script can now also create a release branch
  release: convert some code into getPrevRelTag function
  release: convert some code into checkGitSigningKeyIsConfigured function
  release: convert some code into checkIsOlsrdGitCheckout function
  release: move into the base directory earlier
  release: fix usage of literal dot in regular expressions
  release: make gitIsGitDirectory do the correct thing
  release: move the stringTrim function up a bit

6 years agorelease: the script can now also create a release branch
Ferry Huberts [Mon, 10 Dec 2012 13:41:40 +0000 (14:41 +0100)]
release: the script can now also create a release branch

and update the versions correctly

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: convert some code into getPrevRelTag function
Ferry Huberts [Mon, 10 Dec 2012 10:41:36 +0000 (11:41 +0100)]
release: convert some code into getPrevRelTag function

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: convert some code into checkGitSigningKeyIsConfigured function
Ferry Huberts [Mon, 10 Dec 2012 10:38:20 +0000 (11:38 +0100)]
release: convert some code into checkGitSigningKeyIsConfigured function

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: convert some code into checkIsOlsrdGitCheckout function
Ferry Huberts [Mon, 10 Dec 2012 10:35:46 +0000 (11:35 +0100)]
release: convert some code into checkIsOlsrdGitCheckout function

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: move into the base directory earlier
Ferry Huberts [Mon, 10 Dec 2012 10:34:50 +0000 (11:34 +0100)]
release: move into the base directory earlier

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: fix usage of literal dot in regular expressions
Ferry Huberts [Mon, 10 Dec 2012 12:57:07 +0000 (13:57 +0100)]
release: fix usage of literal dot in regular expressions

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: make gitIsGitDirectory do the correct thing
Ferry Huberts [Mon, 10 Dec 2012 10:30:13 +0000 (11:30 +0100)]
release: make gitIsGitDirectory do the correct thing

Some relevant code was left commented out from debugging

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorelease: move the stringTrim function up a bit
Ferry Huberts [Mon, 10 Dec 2012 10:29:03 +0000 (11:29 +0100)]
release: move the stringTrim function up a bit

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agodoc: do not generate documentation for gui code
Ferry Huberts [Wed, 5 Dec 2012 23:26:02 +0000 (00:26 +0100)]
doc: do not generate documentation for gui code

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agodoc: fix win32 specific documentation tags
Ferry Huberts [Wed, 5 Dec 2012 23:23:09 +0000 (00:23 +0100)]
doc: fix win32 specific documentation tags

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agodoc: fix bsd specific documentation tags
Ferry Huberts [Wed, 5 Dec 2012 23:23:36 +0000 (00:23 +0100)]
doc: fix bsd specific documentation tags

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agodoc: fix unix specific documentation tags
Ferry Huberts [Wed, 5 Dec 2012 23:23:29 +0000 (00:23 +0100)]
doc: fix unix specific documentation tags

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agodoc: fix linux specific documentation tags
Ferry Huberts [Wed, 5 Dec 2012 23:01:58 +0000 (00:01 +0100)]
doc: fix linux specific documentation tags

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agodoc: fix common documentation tags
Ferry Huberts [Wed, 5 Dec 2012 22:36:38 +0000 (23:36 +0100)]
doc: fix common documentation tags

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agodoc: add doxygen documentation generation
Ferry Huberts [Tue, 24 Jul 2012 07:25:49 +0000 (09:25 +0200)]
doc: add doxygen documentation generation

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agolinux: put #ifdef __linux__ around code
Ferry Huberts [Wed, 5 Dec 2012 22:32:10 +0000 (23:32 +0100)]
linux: put #ifdef __linux__ around code

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: only check smart gateway configuration on linux
Ferry Huberts [Thu, 29 Nov 2012 18:38:36 +0000 (19:38 +0100)]
gateway: only check smart gateway configuration on linux

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agopud: enable dynamic polling of the position file
Ferry Huberts [Thu, 29 Nov 2012 20:44:47 +0000 (21:44 +0100)]
pud: enable dynamic polling of the position file

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agocookie: raise the number of cookies
Ferry Huberts [Thu, 29 Nov 2012 20:45:40 +0000 (21:45 +0100)]
cookie: raise the number of cookies

When running many plugins, I run into the cookie limit.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agopud: put plugin config in olsrd.conf.sample
Ferry Huberts [Thu, 29 Nov 2012 14:39:34 +0000 (15:39 +0100)]
pud: put plugin config in olsrd.conf.sample

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agosgwdynspeed: put plugin config in olsrd.conf.sample
Ferry Huberts [Thu, 29 Nov 2012 14:36:49 +0000 (15:36 +0100)]
sgwdynspeed: put plugin config in olsrd.conf.sample

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agobmf: check minimumLength against buffer size
Ferry Huberts [Mon, 19 Nov 2012 07:45:47 +0000 (08:45 +0100)]
bmf: check minimumLength against buffer size

minimumLength includes headerLeangth, but is larger and the most
accurate value we can use.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoMake sure calculated header length does not skip over buffer
Henning Rogge [Sun, 18 Nov 2012 19:06:43 +0000 (20:06 +0100)]
Make sure calculated header length does not skip over buffer

6 years agoRemove unnecessary asserts
Henning Rogge [Sun, 18 Nov 2012 19:00:47 +0000 (20:00 +0100)]
Remove unnecessary asserts
CID 739626 (#1 of 2): Operands don't affect result (CONSTANT_EXPRESSION_RESULT)
CID 739626 (#2 of 2): Operands don't affect result (CONSTANT_EXPRESSION_RESULT)

6 years agoCleanup error handling in ipc_init()
Henning Rogge [Sun, 18 Nov 2012 18:53:27 +0000 (19:53 +0100)]
Cleanup error handling in ipc_init()

6 years agoMerge branch 'release-0.6.4'
Ferry Huberts [Fri, 16 Nov 2012 13:17:34 +0000 (14:17 +0100)]
Merge branch 'release-0.6.4'

* release-0.6.4:
  main: add release script

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoChangelog: remove 0.6.5 preliminary changelog
Ferry Huberts [Fri, 16 Nov 2012 13:16:08 +0000 (14:16 +0100)]
Changelog: remove 0.6.5 preliminary changelog

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoUpdate version after release of v0.6.4
Ferry Huberts [Fri, 16 Nov 2012 13:09:58 +0000 (14:09 +0100)]
Update version after release of v0.6.4

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agomain: add release script
Ferry Huberts [Fri, 16 Nov 2012 13:02:48 +0000 (14:02 +0100)]
main: add release script

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agomain: remove -dispin and -dispout command line options
Ferry Huberts [Tue, 13 Nov 2012 14:03:42 +0000 (15:03 +0100)]
main: remove -dispin and -dispout command line options

Because we actually remove print_packet: tcpdump can parse
olsr packets (for years now already) so print_packet is no
longer needed.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoprint_packet: fix wrong use of sizeof()
Ferry Huberts [Tue, 13 Nov 2012 13:05:12 +0000 (14:05 +0100)]
print_packet: fix wrong use of sizeof()

Coverity:
CID 739690 (#1 of 1): Extra sizeof expression (SIZEOF_MISMATCH)
Adding "4UL /* sizeof (haddr->v4) */" to pointer "haddr" of
type "union olsr_ip_addr *" is suspicious because adding an integral
value to this pointer automatically scales that value by the size,
16 bytes, of the pointed-to type, "union olsr_ip_addr". Most likely,
"sizeof (haddr->v4)" is extraneous and should be replaced with 1.

CID 739691 (#1 of 1): Extra sizeof expression (SIZEOF_MISMATCH)
Adding "4UL /* sizeof (haddr->v4) */" to pointer "haddr" of
type "union olsr_ip_addr *" is suspicious because adding an integral
value to this pointer automatically scales that value by the size,
16 bytes, of the pointed-to type, "union olsr_ip_addr". Most likely,
"sizeof (haddr->v4)" is extraneous and should be replaced with 1.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agochangelog: update to current state
Ferry Huberts [Mon, 12 Nov 2012 20:56:21 +0000 (21:56 +0100)]
changelog: update to current state

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agobmf: do the minimum length check earlier
Ferry Huberts [Sat, 10 Nov 2012 14:33:56 +0000 (15:33 +0100)]
bmf: do the minimum length check earlier

so that getting the destPort does not (potentially) read
beyond the received bytes in the buffer.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agomain: improve random number generator seed
Ferry Huberts [Sat, 10 Nov 2012 10:44:12 +0000 (11:44 +0100)]
main: improve random number generator seed

Make it much more random when /dev/random or /dev/urandom is
available.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoneighbor_table: explicitly cast to (time_t *) in calls to localtime()
Ferry Huberts [Fri, 9 Nov 2012 16:56:06 +0000 (17:56 +0100)]
neighbor_table: explicitly cast to (time_t *) in calls to localtime()

To make it build on win64

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agohna_set: explicitly cast to (time_t *) in calls to localtime()
Ferry Huberts [Fri, 9 Nov 2012 16:55:47 +0000 (17:55 +0100)]
hna_set: explicitly cast to (time_t *) in calls to localtime()

To make it build on win64

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agowin32: remove unused getpid() function
Ferry Huberts [Fri, 9 Nov 2012 16:53:51 +0000 (17:53 +0100)]
win32: remove unused getpid() function

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agomain: do not seed the random number generator with the process id
Ferry Huberts [Fri, 9 Nov 2012 16:52:54 +0000 (17:52 +0100)]
main: do not seed the random number generator with the process id

We now seed it with the current time. This is predictable as well
but getpid() is not compatible with the windows 64bits mingw build.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agotas: remove plugin
Ferry Huberts [Mon, 5 Nov 2012 16:34:37 +0000 (17:34 +0100)]
tas: remove plugin

Unmaintained for a long time, no response on removal announcement,
no known users.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: simplify stopping the cleanup timer
Ferry Huberts [Wed, 7 Nov 2012 21:51:08 +0000 (22:51 +0100)]
gateway: simplify stopping the cleanup timer

To make the code of olsr_delete_gateway_tree_entry consistent with
that of olsr_update_gateway_entry

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogui: linux: fix the string buffer overflow better
Ferry Huberts [Wed, 7 Nov 2012 16:36:12 +0000 (17:36 +0100)]
gui: linux: fix the string buffer overflow better

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogui: linux: fix string buffer overflow
Ferry Huberts [Wed, 7 Nov 2012 16:20:33 +0000 (17:20 +0100)]
gui: linux: fix string buffer overflow

Coverity:
CID 742359 (#1 of 1): Copy into fixed size buffer (STRING_OVERFLOW)
At (2): You might overrun the 10 byte fixed-size string "tmp" by copying
        the return value of "g_locale_to_utf8(gchar const *, gssize,
        gsize *, gsize *, GError **)" without checking the length.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogui: linux: fix string buffer overflow
Ferry Huberts [Wed, 7 Nov 2012 16:17:22 +0000 (17:17 +0100)]
gui: linux: fix string buffer overflow

Coverity:
CID 742358 (#1 of 1): Copy into fixed size buffer (STRING_OVERFLOW)
At (1): You might overrun the 255 byte fixed-size string "title" by
        copying the return value of "ip_to_string(union olsr_ip_addr *)"
        without checking the length.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogui: linux: fix inccorrect sizeof()
Ferry Huberts [Wed, 7 Nov 2012 16:10:25 +0000 (17:10 +0100)]
gui: linux: fix inccorrect sizeof()

Coverity:
CID 742357 (#1 of 1): Incorrect sizeof expression (BAD_SIZEOF)
Taking the size of arithmetic expression "512 + 1" is suspicious.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogui: linux: fix some 'shadow' compiler warnings
Ferry Huberts [Wed, 7 Nov 2012 15:56:58 +0000 (16:56 +0100)]
gui: linux: fix some 'shadow' compiler warnings

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogui: linux: fix some 'may be used uninitialized' compiler warnings
Ferry Huberts [Wed, 7 Nov 2012 15:36:42 +0000 (16:36 +0100)]
gui: linux: fix some 'may be used uninitialized' compiler warnings

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoRevert "gui: linux: fix some 'may be used uninitialized' compiler warnings"
Ferry Huberts [Wed, 7 Nov 2012 15:36:18 +0000 (16:36 +0100)]
Revert "gui: linux: fix some 'may be used uninitialized' compiler warnings"

This reverts commit b27a04dd3106a7123810c066d59362ec6e7a7c64.

6 years agogui: linux: fix some 'unused parameter' compiler warnings
Ferry Huberts [Wed, 7 Nov 2012 13:56:47 +0000 (14:56 +0100)]
gui: linux: fix some 'unused parameter' compiler warnings

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogui: linux: fix a 'mixed declarations and code' compiler warning
Ferry Huberts [Wed, 7 Nov 2012 13:51:49 +0000 (14:51 +0100)]
gui: linux: fix a 'mixed declarations and code' compiler warning

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogui: linux: fix 'too few arguments to function ipc_connect' compiler warning
Ferry Huberts [Wed, 7 Nov 2012 13:46:04 +0000 (14:46 +0100)]
gui: linux: fix 'too few arguments to function ipc_connect' compiler warning

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogui: linux: fix some 'old-style function definition' compiler warnings
Ferry Huberts [Wed, 7 Nov 2012 13:42:59 +0000 (14:42 +0100)]
gui: linux: fix some 'old-style function definition' compiler warnings

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogui: linux: fix some 'discards const qualifier' compiler warnings
Ferry Huberts [Wed, 7 Nov 2012 13:36:41 +0000 (14:36 +0100)]
gui: linux: fix some 'discards const qualifier' compiler warnings

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogui: linux: fix some 'noreturn' compiler warnings
Ferry Huberts [Wed, 7 Nov 2012 13:35:32 +0000 (14:35 +0100)]
gui: linux: fix some 'noreturn' compiler warnings

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogui: linux: use toplevel make options
Ferry Huberts [Wed, 7 Nov 2012 13:34:47 +0000 (14:34 +0100)]
gui: linux: use toplevel make options

But disable some warnings for now.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogui: linux: fix some 'may be used uninitialized' compiler warnings
Ferry Huberts [Wed, 7 Nov 2012 12:32:01 +0000 (13:32 +0100)]
gui: linux: fix some 'may be used uninitialized' compiler warnings

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogui: linux: add VERBOSE handling
Ferry Huberts [Wed, 7 Nov 2012 12:28:10 +0000 (13:28 +0100)]
gui: linux: add VERBOSE handling

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogui: linux: clean and install are phony targets
Ferry Huberts [Wed, 7 Nov 2012 12:26:42 +0000 (13:26 +0100)]
gui: linux: clean and install are phony targets

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogui: linux: minor Makefile fixup
Ferry Huberts [Wed, 7 Nov 2012 12:26:19 +0000 (13:26 +0100)]
gui: linux: minor Makefile fixup

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoMakefile: always pass VERBOSE to the make command
Ferry Huberts [Wed, 7 Nov 2012 12:25:39 +0000 (13:25 +0100)]
Makefile: always pass VERBOSE to the make command

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoMakefile: add gui target
Ferry Huberts [Wed, 7 Nov 2012 11:32:54 +0000 (12:32 +0100)]
Makefile: add gui target

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoMakefile: fixup some forgotten make command prefixes
Ferry Huberts [Wed, 7 Nov 2012 12:16:27 +0000 (13:16 +0100)]
Makefile: fixup some forgotten make command prefixes

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agowin32: use #ifdef _WIN32
Ferry Huberts [Wed, 7 Nov 2012 11:21:26 +0000 (12:21 +0100)]
win32: use #ifdef _WIN32

I'm really tired of seeing (windows) compiler errors in Eclipse
on my Linux machine...

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoMerge tag 'v0.6.4'
Ferry Huberts [Mon, 5 Nov 2012 16:39:27 +0000 (17:39 +0100)]
Merge tag 'v0.6.4'

OLSRd release 0.6.4

* tag 'v0.6.4':
  Update version to 0.6.4
  Fix slightly insulting error message.
  on os x we need to include the proper files in order to have IPv6_PKTINFO
  pud: include nmealib v1.0.3
  pud: force pending buffer out if not enough space for our message
  Pud: Do not use the variable name strlen.

6 years agogateway: refactor olsr_set_inet_gateway
Ferry Huberts [Fri, 2 Nov 2012 15:11:49 +0000 (16:11 +0100)]
gateway: refactor olsr_set_inet_gateway

To make it easier to understand

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agohna_set: olsr_ip_prefix_to_string outputs a wider string
Ferry Huberts [Fri, 2 Nov 2012 12:52:06 +0000 (13:52 +0100)]
hna_set: olsr_ip_prefix_to_string outputs a wider string

See 213f9e04ab44d89c0138b0283883eebe2aabc9a5

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: minor improvement in NULL comparisons
Ferry Huberts [Fri, 2 Nov 2012 11:47:51 +0000 (12:47 +0100)]
gateway: minor improvement in NULL comparisons

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: rename a variable
Ferry Huberts [Fri, 2 Nov 2012 11:49:32 +0000 (12:49 +0100)]
gateway: rename a variable

And add a comment

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: only remove a tunnel when there is one
Ferry Huberts [Fri, 2 Nov 2012 10:20:55 +0000 (11:20 +0100)]
gateway: only remove a tunnel when there is one

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agouse INET_ADDRSTRLEN and INET6_ADDRSTRLEN instead of magic constants
Ferry Huberts [Thu, 1 Nov 2012 13:17:01 +0000 (14:17 +0100)]
use INET_ADDRSTRLEN and INET6_ADDRSTRLEN instead of magic constants

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoneighbor_table: stub out olsr_print_neighbor_table on #ifdef NODEBUG and fix
Ferry Huberts [Thu, 1 Nov 2012 12:22:28 +0000 (13:22 +0100)]
neighbor_table: stub out olsr_print_neighbor_table on #ifdef NODEBUG and fix

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoneighbor_table: stub out olsr_print_neighbor_table on #ifndef NODEBUG
Ferry Huberts [Thu, 1 Nov 2012 12:20:31 +0000 (13:20 +0100)]
neighbor_table: stub out olsr_print_neighbor_table on #ifndef NODEBUG

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agohna_set: stub out olsr_print_hna_set on #ifdef NODEBUG and fix
Ferry Huberts [Thu, 1 Nov 2012 12:17:54 +0000 (13:17 +0100)]
hna_set: stub out olsr_print_hna_set on #ifdef NODEBUG and fix

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agohna_set: stub out olsr_print_hna_set on #ifndef NODEBUG
Ferry Huberts [Thu, 1 Nov 2012 11:52:52 +0000 (12:52 +0100)]
hna_set: stub out olsr_print_hna_set on #ifndef NODEBUG

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agotwo_hop_neighbor_table: stub out olsr_print_two_hop_neighbor_table on #ifdef NODEBUG
Ferry Huberts [Thu, 1 Nov 2012 11:55:40 +0000 (12:55 +0100)]
two_hop_neighbor_table: stub out olsr_print_two_hop_neighbor_table on #ifdef NODEBUG

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agotc_set: stub out olsr_print_tc_table on #ifdef NODEBUG
Ferry Huberts [Thu, 1 Nov 2012 11:54:58 +0000 (12:54 +0100)]
tc_set: stub out olsr_print_tc_table on #ifdef NODEBUG

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agorouting_table: stub out olsr_print_routing_table on #ifdef NODEBUG
Ferry Huberts [Thu, 1 Nov 2012 11:54:34 +0000 (12:54 +0100)]
routing_table: stub out olsr_print_routing_table on #ifdef NODEBUG

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agompr_set: stub out olsr_print_mpr_set on #ifdef NODEBUG
Ferry Huberts [Thu, 1 Nov 2012 11:53:37 +0000 (12:53 +0100)]
mpr_set: stub out olsr_print_mpr_set on #ifdef NODEBUG

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agolink_set: stub out olsr_print_link_set on #ifdef NODEBUG
Ferry Huberts [Thu, 1 Nov 2012 11:53:10 +0000 (12:53 +0100)]
link_set: stub out olsr_print_link_set on #ifdef NODEBUG

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoduplicate_set: stub out olsr_print_duplicate_table on #ifdef NODEBUG
Ferry Huberts [Thu, 1 Nov 2012 11:52:30 +0000 (12:52 +0100)]
duplicate_set: stub out olsr_print_duplicate_table on #ifdef NODEBUG

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: stub out olsr_print_gateway_entries on #ifdef NODEBUG
Ferry Huberts [Thu, 1 Nov 2012 11:51:59 +0000 (12:51 +0100)]
gateway: stub out olsr_print_gateway_entries on #ifdef NODEBUG

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: add a define for the tunnel name
Ferry Huberts [Thu, 1 Nov 2012 09:37:38 +0000 (10:37 +0100)]
gateway: add a define for the tunnel name

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: rename gw_mem_cookie to gateway_entry_mem_cookie
Ferry Huberts [Thu, 1 Nov 2012 09:28:00 +0000 (10:28 +0100)]
gateway: rename gw_mem_cookie to gateway_entry_mem_cookie

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agogateway: improve cleanup
Ferry Huberts [Tue, 30 Oct 2012 16:14:44 +0000 (17:14 +0100)]
gateway: improve cleanup

First remove all inactive gateways from the gateway tree
to avoid getting a gateway re-election. Then remove the active
gateways.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoUpdate version to 0.6.4 v0.6.4
Henning Rogge [Tue, 30 Oct 2012 19:07:35 +0000 (20:07 +0100)]
Update version to 0.6.4

6 years agogateway: minor optimisation
Ferry Huberts [Tue, 30 Oct 2012 11:32:18 +0000 (12:32 +0100)]
gateway: minor optimisation

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
6 years agoRemove dead codepath
Henning Rogge [Mon, 29 Oct 2012 13:37:37 +0000 (14:37 +0100)]
Remove dead codepath

CID 739641: Logically dead code (DEADCODE)
Execution cannot reach this expression "NULL" inside statement "err = olsr_new_netlink_rout...".

6 years agoreset link timer if not set
Henning Rogge [Mon, 29 Oct 2012 13:34:20 +0000 (14:34 +0100)]
reset link timer if not set

CID 739651: Dereference after null check (FORWARD_NULL)
At (6): Passing "entry" to function "olsr_process_hysteresis(struct link_entry *)", which dereferences null "entry->link_timer"

6 years agono hostroute possible in this if() branch
Henning Rogge [Mon, 29 Oct 2012 13:31:01 +0000 (14:31 +0100)]
no hostroute possible in this if() branch

CID 739641: Logically dead code (DEADCODE)
Execution cannot reach this expression "NULL" inside statement "err = olsr_new_netlink_rout...".

6 years agoInterface will always be found.
Henning Rogge [Mon, 29 Oct 2012 13:03:35 +0000 (14:03 +0100)]
Interface will always be found.

CID 739650: Dereference after null check (FORWARD_NULL)
At (10): Dereferencing null pointer "cfg_inter".

6 years agoDeclare olsr_exit() as noreturn
Henning Rogge [Mon, 29 Oct 2012 13:01:33 +0000 (14:01 +0100)]
Declare olsr_exit() as noreturn

CID 739654: Dereference after null check (FORWARD_NULL)
At (7): Dereferencing null pointer "node".

6 years agofail of non-blocking netlink socket is not fatal
Henning Rogge [Mon, 29 Oct 2012 12:58:35 +0000 (13:58 +0100)]
fail of non-blocking netlink socket is not fatal

CID 739623: Unchecked return value (CHECKED_RETURN)
At (24): Calling function "fcntl(olsr_cnf->rtnl_s, 4, 2048)" without checking return value. This library function may fail and return an error code.