commits December 2010

commits@lists.open-mesh.org

1 participants
226 discussions

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit 34836f930aea88b149c8b4783d98820be025bd62 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Dec 18 14:53:20 2006 +0100 - version confusion ... (see www.open-mesh.net -> batman -> faq) diff --git a/batman.c b/batman.c index 4d82baf..83e8468 100644 --- a/batman.c +++ b/batman.c @@ -1209,7 +1209,7 @@ int batman() batman_if->out.ttl = ( batman_if->if_num == 0 ? TTL : 2 ); batman_if->out.seqno = 0; batman_if->out.gwflags = gateway_class; - batman_if->out.version = BATMAN_VERSION; + batman_if->out.version = COMPAT_VERSION; batman_if->if_rp_filter_old = get_rp_filter( batman_if->dev ); set_rp_filter( 0 , batman_if->dev ); } @@ -1325,7 +1325,7 @@ int batman() } - if ( ((struct packet *)&in)->version != BATMAN_VERSION ) { + if ( ((struct packet *)&in)->version != COMPAT_VERSION ) { if ( debug_level == 4 ) output( "Drop packet: incompatible batman version (%i) \n", ((struct packet *)&in)->version ); diff --git a/batman.h b/batman.h index 11ebe66..7250ad2 100644 --- a/batman.h +++ b/batman.h @@ -24,8 +24,8 @@ #include <pthread.h> #include "list.h" -#define VERSION "0.11" -#define BATMAN_VERSION 1 +#define SOURCE_VERSION "0.1.1" +#define COMPAT_VERSION 2 #define PORT 1966 #define UNIDIRECTIONAL 0x80 #define DIRECTLINK 0x40 diff --git a/posix.c b/posix.c index 0d91859..00f7118 100644 --- a/posix.c +++ b/posix.c @@ -1040,14 +1040,14 @@ int main(int argc, char *argv[]) case 'v': - printf( "B.A.T.M.A.N.-III v%s \n", VERSION); + printf( "B.A.T.M.A.N.-III v%s (compability version %i)\n", SOURCE_VERSION, COMPAT_VERSION ); return (0); case 'V': print_animation(); - printf( "\x1B[0;0H\t B.A.T.M.A.N.-III v%s", VERSION); + printf( "\x1B[0;0H\t B.A.T.M.A.N.-III v%s (compability version %i)\n", SOURCE_VERSION, COMPAT_VERSION ); printf( "\x1B[9;0H \t May the bat guide your path ...\n\n\n" ); return (0); @@ -1110,7 +1110,7 @@ int main(int argc, char *argv[]) } else { - printf( "B.A.T.M.A.N.-III v%s \n", VERSION ); + printf( "B.A.T.M.A.N.-III v%s (compability version %i)\n", SOURCE_VERSION, COMPAT_VERSION ); } -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit 5c9ba873ddc33c7ab023cdbdacbfe3000f438334 Author: Mirko Vogt <datenmaulwurf(a)nanl.de> Date: Wed Dec 20 21:15:05 2006 +0100 broken tun-support disabled diff --git a/Makefile b/Makefile index b103b6a..afb8340 100644 --- a/Makefile +++ b/Makefile @@ -29,15 +29,15 @@ OS_OBJ= posix.o linux.o allocate.o endif ifeq ($(UNAME),Darwin) -OS_OBJ= posix.o bsd.o +OS_OBJ= posix.o bsd.o allocate.o endif ifeq ($(UNAME),FreeBSD) -OS_OBJ= posix.o bsd.o +OS_OBJ= posix.o bsd.o allocate.o endif ifeq ($(UNAME),OpenBSD) -OS_OBJ= posix.o bsd.o +OS_OBJ= posix.o bsd.o allocate.o endif batmand: batman.o $(OS_OBJ) diff --git a/bsd.c b/bsd.c index 5a0833f..0fe7e8e 100644 --- a/bsd.c +++ b/bsd.c @@ -26,8 +26,9 @@ #include <netinet/in.h> #include <arpa/inet.h> #include <net/route.h> -#include <net/if.h> -#include <net/if_tun.h> +/* FIXME breaks Mac OS X tun-support + #include <net/if.h> + #include <net/if_tun.h> */ #include <fcntl.h> #include <stdio.h> #include <string.h> @@ -107,8 +108,9 @@ void add_del_route( unsigned int dest, unsigned int netmask, unsigned int router static unsigned int seq = 0; struct rt_msg msg; struct sockaddr_in *so_dest, *so_gateway; +/* FIXME unused ?? struct sockaddr_in ifname; - socklen_t ifname_len; + socklen_t ifname_len; */ ssize_t len; pid_t pid; @@ -252,12 +254,16 @@ int open_tun_any(char *dev_name, size_t dev_name_size) /* Probe for tun interface availability */ int probe_tun() { +/* FIXME tun-supprt broken int fd; fd = open_tun_any(NULL, 0); if (fd == -1) return 0; close(fd); return 1; +*/ + do_log ("tun-support is broken on this platform...\n", "foo"); + return 0; } int del_dev_tun(int fd) @@ -267,17 +273,18 @@ int del_dev_tun(int fd) int add_dev_tun(struct batman_if *batman_if, unsigned int tun_addr, char *tun_dev, size_t tun_dev_size, int *fd) { +/* FIXME tun-support broken int so; struct ifreq ifr_tun, ifr_if; struct tuninfo ti; struct sockaddr_in addr; - /* set up tunnel device */ + / * set up tunnel device * / memset(&ifr_tun, 0, sizeof(ifr_tun)); memset(&ifr_if, 0, sizeof(ifr_if)); memset(&ti, 0, sizeof(ti)); - /* Open tun device. */ + / * Open tun device. * / if ((*fd = open_tun_any(tun_dev, tun_dev_size)) < 0) { perror("Could not open tun device"); return -1; @@ -285,41 +292,41 @@ int add_dev_tun(struct batman_if *batman_if, unsigned int tun_addr, char *tun_de printf("Using %s\n", tun_dev); - /* Initialise tuninfo to defaults. */ + / * Initialise tuninfo to defaults. * / if (ioctl(*fd, TUNGIFINFO, &ti) < 0) { perror("TUNGIFINFO"); del_dev_tun(*fd); return -1; } - /* Prepare to set IP of this end point of tunnel */ + / * Prepare to set IP of this end point of tunnel * / memset(&addr, 0, sizeof(addr)); addr.sin_addr.s_addr = tun_addr; addr.sin_family = AF_INET; memcpy(&ifr_tun.ifr_addr, &addr, sizeof(struct sockaddr)); - /* Set name of interface to configure */ + / * Set name of interface to configure * / strlcpy(ifr_tun.ifr_name, tun_dev, IFNAMSIZ); - /* Open temporary socket to configure tun interface. */ + / * Open temporary socket to configure tun interface. * / so = socket(AF_INET, SOCK_DGRAM, 0); - /* Set IP of this end point of tunnel */ - /* XXX FAILS XXX */ + / * Set IP of this end point of tunnel * / + / * XXX FAILS XXX * / if (ioctl(so, SIOCSIFADDR, &ifr_tun, sizeof(ifr_tun)) < 0) { perror("SIOCSIFADDR"); del_dev_tun(*fd); return -1; } - /* Get interface flags for tun device */ + / * Get interface flags for tun device * / if (ioctl(so, SIOCGIFFLAGS, &ifr_tun) < 0) { perror("SIOCGIFFLAGS"); del_dev_tun(*fd); return -1; } - /* Set up and running interface flags on tun device. */ + / * Set up and running interface flags on tun device. * / ifr_tun.ifr_flags |= IFF_UP; ifr_tun.ifr_flags |= IFF_RUNNING; if (ioctl(so, SIOCSIFFLAGS, &ifr_tun) < 0) { @@ -328,7 +335,7 @@ int add_dev_tun(struct batman_if *batman_if, unsigned int tun_addr, char *tun_de return -1; } - /* get MTU from real interface */ + / * get MTU from real interface * / strlcpy(ifr_if.ifr_name, batman_if->dev, IFNAMSIZ); if (ioctl(*fd, SIOCGIFMTU, &ifr_if) < 0) { perror("SIOCGIFMTU"); @@ -336,7 +343,7 @@ int add_dev_tun(struct batman_if *batman_if, unsigned int tun_addr, char *tun_de return -1; } - /* set MTU of tun interface: real MTU - 28 */ + / * set MTU of tun interface: real MTU - 28 * / if (ifr_if.ifr_mtu < 100) { fprintf(stderr, "Warning: MTU smaller than 100 - cannot reduce MTU anymore\n" ); } else { @@ -349,5 +356,15 @@ int add_dev_tun(struct batman_if *batman_if, unsigned int tun_addr, char *tun_de } strlcpy(tun_dev, ifr_tun.ifr_name, tun_dev_size); +*/ + return 1; +} + +void set_rp_filter(int state, char* dev) +{ +} + +int get_rp_filter(char *dev) +{ return 1; } -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit 8569736df51828f39a44ad7e32cb0c550071a573 Author: Mirko Vogt <datenmaulwurf(a)nanl.de> Date: Wed Dec 20 21:21:18 2006 +0100 fix warning in allocate.c diff --git a/allocate.c b/allocate.c index 4f3ad4d..8977d34 100644 --- a/allocate.c +++ b/allocate.c @@ -72,7 +72,7 @@ void *debugMalloc(unsigned int length, int tag) if (memory == NULL) { - fprintf(stderr, "Cannot allocate %u bytes, tag = %d\n", length + sizeof(struct chunkHeader) + sizeof(struct chunkTrailer), tag); + fprintf(stderr, "Cannot allocate %u bytes, tag = %d\n", (unsigned int)(length + sizeof(struct chunkHeader) + sizeof(struct chunkTrailer)), tag); exit(1); } -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit f05f652c2bd608def3b41a4721158f08527c4b0c Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sun Dec 24 10:48:42 2006 +0100 - actually USE the copyLength for memcpy in realloc() when we already bother calculating it. :> diff --git a/allocate.c b/allocate.c index 8977d34..71c14a5 100644 --- a/allocate.c +++ b/allocate.c @@ -127,7 +127,7 @@ void *debugRealloc(void *memoryParameter, unsigned int length, int tag) if (copyLength > chunkHeader->length) copyLength = chunkHeader->length; - memcpy(result, memoryParameter, length); + memcpy(result, memoryParameter, copyLength); debugFree(memoryParameter); } -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit 73682a55da83cc616333ed149760cdc3bcec3a7b Author: Corinna 'Elektra' Aichele <onelektra(a)gmx.net> Date: Sun Dec 17 21:10:38 2006 +0100 * changed version number to 0.11 * cosmetics to final output the easteregg diff --git a/posix.c b/posix.c index 0c2104c..0d91859 100644 --- a/posix.c +++ b/posix.c @@ -1047,8 +1047,8 @@ int main(int argc, char *argv[]) print_animation(); - printf( "\x1B[0;0HB.A.T.M.A.N.-III v%s", VERSION); - printf( "\x1B[9;0HMay the bat guide your path ...\n" ); + printf( "\x1B[0;0H\t B.A.T.M.A.N.-III v%s", VERSION); + printf( "\x1B[9;0H \t May the bat guide your path ...\n\n\n" ); return (0); -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit ade7d9105c262f22880b63e9866f5d5073a20c93 Author: Corinna 'Elektra' Aichele <onelektra(a)gmx.net> Date: Sun Dec 17 20:57:21 2006 +0100 * inserted missing newline in verbose output * removed unused and unmaintained output 'internal version' * cosmetics: we used B.A.T.M.A.N with and without . at the end - now it is uniformly B.A.T.M.A.N. diff --git a/CHANGELOG b/CHANGELOG index 6eb2962..0c925a6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,12 +1,12 @@ -version 0.1 -^^^^^^^^^^^ +version 0.11 +^^^^^^^^^^^^ documentation: -- english documentation updated to 0.1-rc0 - please have a look at it +- english documentation updated to 0.11 - please have a look at it - german documentation is unmaintained - maybe remove it? too lazy to write a translation at the moment... -- changed the name in the documentation and in posix.c to B.A.T.M.A.N-III, since we made quite some changes in the algorithm +- changed the name in the documentation and in posix.c to B.A.T.M.A.N.-III, since we made quite some changes in the algorithm - added the textfile 'THANKS' diff --git a/INSTALL b/INSTALL index 28b80cf..53c5e5e 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ ################################# -B.A.T.M.A.N Installation and Use +B.A.T.M.A.N. Installation and Use ################################# Marek Lindner (lindner_marek-at-yahoo.de) @@ -16,10 +16,10 @@ Preface ------- This is still a experimental piece of code to test the viability of the -B.A.T.M.A.N routing algorithm based on initial ideas of Thomas Lopatic +B.A.T.M.A.N. routing algorithm based on initial ideas of Thomas Lopatic and Corinna 'Elektra' Aichele. -This is implementation 0.1-final of the improved B.A.T.M.A.N-III algorithm. It +This is implementation 0.11 of the improved B.A.T.M.A.N.-III algorithm. It is not unlikely that we still have to fix some bugs, though. Use - like always - at your own risk! @@ -29,7 +29,7 @@ Use - like always - at your own risk! Features -------- -Improved B.A.T.M.A.N-III algorithm +Improved B.A.T.M.A.N.-III algorithm IP-Tunnels via UDP Gateway classes Multiple Interfaces support @@ -46,11 +46,11 @@ Testing, improvements in the documentation. Support for Free-BSD and Mac OS-X is broken at the moment since we introduced UDP-Tunnels - we hope this will be fixed in the near future. -Develop B.A.T.M.A.N-Advanced that routes on Layer 2 and creates a Link-Local-Illusion for higher +Develop B.A.T.M.A.N.-Advanced that routes on Layer 2 and creates a Link-Local-Illusion for higher OSI-Layers Read speed tables from WiFi-Cards to calculate the transfer speed of routes -in B.A.T.M.A.N-Advanced +in B.A.T.M.A.N.-Advanced ------------ @@ -64,7 +64,7 @@ Installation ------------ You need the usual working environment to compile software. In the -B.A.T.M.A.N directory type +B.A.T.M.A.N. directory type make <press enter> @@ -92,7 +92,7 @@ ipkg update ipkg install batman-iii If you use Freifunk-Firmware you can use the web user-interface for -b.a.t.m.a.n: +B.A.T.M.A.N.: ipkg install freifunk-batman-de @@ -165,13 +165,13 @@ Usage: batman [options] interface [interface interface] -o orginator interval in ms default: 1000, allowed values: >0 - Note: By default B.A.T.M.A.N keeps track of packets received in the + Note: By default B.A.T.M.A.N. keeps track of packets received in the last 60 seconds (this is called sliding window size). B.A.T.M.A.N will perform it's routing decisions based on statistics about 60 packages for a node with an orginator interval of one second. If a node manages to send us at least 1 message in 60 seconds, it will be in our routing table. If the orginator interval is increased to 3 - seconds only 20 packets will be kept in the B.A.T.M.A.N statistic - + seconds only 20 packets will be kept in the B.A.T.M.A.N. statistic - thus the node must manage to send us 1 out of 20 packets to be in our routing table. If the sliding window size has more space for orginator messages the range of multi-hop links will be longer and @@ -213,7 +213,7 @@ Usage: batman [options] interface [interface interface] Switch the output of runtime debugging messages to a low level if you want to test the software on a slow - embedded - system. -We would love to see B.A.T.M.A.N in a match against other routing protocols +We would love to see B.A.T.M.A.N. in a match against other routing protocols in existing mesh networks. You can set up a virtual interface on an interface that you run another mesh routing protocol on. @@ -234,7 +234,7 @@ Now you can check out which protocol works better. Happy routing! -The B.A.T.M.A.N contributors +The B.A.T.M.A.N. contributors diff --git a/LIESMICH b/LIESMICH index db7a0b5..ae46792 100644 --- a/LIESMICH +++ b/LIESMICH @@ -10,24 +10,24 @@ Die deutschsprachige Doku (dieser Text) ist veraltet. Die englische Version HINWEIS HINWEIS HINWEIS HINWEIS HINWEIS HINWEIS HINWEIS HINWEIS HINWEIS ---------------------------------------------------------------------------- -B.A.T.M.A.N-II +B.A.T.M.A.N.-II BETTER APPROACH TO MOBILE AD-HOC NETWORKING -B.A.T.M.A.N ist eine v�llig neue Herangehensweise an Ad-Hoc-Routing, deren +B.A.T.M.A.N. ist eine v�llig neue Herangehensweise an Ad-Hoc-Routing, deren Durchf�hrbarkeit wir mit diesem Code testen wollen. Alle bisherigen uns bekannten Routingalgorithmen f�r MANETs (Mobile Ad-Hoc Networks) versuchen -Routen zu berechnen. B.A.T.M.A.N tut etwas v�llig anderes. Es berechnet keine +Routen zu berechnen. B.A.T.M.A.N. tut etwas v�llig anderes. Es berechnet keine Routen - es sp�rt das Vorhandensein von Routen auf, und benutzt sie bei Bedarf. -B.A.T.M.A.N interessiert sich nicht daf�r wie eine Route verl�uft die es +B.A.T.M.A.N. interessiert sich nicht daf�r wie eine Route verl�uft die es benutzt um mit einem anderen Knoten im Mesh-Netzwerk zu kommunizieren. -B.A.T.M.A.N pr�ft lediglich �ber welchen direkten Nachbarn ein bestimmter -Netzwerkknoten am besten zu erreichen ist. Wer wissen m�chte wie B.A.T.M.A.N +B.A.T.M.A.N. pr�ft lediglich �ber welchen direkten Nachbarn ein bestimmter +Netzwerkknoten am besten zu erreichen ist. Wer wissen m�chte wie B.A.T.M.A.N. zu einem bestimmten Knoten routet, kann das mit ping -R <Zieladresse> @@ -41,10 +41,10 @@ traceroute -n <Zieladresse> herhalten. -Ein Knoten in einem B.A.T.M.A.N-MANET interessiert sich nur daf�r, von der +Ein Knoten in einem B.A.T.M.A.N.-MANET interessiert sich nur daf�r, von der Existenz aller anderer Knoten zu wissen die er direkt oder �ber eine Multi-Hop-Verbindung erreichen kann. Um mit einem indirekten Nachbarn zu -kommunizieren muss B.A.T.M.A.N einen Nachbarn in direkter Funkreichweite +kommunizieren muss B.A.T.M.A.N. einen Nachbarn in direkter Funkreichweite bestimmen dem ein Datenpaket �berreicht werden kann, damit dieser es auf dem g�nstigsten Weg zu dem Nachbarn in der Ferne routet. Am besten wird der Vorteil dieser Herangehensweise vielleicht deutlich wenn wir �ltere Ans�tze @@ -105,7 +105,7 @@ ein paar Bugfixes. Schlussendlich st�rt aber der hohe Rechenaufwand von OLSRD in den CPUs der kleinen Meshrouter im Berliner Freifunk-Netz. Das Freifunk-MANET hat die Grenzen des Wachstums mit dem proaktiven OLSR erreicht. Zeit also f�r etwas -einfacheres und besseres: B.A.T.M.A.N +einfacheres und besseres: B.A.T.M.A.N. Von Antoine Saint Exupery (Autor des 'Kleinen Prinz') stammt dieser Satz: @@ -113,21 +113,21 @@ Alles menschliche Tun geht den Weg vom Primitiven Einfachen. -B.A.T.M.A.N ist eine Gruppe von Regeln an die sich ein Router halten muss. +B.A.T.M.A.N. ist eine Gruppe von Regeln an die sich ein Router halten muss. -##################################### -# Einfachstes B.A.T.M.A.N-Verfahren # -# # -# B.A.T.M.A.N-I # -##################################### +###################################### +# Einfachstes B.A.T.M.A.N.-Verfahren # +# # +# B.A.T.M.A.N.-I # +###################################### -B.A.T.M.A.N verwendet Port 1966 UDP. Dieser Port muss f�r eingehende und ausgehende -Nachrichten offen sein, also darf eine Firewall B.A.T.M.A.N nicht blockieren. +B.A.T.M.A.N. verwendet Port 1966 UDP. Dieser Port muss f�r eingehende und ausgehende +Nachrichten offen sein, also darf eine Firewall B.A.T.M.A.N. nicht blockieren. 1.) Broadcasts -B.A.T.M.A.N findet seine Nachbarn und entfernte Netzwerkknoten im Mesh (im +B.A.T.M.A.N. findet seine Nachbarn und entfernte Netzwerkknoten im Mesh (im folgenden Nodes genannt) durch Broadcasts die weitergereicht werden. In einem Broadcast steht die Adresse des Erzeugers drin (im folgenden Orginator genannt). Weiterhin enth�lt der Broadcast einen TTL-Wert und eine @@ -136,7 +136,7 @@ jedesmal um den Wert 1 reduziert wird, wenn ein Datenpaket weitergereicht wird. Wird der TTL-Wert 0 ist das Paket zu lange (�blicherweise auf Irrwegen) unterwegs und wird verworfen. Anhand der TTL kann man daher auch sehen wie oft ein Paket schon weitergereicht wurde. Besonders wichtig f�r -B.A.T.M.A.N ist die Sequenznummer. Das sind die laufenden Nummern der +B.A.T.M.A.N. ist die Sequenznummer. Das sind die laufenden Nummern der Orginator-Nachrichten die ein Orginator aussendet. Broadcasts werden in einem festgelegten Intervall von jedem Node als @@ -204,22 +204,22 @@ bei der TTL entscheidet wer das letzte eingegangene Orginator-Paket zum Zielknoten gebroadcastet hat. -###################################### -# Verbessertes B.A.T.M.A.N-Verfahren # -# # -# B.A.T.M.A.N-II # -###################################### +####################################### +# Verbessertes B.A.T.M.A.N.-Verfahren # +# # +# B.A.T.M.A.N.-II # +####################################### -Das einfachste B.A.T.M.A.N-Verfahren hat einen Haken: Es ber�cksichtigt nicht, +Das einfachste B.A.T.M.A.N.-Verfahren hat einen Haken: Es ber�cksichtigt nicht, dass Verbindungen unsymmetrisch sein k�nnen. Die Annahme ist, dass auf dem Pfad auf dem die Pakete von Node A den Node F erreichen auch die beste �bertragung in die Gegenrichtung m�glich ist. Das ist im Fall von unsymmetrischen Links ein Trugschluss. Unsymmetrische Links treten auf wenn ein Router zwar einen anderen h�rt, aber umgekehrt nicht. Es kann sein, dass eine perfekte �bertragung m�glich ist - aber nur in eine Richtung. Das -einfache B.A.T.M.A.N-Verfahren w�rde hier komplett scheitern. Es muss also +einfache B.A.T.M.A.N.-Verfahren w�rde hier komplett scheitern. Es muss also gepr�ft werden ob Links symmetrisch sind und nur Informationen die von diesen kommen d�rfen ausgewertet und verwendet werden. @@ -255,7 +255,7 @@ Ansonsten w stets ignorieren - weil sie unsymmetrisch sind und bleiben. Und sie w�rden uns ignorieren... Andere Nodes d�rfen indirekt empfangene Orginatormeldungen mit TTLMAX -1 nicht wiederholen wenn der Unsymmetrieflag gesetzt wird - -sonst f�llt B.A.T.M.A.N doch noch auf Broadcasts rein, die von +sonst f�llt B.A.T.M.A.N. doch noch auf Broadcasts rein, die von unsymmetrischen Links stammen. diff --git a/README b/README index 2a497f3..6f3bf15 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -B.A.T.M.A.N-III +B.A.T.M.A.N.-III BETTER APPROACH TO MOBILE AD-HOC NETWORKING @@ -6,19 +6,19 @@ BETTER APPROACH TO MOBILE AD-HOC NETWORKING # 1.) INTRODUCTION # #################### -B.A.T.M.A.N is a new approach to Ad-Hoc-Routing, unlike other algorithms +B.A.T.M.A.N. is a new approach to Ad-Hoc-Routing, unlike other algorithms that we are aware of. Reactive MANET protocols search for routes when a node initiates communication to a remote node. Proactive protocols (all link-state algorithms and some distance-vector algorithms) calculate routes proactively from all nodes to all nodes in the mesh-cloud, whether they are necessary or not - while reactive protocols search for routes on demand. -B.A.T.M.A.N doesn't calculate or search for routes - it continuously detects +B.A.T.M.A.N. doesn't calculate or search for routes - it continuously detects the existence of routes by forwarding and receiving broadcast packets, and it proactively populates the routing-table with nodes in the mesh. The algorithm does not try to find out which path packets follow to a remote -node. B.A.T.M.A.N merely checks which single hop neighbor it has to send a +node. B.A.T.M.A.N. merely checks which single hop neighbor it has to send a package to in order to push it on the best way to a node in the mesh. If you -want to find out how B.A.T.M.A.N routes to a certain node, perform a +want to find out how B.A.T.M.A.N. routes to a certain node, perform a ping -R <destination address> @@ -35,27 +35,27 @@ instead. # 2.) EVOLUTION # ################# -B.A.T.M.A.N-III is the third stage in the evolution of the -B.A.T.M.A.N. algorithm - hence the numbering scheme. B.A.T.M.A.N-I +B.A.T.M.A.N.-III is the third stage in the evolution of the +B.A.T.M.A.N. algorithm - hence the numbering scheme. B.A.T.M.A.N.-I didn't check for bidirectional link conditions when forwarding packets. This was an obvious design flaw. We didn't bother to add bidirectional link checks in the first experimental implementation that was meant to merely test the algorithm. The results of -B.A.T.M.A.N-I were however promising, so B.A.T.M.A.N-II was +B.A.T.M.A.N.-I were however promising, so B.A.T.M.A.N.-II was implemented introducing a simple mechanism to check for bidirectional links to perform further tests in real-live scenarios. -B.A.T.M.A.N-II implemented the bare algorithm with bi-directional link +B.A.T.M.A.N.-II implemented the bare algorithm with bi-directional link checks for meshnodes with one interface only and was tested in the Freifunk meshclouds of Berlin and Weimar. Thank you very much, you are really brave guys! It was working quite nice on PCs, but the quick and dirty implementation was causing high CPU-Loads on embedded systems and even broadcast packet storms! -We found out that the algorithm of B.A.T.M.A.N-II still had its -flaws. We identified conditions where B.A.T.M.A.N-II would choose +We found out that the algorithm of B.A.T.M.A.N.-II still had its +flaws. We identified conditions where B.A.T.M.A.N.-II would choose routes far from optimal and even could cause routing loops. Hence -B.A.T.M.A.N-III implements changes in the algorithm to cope with these +B.A.T.M.A.N.-III implements changes in the algorithm to cope with these scenarios. Some new features, namely Internet gateway detection and @@ -66,12 +66,12 @@ server so people can download data from this server to display those fancy three-dimensional meshclouds with s3d or two-dimensional with dot-draw. -Now B.A.T.M.A.N-III has - in theory - everything to replace other MANET +Now B.A.T.M.A.N.-III has - in theory - everything to replace other MANET routing daemons. As this is a young and experimental development it needs further testing to improve maturity, of course. -We are having a party today - December 13th 2006 at c-base in Berlin, to celebrate -the release of this milestone as B.A.T.M.A.N-III-0.1! +On December 13th 2006 we had a party at c-base in Berlin, to celebrate +the release of this milestone as B.A.T.M.A.N.-III-0.1! B.A.T.M.A.N. will have a hard time to gain the same popularity like olsrd from olsr.org. OLSR is now the same for community mesh networks in Europe @@ -90,14 +90,14 @@ the way that B.A.T.M.A.N. goes :) ##################################### -# 3.) MANET THEORY AND B.A.T.M.A.N # +# 3.) MANET THEORY AND B.A.T.M.A.N. # ##################################### -A node in a B.A.T.M.A.N-MANET is only interested to learn about the +A node in a B.A.T.M.A.N.-MANET is only interested to learn about the existence of all nodes that it can communicate with, either in single or multi-hop range, and which single hop neighbor it has to choose as a router to a certain destination. To communicate with a node in multi-hop range a -B.A.T.M.A.N node only needs to know which single hop neighbor is the best +B.A.T.M.A.N. node only needs to know which single hop neighbor is the best to send its packets to, so that the packets takes the best way to the node in the distance. To explain the advantage of this approach it may be best to compare it with other ideas about mesh routing - namely source routing and @@ -182,12 +182,12 @@ B.A.T.M.A.N. is a simple set of rules a node has to comply with. NOTE: -A firewall must not block B.A.T.M.A.N traffic. B.A.T.M.A.N sends its +A firewall must not block B.A.T.M.A.N. traffic. B.A.T.M.A.N. sends its packets on Port 1966 UDP. This port must be open for incoming and outgoing UDP traffic. -B.A.T.M.A.N detects neighbors and distant nodes by transmitting, receiving +B.A.T.M.A.N. detects neighbors and distant nodes by transmitting, receiving and repeating broadcasts according to the rules of the B.A.T.M.A.N. algorithm. These broadcasts travel through the mesh-cloud until they are lost or nobody has to rebroadcast them any more. Once a node receives a @@ -243,7 +243,7 @@ looks like this: | | *-------------- E -----------* -What does B.A.T.M.A.N do now? +What does B.A.T.M.A.N. do now? Node A broadcasts an originator-message with sequence number 0. B, C, D and E all forward this message. @@ -255,7 +255,7 @@ receives from node C because it receives the same message again. The message forwarded by node E may get lost or come too late to be the first, too. Using the best path between node A and F the packets travel more -reliable and/or quicker. B.A.T.M.A.N. nodes consider the best path to +reliable and/or quicker. B.A.T.M.A.N.. nodes consider the best path to a destination only as far as to the best next hop (or neighbor) towards the destination. The best next hop is simply identified by gathering statistics about how often and via which neighbor a certain diff --git a/batman.c b/batman.c index 2ac5de1..4d82baf 100644 --- a/batman.c +++ b/batman.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 BATMAN contributors: + * Copyright (C) 2006 B.A.T.M.A.N. contributors: * Thomas Lopatic, Corinna 'Elektra' Aichele, Axel Neumann, * Felix Fietkau, Marek Lindner * diff --git a/batman.h b/batman.h index 60ba2ae..11ebe66 100644 --- a/batman.h +++ b/batman.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 BATMAN contributors: + * 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 @@ -24,7 +24,7 @@ #include <pthread.h> #include "list.h" -#define VERSION "0.1" +#define VERSION "0.11" #define BATMAN_VERSION 1 #define PORT 1966 #define UNIDIRECTIONAL 0x80 @@ -33,7 +33,7 @@ /* * No configuration files or fancy command line switches yet - * To experiment with B.A.T.M.A.N settings change them here + * To experiment with B.A.T.M.A.N. settings change them here * and recompile the code * Here is the stuff you may want to play with: */ diff --git a/posix.c b/posix.c index e636c28..0c2104c 100644 --- a/posix.c +++ b/posix.c @@ -1040,14 +1040,14 @@ int main(int argc, char *argv[]) case 'v': - printf( "B.A.T.M.A.N-III v%s (internal version %i)", VERSION, BATMAN_VERSION ); + printf( "B.A.T.M.A.N.-III v%s \n", VERSION); return (0); case 'V': print_animation(); - printf( "\x1B[0;0HB.A.T.M.A.N-III v%s (internal version %i)", VERSION, BATMAN_VERSION ); + printf( "\x1B[0;0HB.A.T.M.A.N.-III v%s", VERSION); printf( "\x1B[9;0HMay the bat guide your path ...\n" ); return (0); @@ -1110,7 +1110,7 @@ int main(int argc, char *argv[]) } else { - printf( "B.A.T.M.A.N-III v%s (internal version %i)\n", VERSION, BATMAN_VERSION ); + printf( "B.A.T.M.A.N.-III v%s \n", VERSION ); } -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit 25800e186bd450a0f4459192e88f6783b70fbc19 Author: Axel Neumann <neumann(a)cgws.de> Date: Thu Dec 14 02:02:23 2006 +0100 rp_filter patch diff --git a/batman.c b/batman.c index 585889d..2ac5de1 100644 --- a/batman.c +++ b/batman.c @@ -1176,6 +1176,7 @@ int batman() unsigned char in[1501], *hna_recv_buff; static char orig_str[ADDR_STR_LEN], neigh_str[ADDR_STR_LEN]; int forward_old, res, hna_buff_len, hna_buff_count; + int if_rp_filter_all_old, if_rp_filter_default_old; int is_my_addr, is_my_orig, is_broadcast, is_duplicate, is_bidirectional, forward_duplicate_packet; int time_count = 0, curr_time; @@ -1209,9 +1210,16 @@ int batman() batman_if->out.seqno = 0; batman_if->out.gwflags = gateway_class; batman_if->out.version = BATMAN_VERSION; - + batman_if->if_rp_filter_old = get_rp_filter( batman_if->dev ); + set_rp_filter( 0 , batman_if->dev ); } + if_rp_filter_all_old = get_rp_filter( "all" ); + if_rp_filter_default_old = get_rp_filter( "default" ); + + set_rp_filter( 0, "all" ); + set_rp_filter( 0, "default" ); + forward_old = get_forwarding(); set_forwarding(1); @@ -1495,6 +1503,15 @@ int batman() set_forwarding( forward_old ); + list_for_each(if_pos, &if_list) { + batman_if = list_entry(if_pos, struct batman_if, list); + set_rp_filter( batman_if->if_rp_filter_old , batman_if->dev ); + } + + set_rp_filter( if_rp_filter_all_old, "all" ); + set_rp_filter( if_rp_filter_default_old, "default" ); + + checkLeak(); return 0; diff --git a/batman.h b/batman.h index 4ff893b..5355996 100644 --- a/batman.h +++ b/batman.h @@ -142,6 +142,7 @@ struct batman_if int tcp_gw_sock; int tunnel_sock; int if_num; + int if_rp_filter_old; pthread_t listen_thread_id; struct sockaddr_in addr; struct sockaddr_in broad; diff --git a/linux.c b/linux.c index e2a5f4d..937b097 100644 --- a/linux.c +++ b/linux.c @@ -42,6 +42,36 @@ #include "os.h" #include "batman.h" +void set_rp_filter(int state, char* dev) +{ + FILE *f; + char filename[100]; + sprintf( filename, "/proc/sys/net/ipv4/conf/%s/rp_filter", dev); + + + if((f = fopen(filename, "w")) == NULL) + return; + + fprintf(f, "%d", state); + fclose(f); +} + +int get_rp_filter(char *dev) +{ + FILE *f; + int state = 0; + char filename[100]; + sprintf( filename, "/proc/sys/net/ipv4/conf/%s/rp_filter", dev); + + if((f = fopen(filename, "r")) == NULL) + return 0; + + fscanf(f, "%d", &state); + fclose(f); + + return state; +} + void set_forwarding(int state) { FILE *f; diff --git a/os.h b/os.h index 82b28a7..12f361d 100644 --- a/os.h +++ b/os.h @@ -25,6 +25,11 @@ unsigned int get_time(void); void set_forwarding(int); int get_forwarding(void); +void set_rp_filter(int state, char* dev); +int get_rp_filter(char *dev); + + + void output(char *format, ...); void add_del_route( unsigned int dest, unsigned int netmask, unsigned int router, int del, char *dev, int sock ); int is_aborted(); -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit 78ccf9b3afff1caddd983fc9a27f3cb158c99f77 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Dec 14 12:08:27 2006 +0100 rp_filter patch for interface aliases diff --git a/batman.h b/batman.h index 5355996..60ba2ae 100644 --- a/batman.h +++ b/batman.h @@ -142,7 +142,7 @@ struct batman_if int tcp_gw_sock; int tunnel_sock; int if_num; - int if_rp_filter_old; + int if_rp_filter_old; pthread_t listen_thread_id; struct sockaddr_in addr; struct sockaddr_in broad; diff --git a/linux.c b/linux.c index 937b097..8c94814 100644 --- a/linux.c +++ b/linux.c @@ -45,22 +45,34 @@ void set_rp_filter(int state, char* dev) { FILE *f; - char filename[100]; - sprintf( filename, "/proc/sys/net/ipv4/conf/%s/rp_filter", dev); + char filename[100], *colon_ptr; + + /* if given interface is an alias use parent interface */ + if ( ( colon_ptr = strchr( dev, ':' ) ) != NULL ) + *colon_ptr = '\0'; + sprintf( filename, "/proc/sys/net/ipv4/conf/%s/rp_filter", dev); if((f = fopen(filename, "w")) == NULL) return; fprintf(f, "%d", state); fclose(f); + + if ( colon_ptr != NULL ) + *colon_ptr = ':'; } int get_rp_filter(char *dev) { FILE *f; int state = 0; - char filename[100]; + char filename[100], *colon_ptr; + + /* if given interface is an alias use parent interface */ + if ( ( colon_ptr = strchr( dev, ':' ) ) != NULL ) + *colon_ptr = '\0'; + sprintf( filename, "/proc/sys/net/ipv4/conf/%s/rp_filter", dev); if((f = fopen(filename, "r")) == NULL) @@ -69,6 +81,9 @@ int get_rp_filter(char *dev) fscanf(f, "%d", &state); fclose(f); + if ( colon_ptr != NULL ) + *colon_ptr = ':'; + return state; } diff --git a/posix.c b/posix.c index 3287fb0..e636c28 100644 --- a/posix.c +++ b/posix.c @@ -1148,44 +1148,6 @@ int main(int argc, char *argv[]) } - - /* FIXME: does that help ? - socklen_t get_len; - int get_value; - get_len = sizeof (get_value); - if ( getsockopt( batman_if->udp_recv_sock, SOL_SOCKET, SO_RCVBUF, &get_value, &get_len ) < 0 ) { - - do_log( "Error - can't get socket option: %s\n", strerror(errno) ); - close_all_sockets(); - exit(EXIT_FAILURE); - - } - - printf( "receive buffer (%s): %i (before)\n", batman_if->dev, get_value ); - - get_value = get_value * 2; - - if ( setsockopt( batman_if->udp_recv_sock, SOL_SOCKET, SO_RCVBUF, &get_value, sizeof (int) ) < 0 ) { - - do_log( "Error - can't set recv buffer size: %s\n", strerror(errno) ); - close_all_sockets(); - exit(EXIT_FAILURE); - - } - - if ( getsockopt( batman_if->udp_recv_sock, SOL_SOCKET, SO_RCVBUF, &get_value, &get_len ) < 0 ) { - - do_log( "Error - can't get socket option: %s\n", strerror(errno) ); - close_all_sockets(); - exit(EXIT_FAILURE); - - } - - printf( "receive buffer (%s): %i (now)\n", batman_if->dev, get_value ); - - */ - - memset(&int_req, 0, sizeof (struct ifreq)); strncpy(int_req.ifr_name, batman_if->dev, IFNAMSIZ - 1); -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit 222b1696f6ae47e428ec4ebc967a9671c786e490 Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sun Dec 17 18:42:36 2006 +0100 - remove hard pointer increments, replace it with sizeof(struct ..), thus making it 32bit-wordsize-independent - realloc(NULL,n) acts like malloc(n) diff --git a/allocate.c b/allocate.c index 0956c01..4f3ad4d 100644 --- a/allocate.c +++ b/allocate.c @@ -41,7 +41,7 @@ void checkIntegrity(void) memory = (unsigned char *)walker; - chunkTrailer = (struct chunkTrailer *)(memory + 16 + walker->length); + chunkTrailer = (struct chunkTrailer *)(memory + sizeof(struct chunkHeader) + walker->length); if (chunkTrailer->magicNumber != MAGIC_NUMBER) { @@ -68,17 +68,17 @@ void *debugMalloc(unsigned int length, int tag) // printf("sizeof(struct chunkHeader) = %u, sizeof (struct chunkTrailer) = %u\n", sizeof (struct chunkHeader), sizeof (struct chunkTrailer)); - memory = malloc(length + 20); + memory = malloc(length + sizeof(struct chunkHeader) + sizeof(struct chunkTrailer)); if (memory == NULL) { - fprintf(stderr, "Cannot allocate %u bytes, tag = %d\n", length + 20, tag); + fprintf(stderr, "Cannot allocate %u bytes, tag = %d\n", length + sizeof(struct chunkHeader) + sizeof(struct chunkTrailer), tag); exit(1); } chunkHeader = (struct chunkHeader *)memory; - chunk = memory + 16; - chunkTrailer = (struct chunkTrailer *)(memory + 16 + length); + chunk = memory + sizeof(struct chunkHeader); + chunkTrailer = (struct chunkTrailer *)(memory + sizeof(struct chunkHeader) + length); chunkHeader->length = length; chunkHeader->tag = tag; @@ -100,33 +100,37 @@ void *debugRealloc(void *memoryParameter, unsigned int length, int tag) unsigned char *result; unsigned int copyLength; - memory = memoryParameter; - chunkHeader = (struct chunkHeader *)(memory - 16); - - if (chunkHeader->magicNumber != MAGIC_NUMBER) - { - fprintf(stderr, "Invalid magic number in header: %08x, tag = %d\n", chunkHeader->magicNumber, chunkHeader->tag); - exit(1); - } - - chunkTrailer = (struct chunkTrailer *)(memory + chunkHeader->length); - - if (chunkTrailer->magicNumber != MAGIC_NUMBER) - { - fprintf(stderr, "Invalid magic number in header: %08x, tag = %d\n", chunkTrailer->magicNumber, chunkHeader->tag); - exit(1); + if (memoryParameter) { /* if memoryParameter==NULL, realloc() should work like malloc() !! */ + memory = memoryParameter; + chunkHeader = (struct chunkHeader *)(memory - sizeof(struct chunkHeader)); + + if (chunkHeader->magicNumber != MAGIC_NUMBER) + { + fprintf(stderr, "Invalid magic number in header: %08x, tag = %d\n", chunkHeader->magicNumber, chunkHeader->tag); + exit(1); + } + + chunkTrailer = (struct chunkTrailer *)(memory + chunkHeader->length); + + if (chunkTrailer->magicNumber != MAGIC_NUMBER) + { + fprintf(stderr, "Invalid magic number in header: %08x, tag = %d\n", chunkTrailer->magicNumber, chunkHeader->tag); + exit(1); + } } + result = debugMalloc(length, tag); + if (memoryParameter) { + copyLength = length; + + if (copyLength > chunkHeader->length) + copyLength = chunkHeader->length; + + memcpy(result, memoryParameter, length); + debugFree(memoryParameter); + } - copyLength = length; - - if (copyLength > chunkHeader->length) - copyLength = chunkHeader->length; - - memcpy(result, memoryParameter, length); - - debugFree(memoryParameter); return result; } @@ -140,7 +144,7 @@ void debugFree(void *memoryParameter) struct chunkHeader *previous; memory = memoryParameter; - chunkHeader = (struct chunkHeader *)(memory - 16); + chunkHeader = (struct chunkHeader *)(memory - sizeof(struct chunkHeader)); if (chunkHeader->magicNumber != MAGIC_NUMBER) { -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit c5db27fbf8b4a6adec050407d7d56ac0d64efd89 Author: Axel Neumann <neumann(a)cgws.de> Date: Wed Dec 13 16:33:31 2006 +0100 announcing todays party diff --git a/INSTALL b/INSTALL index b608c24..28b80cf 100644 --- a/INSTALL +++ b/INSTALL @@ -19,8 +19,8 @@ This is still a experimental piece of code to test the viability of the B.A.T.M.A.N routing algorithm based on initial ideas of Thomas Lopatic and Corinna 'Elektra' Aichele. -This is implementation 0.1-rc6b of the improved B.A.T.M.A.N-III algorithm. It -is not unlikely that we still have to fix some bugs. +This is implementation 0.1-final of the improved B.A.T.M.A.N-III algorithm. It +is not unlikely that we still have to fix some bugs, though. Use - like always - at your own risk! @@ -130,7 +130,13 @@ Here's what you see if you start long help (with some extra comments) batmand -H Usage: batman [options] interface [interface interface] + + -a announce network(s) + network/netmask is expected + Announce that this node is a gateway to this + network + -d debug level default: 0, allowed values: 0 - 3 diff --git a/README b/README index 5d96233..2a497f3 100644 --- a/README +++ b/README @@ -70,8 +70,8 @@ Now B.A.T.M.A.N-III has - in theory - everything to replace other MANET routing daemons. As this is a young and experimental development it needs further testing to improve maturity, of course. -We'll have a party at c-base in Berlin soon, to celebrate when this -milestone will finally be released as B.A.T.M.A.N-III-0.10! +We are having a party today - December 13th 2006 at c-base in Berlin, to celebrate +the release of this milestone as B.A.T.M.A.N-III-0.1! B.A.T.M.A.N. will have a hard time to gain the same popularity like olsrd from olsr.org. OLSR is now the same for community mesh networks in Europe -- batman; test conversation

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2010