B.A.T.M.A.N June 2010

b.a.t.m.a.n@lists.open-mesh.org

24 participants
44 discussions

[B.A.T.M.A.N.] The state of batman-adv branches in june 2010
by Sven Eckelmann 26 Jun '10

26 Jun '10

Hi, as we started to have different branches and repositories, everything became a little bit more complex to track. I will try to summarize what and where is something going on inside the batman-adv universe. Please note that the different repositories and branches were changed slightly. For example batctl is now also available using git and the linux integration branch was moved to a separate repository. * trunk/batman-adv/ [1], master [2] In trunk is always summer - so changes always(?) enter here and will get moved to other branches unless they need some more time to get a fine flavor - or at least more testing. Even if everything should hit trunk, it is easier to describe changes in a different places (maint, master-rebase). This branch can be used together with trunk/batctl/ [3] * maint [4] This is were commits are gathered to be send later to the linux kernel folks. Only tested features or features which are dependencies for the in-kernel batman-adv should enter this branch. Since the last time [5] a lot of things happen. The most important one is probably the release of batman-adv 2010.0.0 [6]. This is essentially what you will get when you will build linux 2.6.35 - or what you will get when Linus will come back from his vacation [7] and merges GregKH's staging branch. Since that release we merged some patches from master which seems to work good enough (at least no major flaw was found during WMBv3 [8]). * batman-adv: 32bit sequence number and TTL for broadcasts [9] * batman-adv: Add bonding functionality [10] * batman-adv: bonding and interface alternating [11] * batman-adv: record route for ICMP messages [12] Also smaller patches entered it. For example some java style namings of variables and functions were converted to better match the kernel coding style, rounding issues were identified + resolved and the code was cleaned up a little bit. This branch can be used together with batctl-maint [13] * linux-2.6.36 The release of linux 2.6.35 isn't finished yet, but we have submitted all patches in maint. This means that we have hopefully all patches in 2.6.36 we wanted - this includes the debugfs and netfilter patches which were dropped in 2.6.35 because they were submitted to late (during the 2.6.35 merge window instead a week before 2.6.34 was released). We also tried to contact the network subsystem developers to get a review [14] for batman-adv. This is needed to get it moved from drivers/staging/batman-adv to net/batman-adv/. Even if our goal is not to get it merged in 2.6.36, we still hope that we get enough information to merge soon into net/. * maint-0.2.2 This branch was removed after the release of batman-adv 2010.0.0. * linux [15] The dirty place were all the linux integration happens. It is ugly, misunderstood and uninteresting for most people. The last synchronization point was GregKH-20100625 [16]. It is a merge of v2.6.34 and v2010.0.0-30-g13bc17e [17] + a documentation of all files we create in sysfs. So this synchronization point (a git tag) just says that we check at least v2.6.34 for new patches not yet integrated in maint/trunk of batman-adv and that we send our changes until that point to GregKH [18]. * rebase [19] My personal playground. (With a little delay) I will try to get all changes in trunk rebased on top of maint. As result we get only the essence of changes in trunk which aren't already part of maint. This also means for example that patches will look like they were made with sysfs in mind when they are originally created files in /proc. Even when I always ensure that the files in master and rebase are 100% equal, the original author may not be blamed when a single patch will try to eat your pet (or you could say that patches in that branch will not be checked by their original authors and I will only guarantee that when you apply all patches you will get the same files as in trunk). Nevertheless it is a great place to get and test feature patches on top of maint without using the complete set of changes in master. Or to understand what goes on in trunk compared to maint. Currently we have following patches waiting inside of it * batman-adv: adapting source version to revised versioning scheme [20] * batman-adv: move queue counters into bat_priv [21] * batman-adv: adding gateway functionality [22] * batman-adv: send DHCP requests directly to the chosen gw [23] * batman-adv: best gw DHCP filter 802.1Q support [24] This branch will jump around and it is not save to track it using a local git branch. This branch can be used together with trunk/batctl/ [3] Last but not least, thanks to everyone who has done the real work * Antonio Quartulli * Dan Carpenter * Daniel Seither * Javier Martinez Canillas * Jiri Pirko * Joe Perches * Linus Lüssing * Marek Lindner * Simon Wunderlich * Tejun Heo and lets see what the next months will bring us. Best regards, Sven [1] http://downloads.open-mesh.org/svn/batman/trunk/batman-adv/ [2] http://git.open-mesh.net/?p=batman-adv;a=shortlog;h=refs/heads/master [3] http://downloads.open-mesh.net/svn/batman/trunk/batctl/ [4] http://git.open-mesh.net/?p=batman-adv;a=shortlog;h=refs/heads/maint [5] http://git.open-mesh.net/?p=batman-adv;a=shortlog;h=11d889980441dd5350e6faa… [6] http://open-mesh.net/wiki/2010-06-19-batman-adv-2010-0-0-release [7] http://lkml.org/lkml/2010/6/6/3 [8] http://open-mesh.net/wiki/2010-06-13-wbm2010-bracciano [9] http://git.open-mesh.net/?p=batman-adv;a=commit;h=0e5c09ca3f7f14596fbf932d1… [10] http://git.open-mesh.net/?p=batman-adv;a=commit;h=287063696f2d3dfc21afe4fec… [11] http://git.open-mesh.net/?p=batman-adv;a=commit;h=231c5e0b8f79f79b90247f44e… [12] http://git.open-mesh.net/?p=batman-adv;a=commit;h=1a0a622c040bcc6db492af5df… [13] http://git.open-mesh.net/?p=batctl.git;a=shortlog;h=refs/heads/maint [14] https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2010-June/003008.html [15] http://git.open-mesh.net/?p=batman-adv;a=shortlog;h=refs/heads/linux [16] http://git.open-mesh.net/?p=ecsv/linux-merge.git;a=commit;h=GregKH-20100625 [17] http://git.open-mesh.net/?p=batman-adv;a=commit;h=13bc17ebf3e6062d92673a31f… [18] http://open-mesh.net/wiki/SubmittingLinux [19] http://git.open-mesh.net/?p=ecsv/master-rebase.git;a=shortlog;h=rebase [20] http://git.open-mesh.net/?p=ecsv/master-rebase.git;a=commit;h=b0df1c48a435a… [21] http://git.open-mesh.net/?p=ecsv/master-rebase.git;a=commit;h=822bb7e77ee2e… [22] http://git.open-mesh.net/?p=ecsv/master-rebase.git;a=commit;h=73d01acffd6bd… [23] http://git.open-mesh.net/?p=ecsv/master-rebase.git;a=commit;h=370a2b6521cc5… [24] http://git.open-mesh.net/?p=ecsv/master-rebase.git;a=commit;h=d4199c7fbe5e8…

