[Olsr-commit] OLSR.org main repository branch, master, updated. v0.9.0-12-gbdc1578

[(spam-protected)]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OLSR.org main repository".

        See http://olsr.org/git/?p=olsrd.git;a=commitdiff;h=v0.9.0-12-gbdc1578
        for a web version of the last commit.

The branch, master has been updated
       via  bdc15788f050c3149023d84cd3a36eea46bf261d (commit)
       via  333d99bf2a50f9fab1e1beeef797d7210ad9537c (commit)
       via  a7326a0237929d366b97ba82d0079dd336c1320f (commit)
      from  043ee47f5a6213f30fb0eddf8c8f316e13303530 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bdc15788f050c3149023d84cd3a36eea46bf261d
Author: Ferry Huberts <(spam-protected)>
Date:   Fri Jun 19 18:13:31 2015 +0200

    txtinfo: fix a crash when there are no gateways
    
    Signed-off-by: Ferry Huberts <(spam-protected)>

commit 333d99bf2a50f9fab1e1beeef797d7210ad9537c
Author: Ferry Huberts <(spam-protected)>
Date:   Fri Jun 19 18:12:04 2015 +0200

    jsoninfo: fix a crash when there are no gateways
    
    Signed-off-by: Ferry Huberts <(spam-protected)>

commit a7326a0237929d366b97ba82d0079dd336c1320f
Author: Ferry Huberts <(spam-protected)>
Date:   Fri Jun 19 14:03:02 2015 +0200

    conf: lock_file is derived config.
    
    Hi!
    
    We're running two OLSRd instances on our routers (one IPv4, one IPv6).
    0.9.x breaks with that setup since there seems to be a bug that causes
    the default lockfile name always set to be "olsrd-ipv4.lock".
    
    This bug seems to have been introduced in
    http://www.olsr.org/git/?p=olsrd.git;a=commitdiff;h=089c78e208dcb0802ce93f47554a502ab8b77be5
    
    olsrd_get_default_lockfile()
    http://www.olsr.org/git/?p=olsrd.git;a=blob;f=src/cfgparser/olsrd_conf.c;h=30e2829cfd1be2717fc25639a9cbdb0da5fea466;hb=089c78e208dcb0802ce93f47554a502ab8b77be5#l976
    always sees cnf->ip_version==AF_INET, as that's the default that was
    just set in line 932.
    
    Reported-by: Malte <(spam-protected)>
    Signed-off-by: Ferry Huberts <(spam-protected)>

-----------------------------------------------------------------------

Summary of changes:
 lib/jsoninfo/src/olsrd_jsoninfo.c |    2 +-
 lib/txtinfo/src/olsrd_txtinfo.c   |    2 +-
 src/cfgparser/olsrd_conf.c        |    8 +++++++-
 src/cfgparser/olsrd_conf.h        |    2 ++
 src/main.c                        |    7 +++++++
 5 files changed, 18 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
OLSR.org main repository