commits October 2012

commits@lists.open-mesh.org

1 participants
92 discussions

[batman-adv] master: Merge branch 'next' (762081b)
by postmaster＠open-mesh.org 18 Oct '12

18 Oct '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 762081b670ba0a234769289746c59af583306a1f Merge: 4e3c233 cca9d02 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Oct 18 18:04:40 2012 +0800 Merge branch 'next' >--------------------------------------------------------------- 762081b670ba0a234769289746c59af583306a1f bridge_loop_avoidance.c | 5 ++++- main.c | 1 - 2 files changed, 4 insertions(+), 2 deletions(-)

1 0

[batman-adv] master's head updated: Merge branch 'next' (762081b)
by postmaster＠open-mesh.org 18 Oct '12

18 Oct '12

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 5276048 batman-adv: Fix regression in bla multiline comment style cca9d02 batman-adv: Fix build of batman-adv without BLA 762081b Merge branch 'next'

1 0

[batman-adv] next: batman-adv: Fix build of batman-adv without BLA (cca9d02)
by postmaster＠open-mesh.org 18 Oct '12

18 Oct '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit cca9d02f8df36a8273e8059e59c4cc0354a41be5 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 18 10:48:32 2012 +0200 batman-adv: Fix build of batman-adv without BLA 4c1721b39c8a77c99e8f4de97b5d5d112006406c ("batman-adv: Fix potential broadcast BLA-duplicate-check race condition") introduced a spinlock for bridge loop avoidance which was initialized outside of bla. This causes an build error when BLA is disabled. Instead the batadv_bla_init function should handle the initialization. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- cca9d02f8df36a8273e8059e59c4cc0354a41be5 bridge_loop_avoidance.c | 2 ++ main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 1f5ee77..fd8d5af 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1167,6 +1167,8 @@ int batadv_bla_init(struct batadv_priv *bat_priv) uint16_t crc; unsigned long entrytime; + spin_lock_init(&bat_priv->bla.bcast_duplist_lock); + batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla hash registering\n"); /* setting claim destination address */ diff --git a/main.c b/main.c index f167b65..b4aa470 100644 --- a/main.c +++ b/main.c @@ -101,7 +101,6 @@ int batadv_mesh_init(struct net_device *soft_iface) spin_lock_init(&bat_priv->gw.list_lock); spin_lock_init(&bat_priv->vis.hash_lock); spin_lock_init(&bat_priv->vis.list_lock); - spin_lock_init(&bat_priv->bla.bcast_duplist_lock); INIT_HLIST_HEAD(&bat_priv->forw_bat_list); INIT_HLIST_HEAD(&bat_priv->forw_bcast_list);

1 0

[batman-adv] next: batman-adv: Fix regression in bla multiline comment style (5276048)
by postmaster＠open-mesh.org 18 Oct '12

18 Oct '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 52760489b819aa4799058835ae2e02bf1b104937 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 18 10:48:31 2012 +0200 batman-adv: Fix regression in bla multiline comment style 4c1721b39c8a77c99e8f4de97b5d5d112006406c ("batman-adv: Fix potential broadcast BLA-duplicate-check race condition") introduced a comment with the wrong line ending. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 52760489b819aa4799058835ae2e02bf1b104937 bridge_loop_avoidance.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 9a4b24f..1f5ee77 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1265,7 +1265,8 @@ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, goto out; } /* not found, add a new entry (overwrite the oldest entry) - * and allow it, its the first occurence. */ + * and allow it, its the first occurence. + */ curr = (bat_priv->bla.bcast_duplist_curr + BATADV_DUPLIST_SIZE - 1); curr %= BATADV_DUPLIST_SIZE; entry = &bat_priv->bla.bcast_duplist[curr];

1 0

[batman-adv] master: batman-adv: Recommend not to change Makefile for configuration (4e3c233)
by postmaster＠open-mesh.org 18 Oct '12

18 Oct '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 4e3c233cbdc129e83ece90a16fd338cb4834a53a Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 18 11:43:54 2012 +0200 batman-adv: Recommend not to change Makefile for configuration The Makefile suggests to change it to enable or disable features. This resulted in patch submissions with changed Makefile even when this change would not be necessary. Instead the configuration should be done using the make parameters explained in README.external Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 4e3c233cbdc129e83ece90a16fd338cb4834a53a Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c6266a2..4d70e40 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ # 02110-1301, USA # -# changing the CONFIG_* line to 'y' enables the related feature +# read README.external for more information about the configuration # B.A.T.M.A.N. debugging: export CONFIG_BATMAN_ADV_DEBUG=n # B.A.T.M.A.N. bridge loop avoidance:

1 0

[alfred] master: alfred: Fix parsing of short program parameter -v and -V (4f92363)
by postmaster＠open-mesh.org 17 Oct '12

