olsrd.git
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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...".

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

7 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...".

7 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".

7 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".

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

7 years agoFail in IPC initializationis always fatal.
Henning Rogge [Mon, 29 Oct 2012 12:56:27 +0000 (13:56 +0100)]
Fail in IPC initializationis always fatal.

CID 739624 (#1 of 1): Unchecked return value (CHECKED_RETURN)
At (34): Calling function "ipc_init()" without checking return value. It wraps a library function that may fail and return an error code.

7 years agoFix command line parsing macro
Henning Rogge [Mon, 29 Oct 2012 12:44:37 +0000 (13:44 +0100)]
Fix command line parsing macro

CID 739642: Logically dead code (DEADCODE)
Execution cannot reach this statement "fprintf(stderr, "Error pars...".

7 years agohttpinfo: add a comment about why the client socket is not closed
Ferry Huberts [Fri, 26 Oct 2012 14:50:46 +0000 (16:50 +0200)]
httpinfo: add a comment about why the client socket is not closed

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoRevert "httpdinfo: fix resource leak"
Ferry Huberts [Fri, 26 Oct 2012 14:38:16 +0000 (16:38 +0200)]
Revert "httpdinfo: fix resource leak"

This reverts commit 808928830ed65a3d8de80876d00ad78a8cfe540b.

It breaks the httpinfo page serving

7 years agocookie: add an assert
Ferry Huberts [Fri, 26 Oct 2012 13:15:03 +0000 (15:15 +0200)]
cookie: add an assert

Coverity doesn't understand the olsr_exit

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agocookie: an array already is a pointer
Ferry Huberts [Fri, 26 Oct 2012 12:50:44 +0000 (14:50 +0200)]
cookie: an array already is a pointer

Coverity:
CID 739655 (#1 of 1): Dereference after null check (FORWARD_NULL)
At (8): Passing null pointer "&branding->cmb_sig" to function
        "memcpy(void * restrict, void const * restrict, size_t)", which
        dereferences it.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoMerge branch 'lua-official-502'
Ferry Huberts [Fri, 26 Oct 2012 11:28:16 +0000 (13:28 +0200)]
Merge branch 'lua-official-502'

* lua-official-502:
  tas: lua: run gnu-indent.sh script
  use the POSIX standard '__linux__' macro instead of 'linux'
  Patch ALIGN_NOWARN_ARM macro for better priority handling.
  ARM alignment warnings fixed
  Fix sytax errs and line break quirks for gnu-indent
  * added -Wcast-qual: this killed lots of unnecessary type-casts
  * added -Wbad-function-cast
  cleanup, 1. step (to get some local changes away):
  x86_64 patch from Bernd
  tas: lua: official source code for 5.0.2

7 years agotas: lua: sync up to official source code with fixes
Ferry Huberts [Fri, 26 Oct 2012 11:27:29 +0000 (13:27 +0200)]
tas: lua: sync up to official source code with fixes

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agotas: lua: run gnu-indent.sh script
Ferry Huberts [Fri, 26 Oct 2012 11:15:36 +0000 (13:15 +0200)]
tas: lua: run gnu-indent.sh script

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agouse the POSIX standard '__linux__' macro instead of 'linux'
Ferry Huberts [Fri, 26 Oct 2012 08:38:04 +0000 (10:38 +0200)]
use the POSIX standard '__linux__' macro instead of 'linux'

"Use __linux__ for this purpose, not linux. Although the latter is defined, it is not POSIX compliant."
    http://www.faqs.org/docs/Linux-HOWTO/GCC-HOWTO.html#INDEX.25

from: 485c4d5ca8ad403b27afd39d3016f9741f28867a

7 years agoPatch ALIGN_NOWARN_ARM macro for better priority handling.
Ferry Huberts [Fri, 26 Oct 2012 08:27:50 +0000 (10:27 +0200)]
Patch ALIGN_NOWARN_ARM macro for better priority handling.

from: 7fce805df297d920e5c65e537f610fa7da75bab5

7 years agoARM alignment warnings fixed
Ferry Huberts [Fri, 26 Oct 2012 08:25:52 +0000 (10:25 +0200)]
ARM alignment warnings fixed

from: d1656d8112d5605cd709c211960ab71b34a49bed

7 years agoFix sytax errs and line break quirks for gnu-indent
Ferry Huberts [Fri, 26 Oct 2012 10:43:15 +0000 (12:43 +0200)]
Fix sytax errs and line break quirks for gnu-indent

from: 0e3c43820a333bea7863e08208de22d77dc828aa

corrected gnu-indent quirks

from: 29d2799ba478fc0354596ff132128e873454bb20

7 years ago* added -Wcast-qual: this killed lots of unnecessary type-casts
Ferry Huberts [Fri, 26 Oct 2012 10:42:21 +0000 (12:42 +0200)]
* added -Wcast-qual: this killed lots of unnecessary type-casts

from: 17271941ffaa174ee45959effee041831b489d00

7 years ago* added -Wbad-function-cast
Bernd Petrovitsch [Fri, 16 Nov 2007 19:34:26 +0000 (19:34 +0000)]
* added -Wbad-function-cast

from: ee7eeb6d7f7b5a23830402c6b346d8db93995d41

7 years agocleanup, 1. step (to get some local changes away):
Ferry Huberts [Fri, 26 Oct 2012 11:06:40 +0000 (13:06 +0200)]
cleanup, 1. step (to get some local changes away):

from: 6ff6c1cc6464a9ca6ac1d3961fc044960a402e5b

7 years agotas: lua: run gnu-indent.sh script
Ferry Huberts [Fri, 26 Oct 2012 10:40:36 +0000 (12:40 +0200)]
tas: lua: run gnu-indent.sh script

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agox86_64 patch from Bernd
Andreas Tonnesen [Sat, 19 Nov 2005 08:39:26 +0000 (08:39 +0000)]
x86_64 patch from Bernd

from: eda03ea1f7554d8bc24c6443b7a405d0ed84e9a0

7 years agotas: lua: official source code for 5.0.2
Ferry Huberts [Fri, 26 Oct 2012 10:35:23 +0000 (12:35 +0200)]
tas: lua: official source code for 5.0.2

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agodefs: fix strscpy null pointer dereference
Ferry Huberts [Wed, 24 Oct 2012 13:22:18 +0000 (15:22 +0200)]
defs: fix strscpy null pointer dereference

Coverity:
CID 739649 (#1 of 1): Dereference after null check (FORWARD_NULL)
At (5): Passing null pointer "dest" to function
        "strncpy(char * restrict, char const * restrict, size_t)", which
        dereferences it.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agolinux: sanitise ACPI battery data
Ferry Huberts [Wed, 24 Oct 2012 13:07:34 +0000 (15:07 +0200)]
linux: sanitise ACPI battery data

Coverity:
CID 739695 (#1 of 1): Use of untrusted scalar value (TAINTED_SCALAR)
At (23): Using tainted variable "bat_max" as the divisor in
         "bat_val * 100 / bat_max".

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agogateway: walk the gateway tree to properly cleanup
Ferry Huberts [Thu, 18 Oct 2012 09:44:27 +0000 (11:44 +0200)]
gateway: walk the gateway tree to properly cleanup

No need to explicitly remove the tunnels, since these are
removed by the olsr_delete_gateway_entry function.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agogateway: split olsr_delete_gateway_entry
Ferry Huberts [Thu, 18 Oct 2012 09:14:36 +0000 (11:14 +0200)]
gateway: split olsr_delete_gateway_entry

The olsr_delete_gateway_entry function now is a wrapper around
the olsr_delete_gateway_tree_entry function. The latter function
will be used by the cleanup function later on, to prevent needless
iterations on the gateway tree.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agogateway: allow immediate removal of a gateway entry
Ferry Huberts [Thu, 18 Oct 2012 09:09:02 +0000 (11:09 +0200)]
gateway: allow immediate removal of a gateway entry

This is going to be used by the cleanup function later on.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agogateway: minor simplification in olsr_delete_gateway_entry
Ferry Huberts [Thu, 18 Oct 2012 08:57:13 +0000 (10:57 +0200)]
gateway: minor simplification in olsr_delete_gateway_entry

Do an early return if the gw is NULL

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agogateway: ensure cleanup uses the reverse order of init
Ferry Huberts [Thu, 18 Oct 2012 09:40:12 +0000 (11:40 +0200)]
gateway: ensure cleanup uses the reverse order of init

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agogateway: cleanup: free the allocated memory cookie
Ferry Huberts [Thu, 18 Oct 2012 09:18:08 +0000 (11:18 +0200)]
gateway: cleanup: free the allocated memory cookie

This was forgotten

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agogateway: initialise the handler before setting up the tunnel
Ferry Huberts [Thu, 18 Oct 2012 09:16:54 +0000 (11:16 +0200)]
gateway: initialise the handler before setting up the tunnel

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agopud: fix alignment warning
Ferry Huberts [Wed, 24 Oct 2012 08:51:43 +0000 (10:51 +0200)]
pud: fix alignment warning

src/netTools.c: In function 'getIPv4Address':
src/netTools.c:102:11: warning: cast increases required alignment of target type [-Wcast-align]

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoandroid: fix type punning warning
Ferry Huberts [Tue, 23 Oct 2012 14:11:42 +0000 (16:11 +0200)]
android: fix type punning warning

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agolq: make sure last_ip != NULL
Ferry Huberts [Tue, 23 Oct 2012 12:45:29 +0000 (14:45 +0200)]
lq: make sure last_ip != NULL

Coverity:
CID 739653 (#1 of 1): Explicit null dereferenced (FORWARD_NULL)
At (11): Passing null pointer "last_ip" to function
         "calculate_border_flag(void *, void *)", which dereferences it.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agolq: make sure that info_head != NULL
Ferry Huberts [Tue, 23 Oct 2012 12:42:32 +0000 (14:42 +0200)]
lq: make sure that info_head != NULL

Coverity:
CID 739652 (#1 of 1): Explicit null dereferenced (FORWARD_NULL)
At (88): Dereferencing null pointer "info_head".

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoolsr_switch: fix a memory leak
Ferry Huberts [Tue, 23 Oct 2012 12:14:44 +0000 (14:14 +0200)]
olsr_switch: fix a memory leak

Coverity:
CID 739687 (#1 of 1): Resource leak (RESOURCE_LEAK)
At (16): Variable "oc" going out of scope leaks the storage it points to.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agolinux: apm: fix retry opening of apm proc file
Ferry Huberts [Tue, 23 Oct 2012 12:12:33 +0000 (14:12 +0200)]
linux: apm: fix retry opening of apm proc file

Coverity:
CID 739684 (#1 of 1): Resource leak (RESOURCE_LEAK)
At (6): Variable "apm_procfile" going out of scope leaks the storage it
        points to.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agocfgparser: fix dereference before assert
Ferry Huberts [Tue, 23 Oct 2012 12:38:22 +0000 (14:38 +0200)]
cfgparser: fix dereference before assert

Coverity:
CID 739688 (#1 of 1): Dereference before null check (REVERSE_INULL)
Null-checking "in->cnf" suggests that it may be null, but it has already
been dereferenced on all paths leading to the check.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agocfgparser: fix a copy/paste error and resulting memory leak
Ferry Huberts [Tue, 23 Oct 2012 12:06:55 +0000 (14:06 +0200)]
cfgparser: fix a copy/paste error and resulting memory leak

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agocfgparser: fix some memory leaks
Ferry Huberts [Tue, 23 Oct 2012 12:06:12 +0000 (14:06 +0200)]
cfgparser: fix some memory leaks

Coverity:
CID 739682 (#1 of 2): Resource leak (RESOURCE_LEAK)
At (84): Variable "in" going out of scope leaks the storage it points to.
CID 739682 (#2 of 2): Resource leak (RESOURCE_LEAK)
At (89): Variable "in" going out of scope leaks the storage it points to.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agomain: fix an Out-of-bounds access
Ferry Huberts [Tue, 23 Oct 2012 11:52:10 +0000 (13:52 +0200)]
main: fix an Out-of-bounds access

Coverity:
CID 739670 (#1 of 1): Out-of-bounds access (OVERRUN)
At (46): Overrunning struct type in_addr of 4 bytes by passing it to a
         function which accesses it at byte offset 15 using argument
         "16UL".

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agotxtinfo: remove some dead code
Ferry Huberts [Tue, 23 Oct 2012 09:31:31 +0000 (11:31 +0200)]
txtinfo: remove some dead code

Coverity:
CID 739639 (#1 of 1): Logically dead code (DEADCODE)
  Execution cannot reach this expression "97" inside statement
  "v4 = (autoV4 ? 97 : 115);".
CID 739640 (#1 of 1): Logically dead code (DEADCODE)
  Execution cannot reach this expression "97" inside statement
  "v6 = (autoV6 ? 97 : 115);".

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agotas: fix a memory leak
Ferry Huberts [Tue, 23 Oct 2012 08:35:00 +0000 (10:35 +0200)]
tas: fix a memory leak

Coverity:
CID 739681 (#1 of 1): Resource leak (RESOURCE_LEAK)
At (21): Variable "walker" going out of scope leaks the storage it points to.
At (22): Variable "mess" going out of scope leaks the storage it points to.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agoquagga: explicitly ignore return value of fcntl
Ferry Huberts [Tue, 23 Oct 2012 11:32:51 +0000 (13:32 +0200)]
quagga: explicitly ignore return value of fcntl

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agopud: remove some dead code
Ferry Huberts [Tue, 23 Oct 2012 09:03:03 +0000 (11:03 +0200)]
pud: remove some dead code

Coverity:
CID 739635 (#1 of 1): Logically dead code (DEADCODE)
  Execution cannot reach this expression ""disable"" inside statement
  "pudError(true, "Could not %...".

CID 739636: Logically dead code (DEADCODE)
  Execution cannot reach this expression ""enable"" inside statement
  "pudError(true, "Could not %...".

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agobmf: do not close an fd that is not open
Ferry Huberts [Tue, 23 Oct 2012 11:03:07 +0000 (13:03 +0200)]
bmf: do not close an fd that is not open

CID 739656 (#1 of 4): Argument cannot be negative (NEGATIVE_RETURNS)
At (7): "encapsulatingSkfd" is passed to a parameter that cannot be
        negative.
CID 739656 (#2 of 4): Argument cannot be negative (NEGATIVE_RETURNS)
At (9): "encapsulatingSkfd" is passed to a parameter that cannot be
        negative.
CID 739656 (#3 of 4): Argument cannot be negative (NEGATIVE_RETURNS)
At (12): "capturingSkfd" is passed to a parameter that cannot be
         negative.
CID 739656 (#4 of 4): Argument cannot be negative (NEGATIVE_RETURNS)
At (11): "encapsulatingSkfd" is passed to a parameter that cannot be
         negative.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agop2pd: remove some dead code
Ferry Huberts [Tue, 23 Oct 2012 11:14:31 +0000 (13:14 +0200)]
p2pd: remove some dead code

Coverity:
CID 739634 (#1 of 1): Dead default in switch (DEADCODE)
  Execution cannot reach this statement "default:".

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agop2pd: do not close an fd that is not open
Ferry Huberts [Tue, 23 Oct 2012 10:12:46 +0000 (12:12 +0200)]
p2pd: do not close an fd that is not open

Coverity:
CID 739656 (#6 of 8): Argument cannot be negative (NEGATIVE_RETURNS)
At (7): "capturingSkfd" is passed to a parameter that cannot be negative.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agop2pd: do not close an fd that is not open
Ferry Huberts [Tue, 23 Oct 2012 10:10:30 +0000 (12:10 +0200)]
p2pd: do not close an fd that is not open

Coverity:
CID 739656 (#5 of 8): Argument cannot be negative (NEGATIVE_RETURNS)
At (6): "encapsulatingSkfd" is passed to a parameter that cannot be
        negative.
CID 739656 (#7-8 of 8): Argument cannot be negative (NEGATIVE_RETURNS)
At (8): "encapsulatingSkfd" is passed to a parameter that cannot be
        negative.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agomdns: check return value of sendto
Ferry Huberts [Tue, 23 Oct 2012 10:32:33 +0000 (12:32 +0200)]
mdns: check return value of sendto

Coverity:
CID 739617 (#1 of 1): Unchecked return value (CHECKED_RETURN)
At (7): Calling function "sendto(walker->helloSkfd, (char const *)hello,
        25UL, 0, (struct sockaddr *)&dest, 16U)" without checking return
        value. This library function may fail and return an error code.
At (8): No check of the return value of "sendto(walker->helloSkfd, (
        char const *)hello, 25UL, 0, (struct sockaddr *)&dest, 16U)".

CID 739617 (#2 of 2): Unchecked return value (CHECKED_RETURN)
At (7): Calling function "sendto(walker->helloSkfd, (char const *)hello,
        25UL, 0, (struct sockaddr *)&dest6, 28U)" without checking
        return value. This library function may fail and return an error
        code.
At (8): No check of the return value of "sendto(walker->helloSkfd, (
        char const *)hello, 25UL, 0, (struct sockaddr *)&dest6, 28U)".

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agomdns: check return value of inet_pton
Ferry Huberts [Tue, 23 Oct 2012 10:27:10 +0000 (12:27 +0200)]
mdns: check return value of inet_pton

Coverity:
CID 739616 (#1 of 2): Unchecked return value (CHECKED_RETURN)
At (8): Calling function "inet_pton(int, char const * restrict,
                                    void * restrict)" without checking
        return value (as is done elsewhere 23 out of 25 times).
At (9): No check of the return value of "inet_pton(2, "224.0.0.2",
        &mc_settings.imr_multiaddr.s_addr)".

CID 739616 (#2 of 2): Unchecked return value (CHECKED_RETURN)
At (7): Calling function "inet_pton(int, char const * restrict,
                                    void * restrict)" without checking
        return value (as is done elsewhere 23 out of 25 times).
At (8): No check of the return value of "inet_pton(10, "ff02::2",
        &mc6_settings.ipv6mr_multiaddr.__in6_u.__u6_addr8)".

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agomdns: do not close an fd that is not open
Ferry Huberts [Tue, 23 Oct 2012 09:52:23 +0000 (11:52 +0200)]
mdns: do not close an fd that is not open

Coverity:
CID 739659 (#1 of 1): Argument cannot be negative (NEGATIVE_RETURNS)
At (7): "capturingSkfd" is passed to a parameter that cannot be negative.
CID 739660 (#1 of 1): Argument cannot be negative (NEGATIVE_RETURNS)
At (8): "electionSkfd" is passed to a parameter that cannot be negative.
CID 739661 (#1 of 1): Argument cannot be negative (NEGATIVE_RETURNS)
At (9): "helloSkfd" is passed to a parameter that cannot be negative.

CID 739656 (#6 of 14): Argument cannot be negative (NEGATIVE_RETURNS)
At (7): "capturingSkfd" is passed to a parameter that cannot be negative.
CID 739656 (#9 of 14): Argument cannot be negative (NEGATIVE_RETURNS)
At (7): "electionSkfd" is passed to a parameter that cannot be negative.
CID 739656 (#10 of 14): Argument cannot be negative (NEGATIVE_RETURNS)
At (7): "helloSkfd" is passed to a parameter that cannot be negative.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agomdns: do not close an fd that is not open
Ferry Huberts [Tue, 23 Oct 2012 09:45:03 +0000 (11:45 +0200)]
mdns: do not close an fd that is not open

Coverity:
CID 739656 (#5 of 14): Argument cannot be negative (NEGATIVE_RETURNS)
At (8): "encapsulatingSkfd" is passed to a parameter that cannot be
        negative.
CID 739656 (#7-8 of 14): Argument cannot be negative (NEGATIVE_RETURNS)
At (10): "encapsulatingSkfd" is passed to a parameter that cannot be
         negative.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agomdns: remove some dead code
Ferry Huberts [Tue, 23 Oct 2012 09:38:15 +0000 (11:38 +0200)]
mdns: remove some dead code

Coverity:
CID 739631 (#1 of 1): Logically dead code (DEADCODE)
  Execution cannot reach this expression ""enable"" inside statement
  "BmfPError("Could not %s mul...".
CID 739632 (#1 of 1): Logically dead code (DEADCODE)
  Execution cannot reach this expression ""disable"" inside statement
  "BmfPError("Could not %s mul...".

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agomdns: suppress a Coverity warning
Ferry Huberts [Tue, 23 Oct 2012 08:51:55 +0000 (10:51 +0200)]
mdns: suppress a Coverity warning

Coverity:
CID 739612 (#1 of 1): Buffer not null terminated (BUFFER_SIZE)
At (5): Calling strncpy with a source string whose length (4 chars) is
        greater than or equal to the size argument (4) will fail to
        null-terminate "hello->head".

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agojsoninfo: remove pointless compare
Ferry Huberts [Tue, 23 Oct 2012 09:35:11 +0000 (11:35 +0200)]
jsoninfo: remove pointless compare

Coverity:
CID 739666 (#1 of 1): Array compared against 0 (NO_EFFECT)
  Comparing an array to null is not useful: "linkpath != NULL".

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agojsoninfo: remove some dead code
Ferry Huberts [Tue, 23 Oct 2012 09:33:14 +0000 (11:33 +0200)]
jsoninfo: remove some dead code

Coverity:
CID 739629 (#1 of 1): Logically dead code (DEADCODE)
  Execution cannot reach this expression ""auto"" inside statement
  "v4 = (autoV4 ? "auto" : "s");".
CID 739630 (#1 of 1): Logically dead code (DEADCODE)
  Execution cannot reach this expression ""auto"" inside statement
  "v6 = (autoV6 ? "auto" : "s");".

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agojsoninfo: make sure that uuid is null-terminated
Ferry Huberts [Tue, 23 Oct 2012 08:16:47 +0000 (10:16 +0200)]
jsoninfo: make sure that uuid is null-terminated

Since it's used as a string.

Coverity:
CID 739693 (#1 of 1): String not null terminated (STRING_NULL)
At (2): Function "fread(void * restrict, size_t, size_t, FILE * restrict)"
        does not terminate string "*uuid".
At (4): Passing unterminated string "uuid" to "strchr(char const *, int)",
        which expects a null-terminated string.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agojsoninfo: fix a resource leak
Ferry Huberts [Tue, 23 Oct 2012 08:46:08 +0000 (10:46 +0200)]
jsoninfo: fix a resource leak

Coverity:
CID 739677 (#1 of 1): Resource leak (RESOURCE_LEAK)
At (6): Variable "f" going out of scope leaks the storage it points to.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agonameservice: remove some dead code
Ferry Huberts [Tue, 23 Oct 2012 11:21:05 +0000 (13:21 +0200)]
nameservice: remove some dead code

Coverity:
CID 739633 (#1 of 1): Logically dead code (DEADCODE)
  Execution cannot reach this expression "127" inside statement
  "tmp->len = ((len_of_name > ...".
  (The condition "len_of_name > 127U" cannot be true.)

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agonameservice: do not close an fd that is not open
Ferry Huberts [Tue, 23 Oct 2012 11:18:05 +0000 (13:18 +0200)]
nameservice: do not close an fd that is not open

Coverity:
CID 739644 (#1 of 1): Dereference after null check (FORWARD_NULL)At (11): Passing null pointer "add_hosts" to function "fclose(FILE *)", which dereferences it.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agonameservice: check return value of fcntl
Ferry Huberts [Tue, 23 Oct 2012 10:40:45 +0000 (12:40 +0200)]
nameservice: check return value of fcntl

Coverity:
CID 739618 (#1 of 1): Unchecked return value (CHECKED_RETURN)
At (4): Calling function "fcntl(fd, 4, 1)" without checking return value.
        This library function may fail and return an error code.
At (5): No check of the return value of "fcntl(fd, 4, 1)".

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agonameservice: fix wrong size argument
Ferry Huberts [Tue, 23 Oct 2012 10:07:15 +0000 (12:07 +0200)]
nameservice: fix wrong size argument

Coverity:
CID 739689 (#1 of 1): Wrong sizeof argument (SIZEOF_MISMATCH)
  Passing argument "ip" of type "union olsr_ip_addr *" and argument
  "8UL /* sizeof (ip) */" to function "memset(void *, int, size_t)" is
  suspicious. Did you intend to use "sizeof(*ip)" instead of "sizeof (ip)"?

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agonameservice: fix a resource leak
Ferry Huberts [Tue, 23 Oct 2012 08:39:48 +0000 (10:39 +0200)]
nameservice: fix a resource leak

Coverity:
CID 739678 (#1 of 1): Resource leak (RESOURCE_LEAK)
At (24): Handle variable "fd" going out of scope leaks the handle.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agosecure: initialise cmsg correctly
Ferry Huberts [Tue, 23 Oct 2012 08:06:28 +0000 (10:06 +0200)]
secure: initialise cmsg correctly

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agosecure: decrease a (stack allocated) buffer size
Ferry Huberts [Tue, 23 Oct 2012 08:06:01 +0000 (10:06 +0200)]
secure: decrease a (stack allocated) buffer size

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agosecure: do not hard-code a sizeof()
Ferry Huberts [Tue, 23 Oct 2012 08:05:46 +0000 (10:05 +0200)]
secure: do not hard-code a sizeof()

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agosecure: can only work for IPv4, so assert on it
Ferry Huberts [Tue, 23 Oct 2012 08:05:27 +0000 (10:05 +0200)]
secure: can only work for IPv4, so assert on it

Because of:
  memcpy(&cmsg.destination, new_host, olsr_cnf->ipsize);
with
  cmsg.destination being an uint32_t

7 years agosecure: initialise crmsg correctly
Ferry Huberts [Tue, 23 Oct 2012 07:58:49 +0000 (09:58 +0200)]
secure: initialise crmsg correctly

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agosecure: decrease a (stack allocated) buffer size
Ferry Huberts [Tue, 23 Oct 2012 07:58:38 +0000 (09:58 +0200)]
secure: decrease a (stack allocated) buffer size

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agosecure: use sizeof() of the fields being copied
Ferry Huberts [Tue, 23 Oct 2012 07:58:27 +0000 (09:58 +0200)]
secure: use sizeof() of the fields being copied

7 years agosecure: decrease a (stack allocated) buffer size
Ferry Huberts [Tue, 23 Oct 2012 07:57:53 +0000 (09:57 +0200)]
secure: decrease a (stack allocated) buffer size

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agosecure: do not hard-code a sizeof()
Ferry Huberts [Tue, 23 Oct 2012 07:57:40 +0000 (09:57 +0200)]
secure: do not hard-code a sizeof()

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agosecure: can only work for IPv4, so assert on it
Ferry Huberts [Tue, 23 Oct 2012 07:57:06 +0000 (09:57 +0200)]
secure: can only work for IPv4, so assert on it

Because of:
  memcpy(&crmsg.destination, to, olsr_cnf->ipsize);
with
  crmsg.destination being an uint32_t

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agosecure: initialise rrmsg correctly
Ferry Huberts [Tue, 23 Oct 2012 07:52:00 +0000 (09:52 +0200)]
secure: initialise rrmsg correctly

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agosecure: decrease a (stack allocated) buffer size
Ferry Huberts [Tue, 23 Oct 2012 07:51:41 +0000 (09:51 +0200)]
secure: decrease a (stack allocated) buffer size

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agosecure: use sizeof() of the fields being copied
Ferry Huberts [Tue, 23 Oct 2012 07:51:21 +0000 (09:51 +0200)]
secure: use sizeof() of the fields being copied

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
7 years agosecure: decrease a (stack allocated) buffer size
Ferry Huberts [Tue, 23 Oct 2012 07:45:42 +0000 (09:45 +0200)]
secure: decrease a (stack allocated) buffer size

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>