commits January 2014

commits@lists.open-mesh.org

1 participants
96 discussions

[openwrt-feed-batman-adv] master: batman-adv-devel: update to latest batctl master and add libnl build params (d2d2267)
by postmaster＠open-mesh.org 29 Jan '14

29 Jan '14

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit d2d22675f863d8efcc0edfd78f1451a1ecbb98fe Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Wed Jan 29 13:23:50 2014 +0800 batman-adv-devel: update to latest batctl master and add libnl build params Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- d2d22675f863d8efcc0edfd78f1451a1ecbb98fe batman-adv-devel/Config.in | 2 +- batman-adv-devel/Makefile | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index fc8f917..9612da2 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -42,7 +42,7 @@ config KMOD_BATMAN_ADV_DEVEL_BATCTL_REV string prompt "batctl git revision to build package with" depends on PACKAGE_kmod-batman-adv-devel - default "f168d47" + default "b8eaea8" help Enter the full or shortened git revision to override package default value. This allows to build from non-master branches diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index dafa6ee..25699fe 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -33,7 +33,7 @@ define KernelPackage/batman-adv-devel URL:=http://www.open-mesh.org/ MAINTAINER:=Marek Lindner <lindner_marek(a)yahoo.de> SUBMENU:=Network Support - DEPENDS:=+kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c +libc + DEPENDS:=+KMOD_BATMAN_ADV_DEVEL_BLA:kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c +libc +KMOD_BATMAN_ADV_DEVEL_BATCTL:libnl-tiny TITLE:=B.A.T.M.A.N. Adv devel FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,batman-adv) @@ -81,7 +81,10 @@ TARGET_LDFLAGS += -fuse-linker-plugin MAKE_BATCTL_ENV += \ CPPFLAGS="$(TARGET_CPPFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ + LIBNL_NAME="libnl-tiny" \ + LIBNL_CFLAGS="-I$(STAGING_DIR)/usr/include/libnl-tiny" \ + LIBNL_LDLIBS="-lnl-tiny" MAKE_BATCTL_ARGS += \ REVISION="$(PKG_BATCTL_SHORTREV)" \

1 0

[batman-adv] master: Merge branch 'next' (f6a1006)
by postmaster＠open-mesh.org 29 Jan '14

29 Jan '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit f6a10065d42545528d16c6e55d05dbde9543857a Merge: 3ce6275 fedc76c Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Wed Jan 29 12:46:41 2014 +0800 Merge branch 'next' >--------------------------------------------------------------- f6a10065d42545528d16c6e55d05dbde9543857a translation-table.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

1 0

[batman-adv] master's head updated: Merge branch 'next' (f6a1006)
by postmaster＠open-mesh.org 29 Jan '14

29 Jan '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: db13d36 batman-adv: fix TT-TVLV parsing on OGM reception dc08c04 batman-adv: release vlan object after checking the CRC fedc76c Merge branch 'maint' into next f6a1006 Merge branch 'next'

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (fedc76c)
by postmaster＠open-mesh.org 29 Jan '14

29 Jan '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: db13d36 batman-adv: fix TT-TVLV parsing on OGM reception dc08c04 batman-adv: release vlan object after checking the CRC fedc76c Merge branch 'maint' into next

1 0

[batman-adv] next: Merge branch 'maint' into next (fedc76c)
by postmaster＠open-mesh.org 29 Jan '14

29 Jan '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit fedc76c01227c9c3d15374851ff11e2701d7fd08 Merge: 0f8a4e6 dc08c04 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Wed Jan 29 12:46:08 2014 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- fedc76c01227c9c3d15374851ff11e2701d7fd08 translation-table.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

1 0

[batman-adv] maint: batman-adv: release vlan object after checking the CRC (dc08c04)
by postmaster＠open-mesh.org 29 Jan '14