1 0

[B.A.T.M.A.N.] [PATCH 1/2] batctl: Add support for git revision string
by Sven Eckelmann 24 Jun '10

24 Jun '10

The Makefile tries to find a version number which describes the state of the version somebody compiles. Currently this can only be a subversion revision. This must also be done for git as it is used to prepare the actual releases. The revision string consists of 4 parts: 1. last annotated tag name 2. number of commits inbetween last tag name and this commit 3. shortened sha1 sum of the commit 4. indicator whether the files where modified The first part is only shown when there was a tag before the commit or the current commit was tagged. Part two and three is only shown when the current commit is not tagged. The indicator is also only shown when the files were modified. This should make it quite easy understandable for humans and still makes it possible to find the commit in the repository using standard git tools (for that purpose the "-dirty" string must be ommited). A full example would be v2010.0.0-15-g154f68a-dirty Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batctl/Makefile | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/batctl/Makefile b/batctl/Makefile index ab9c075..fde5486 100644 --- a/batctl/Makefile +++ b/batctl/Makefile @@ -47,23 +47,27 @@ PACKAGE_NAME = batctl BINARY_NAME = batctl SOURCE_VERSION_HEADER = main.h -REVISION = $(shell if [ -d .svn ]; then \ - if which svn > /dev/null; then \ - svn info | grep "Rev:" | sed -e '1p' -n | awk '{print $$4}'; \ - else \ - echo "[unknown]"; \ - fi ; \ +REVISION= $(shell if [ -d .svn ]; then \ + if which svn > /dev/null; then \ + echo rv$$(svn info | grep "Rev:" | sed -e '1p' -n | awk '{print $$4}'); \ else \ - if [ -d ~/.svk ]; then \ - if which svk > /dev/null; then \ - echo $$(svk info | grep "Mirrored From" | awk '{print $$5}'); \ - else \ - echo "[unknown]"; \ - fi; \ - fi; \ - fi) + echo "[unknown]"; \ + fi; \ + elif [ -d .git ]; then \ + if which git > /dev/null; then \ + echo $$(git describe --always --dirty 2> /dev/null); \ + else \ + echo "[unknown]"; \ + fi; \ + elif [ -d ~/.svk ]; then \ + if which svk > /dev/null; then \ + echo rv$$(svk info | grep "Mirrored From" | awk '{print $$5}'); \ + else \ + echo "[unknown]"; \ + fi; \ + fi) -REVISION_VERSION =\"\ rv$(REVISION)\" +REVISION_VERSION =\"\ $(REVISION)\" BAT_VERSION = $(shell grep "^\#define SOURCE_VERSION " $(SOURCE_VERSION_HEADER) | sed -e '1p' -n | awk -F '"' '{print $$2}' | awk '{print $$1}') FILE_NAME = $(PACKAGE_NAME)_$(BAT_VERSION)-rv$(REVISION)_$@ -- 1.7.1

