28 Oct
2010
28 Oct
'10
2:02 a.m.
On Wed, Oct 27, 2010 at 8:17 PM, Xianghua Xiao <xiaoxianghua(a)gmail.com> wrote:
On Mon, Oct 25, 2010 at 5:16 PM, Xianghua Xiao
<xiaoxianghua(a)gmail.com> wrote:
sent out too fast, I removed that offending line and it compiles. never mind.
On Mon, Oct 25, 2010 at 5:06 PM, Linus Lüssing
<linus.luessing(a)web.de> wrote:
************A*******************
$ git revert 660d20261343e0b2ff57e51e50d7eb0e557d5e5b
Automatic revert failed. After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm
<paths>'
and commit the result.
************B*********************
$ git diff
diff --cc send.c
index 16ffd03,283c6bb..0000000
--- a/send.c
+++ b/send.c
@@@ -28,6 -28,8 +28,11 @@@
#include "types.h"
#include "vis.h"
#include "aggregation.h"
++<<<<<<< HEAD
++=======
+ #include "gateway_common.h"
+ #include <linux/netfilter_bridge.h>
++>>>>>>> 660d202... batman-adv: Revert "Adding
netfilter-bridge hooks"
#include "compat.h"
****************C*********************
$cat send.c
<snip>
#include "main.h"
#include "send.h"
#include "routing.h"
#include "translation-table.h"
#include "soft-interface.h"
#include "hard-interface.h"
#include "types.h"
#include "vis.h"
#include "aggregation.h"
#include "gateway_common.h"
#include <linux/netfilter_bridge.h>
#include "compat.h"
<snip>
****************D*********************
~/devel/mesh/batman-adv$ make
make -C /lib/modules/2.6.32-25-generic/build
REVISION=v2010.1.0-52-gdbfbc90-dirty
M=/home/xxiao/devel/mesh/batman-adv
PWD=/home/xxiao/devel/mesh/batman-adv -j 1 modules
make[1]: Entering directory `/usr/src/linux-headers-2.6.32-25-generic'
CC [M] /home/xxiao/devel/mesh/batman-adv/main.o
CC [M] /home/xxiao/devel/mesh/batman-adv/bat_debugfs.o
CC [M] /home/xxiao/devel/mesh/batman-adv/bat_sysfs.o
CC [M] /home/xxiao/devel/mesh/batman-adv/send.o
/home/xxiao/devel/mesh/batman-adv/send.c:31:28: error:
gateway_common.h: No such file or directory
make[2]: *** [/home/xxiao/devel/mesh/batman-adv/send.o] Error 1
make[1]: *** [_module_/home/xxiao/devel/mesh/batman-adv] Error 2
make[1]: Leaving directory `/usr/src/linux-headers-2.6.32-25-generic'
make: *** [all] Error 2
so, where is gateway_common.h?
thanks!
Hi xianghua,
for such test cases basically this patch had once been made to force batman-adv
onto certain routes but needed to be removed again as the way ebtables is
used here is not standard-conforming. However, this shouldn't bother you :).
You can then just use ebtables to prohibit certain routes:
Thanks!
Will give it a try.
Xianghua
ebtables -I INPUT -s MAC -j DROP or
ebtables -I INPUT -p 0x4305 -j DROP
(and the same for -I OUTPUT)
Antonio had been doing tests with this ebtables patch, too (see this
mailing list's archive from about the 10 May 2010).
This is a revert of the revert of commit 660d20261343e0b2ff57e51e50d7eb0e557d5e5b.
and applies on top of the current git master branch. If you need it for any
other version of batman-adv, try 'git revert
660d20261343e0b2ff57e51e50d7eb0e557d5e5b'
and if that doesn't work, just bug me again :).
Cheers, Linus