29 Jan '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit dc08c045b46bdd9a5c81068a89f9f2a78d3d4bbd Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Tue Jan 28 02:06:47 2014 +0100 batman-adv: release vlan object after checking the CRC There is a refcounter unbalance in the CRC checking routine invoked on OGM reception. A vlan object is retrieved (thus its refcounter is increased by one) but it is never properly released. This leads to a memleak because the vlan object will never be free'd. Fix this by releasing the vlan object after having read the CRC. Reported-by: Russell Senior <russell(a)personaltelco.net> Reported-by: Daniel <daniel(a)makrotopia.org> Reported-by: cmsv <cmsv(a)wirelesspt.net> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- dc08c045b46bdd9a5c81068a89f9f2a78d3d4bbd translation-table.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/translation-table.c b/translation-table.c index 45b6155..05c2a9b 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2248,6 +2248,7 @@ static bool batadv_tt_global_check_crc(struct batadv_orig_node *orig_node, { struct batadv_tvlv_tt_vlan_data *tt_vlan_tmp; struct batadv_orig_node_vlan *vlan; + uint32_t crc; int i; /* check if each received CRC matches the locally stored one */ @@ -2267,7 +2268,10 @@ static bool batadv_tt_global_check_crc(struct batadv_orig_node *orig_node, if (!vlan) return false; - if (vlan->tt.crc != ntohl(tt_vlan_tmp->crc)) + crc = vlan->tt.crc; + batadv_orig_node_vlan_free_ref(vlan); + + if (crc != ntohl(tt_vlan_tmp->crc)) return false; }

1 0

[batman-adv] maint: batman-adv: fix TT-TVLV parsing on OGM reception (db13d36)
by postmaster＠open-mesh.org 29 Jan '14

29 Jan '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit db13d361ff6abf57090acfdeb0f5cedd8dd7f02e Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Mon Jan 27 12:23:28 2014 +0100 batman-adv: fix TT-TVLV parsing on OGM reception When accessing a TT-TVLV container in the OGM RX path the variable pointing to the list of changes to apply is altered by mistake. This makes the TT component read data at the wrong position in the OGM packet buffer. Fix it by removing the bogus pointer alteration. Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- db13d361ff6abf57090acfdeb0f5cedd8dd7f02e translation-table.c | 1 - 1 file changed, 1 deletion(-) diff --git a/translation-table.c b/translation-table.c index 3fca99d..45b6155 100644 --- a/translation-table.c +++ b/translation-table.c @@ -3204,7 +3204,6 @@ static void batadv_tt_update_orig(struct batadv_priv *bat_priv, spin_lock_bh(&orig_node->tt_lock); - tt_change = (struct batadv_tvlv_tt_change *)tt_buff; batadv_tt_update_changes(bat_priv, orig_node, tt_num_changes, ttvn, tt_change);

1 0

[batman-adv] master: Merge branch 'next' (3ce6275)
by postmaster＠open-mesh.org 27 Jan '14

27 Jan '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 3ce62758042225ca18bf94d64757f6e336de26b6 Merge: 5b70699 0f8a4e6 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Jan 27 15:58:43 2014 +0800 Merge branch 'next' >--------------------------------------------------------------- 3ce62758042225ca18bf94d64757f6e336de26b6 hard-interface.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)

1 0

[batman-adv] master's head updated: Merge branch 'next' (3ce6275)
by postmaster＠open-mesh.org 27 Jan '14

27 Jan '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 2b108cc batman-adv: fix soft-interface MTU computation 0f8a4e6 Merge branch 'maint' into next 3ce6275 Merge branch 'next'

1 0

[batman-adv] next: Merge branch 'maint' into next (0f8a4e6)
by postmaster＠open-mesh.org 27 Jan '14

27 Jan '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 0f8a4e6c6034dfd8a7924f1dd956354d740537b7 Merge: 6e48fd6 2b108cc Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Jan 27 15:58:06 2014 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 0f8a4e6c6034dfd8a7924f1dd956354d740537b7 hard-interface.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits January 2014