The following commit has been merged in the master branch: commit e5d9a24cb0e79c180506e50e9f58dcda9a09c2e4 Author: Marek Lindner lindner_marek@yahoo.de Date: Mon Jan 15 13:57:34 2007 +0100

merge batman && batman-experimental

diff --git a/allocate.c b/allocate.c index e6ea113..14dd362 100644 --- a/allocate.c +++ b/allocate.c @@ -1,3 +1,24 @@ +/* + * Copyright (C) 2006 B.A.T.M.A.N. contributors: + * Thomas Lopatic, Corinna 'Elektra' Aichele, Axel Neumann, Marek Lindner + * 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 + * + */ + + + #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/allocate.h b/allocate.h index 784a79e..4c15bfc 100644 --- a/allocate.h +++ b/allocate.h @@ -1,3 +1,24 @@ +/* + * Copyright (C) 2006 B.A.T.M.A.N. contributors: + * Thomas Lopatic, Corinna 'Elektra' Aichele, Axel Neumann, Marek Lindner + * 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 + * + */ + + + void checkIntegrity(void); void checkLeak(void); void *debugMalloc(unsigned int length, int tag); diff --git a/bsd.c b/bsd.c index 0fe7e8e..fb29464 100644 --- a/bsd.c +++ b/bsd.c @@ -38,7 +38,7 @@ #include <err.h>

#include "os.h" -#include "batman.h" +#include "batman-specific.h"

void set_forwarding(int state) { diff --git a/linux.c b/linux.c index 8c94814..2858fab 100644 --- a/linux.c +++ b/linux.c @@ -40,7 +40,7 @@ #include <fcntl.h>

#include "os.h" -#include "batman.h" +#include "batman-specific.h"

void set_rp_filter(int state, char* dev) { diff --git a/os.h b/os.h index 12f361d..1c79aa3 100644 --- a/os.h +++ b/os.h @@ -17,10 +17,12 @@ * */

+ + #ifndef _BATMAN_OS_H #define _BATMAN_OS_H

-#include "batman.h" +#include "batman-specific.h"

unsigned int get_time(void); void set_forwarding(int); diff --git a/posix.c b/posix.c index 5e21791..aa844aa 100644 --- a/posix.c +++ b/posix.c @@ -37,7 +37,7 @@ #include <syslog.h>

#include "os.h" -#include "batman.h" +#include "batman-specific.h" #include "list.h" #include "allocate.h"