2 2

[B.A.T.M.A.N.] [PATCH] batman-adv: Add include guards to all header files
by Sven Eckelmann 24 Jun '10

24 Jun '10

We include different header files indirectly to the same source file. This creates weird compiler errors from time to time. Include guards should prefend that functions/variables/... gets redefined by itself. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman-adv/aggregation.h | 5 +++++ batman-adv/bat_debugfs.h | 6 +++--- batman-adv/bat_sysfs.h | 6 +++--- batman-adv/bitarray.h | 4 ++++ batman-adv/compat.h | 5 +++++ batman-adv/gateway_client.h | 5 +++++ batman-adv/gateway_common.h | 5 +++++ batman-adv/hard-interface.h | 5 +++++ batman-adv/hash.h | 8 +++++--- batman-adv/icmp_socket.h | 5 +++++ batman-adv/main.h | 5 +++++ batman-adv/originator.h | 5 +++++ batman-adv/packet.h | 5 +++++ batman-adv/ring_buffer.h | 5 +++++ batman-adv/routing.h | 5 +++++ batman-adv/send.h | 5 +++++ batman-adv/soft-interface.h | 5 +++++ batman-adv/translation-table.h | 5 +++++ batman-adv/types.h | 6 +++--- batman-adv/vis.h | 5 +++++ 20 files changed, 93 insertions(+), 12 deletions(-) diff --git a/batman-adv/aggregation.h b/batman-adv/aggregation.h index 84401ca..71a91b3 100644 --- a/batman-adv/aggregation.h +++ b/batman-adv/aggregation.h @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_AGGREGATION_H_ +#define _NET_BATMAN_ADV_AGGREGATION_H_ + #include "main.h" /* is there another aggregated packet here? */ @@ -36,3 +39,5 @@ void add_bat_packet_to_list(struct bat_priv *bat_priv, unsigned long send_time); void receive_aggr_bat_packet(struct ethhdr *ethhdr, unsigned char *packet_buff, int packet_len, struct batman_if *if_incoming); + +#endif /* _NET_BATMAN_ADV_AGGREGATION_H_ */ diff --git a/batman-adv/bat_debugfs.h b/batman-adv/bat_debugfs.h index 5cdd332..72df532 100644 --- a/batman-adv/bat_debugfs.h +++ b/batman-adv/bat_debugfs.h @@ -20,8 +20,8 @@ */ -#ifndef BAT_DEBUGFS_H -#define BAT_DEBUGFS_H +#ifndef _NET_BATMAN_ADV_DEBUGFS_H_ +#define _NET_BATMAN_ADV_DEBUGFS_H_ #define DEBUGFS_BAT_SUBDIR "batman_adv" @@ -30,4 +30,4 @@ void debugfs_destroy(void); int debugfs_add_meshif(struct net_device *dev); void debugfs_del_meshif(struct net_device *dev); -#endif +#endif /* _NET_BATMAN_ADV_DEBUGFS_H_ */ diff --git a/batman-adv/bat_sysfs.h b/batman-adv/bat_sysfs.h index cb45a91..7f186c0 100644 --- a/batman-adv/bat_sysfs.h +++ b/batman-adv/bat_sysfs.h @@ -20,8 +20,8 @@ */ -#ifndef BAT_SYSFS_H -#define BAT_SYSFS_H +#ifndef _NET_BATMAN_ADV_SYSFS_H_ +#define _NET_BATMAN_ADV_SYSFS_H_ #define SYSFS_IF_MESH_SUBDIR "mesh" #define SYSFS_IF_BAT_SUBDIR "batman_adv" @@ -39,4 +39,4 @@ void sysfs_del_meshif(struct net_device *dev); int sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev); void sysfs_del_hardif(struct kobject **hardif_obj); -#endif +#endif /* _NET_BATMAN_ADV_SYSFS_H_ */ diff --git a/batman-adv/bitarray.h b/batman-adv/bitarray.h index dad13bf..01897d6 100644 --- a/batman-adv/bitarray.h +++ b/batman-adv/bitarray.h @@ -19,6 +19,8 @@ * */ +#ifndef _NET_BATMAN_ADV_BITARRAY_H_ +#define _NET_BATMAN_ADV_BITARRAY_H_ /* you should choose something big, if you don't want to waste cpu */ #define TYPE_OF_WORD unsigned long @@ -40,3 +42,5 @@ char bit_get_packet(TYPE_OF_WORD *seq_bits, int32_t seq_num_diff, /* count the hamming weight, how many good packets did we receive? */ int bit_packet_count(TYPE_OF_WORD *seq_bits); + +#endif /* _NET_BATMAN_ADV_BITARRAY_H_ */ diff --git a/batman-adv/compat.h b/batman-adv/compat.h index 8302a58..3cc0b52 100644 --- a/batman-adv/compat.h +++ b/batman-adv/compat.h @@ -22,6 +22,9 @@ * of the Linux kernel. */ +#ifndef _NET_BATMAN_ADV_COMPAT_H_ +#define _NET_BATMAN_ADV_COMPAT_H_ + #include <linux/version.h> /* LINUX_VERSION_CODE */ #include "bat_sysfs.h" /* struct bat_attribute */ @@ -232,3 +235,5 @@ static inline struct net_device_stats *dev_get_stats(struct net_device *dev) } #endif /* < KERNEL_VERSION(2, 6, 29) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_H_ */ diff --git a/batman-adv/gateway_client.h b/batman-adv/gateway_client.h index 6a71cee..1c24187 100644 --- a/batman-adv/gateway_client.h +++ b/batman-adv/gateway_client.h @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_GATEWAY_CLIENT_H_ +#define _NET_BATMAN_ADV_GATEWAY_CLIENT_H_ + void gw_deselect(void); void gw_election(void); void *gw_get_selected(void); @@ -29,3 +32,5 @@ void gw_node_purge_deleted(void); void gw_node_list_free(void); int gw_client_seq_print_text(struct seq_file *seq, void *offset); bool gw_is_target(struct bat_priv *bat_priv, struct sk_buff *skb); + +#endif /* _NET_BATMAN_ADV_GATEWAY_CLIENT_H_ */ diff --git a/batman-adv/gateway_common.h b/batman-adv/gateway_common.h index b88eb50..13953af 100644 --- a/batman-adv/gateway_common.h +++ b/batman-adv/gateway_common.h @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_GATEWAY_COMMON_H_ +#define _NET_BATMAN_ADV_GATEWAY_COMMON_H_ + enum gw_modes { GW_MODE_OFF, GW_MODE_CLIENT, @@ -31,3 +34,5 @@ enum gw_modes { void gw_srv_class_to_kbit(uint8_t gw_class, int *down, int *up); ssize_t gw_mode_set(struct bat_priv *bat_priv, char *buff, size_t count); + +#endif /* _NET_BATMAN_ADV_GATEWAY_COMMON_H_ */ diff --git a/batman-adv/hard-interface.h b/batman-adv/hard-interface.h index 1e5fc3e..d5640b0 100644 --- a/batman-adv/hard-interface.h +++ b/batman-adv/hard-interface.h @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_HARD_INTERFACE_H_ +#define _NET_BATMAN_ADV_HARD_INTERFACE_H_ + #define IF_NOT_IN_USE 0 #define IF_TO_BE_REMOVED 1 #define IF_INACTIVE 2 @@ -38,3 +41,5 @@ int batman_skb_recv(struct sk_buff *skb, struct net_device *orig_dev); int hardif_min_mtu(void); void update_min_mtu(void); + +#endif /* _NET_BATMAN_ADV_HARD_INTERFACE_H_ */ diff --git a/batman-adv/hash.h b/batman-adv/hash.h index 0505595..c483e11 100644 --- a/batman-adv/hash.h +++ b/batman-adv/hash.h @@ -19,8 +19,9 @@ * */ -#ifndef _BATMAN_HASH_H -#define _BATMAN_HASH_H +#ifndef _NET_BATMAN_ADV_HASH_H_ +#define _NET_BATMAN_ADV_HASH_H_ + #define HASHIT(name) struct hash_it_t name = { \ .index = -1, .bucket = NULL, \ .prev_bucket = NULL, \ @@ -95,4 +96,5 @@ struct hashtable_t *hash_resize(struct hashtable_t *hash, int size); * the returned iterator to access the elements until hash_it_t returns NULL. */ struct hash_it_t *hash_iterate(struct hashtable_t *hash, struct hash_it_t *iter_in); -#endif + +#endif /* _NET_BATMAN_ADV_HASH_H_ */ diff --git a/batman-adv/icmp_socket.h b/batman-adv/icmp_socket.h index 2dc954a..bf9b348 100644 --- a/batman-adv/icmp_socket.h +++ b/batman-adv/icmp_socket.h @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_ICMP_SOCKET_H_ +#define _NET_BATMAN_ADV_ICMP_SOCKET_H_ + #include "types.h" #define ICMP_SOCKET "socket" @@ -27,3 +30,5 @@ void bat_socket_init(void); int bat_socket_setup(struct bat_priv *bat_priv); void bat_socket_receive_packet(struct icmp_packet_rr *icmp_packet, size_t icmp_len); + +#endif /* _NET_BATMAN_ADV_ICMP_SOCKET_H_ */ diff --git a/batman-adv/main.h b/batman-adv/main.h index cb17a9c..cb0135e 100644 --- a/batman-adv/main.h +++ b/batman-adv/main.h @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_MAIN_H_ +#define _NET_BATMAN_ADV_MAIN_H_ + /* Kernel Programming */ #define LINUX @@ -160,3 +163,5 @@ int choose_orig(void *data, int32_t size); int is_my_mac(uint8_t *addr); int is_bcast(uint8_t *addr); int is_mcast(uint8_t *addr); + +#endif /* _NET_BATMAN_ADV_MAIN_H_ */ diff --git a/batman-adv/originator.h b/batman-adv/originator.h index 6632538..e88411d 100644 --- a/batman-adv/originator.h +++ b/batman-adv/originator.h @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_ORIGINATOR_H_ +#define _NET_BATMAN_ADV_ORIGINATOR_H_ + int originator_init(void); void originator_free(void); void purge_orig(struct work_struct *work); @@ -29,3 +32,5 @@ create_neighbor(struct orig_node *orig_node, struct orig_node *orig_neigh_node, int orig_seq_print_text(struct seq_file *seq, void *offset); int orig_hash_add_if(struct batman_if *batman_if, int max_if_num); int orig_hash_del_if(struct batman_if *batman_if, int max_if_num); + +#endif /* _NET_BATMAN_ADV_ORIGINATOR_H_ */ diff --git a/batman-adv/packet.h b/batman-adv/packet.h index 51375d2..e94960d 100644 --- a/batman-adv/packet.h +++ b/batman-adv/packet.h @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_PACKET_H_ +#define _NET_BATMAN_ADV_PACKET_H_ + #define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ #define BAT_PACKET 0x01 @@ -115,3 +118,5 @@ struct vis_packet { uint8_t target_orig[6]; /* who should receive this packet */ uint8_t sender_orig[6]; /* who sent or rebroadcasted this packet */ } __attribute__((packed)); + +#endif /* _NET_BATMAN_ADV_PACKET_H_ */ diff --git a/batman-adv/ring_buffer.h b/batman-adv/ring_buffer.h index b8c9456..6b0cb9a 100644 --- a/batman-adv/ring_buffer.h +++ b/batman-adv/ring_buffer.h @@ -19,5 +19,10 @@ * */ +#ifndef _NET_BATMAN_ADV_RING_BUFFER_H_ +#define _NET_BATMAN_ADV_RING_BUFFER_H_ + void ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index, uint8_t value); uint8_t ring_buffer_avg(uint8_t lq_recv[]); + +#endif /* _NET_BATMAN_ADV_RING_BUFFER_H_ */ diff --git a/batman-adv/routing.h b/batman-adv/routing.h index 43387a2..3eac64e 100644 --- a/batman-adv/routing.h +++ b/batman-adv/routing.h @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_ROUTING_H_ +#define _NET_BATMAN_ADV_ROUTING_H_ + #include "types.h" void slide_own_bcast_window(struct batman_if *batman_if); @@ -39,3 +42,5 @@ struct neigh_node *find_router(struct orig_node *orig_node, struct batman_if *recv_if); void update_bonding_candidates(struct bat_priv *bat_priv, struct orig_node *orig_node); + +#endif /* _NET_BATMAN_ADV_ROUTING_H_ */ diff --git a/batman-adv/send.h b/batman-adv/send.h index 0a0990d..b64c627 100644 --- a/batman-adv/send.h +++ b/batman-adv/send.h @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_SEND_H_ +#define _NET_BATMAN_ADV_SEND_H_ + #include "types.h" int send_skb_packet(struct sk_buff *skb, @@ -35,3 +38,5 @@ void schedule_forward_packet(struct orig_node *orig_node, int add_bcast_packet_to_list(struct sk_buff *skb); void send_outstanding_bat_packet(struct work_struct *work); void purge_outstanding_packets(struct batman_if *batman_if); + +#endif /* _NET_BATMAN_ADV_SEND_H_ */ diff --git a/batman-adv/soft-interface.h b/batman-adv/soft-interface.h index 0847e42..6364854 100644 --- a/batman-adv/soft-interface.h +++ b/batman-adv/soft-interface.h @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_SOFT_INTERFACE_H_ +#define _NET_BATMAN_ADV_SOFT_INTERFACE_H_ + void set_main_if_addr(uint8_t *addr); void interface_setup(struct net_device *dev); int interface_tx(struct sk_buff *skb, struct net_device *dev); @@ -26,3 +29,5 @@ void interface_rx(struct sk_buff *skb, int hdr_size); int my_skb_push(struct sk_buff *skb, unsigned int len); extern unsigned char main_if_addr[]; + +#endif /* _NET_BATMAN_ADV_SOFT_INTERFACE_H_ */ diff --git a/batman-adv/translation-table.h b/batman-adv/translation-table.h index 232208f..fa93e37 100644 --- a/batman-adv/translation-table.h +++ b/batman-adv/translation-table.h @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ +#define _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ + #include "types.h" int hna_local_init(void); @@ -38,3 +41,5 @@ struct orig_node *transtable_search(uint8_t *addr); extern spinlock_t hna_local_hash_lock; extern struct hashtable_t *hna_local_hash; extern atomic_t hna_local_changed; + +#endif /* _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ */ diff --git a/batman-adv/types.h b/batman-adv/types.h index 75930cf..1daebed 100644 --- a/batman-adv/types.h +++ b/batman-adv/types.h @@ -23,8 +23,8 @@ -#ifndef TYPES_H -#define TYPES_H +#ifndef _NET_BATMAN_ADV_TYPES_H_ +#define _NET_BATMAN_ADV_TYPES_H_ #include "packet.h" #include "bitarray.h" @@ -184,4 +184,4 @@ struct if_list_entry { struct hlist_node list; }; -#endif +#endif /* _NET_BATMAN_ADV_TYPES_H_ */ diff --git a/batman-adv/vis.h b/batman-adv/vis.h index e152cd7..bb13bf1 100644 --- a/batman-adv/vis.h +++ b/batman-adv/vis.h @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_VIS_H_ +#define _NET_BATMAN_ADV_VIS_H_ + #define VIS_TIMEOUT 200 /* timeout of vis packets in seconds */ struct vis_info { @@ -53,3 +56,5 @@ void receive_client_update_packet(struct bat_priv *bat_priv, int vis_info_len); int vis_init(void); void vis_quit(void); + +#endif /* _NET_BATMAN_ADV_VIS_H_ */ -- 1.7.1