17 Oct '12

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 4f9236308f38d5691b2532f0b32f43039c53500a Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Oct 17 21:45:28 2012 +0200 alfred: Fix parsing of short program parameter -v and -V Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 4f9236308f38d5691b2532f0b32f43039c53500a main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.c b/main.c index 0852236..ccb72cd 100644 --- a/main.c +++ b/main.c @@ -78,7 +78,7 @@ struct globals *alfred_init(int argc, char *argv[]) globals->best_server = NULL; globals->clientmode_version = 0; - while ((opt = getopt_long(argc, argv, "ms:r:hi:", long_options, + while ((opt = getopt_long(argc, argv, "ms:r:hi:vV:", long_options, &opt_ind)) != -1) { switch (opt) { case 'r':

1 0

[alfred] master: alfred: Fix test for failed sendbuf allocation (3c2de69)
by postmaster＠open-mesh.org 17 Oct '12

17 Oct '12

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 3c2de69b06b5ac6ad1fead0ad7efb79851538d7f Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Oct 17 21:51:07 2012 +0200 alfred: Fix test for failed sendbuf allocation Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 3c2de69b06b5ac6ad1fead0ad7efb79851538d7f recv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recv.c b/recv.c index dce7e50..8ddf7ab 100644 --- a/recv.c +++ b/recv.c @@ -217,7 +217,7 @@ int send_alfred_packet(struct globals *globals, uint8_t *dest, void *buf, char *sendbuf; sendbuf = malloc(sizeof(*ethhdr) + length); - if (!buf) + if (!sendbuf) return -1; ethhdr = (struct ethhdr *)sendbuf;

1 0

[alfred] master: alfred: Test for failed global memory allocation (09c40ac)
by postmaster＠open-mesh.org 17 Oct '12

17 Oct '12

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 09c40ac1d0f1d656e0a767685ecebd0fffaf5796 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Oct 17 21:49:23 2012 +0200 alfred: Test for failed global memory allocation Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 09c40ac1d0f1d656e0a767685ecebd0fffaf5796 main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.c b/main.c index 0315fe3..0852236 100644 --- a/main.c +++ b/main.c @@ -67,11 +67,11 @@ struct globals *alfred_init(int argc, char *argv[]) }; globals = malloc(sizeof(*globals)); - memset(globals, 0, sizeof(*globals)); - if (!globals) return NULL; + memset(globals, 0, sizeof(*globals)); + globals->opmode = OPMODE_SLAVE; globals->clientmode = CLIENT_NONE; globals->interface = NULL;

1 0

[alfred] master: alfred: define SOURCE_VERSION only if not defined from outside (e6b21c6)
by postmaster＠open-mesh.org 17 Oct '12

17 Oct '12

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit e6b21c6fff03065f0e451ea1b29049308d61c178 Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Wed Oct 17 22:15:57 2012 +0200 alfred: define SOURCE_VERSION only if not defined from outside Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> >--------------------------------------------------------------- e6b21c6fff03065f0e451ea1b29049308d61c178 alfred.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/alfred.h b/alfred.h index 795a78a..6310f40 100644 --- a/alfred.h +++ b/alfred.h @@ -19,6 +19,10 @@ * */ +#ifndef SOURCE_VERSION +#define SOURCE_VERSION "2012.?.?" +#endif + #include <stdint.h> #include <linux/if_ether.h> #include <time.h>

1 0

[alfred] master: alfred: Prepare makefile for distributions (fd9df5a)
by postmaster＠open-mesh.org 17 Oct '12

17 Oct '12

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit fd9df5a63808dbe05a79bed6db493f456279516f Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Oct 17 21:38:23 2012 +0200 alfred: Prepare makefile for distributions Distributions must be able to easily set CPPFLAGS, CFLAGS and LDFLAGS to have full control about optimization or security related flags. It is also necessary to be able to install all files. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- fd9df5a63808dbe05a79bed6db493f456279516f Makefile | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 79 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 92299ac..9796528 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,81 @@ -LDFLAGS=-ggdb -static -CFLAGS=-O2 -Wall -ggdb -BIN=alfred -OBJS=main.o server.o client.o netsock.o send.o recv.o hash.o unix_sock.o util.o -default: all -all: $(BIN) -$(BIN): $(OBJS) - gcc $(LDFLAGS) $(OBJS) -o $(BIN) +#!/usr/bin/make -f +# -*- makefile -*- +# +# Copyright (C) 2012 B.A.T.M.A.N. contributors +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 of the GNU General Public +# License as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA +# + +# alfred build +BINARY_NAME = alfred +OBJ = main.o server.o client.o netsock.o send.o recv.o hash.o unix_sock.o util.o + +# alfred flags and options +CFLAGS += -pedantic -Wall -W -std=gnu99 -fno-strict-aliasing -MD +LDLIBS += + +# disable verbose output +ifneq ($(findstring $(MAKEFLAGS),s),s) +ifndef V + Q_CC = @echo ' ' CC $@; + Q_LD = @echo ' ' LD $@; + export Q_CC + export Q_LD +endif +endif + +# standard build tools +CC ?= gcc +RM ?= rm -f +INSTALL ?= install +MKDIR ?= mkdir -p +COMPILE.c = $(Q_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c +LINK.o = $(Q_LD)$(CC) $(LDFLAGS) $(TARGET_ARCH) + +# standard install paths +PREFIX = /usr/local +SBINDIR = $(PREFIX)/sbin + +# try to generate revision +REVISION= $(shell if [ -d .git ]; then \ + echo $$(git describe --always --dirty --match "v*" |sed 's/^v//' 2> /dev/null || echo "[unknown]"); \ + fi) +ifneq ($(REVISION),) +CPPFLAGS += -DSOURCE_VERSION=\"$(REVISION)\" +endif + +# default target +all: $(BINARY_NAME) + +# standard build rules +.SUFFIXES: .o .c .c.o: - gcc $(CFLAGS) -o $@ -c $< + $(COMPILE.c) -o $@ $< + +$(BINARY_NAME): $(OBJ) + $(LINK.o) $^ $(LDLIBS) -o $@ + clean: - rm -f $(BIN) $(OBJS) + $(RM) $(BINARY_NAME) $(OBJ) $(DEP) + +install: $(BINARY_NAME) + $(MKDIR) $(DESTDIR)$(SBINDIR) + $(INSTALL) -m 0755 $(BINARY_NAME) $(DESTDIR)$(SBINDIR) + +# load dependencies +DEP = $(OBJ:.o=.d) +-include $(DEP) + +.PHONY: all clean install

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits October 2012