commits February 2012

commits@lists.open-mesh.org

1 participants
131 discussions

batman-adv; branch, next, updated. v2012.0.0-34-ga037487
by postmaster＠open-mesh.org 05 Feb '12

05 Feb '12

The following commit has been merged in the next branch: commit 8d143abdeff5ddfdb2b5d6bffae8c1fdbbef4de8 Merge: 24d65d307541b7d9bcbb09e58b9209bb20b2c721 d22e13c6c380261cf0b13d34e6412a1e393b5197 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Dec 12 18:49:28 2011 +0800 Merge branch 'next' diff --combined icmp_socket.c index 5bc8649,d9c1e7b..5d69e10 --- a/icmp_socket.c +++ b/icmp_socket.c @@@ -136,10 -136,9 +136,9 @@@ static ssize_t bat_socket_read(struct f spin_unlock_bh(&socket_client->lock); - error = __copy_to_user(buf, &socket_packet->icmp_packet, - socket_packet->icmp_len); + packet_len = min(count, socket_packet->icmp_len); + error = copy_to_user(buf, &socket_packet->icmp_packet, packet_len); - packet_len = socket_packet->icmp_len; kfree(socket_packet); if (error) @@@ -187,17 -186,12 +186,12 @@@ static ssize_t bat_socket_write(struct skb_reserve(skb, sizeof(struct ethhdr)); icmp_packet = (struct icmp_packet_rr *)skb_put(skb, packet_len); - if (!access_ok(VERIFY_READ, buff, packet_len)) { - len = -EFAULT; - goto free_skb; - } - - if (__copy_from_user(icmp_packet, buff, packet_len)) { + if (copy_from_user(icmp_packet, buff, packet_len)) { len = -EFAULT; goto free_skb; } - if (icmp_packet->packet_type != BAT_ICMP) { + if (icmp_packet->header.packet_type != BAT_ICMP) { bat_dbg(DBG_BATMAN, bat_priv, "Error - can't send packet from char device: " "got bogus packet type (expected: BAT_ICMP)\n"); @@@ -215,9 -209,9 +209,9 @@@ icmp_packet->uid = socket_client->index; - if (icmp_packet->version != COMPAT_VERSION) { + if (icmp_packet->header.version != COMPAT_VERSION) { icmp_packet->msg_type = PARAMETER_PROBLEM; - icmp_packet->version = COMPAT_VERSION; + icmp_packet->header.version = COMPAT_VERSION; bat_socket_add_packet(socket_client, icmp_packet, packet_len); goto free_skb; } -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.0.0-34-ga037487
by postmaster＠open-mesh.org 05 Feb '12

05 Feb '12

The following commit has been merged in the next branch: commit 27fa91679763b29d92374217845d422cfbb7ca8e Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Nov 28 17:40:17 2011 +0800 batman-adv: add infrastructure to change routing algorithm at runtime Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/ring_buffer.h b/bat_algo.h similarity index 69% copy from ring_buffer.h copy to bat_algo.h index 7cdfe62..755379f 100644 --- a/ring_buffer.h +++ b/bat_algo.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2011 B.A.T.M.A.N. contributors: * * Marek Lindner * @@ -19,10 +19,9 @@ * */ -#ifndef _NET_BATMAN_ADV_RING_BUFFER_H_ -#define _NET_BATMAN_ADV_RING_BUFFER_H_ +#ifndef _NET_BATMAN_ADV_BAT_ALGO_H_ +#define _NET_BATMAN_ADV_BAT_ALGO_H_ -void ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index, uint8_t value); -uint8_t ring_buffer_avg(const uint8_t lq_recv[]); +int bat_iv_init(void); -#endif /* _NET_BATMAN_ADV_RING_BUFFER_H_ */ +#endif /* _NET_BATMAN_ADV_BAT_ALGO_H_ */ diff --git a/bat_debugfs.c b/bat_debugfs.c index d0af9bf..a7a393e 100644 --- a/bat_debugfs.c +++ b/bat_debugfs.c @@ -221,6 +221,11 @@ static void debug_log_cleanup(struct bat_priv *bat_priv) } #endif +static int bat_algorithms_open(struct inode *inode, struct file *file) +{ + return single_open(file, bat_algo_seq_print_text, NULL); +} + static int originators_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; @@ -274,6 +279,7 @@ struct bat_debuginfo bat_debuginfo_##_name = { \ } \ }; +static BAT_DEBUGINFO(routing_algos, S_IRUGO, bat_algorithms_open); static BAT_DEBUGINFO(originators, S_IRUGO, originators_open); static BAT_DEBUGINFO(gateways, S_IRUGO, gateways_open); static BAT_DEBUGINFO(softif_neigh, S_IRUGO, softif_neigh_open); @@ -293,9 +299,25 @@ static struct bat_debuginfo *mesh_debuginfos[] = { void debugfs_init(void) { + struct bat_debuginfo *bat_debug; + struct dentry *file; + bat_debugfs = debugfs_create_dir(DEBUGFS_BAT_SUBDIR, NULL); if (bat_debugfs == ERR_PTR(-ENODEV)) bat_debugfs = NULL; + + if (!bat_debugfs) + goto out; + + bat_debug = &bat_debuginfo_routing_algos; + file = debugfs_create_file(bat_debug->attr.name, + S_IFREG | bat_debug->attr.mode, + bat_debugfs, NULL, &bat_debug->fops); + if (!file) + pr_err("Can't add debugfs file: %s\n", bat_debug->attr.name); + +out: + return; } void debugfs_destroy(void) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 3402fa5..1847efa 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -29,6 +29,7 @@ #include "gateway_client.h" #include "hard-interface.h" #include "send.h" +#include "bat_algo.h" void bat_ogm_init(struct hard_iface *hard_iface) { @@ -1172,3 +1173,12 @@ void bat_ogm_receive(struct hard_iface *if_incoming, struct sk_buff *skb) } while (bat_ogm_aggr_packet(buff_pos, packet_len, batman_ogm_packet->tt_num_changes)); } + +static struct bat_algo_ops batman_iv __read_mostly = { + .name = "BATMAN IV", +}; + +int __init bat_iv_init(void) +{ + return bat_algo_register(&batman_iv); +} diff --git a/main.c b/main.c index 71b56cf..7c87a34 100644 --- a/main.c +++ b/main.c @@ -32,11 +32,14 @@ #include "gateway_client.h" #include "vis.h" #include "hash.h" +#include "bat_algo.h" /* List manipulations on hardif_list have to be rtnl_lock()'ed, * list traversals just rcu-locked */ struct list_head hardif_list; +char bat_routing_algo[20] = "BATMAN IV"; +static struct hlist_head bat_algo_list; unsigned char broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; @@ -45,6 +48,9 @@ struct workqueue_struct *bat_event_workqueue; static int __init batman_init(void) { INIT_LIST_HEAD(&hardif_list); + INIT_HLIST_HEAD(&bat_algo_list); + + bat_iv_init(); /* the name should not be longer than 10 chars - see * http://lwn.net/Articles/23634/ */ @@ -172,6 +178,72 @@ int is_my_mac(const uint8_t *addr) return 0; } +static struct bat_algo_ops *bat_algo_get(char *name) +{ + struct bat_algo_ops *bat_algo_ops = NULL, *bat_algo_ops_tmp; + struct hlist_node *node; + + hlist_for_each_entry(bat_algo_ops_tmp, node, &bat_algo_list, list) { + if (strcmp(bat_algo_ops_tmp->name, name) != 0) + continue; + + bat_algo_ops = bat_algo_ops_tmp; + break; + } + + return bat_algo_ops; +} + +int bat_algo_register(struct bat_algo_ops *bat_algo_ops) +{ + struct bat_algo_ops *bat_algo_ops_tmp; + int ret = -1; + + bat_algo_ops_tmp = bat_algo_get(bat_algo_ops->name); + if (bat_algo_ops_tmp) { + pr_info("Trying to register already registered routing " + "algorithm: %s\n", bat_algo_ops->name); + goto out; + } + + INIT_HLIST_NODE(&bat_algo_ops->list); + hlist_add_head(&bat_algo_ops->list, &bat_algo_list); + ret = 0; + +out: + return ret; +} + +int bat_algo_select(struct bat_priv *bat_priv, char *name) +{ + struct bat_algo_ops *bat_algo_ops; + int ret = -1; + + bat_algo_ops = bat_algo_get(name); + if (!bat_algo_ops) + goto out; + + bat_priv->bat_algo_ops = bat_algo_ops; + ret = 0; + +out: + return ret; +} + +int bat_algo_seq_print_text(struct seq_file *seq, void *offset) +{ + struct bat_algo_ops *bat_algo_ops; + struct hlist_node *node; + + seq_printf(seq, "Available routing algorithms:\n"); + + hlist_for_each_entry(bat_algo_ops, node, &bat_algo_list, list) { + seq_printf(seq, "%s\n", bat_algo_ops->name); + } + + return 0; +} + module_init(batman_init); module_exit(batman_exit); diff --git a/main.h b/main.h index d305845..222c120 100644 --- a/main.h +++ b/main.h @@ -149,6 +149,7 @@ enum dbg_level { #include "types.h" +extern char bat_routing_algo[]; extern struct list_head hardif_list; extern unsigned char broadcast_addr[]; @@ -159,6 +160,9 @@ void mesh_free(struct net_device *soft_iface); void inc_module_count(void); void dec_module_count(void); int is_my_mac(const uint8_t *addr); +int bat_algo_register(struct bat_algo_ops *bat_algo_ops); +int bat_algo_select(struct bat_priv *bat_priv, char *name); +int bat_algo_seq_print_text(struct seq_file *seq, void *offset); #ifdef CONFIG_BATMAN_ADV_DEBUG int debug_log(struct bat_priv *bat_priv, const char *fmt, ...) __printf(2, 3); diff --git a/soft-interface.c b/soft-interface.c index bd8c7cf..b5aecd5 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -855,6 +855,10 @@ struct net_device *softif_create(const char *name) bat_priv->primary_if = NULL; bat_priv->num_ifaces = 0; + ret = bat_algo_select(bat_priv, bat_routing_algo); + if (ret < 0) + goto unreg_soft_iface; + ret = sysfs_add_meshif(soft_iface); if (ret < 0) goto unreg_soft_iface; diff --git a/types.h b/types.h index 35085f4..d21ff2c 100644 --- a/types.h +++ b/types.h @@ -206,6 +206,7 @@ struct bat_priv { atomic_t gw_reselect; struct hard_iface __rcu *primary_if; /* rcu protected pointer */ struct vis_info *my_vis_info; + struct bat_algo_ops *bat_algo_ops; }; struct socket_client { @@ -344,4 +345,9 @@ struct softif_neigh { struct rcu_head rcu; }; +struct bat_algo_ops { + struct hlist_node list; + char *name; +}; + #endif /* _NET_BATMAN_ADV_TYPES_H_ */ -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.0.0-34-ga037487
by postmaster＠open-mesh.org 05 Feb '12

05 Feb '12

The following commit has been merged in the next branch: commit 292753056eede01fb925415ff32e987c5570546e Merge: 5a1f1a52a2af40669b17db05cd18bb0b65b4afd0 dc96f5b62bfbac7ea0a5f53ed9795ad262daad91 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Dec 6 15:58:26 2011 +0800 Merge branch 'next' diff --combined routing.c index d5ddbd1,773e606..4363d19 --- a/routing.c +++ b/routing.c @@@ -320,7 -320,7 +320,7 @@@ static int recv_my_icmp_packet(struct b memcpy(icmp_packet->dst, icmp_packet->orig, ETH_ALEN); memcpy(icmp_packet->orig, primary_if->net_dev->dev_addr, ETH_ALEN); icmp_packet->msg_type = ECHO_REPLY; - icmp_packet->ttl = TTL; + icmp_packet->header.ttl = TTL; send_skb_packet(skb, router->if_incoming, router->addr); ret = NET_RX_SUCCESS; @@@ -376,7 -376,7 +376,7 @@@ static int recv_icmp_ttl_exceeded(struc memcpy(icmp_packet->dst, icmp_packet->orig, ETH_ALEN); memcpy(icmp_packet->orig, primary_if->net_dev->dev_addr, ETH_ALEN); icmp_packet->msg_type = TTL_EXCEEDED; - icmp_packet->ttl = TTL; + icmp_packet->header.ttl = TTL; send_skb_packet(skb, router->if_incoming, router->addr); ret = NET_RX_SUCCESS; @@@ -441,7 -441,7 +441,7 @@@ int recv_icmp_packet(struct sk_buff *sk return recv_my_icmp_packet(bat_priv, skb, hdr_size); /* TTL exceeded */ - if (icmp_packet->ttl < 2) + if (icmp_packet->header.ttl < 2) return recv_icmp_ttl_exceeded(bat_priv, skb); /* get routing information */ @@@ -460,7 -460,7 +460,7 @@@ icmp_packet = (struct icmp_packet_rr *)skb->data; /* decrement ttl */ - icmp_packet->ttl--; + icmp_packet->header.ttl--; /* route it */ send_skb_packet(skb, router->if_incoming, router->addr); @@@ -627,8 -627,7 +627,7 @@@ int recv_tt_query(struct sk_buff *skb, /* Ensure we have all the claimed data */ if (unlikely(skb_headlen(skb) < - sizeof(struct tt_query_packet) + - tt_len)) + sizeof(struct tt_query_packet) + tt_len)) goto out; handle_tt_response(bat_priv, tt_query); @@@ -816,7 -815,7 +815,7 @@@ int route_unicast_packet(struct sk_buf unicast_packet = (struct unicast_packet *)skb->data; /* TTL exceeded */ - if (unicast_packet->ttl < 2) { + if (unicast_packet->header.ttl < 2) { pr_debug("Warning - can't forward unicast packet from %pM to " "%pM: ttl exceeded\n", ethhdr->h_source, unicast_packet->dest); @@@ -841,7 -840,7 +840,7 @@@ unicast_packet = (struct unicast_packet *)skb->data; - if (unicast_packet->packet_type == BAT_UNICAST && + if (unicast_packet->header.packet_type == BAT_UNICAST && atomic_read(&bat_priv->fragmentation) && skb->len > neigh_node->if_incoming->net_dev->mtu) { ret = frag_send_skb(skb, bat_priv, @@@ -849,7 -848,7 +848,7 @@@ goto out; } - if (unicast_packet->packet_type == BAT_UNICAST_FRAG && + if (unicast_packet->header.packet_type == BAT_UNICAST_FRAG && frag_can_reassemble(skb, neigh_node->if_incoming->net_dev->mtu)) { ret = frag_reassemble_skb(skb, bat_priv, &new_skb); @@@ -868,7 -867,7 +867,7 @@@ } /* decrement ttl */ - unicast_packet->ttl--; + unicast_packet->header.ttl--; /* route it */ send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr); @@@ -1042,7 -1041,7 +1041,7 @@@ int recv_bcast_packet(struct sk_buff *s if (is_my_mac(bcast_packet->orig)) goto out; - if (bcast_packet->ttl < 2) + if (bcast_packet->header.ttl < 2) goto out; orig_node = orig_hash_find(bat_priv, bcast_packet->orig); diff --combined translation-table.c index 7a7df4a,58361ed..20d6628 --- a/translation-table.c +++ b/translation-table.c @@@ -242,9 -242,10 +242,10 @@@ void tt_local_add(struct net_device *so if (tt_global_entry) { /* This node is probably going to update its tt table */ tt_global_entry->orig_node->tt_poss_change = true; - /* The global entry has to be marked as PENDING and has to be + /* The global entry has to be marked as ROAMING and has to be * kept for consistency purpose */ - tt_global_entry->common.flags |= TT_CLIENT_PENDING; + tt_global_entry->common.flags |= TT_CLIENT_ROAM; + tt_global_entry->roam_at = jiffies; send_roam_adv(bat_priv, tt_global_entry->common.addr, tt_global_entry->orig_node); } @@@ -661,6 -662,7 +662,7 @@@ void tt_global_del(struct bat_priv *bat const char *message, bool roaming) { struct tt_global_entry *tt_global_entry = NULL; + struct tt_local_entry *tt_local_entry = NULL; tt_global_entry = tt_global_hash_find(bat_priv, addr); if (!tt_global_entry) @@@ -668,15 -670,29 +670,29 @@@ if (tt_global_entry->orig_node == orig_node) { if (roaming) { - tt_global_entry->common.flags |= TT_CLIENT_ROAM; - tt_global_entry->roam_at = jiffies; - goto out; + /* if we are deleting a global entry due to a roam + * event, there are two possibilities: + * 1) the client roamed from node A to node B => we mark + * it with TT_CLIENT_ROAM, we start a timer and we + * wait for node B to claim it. In case of timeout + * the entry is purged. + * 2) the client roamed to us => we can directly delete + * the global entry, since it is useless now. */ + tt_local_entry = tt_local_hash_find(bat_priv, + tt_global_entry->common.addr); + if (!tt_local_entry) { + tt_global_entry->common.flags |= TT_CLIENT_ROAM; + tt_global_entry->roam_at = jiffies; + goto out; + } } _tt_global_del(bat_priv, tt_global_entry, message); } out: if (tt_global_entry) tt_global_entry_free_ref(tt_global_entry); + if (tt_local_entry) + tt_local_entry_free_ref(tt_local_entry); } void tt_global_del_orig(struct bat_priv *bat_priv, @@@ -717,7 -733,6 +733,7 @@@ spin_unlock_bh(list_lock); } atomic_set(&orig_node->tt_size, 0); + orig_node->tt_initialised = false; } static void tt_global_roam_purge(struct bat_priv *bat_priv) @@@ -1119,11 -1134,11 +1135,11 @@@ static int send_tt_request(struct bat_p tt_request = (struct tt_query_packet *)skb_put(skb, sizeof(struct tt_query_packet)); - tt_request->packet_type = BAT_TT_QUERY; - tt_request->version = COMPAT_VERSION; + tt_request->header.packet_type = BAT_TT_QUERY; + tt_request->header.version = COMPAT_VERSION; memcpy(tt_request->src, primary_if->net_dev->dev_addr, ETH_ALEN); memcpy(tt_request->dst, dst_orig_node->orig, ETH_ALEN); - tt_request->ttl = TTL; + tt_request->header.ttl = TTL; tt_request->ttvn = ttvn; tt_request->tt_data = tt_crc; tt_request->flags = TT_REQUEST; @@@ -1249,9 -1264,9 +1265,9 @@@ static bool send_other_tt_response(stru tt_response = (struct tt_query_packet *)skb->data; } - tt_response->packet_type = BAT_TT_QUERY; - tt_response->version = COMPAT_VERSION; - tt_response->ttl = TTL; + tt_response->header.packet_type = BAT_TT_QUERY; + tt_response->header.version = COMPAT_VERSION; + tt_response->header.ttl = TTL; memcpy(tt_response->src, req_dst_orig_node->orig, ETH_ALEN); memcpy(tt_response->dst, tt_request->src, ETH_ALEN); tt_response->flags = TT_RESPONSE; @@@ -1366,9 -1381,9 +1382,9 @@@ static bool send_my_tt_response(struct tt_response = (struct tt_query_packet *)skb->data; } - tt_response->packet_type = BAT_TT_QUERY; - tt_response->version = COMPAT_VERSION; - tt_response->ttl = TTL; + tt_response->header.packet_type = BAT_TT_QUERY; + tt_response->header.version = COMPAT_VERSION; + tt_response->header.ttl = TTL; memcpy(tt_response->src, primary_if->net_dev->dev_addr, ETH_ALEN); memcpy(tt_response->dst, tt_request->src, ETH_ALEN); tt_response->flags = TT_RESPONSE; @@@ -1477,7 -1492,6 +1493,7 @@@ static void tt_update_changes(struct ba tt_save_orig_buffer(bat_priv, orig_node, (unsigned char *)tt_change, tt_num_changes); atomic_set(&orig_node->last_ttvn, ttvn); + orig_node->tt_initialised = true; } bool is_my_client(struct bat_priv *bat_priv, const uint8_t *addr) @@@ -1655,9 -1669,9 +1671,9 @@@ void send_roam_adv(struct bat_priv *bat roam_adv_packet = (struct roam_adv_packet *)skb_put(skb, sizeof(struct roam_adv_packet)); - roam_adv_packet->packet_type = BAT_ROAM_ADV; - roam_adv_packet->version = COMPAT_VERSION; - roam_adv_packet->ttl = TTL; + roam_adv_packet->header.packet_type = BAT_ROAM_ADV; + roam_adv_packet->header.version = COMPAT_VERSION; + roam_adv_packet->header.ttl = TTL; primary_if = primary_if_get_selected(bat_priv); if (!primary_if) goto out; @@@ -1840,10 -1854,8 +1856,10 @@@ void tt_update_orig(struct bat_priv *ba uint8_t orig_ttvn = (uint8_t)atomic_read(&orig_node->last_ttvn); bool full_table = true; - /* the ttvn increased by one -> we can apply the attached changes */ - if (ttvn - orig_ttvn == 1) { + /* orig table not initialised AND first diff is in the OGM OR the ttvn + * increased by one -> we can apply the attached changes */ + if ((!orig_node->tt_initialised && ttvn == 1) || + ttvn - orig_ttvn == 1) { /* the OGM could not contain the changes due to their size or * because they have already been sent TT_OGM_APPEND_MAX times. * In this case send a tt request */ @@@ -1877,8 -1889,7 +1893,8 @@@ } else { /* if we missed more than one change or our tables are not * in sync anymore -> request fresh tt data */ - if (ttvn != orig_ttvn || orig_node->tt_crc != tt_crc) { + if (!orig_node->tt_initialised || ttvn != orig_ttvn || + orig_node->tt_crc != tt_crc) { request_table: bat_dbg(DBG_TT, bat_priv, "TT inconsistency for %pM. " "Need to retrieve the correct information " -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.0.0-34-ga037487
by postmaster＠open-mesh.org 05 Feb '12

05 Feb '12

The following commit has been merged in the next branch: commit caa770807e99fb41cf56885e3cdcbeffe946a54c Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Dec 5 04:01:51 2011 +0800 batman-adv: simplify bat_ogm_receive API call Most of the values in that call are derived from the skb, so we can hand over the skb instead. Reported-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index d60e1ba..3402fa5 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -1140,13 +1140,16 @@ out: orig_node_free_ref(orig_node); } -void bat_ogm_receive(const struct ethhdr *ethhdr, unsigned char *packet_buff, - int packet_len, struct hard_iface *if_incoming) +void bat_ogm_receive(struct hard_iface *if_incoming, struct sk_buff *skb) { struct batman_ogm_packet *batman_ogm_packet; - int buff_pos = 0; - unsigned char *tt_buff; + struct ethhdr *ethhdr; + int buff_pos = 0, packet_len; + unsigned char *tt_buff, *packet_buff; + packet_len = skb_headlen(skb); + ethhdr = (struct ethhdr *)skb_mac_header(skb); + packet_buff = skb->data; batman_ogm_packet = (struct batman_ogm_packet *)packet_buff; /* unpack the aggregated packets and process them one by one */ diff --git a/bat_ogm.h b/bat_ogm.h index 69329c1..47edfde 100644 --- a/bat_ogm.h +++ b/bat_ogm.h @@ -29,7 +29,6 @@ void bat_ogm_init_primary(struct hard_iface *hard_iface); void bat_ogm_update_mac(struct hard_iface *hard_iface); void bat_ogm_schedule(struct hard_iface *hard_iface, int tt_num_changes); void bat_ogm_emit(struct forw_packet *forw_packet); -void bat_ogm_receive(const struct ethhdr *ethhdr, unsigned char *packet_buff, - int packet_len, struct hard_iface *if_incoming); +void bat_ogm_receive(struct hard_iface *if_incoming, struct sk_buff *skb); #endif /* _NET_BATMAN_ADV_OGM_H_ */ diff --git a/routing.c b/routing.c index 4363d19..5bc41c8 100644 --- a/routing.c +++ b/routing.c @@ -272,9 +272,7 @@ int recv_bat_ogm_packet(struct sk_buff *skb, struct hard_iface *hard_iface) if (skb_linearize(skb) < 0) return NET_RX_DROP; - ethhdr = (struct ethhdr *)skb_mac_header(skb); - - bat_ogm_receive(ethhdr, skb->data, skb_headlen(skb), hard_iface); + bat_ogm_receive(hard_iface, skb); kfree_skb(skb); return NET_RX_SUCCESS; -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.0.0-34-ga037487
by postmaster＠open-mesh.org 05 Feb '12

05 Feb '12

The following commit has been merged in the next branch: commit 63b3c662a1b5ec2a288091bbc0d01ce6197873bf Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Dec 4 20:10:45 2011 +0100 batman-adv: Don't automatically build in parallel Distributions like Gentoo and Debian have policies which make it necessary to use some kind of environmental variable to control the parallel build. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index 3374687..15f099e 100644 --- a/Makefile +++ b/Makefile @@ -33,12 +33,10 @@ REVISION= $(shell if [ -d .git ]; then \ echo $$(git describe --always --dirty --match "v*" |sed 's/^v//' 2> /dev/null || echo "[unknown]"); \ fi) -NUM_CPUS = $(shell nproc 2> /dev/null || echo 1) - include $(PWD)/Makefile.kbuild all: - $(MAKE) -C $(KERNELPATH) REVISION=$(REVISION) M=$(PWD) PWD=$(PWD) -j $(NUM_CPUS) modules + $(MAKE) -C $(KERNELPATH) REVISION=$(REVISION) M=$(PWD) PWD=$(PWD) modules clean: $(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) clean -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.0.0-34-ga037487
by postmaster＠open-mesh.org 05 Feb '12

05 Feb '12

The following commit has been merged in the next branch: commit fac4043933f4bc09ad08c57c6f338623a383b2de Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Dec 4 20:10:46 2011 +0100 batman-adv: Remove OpenWRT specific makefile rules Makefile and Makefile.kbuild are included by the linux kbuild environment to build the kernel module. Rules by other build systems could lead to hard to debug problems and therefore should be avoided. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile.kbuild b/Makefile.kbuild index bd7e93c..3c51455 100644 --- a/Makefile.kbuild +++ b/Makefile.kbuild @@ -18,13 +18,6 @@ # 02110-1301, USA # - - -# openwrt integration -ifeq ($(MAKING_MODULES),1) --include $(TOPDIR)/Rules.make -endif - # ccflags-y += -DCONFIG_BATMAN_ADV_DEBUG ifneq ($(REVISION),) -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.0.0-34-ga037487
by postmaster＠open-mesh.org 05 Feb '12

05 Feb '12

The following commit has been merged in the next branch: commit b49b17f6da9928d32b3162f5e2779cbd10edf8a4 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Dec 4 20:10:47 2011 +0100 batman-adv: Remove non-kernel parts from Makefile.kbuild The standalone batman-adv module is sent to the linux kernel maintainers to be merged by them. A batman-adv developer has to manually merge the changes since the last submission and apply it on top of the current linux development tree. The standalone sources have to provide an additional layer that increases the compatibility to kernels and to give a better user experience. This layer will not be sent to the kernel maintainers and has to manually removed each time. To reduce this work, the Makefile.kbuild should be cleaned up to be only the vanilla version of the Makefile in the kernel. The Makefile in the standalone sources is used to provide most of the additional layer. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index 15f099e..4f338aa 100644 --- a/Makefile +++ b/Makefile @@ -33,10 +33,16 @@ REVISION= $(shell if [ -d .git ]; then \ echo $$(git describe --always --dirty --match "v*" |sed 's/^v//' 2> /dev/null || echo "[unknown]"); \ fi) +CONFIG_BATMAN_ADV=m +batman-adv-y += compat.o +ifneq ($(REVISION),) +ccflags-y += -DSOURCE_VERSION=\"$(REVISION)\" +endif +# ccflags-y += -DCONFIG_BATMAN_ADV_DEBUG include $(PWD)/Makefile.kbuild all: - $(MAKE) -C $(KERNELPATH) REVISION=$(REVISION) M=$(PWD) PWD=$(PWD) modules + $(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) modules clean: $(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) clean diff --git a/Makefile.kbuild b/Makefile.kbuild index 3c51455..ce68611 100644 --- a/Makefile.kbuild +++ b/Makefile.kbuild @@ -18,13 +18,7 @@ # 02110-1301, USA # -# ccflags-y += -DCONFIG_BATMAN_ADV_DEBUG - -ifneq ($(REVISION),) -ccflags-y += -DSOURCE_VERSION=\"$(REVISION)\" -endif - -obj-m += batman-adv.o +obj-$(CONFIG_BATMAN_ADV) += batman-adv.o batman-adv-y += bat_debugfs.o batman-adv-y += bat_iv_ogm.o batman-adv-y += bat_sysfs.o @@ -43,4 +37,3 @@ batman-adv-y += soft-interface.o batman-adv-y += translation-table.o batman-adv-y += unicast.o batman-adv-y += vis.o -batman-adv-y += compat.o -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.0.0-34-ga037487
by postmaster＠open-mesh.org 05 Feb '12

05 Feb '12

The following commit has been merged in the next branch: commit b3d474c54bca76797e88878f29f100a7d5c7e02b Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Dec 4 20:10:48 2011 +0100 batman-adv: Allow to enable features without editing Makefile The user should not be encouraged to edit sources to prevent inconsistent changes. Upcoming features will not only use preprocessor variables to enable or disable itself, but also need to compile specific files at the same time. Therefore, it is safer to provide make parameters which can enable everything necessary for a specific option and look similar to the .config options of the kernel. It is not possible to disable features enabled by the target kernel because the include/generated/autoconf.h of the kernel sources isn't regenerated by a module build. Hence, it is better not to disable features in the makefile by default because the preprocessor will not have the same information. This can be changed later by a more complex configuration system that generates an own compat_autoconf.h that is included by compat.h. This header would have to define/undef all preprocessor variables used to configure batman-adv features. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index 4f338aa..e78e797 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,10 @@ # 02110-1301, USA # - +# uncomment the CONFIG_* line to enable the related feature +# features enabled in the target kernel configuration cannot be disabled +# B.A.T.M.A.N. debugging: +# CONFIG_BATMAN_ADV_DEBUG=y PWD:=$(shell pwd) KERNELPATH ?= /lib/modules/$(shell uname -r)/build @@ -38,7 +41,7 @@ batman-adv-y += compat.o ifneq ($(REVISION),) ccflags-y += -DSOURCE_VERSION=\"$(REVISION)\" endif -# ccflags-y += -DCONFIG_BATMAN_ADV_DEBUG +ccflags-$(CONFIG_BATMAN_ADV_DEBUG) += -DCONFIG_BATMAN_ADV_DEBUG include $(PWD)/Makefile.kbuild all: diff --git a/README b/README index 7404c0a..ddc9569 100644 --- a/README +++ b/README @@ -207,10 +207,10 @@ times necessary to see more detail debug messages. This must be enabled when compiling the batman-adv module. When building bat- man-adv as part of kernel, use "make menuconfig" and enable the option "B.A.T.M.A.N. debugging". When compiling outside of the -kernel tree it is necessary to edit the file Makefile.kbuild and -uncomment the line +kernel tree it is necessary to enable it using the make option +CONFIG_BATMAN_ADV_DEBUG=y -#ccflags-y += -DCONFIG_BATMAN_ADV_DEBUG +# make CONFIG_BATMAN_ADV_DEBUG=y Those additional debug messages can be accessed using a special file in debugfs -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.0.0-34-ga037487
by postmaster＠open-mesh.org 05 Feb '12

05 Feb '12

The following commit has been merged in the next branch: commit 913451882c23e618ab80e3a110bf38d951b5d4e8 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Dec 7 13:29:11 2011 +0100 batman-adv: Allow to disable features The user could not disable features which were enabled in the target kernel as explained in b3d474c54bca76797e88878f29f100a7d5c7e02b. We have to undef batman-adv specific preprocessor variables and generate an own header that sets them according to the user settings. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index e78e797..99fd366 100644 --- a/Makefile +++ b/Makefile @@ -18,10 +18,9 @@ # 02110-1301, USA # -# uncomment the CONFIG_* line to enable the related feature -# features enabled in the target kernel configuration cannot be disabled +# changing the CONFIG_* line to 'y' enables the related feature # B.A.T.M.A.N. debugging: -# CONFIG_BATMAN_ADV_DEBUG=y +export CONFIG_BATMAN_ADV_DEBUG=n PWD:=$(shell pwd) KERNELPATH ?= /lib/modules/$(shell uname -r)/build @@ -31,6 +30,7 @@ $(warning $(KERNELPATH) is missing, please set KERNELPATH) endif export KERNELPATH +RM ?= rm -f REVISION= $(shell if [ -d .git ]; then \ echo $$(git describe --always --dirty --match "v*" |sed 's/^v//' 2> /dev/null || echo "[unknown]"); \ @@ -41,14 +41,19 @@ batman-adv-y += compat.o ifneq ($(REVISION),) ccflags-y += -DSOURCE_VERSION=\"$(REVISION)\" endif -ccflags-$(CONFIG_BATMAN_ADV_DEBUG) += -DCONFIG_BATMAN_ADV_DEBUG include $(PWD)/Makefile.kbuild -all: +all: config $(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) modules clean: + $(RM) compat-autoconf.h* $(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) clean -install: +install: config $(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) INSTALL_MOD_DIR=kernel/net/batman-adv/ modules_install + +config: + $(PWD)/gen-compat-autoconf.sh $(PWD)/compat-autoconf.h + +.PHONY: all clean install config diff --git a/compat.h b/compat.h index 964c066..6480614 100644 --- a/compat.h +++ b/compat.h @@ -27,6 +27,13 @@ #include <linux/version.h> /* LINUX_VERSION_CODE */ +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)) +#include <linux/autoconf.h> +#else +#include <generated/autoconf.h> +#endif +#include "compat-autoconf.h" + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) #define __always_unused __attribute__((unused)) diff --git a/gen-compat-autoconf.sh b/gen-compat-autoconf.sh new file mode 100755 index 0000000..440accc --- /dev/null +++ b/gen-compat-autoconf.sh @@ -0,0 +1,35 @@ +#! /bin/sh + +set -e + +TARGET=${1:="compat-autoconf.h"} +TMP="${TARGET}.tmp" + +echo -n > "${TMP}" + +gen_config() { + KEY="${1}" + VALUE="${2}" + + echo "#undef ${KEY}" + case "${VALUE}" in + y) + echo "#define ${KEY} 1" + ;; + m) + echo "#define ${KEY} 1" + ;; + n) + # leave it undefined + ;; + *) + echo "#define ${KEY} \"${VALUE}\"" + ;; + esac +} + +# write config variables +gen_config 'CONFIG_BATMAN_ADV_DEBUG' ${CONFIG_BATMAN_ADV_DEBUG:="n"} >> "${TMP}" + +# only regenerate compat-autoconf.h when config was changed +diff "${TMP}" "${TARGET}" > /dev/null 2>&1 || cp "${TMP}" "${TARGET}" -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.0.0-34-ga037487
by postmaster＠open-mesh.org 05 Feb '12

05 Feb '12

The following commit has been merged in the next branch: commit 486dc02b027ff118757c0cc530040a4e855f2e5a Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Dec 7 13:27:16 2011 +0100 batman-adv: Don't try to read commit information from target kernel It is possible that the kernel used to build the batman-adv module also contains a .git directory. The makefile should not try to run git-describe inside this kernel to prevent that wrong version information is stored in the generated module. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index 99fd366..e2276be 100644 --- a/Makefile +++ b/Makefile @@ -32,8 +32,8 @@ endif export KERNELPATH RM ?= rm -f -REVISION= $(shell if [ -d .git ]; then \ - echo $$(git describe --always --dirty --match "v*" |sed 's/^v//' 2> /dev/null || echo "[unknown]"); \ +REVISION= $(shell if [ -d "$(PWD)/.git" ]; then \ + echo $$(git --git-dir="$(PWD)/.git" describe --always --dirty --match "v*" |sed 's/^v//' 2> /dev/null || echo "[unknown]"); \ fi) CONFIG_BATMAN_ADV=m -- batman-adv

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits February 2012