2 1

[B.A.T.M.A.N.] [PATCH 1/4] batman-adv: Use nproc to get number of available processors
by Sven Eckelmann 24 Jun '10

24 Jun '10

The current way of getting the number of cpus uses different assumptions which may or may not be true in the future: * /proc/cpuinfo exists * cpuinfo provides a list of all processing units * all processing units are available for the current process and its childs * the word 'processor' is only used in the cpu index and 'model name' lines * cpu index is strict monotonic increasing * lowest cpu index is 0 and highest cpu index is n-1 (n is the number of processing units) At least the number of available processing units for the current process can be shown to be wrong. on current systems by assigning a singe cpu to a process and its childs: $ numactl --physcpubind=0 nproc 1 $ numactl --physcpubind=0 sh -c 'NUM_CPUS=`cat /proc/cpuinfo | grep -v "model name" | grep processor | tail -1 | awk -F" " '\''{print $$3}'\''`;echo `expr $NUM_CPUS + 1`' 4 nproc is part of coreutils since version 8.1. On systems without nproc it will just assume that a single processing unit is available. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman-adv/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/batman-adv/Makefile b/batman-adv/Makefile index 4f6a460..adfbbc9 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -41,7 +41,7 @@ REVISION= $(shell if [ -d .svn ]; then \ fi; \ fi) -NUM_CPUS = $(shell NUM_CPUS=`cat /proc/cpuinfo | grep -v 'model name' | grep processor | tail -1 | awk -F' ' '{print $$3}'`;echo `expr $$NUM_CPUS + 1`) +NUM_CPUS = $(shell nproc 2> /dev/null || echo 1) include $(PWD)/Makefile.kbuild -- 1.7.1

2 4

[B.A.T.M.A.N.] batman-adv debug logging
by Marek Lindner 23 Jun '10

23 Jun '10

Hi, a couple of months ago a series of patches had been introduced which removed the batman-adv log inside the proc filesystem and redirected the messages to the standard linux logs. This allowed us to be more compliant with the linux rules but also crippled our debugging mechanisms. The following patches re- introduce thedebug logging but inside debugfs which should be ok according to Greg KH. Feedback is welcome, :-) Marek

3 14

[B.A.T.M.A.N.] batman-adv: Migration from staging to net
by Sven Eckelmann 23 Jun '10

23 Jun '10

Hi, the batman-adv developers had a smaller discussion what we wanted to achieve in drivers/staging and if we have done everything we wanted to do. We think that everything we wanted to do in staging is finished (the TODO file is empty since a while), but that is just our opinion. So we wanted to ask you first if you see any showstopper which make batman-adv insufficient for net before we would ask the net maintainer. Our personal favorite kernel for the move would be 2.6.37. Before that we would have 2.6.35 (which is not completely correct using the sysfs infrastructure) and at least some RCs of 2.6.36 (which moves the remaining wrong stuff from sysfs to debugfs). Open patches for 2.6.36 are currently (may change) * batman-adv: Mark locally used symbols as static (removed some dead code) * batman-adv: 32bit sequence number and TTL for broadcasts * batman-adv: Add bonding functionality * batman-adv: bonding and interface alternating * batman-adv: record route for ICMP messages * ... Nearly all of them are features and not really things which makes it more suitable for the kernel. Open things are for example * Re-Integration of some debugging infrastructure (currently not decided which technology to use) * virtualized meshing (I am not sure if that was the same fancy term the actual developer used) * forward error correction * mesh optimized gateway support * protocol optimizations Again I wouldn't think that one of the mentioned points would make it better suitable for the kernel (but of course makes batman-adv better in general terms). So is there anything you would want us to change before you would say that we could try a review by the net maintainer? To the merge process itself. We should prepare a patch which adds everything in net/batman-adv/ (and Documentation/ABI/testing/, MAINTAINERS) and then send it to netdev(a)vger.kernel.org/David S. Miller. After it was merged we just send you a patch which removes drivers/staging/batman-adv. Is that correct (just searched for an example and only found benet[1, 2])? thanks, Sven [1] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=shortlog… [2] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=shortlog…

2 3

[B.A.T.M.A.N.] Staging: batman-adv for 2.6.36 (2)
by Sven Eckelmann 22 Jun '10

22 Jun '10

Hi, here are patches targetted for 2.6.36. They are made on top of patches you have already received in 1275852501-28523-1-git-send-email-sven.eckelmann(a)gmx.de : * Staging: batman-adv: remove redundant struct declaration * Staging: batman-adv: Move device for icmp injection to debugfs * Staging: batman-adv: Move tables from sysfs to debugfs * Staging: batman-adv: convert all sysfs files to single value files * Staging: batman-adv: Adding netfilter-bridge hooks * Staging: batman-adv: Add information about batman-adv sysfs entries * Staging: batman-adv: remove superfluous hint to "translation table" * Staging: batman-adv: convert vis_interval into define * Staging: batman-adv: Convert MAC_FMT to %pM They also depend on patches not yet applied on 2.6.35, but sent to you: * Staging: batman-adv: return -EFAULT on copy_to_user errors * Staging: batman-adv: fix function prototype thanks, Sven drivers/staging/batman-adv/CHANGELOG | 12 + drivers/staging/batman-adv/README | 2 +- drivers/staging/batman-adv/aggregation.c | 4 +- drivers/staging/batman-adv/bat_debugfs.c | 2 + drivers/staging/batman-adv/bat_sysfs.c | 54 ++++- drivers/staging/batman-adv/bitarray.c | 10 +- drivers/staging/batman-adv/bitarray.h | 9 +- drivers/staging/batman-adv/hard-interface.c | 4 +- drivers/staging/batman-adv/hash.c | 2 +- drivers/staging/batman-adv/hash.h | 6 - drivers/staging/batman-adv/icmp_socket.c | 45 ++-- drivers/staging/batman-adv/icmp_socket.h | 3 +- drivers/staging/batman-adv/main.h | 9 +- drivers/staging/batman-adv/originator.c | 40 ++-- drivers/staging/batman-adv/originator.h | 2 - drivers/staging/batman-adv/packet.h | 27 ++- drivers/staging/batman-adv/routing.c | 324 ++++++++++++++++++++---- drivers/staging/batman-adv/routing.h | 8 +- drivers/staging/batman-adv/send.c | 23 ++- drivers/staging/batman-adv/send.h | 2 - drivers/staging/batman-adv/soft-interface.c | 159 ++++++------ drivers/staging/batman-adv/soft-interface.h | 6 - drivers/staging/batman-adv/translation-table.c | 9 +- drivers/staging/batman-adv/translation-table.h | 3 - drivers/staging/batman-adv/types.h | 20 ++- drivers/staging/batman-adv/vis.c | 9 +- drivers/staging/batman-adv/vis.h | 3 - 27 files changed, 562 insertions(+), 235 deletions(-) Daniel Seither (1): Staging: batman-adv: record route for ICMP messages Linus Lüssing (1): Staging: batman-adv: permit setting ogm interval to JITTER*2 Simon Wunderlich (4): Staging: batman-adv: Add release information for version 2010.0.0 Staging: batman-adv: 32bit sequence number and TTL for broadcasts Staging: batman-adv: Add bonding functionality Staging: batman-adv: bonding and interface alternating Sven Eckelmann (2): Staging: batman-adv: Mark locally used symbols as static Staging: batman-adv: Ignore debugfs on kernels without debugfs support

3 18

[B.A.T.M.A.N.] Link quality
by Clemens John 22 Jun '10

22 Jun '10

Hi, I´m using Batman advanced and with "batctl o" I can get originators. Is there a way to get the link quality to this originators? Greetings Clemens

2 1

[B.A.T.M.A.N.] Cannot build actual OpenWrt Backfire branch with Batman Advanced
by Clemens John 22 Jun '10

22 Jun '10

Hi, I tried to build OpenWrt Backfire with Batman adv from an actual branch 5 minutes ago and it fails with the following error (seems to be a version/download problem): ------------ --2010-06-21 16:03:50-- http://mirror2.openwrt.org/sources/batctl- maint-1611.tar.gz Resolving mirror2.openwrt.org... 88.198.39.176 Connecting to mirror2.openwrt.org|88.198.39.176|:80... connected. HTTP request sent, awaiting response... 404 Not Found 2010-06-21 16:03:50 ERROR 404: Not Found. Download failed. --2010-06-21 16:03:50-- http://downloads.openwrt.org/sources/batctl- maint-1611.tar.gz Resolving downloads.openwrt.org... 78.24.191.177 Connecting to downloads.openwrt.org|78.24.191.177|:80... connected. HTTP request sent, awaiting response... 404 Not Found 2010-06-21 16:03:50 ERROR 404: Not Found. Download failed. No more mirrors to try - giving up. Checking out files from the svn repository... svn: Write error: Broken pipe svn: '/svn/batman/!svn/bc/1718/branches/batctl-0.2.x' path not found svn: '/svn/batman/!svn/bc/1718/branches/batctl-0.2.x' path not found make[3]: *** [/home/floh1111/openwrtbuild_luci/dl/batctl-maint-1611.tar.gz] Error 1 make[3]: Leaving directory `/home/floh1111/openwrtbuild_luci/feeds/packages/net/batman-advanced' make[2]: *** [package/feeds/packages/batman-advanced/compile] Error 2 make[2]: Leaving directory `/home/floh1111/openwrtbuild_luci' make[1]: *** [/home/floh1111/openwrtbuild_luci/staging_dir/target- mips_uClibc-0.9.30.1/stamp/.package_compile] Error 2 make[1]: Leaving directory `/home/floh1111/openwrtbuild_luci' make: *** [world] Fehler 2 ------- It seems to be that the source file saved in the makefile is not right. https://dev.openwrt.org/browser/packages/net/batman-advanced/Makefile Can someone fix this please? Another question: What´s up with the latest release (Batman-adv 2010.0.0)? Will I be able to build it with the Backfire branch? Maybe someone can update the makefile? Thanks Clemens

3 3

[B.A.T.M.A.N.] [PATCH 1/2] batctl: Remove dead code from old sysfs parsing
by Sven Eckelmann 21 Jun '10

21 Jun '10

The old batman-adv sysfs files provided all their available options inside their output. This made it necessary to parse the output to analyse it before we accept an input given to batctl. This functionality was removed as it wasn't the correct style according to the sysfs maintainer. Not all code related to that were removed right away when batctl was adopted to the new sysfs handling. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- functions.c | 18 ------------------ functions.h | 1 - 2 files changed, 0 insertions(+), 19 deletions(-) diff --git a/functions.c b/functions.c index 3bcb0b2..7be9511 100644 --- a/functions.c +++ b/functions.c @@ -303,21 +303,3 @@ out: close(fd); return res; } - -char *strchr_anyof(const char *s, const char *n) -{ - char *cur, *first = NULL; - size_t i, len; - - if (s == NULL || n == NULL) - return first; - - len = strlen(n); - for (i = 0; i < len; i++) { - cur = strchr(s, n[i]); - if (cur != NULL && (cur < first || first == NULL)) - first = cur; - } - - return first; -} diff --git a/functions.h b/functions.h index 847a482..885df34 100644 --- a/functions.h +++ b/functions.h @@ -35,7 +35,6 @@ char *get_name_by_macaddr(struct ether_addr *mac_addr, int read_opt); char *get_name_by_macstr(char *mac_str, int read_opt); int read_file(char *dir, char *path, int read_opt); int write_file(char *dir, char *fname, char *arg1, char *arg2); -char *strchr_anyof(const char *s, const char *n); extern char *line_ptr; -- 1.7.1

2 2

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N June 2010