gmane.org.freifunk.batman

[PATCH] batman-adv: Use batctl indentation ofbat_packettype

Sven Eckelmann — 2012-05-25T06:55:55

The style of the indentation was changed in
206af118414355e867e725ea83bc3a2989db5a40

Signed-off-by: Sven Eckelmann <sven-KaDOiPu9UxWEi8DpZVb4nw< at >public.gmane.org>
---
 packet.h |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packet.h b/packet.h
index 205879e..c90219c 100644
--- a/packet.h
+++ b/packet.h
< at >< at > -23,14 +23,14 < at >< at >
 #define ETH_P_BATMAN  0x4305/* unofficial/not registered Ethertype */
 
 enum bat_packettype {
-BAT_IV_OGM       = 0x01,
-BAT_ICMP         = 0x02,
-BAT_UNICAST      = 0x03,
-BAT_BCAST        = 0x04,
-BAT_VIS          = 0x05,
+BAT_IV_OGM = 0x01,
+BAT_ICMP = 0x02,
+BAT_UNICAST = 0x03,
+BAT_BCAST = 0x04,
+BAT_VIS = 0x05,
 BAT_UNICAST_FRAG = 0x06,
-BAT_TT_QUERY     = 0x07,
-BAT_ROAM_ADV     = 0x08
+BAT_TT_QUERY = 0x07,
+BAT_ROAM_ADV = 0x08
 };
 
 /* this file is included by batctl which needs these defines */

[PATCHv2] batman-adv: beautify tt_global_add()argument list

Antonio Quartulli — 2012-05-24T22:00:54

Instead of adding a new bool argument each time it is needed, it is better (and
simpler) to pass an 8bit flag argument which contains all the needed flags

Signed-off-by: Antonio Quartulli <ordex-GaUfNO9RBHfsrOwW+9ziJQ< at >public.gmane.org>
---

changes in v2:
- rebased on top of the last patches for code restyling

 routing.c           |    4 ++--
 translation-table.c |   24 +++++++++---------------
 translation-table.h |    4 ++--
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/routing.c b/routing.c
index c3160be..1260253 100644
--- a/routing.c
+++ b/routing.c
< at >< at > -697,8 +697,8 < at >< at > int batadv_recv_roam_adv(struct sk_buff *skb, struct hard_iface *recv_if)
    roam_adv_packet->src, roam_adv_packet->client);
 
 batadv_tt_global_add(bat_priv, orig_node, roam_adv_packet->client,
-     atomic_read(&orig_node->last_ttvn) + 1, true,
-     false);
+     TT_CLIENT_ROAM,
+     atomic_read(&orig_node->last_ttvn) + 1);
 
 /* Roaming phase starts: I have new information but the ttvn has not
  * been incremented yet. This flag will make me check all the incoming
diff --git a/translation-table.c b/translation-table.c
index 2c8266a..c03c479 100644
--- a/translation-table.c
+++ b/translation-table.c
< at >< at > -656,8 +656,8 < at >< at > batadv_tt_global_add_orig_entry(struct tt_global_entry *tt_global_entry,
 
 /* caller must hold orig_node refcount */
 int batadv_tt_global_add(struct bat_priv *bat_priv, struct orig_node *orig_node,
- const unsigned char *tt_addr, uint8_t ttvn,
- bool roaming, bool wifi)
+ const unsigned char *tt_addr, uint8_t flags,
+ uint8_t ttvn)
 {
 struct tt_global_entry *tt_global_entry = NULL;
 int ret = 0;
< at >< at > -667,15 +667,14 < at >< at > int batadv_tt_global_add(struct bat_priv *bat_priv, struct orig_node *orig_node,
 tt_global_entry = batadv_tt_global_hash_find(bat_priv, tt_addr);
 
 if (!tt_global_entry) {
-tt_global_entry = kzalloc(sizeof(*tt_global_entry),
-  GFP_ATOMIC);
+tt_global_entry = kzalloc(sizeof(*tt_global_entry), GFP_ATOMIC);
 if (!tt_global_entry)
 goto out;
 
 common = &tt_global_entry->common;
 memcpy(common->addr, tt_addr, ETH_ALEN);
 
-common->flags = NO_FLAGS;
+common->flags = flags;
 tt_global_entry->roam_at = 0;
 atomic_set(&common->refcount, 2);
 
< at >< at > -717,9 +716,6 < at >< at > int batadv_tt_global_add(struct bat_priv *bat_priv, struct orig_node *orig_node,
 orig_node, ttvn);
 }
 
-if (wifi)
-tt_global_entry->common.flags |= TT_CLIENT_WIFI;
-
 batadv_dbg(DBG_TT, bat_priv,
    "Creating new global tt entry: %pM (via %pM)\n",
    tt_global_entry->common.addr, orig_node->orig);
< at >< at > -727,7 +723,7 < at >< at > int batadv_tt_global_add(struct bat_priv *bat_priv, struct orig_node *orig_node,
 out_remove:
 /* remove address from local hash if present */
 batadv_tt_local_remove(bat_priv, tt_global_entry->common.addr,
-       "global tt received", roaming);
+       "global tt received", flags & TT_CLIENT_ROAM);
 ret = 1;
 out:
 if (tt_global_entry)
< at >< at > -1755,7 +1751,6 < at >< at > static void _batadv_tt_update_changes(struct bat_priv *bat_priv,
       uint16_t tt_num_changes, uint8_t ttvn)
 {
 int i;
-int is_wifi;
 int roams;
 
 for (i = 0; i < tt_num_changes; i++) {
< at >< at > -1763,13 +1758,12 < at >< at > static void _batadv_tt_update_changes(struct bat_priv *bat_priv,
 roams = (tt_change + i)->flags & TT_CLIENT_ROAM;
 batadv_tt_global_del(bat_priv, orig_node,
      (tt_change + i)->addr,
-      "tt removed by changes",
-      roams);
+     "tt removed by changes",
+     roams);
 } else {
-is_wifi = (tt_change + i)->flags & TT_CLIENT_WIFI;
 if (!batadv_tt_global_add(bat_priv, orig_node,
-  (tt_change + i)->addr, ttvn,
-  false, is_wifi))
+  (tt_change + i)->addr,
+  (tt_change + i)->flags, ttvn))
 /* In case of problem while storing a
  * global_entry, we stop the updating
  * procedure without committing the
diff --git a/translation-table.h b/translation-table.h
index 7edc9df..46b60bd 100644
--- a/translation-table.h
+++ b/translation-table.h
< at >< at > -32,8 +32,8 < at >< at > void batadv_tt_global_add_orig(struct bat_priv *bat_priv,
        struct orig_node *orig_node,
        const unsigned char *tt_buff, int tt_buff_len);
 int batadv_tt_global_add(struct bat_priv *bat_priv, struct orig_node *orig_node,
- const unsigned char *addr, uint8_t ttvn, bool roaming,
- bool wifi);
+ const unsigned char *addr, uint8_t flags,
+ uint8_t ttvn);
 int batadv_tt_global_seq_print_text(struct seq_file *seq, void *offset);
 void batadv_tt_global_del_orig(struct bat_priv *bat_priv,
        struct orig_node *orig_node,

[PATCHv3] batman-adv: clear ADD+DEL (and viceversa)events in the same orig-interval

Antonio Quartulli — 2012-05-24T22:00:42

During an OGM-interval (time between two different OGM sendings) the same client
could roam away and then roam back to us. In this case the node would add two
events to the events list (that is going to be sent appended to the next OGM). A
DEL one and an ADD one. Obviously they will only increase the overhead (either in
the air and on the receiver side) and eventually trigger wrong states/events
without producing any real effect.

For this reason we can safely delete any ADD event with its related DEL one.

Signed-off-by: Antonio Quartulli <ordex-GaUfNO9RBHfsrOwW+9ziJQ< at >public.gmane.org>
---

changes in v3:
- rebased on top of the last patches for code restyling

 translation-table.c |   40 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/translation-table.c b/translation-table.c
index cb1d3a8..2c8266a 100644
--- a/translation-table.c
+++ b/translation-table.c
< at >< at > -156,7 +156,9 < at >< at > batadv_tt_orig_list_entry_free_ref(struct tt_orig_list_entry *orig_entry)
 static void batadv_tt_local_event(struct bat_priv *bat_priv,
   const uint8_t *addr, uint8_t flags)
 {
-struct tt_change_node *tt_change_node;
+struct tt_change_node *tt_change_node, *entry, *safe;
+bool event_removed = false;
+bool del_op_requested, del_op_entry;
 
 tt_change_node = kmalloc(sizeof(*tt_change_node), GFP_ATOMIC);
 
< at >< at > -166,13 +168,45 < at >< at > static void batadv_tt_local_event(struct bat_priv *bat_priv,
 tt_change_node->change.flags = flags;
 memcpy(tt_change_node->change.addr, addr, ETH_ALEN);
 
+del_op_requested = flags & TT_CLIENT_DEL;
+
+/* check for ADD+DEL or DEL+ADD events */
 spin_lock_bh(&bat_priv->tt_changes_list_lock);
+list_for_each_entry_safe(entry, safe, &bat_priv->tt_changes_list,
+ list) {
+if (!batadv_compare_eth(entry->change.addr, addr))
+continue;
+
+/* DEL+ADD in the same orig interval have no effect and can be
+ * removed to avoid silly behaviour on the receiver side. The
+ * other way around (ADD+DEL) can happen in case of roaming of
+ * a client still in the NEW state. Roaming of NEW clients is
+ * now possible due to automatically recognition of "temporary"
+ * clients
+ */
+del_op_entry = entry->change.flags & TT_CLIENT_DEL;
+if (!del_op_requested && del_op_entry)
+goto del;
+if (del_op_requested && !del_op_entry)
+goto del;
+continue;
+del:
+list_del(&entry->list);
+kfree(entry);
+event_removed = true;
+goto unlock;
+}
+
 /* track the change in the OGMinterval list */
 list_add_tail(&tt_change_node->list, &bat_priv->tt_changes_list);
-atomic_inc(&bat_priv->tt_local_changes);
+
+unlock:
 spin_unlock_bh(&bat_priv->tt_changes_list_lock);
 
-atomic_set(&bat_priv->tt_ogm_append_cnt, 0);
+if (event_removed)
+atomic_dec(&bat_priv->tt_local_changes);
+else
+atomic_inc(&bat_priv->tt_local_changes);
 }
 
 int batadv_tt_len(int changes_num)

Re: [PATCH 06/15] batman-adv: Distributed ARP Table - add snooping functions for ARP messages

Simon Wunderlich — 2012-05-24T08:09:55

Hey David,

thanks for your answer,

On Thu, May 24, 2012 at 01:54:57AM -0400, David Miller wrote:

well, thats pretty much answers it. If we must not use ARP or neighbour
internals, even after your rewrite (?), we have to come up with an alternative
in any case (write our own backened).

We don't expect you to come up with an alternative implementation, but
as you are the one accepting the patches (or not) we need to know why
you decline something and what the problem is so we ca n work around
or improve.

Thanks
Simon

Re: [PATCH 06/15] batman-adv: Distributed ARP Table - add snooping functions for ARP messages

David Miller — 2012-05-24T05:54:57

From: Sven Eckelmann <sven-KaDOiPu9UxWEi8DpZVb4nw< at >public.gmane.org>
Date: Thu, 24 May 2012 07:34:12 +0200

If I say that you must not use ARP nor neighbour layer internals, it
doesn't mean that I have to come up with the alternative
implementation for you.

Now, you can ask others on the netdev list for suggestions, but you
can't expect me to be the direct and only responder on things like
that.

Re: [PATCH 06/15] batman-adv: Distributed ARP Table- add snooping functions for ARP messages

Sven Eckelmann — 2012-05-24T05:34:12

_You_ were the person that declined the pull request because _you_ wanted to 
rewrite the ARP handling. So _you_ are the person that has the insight in 
_your_ plans. Either _you_ tell us what is _your_ problem with it or _you_ 
will have to point us to a person that knows _you_.

Until now nobody stepped up (the mails were public visible to the netdev 
people). But I will ask ask Antonio to send a separate mail to netdev and 
recent arp.c commiter.

Thanks,
Sven

Re: [PATCH 06/15] batman-adv: Distributed ARP Table - add snooping functions for ARP messages

David Miller — 2012-05-23T23:01:58

It can't be all on me to answer your question, I cannot be
the choke point.

You must lean on the entire networking developer community
for help, otherwise it simply will not scale.

Re: [PATCH 06/15] batman-adv: Distributed ARP Table - add snooping functions for ARP messages

Simon Wunderlich — 2012-05-23T21:48:02

Hello David, 

we are a little bit in a pinch here - the DAT feature sent with this
patchset was developed for a long time, and we need your decision to move on
as more and more patches depend on it:

 * should we rewrite DAT to use our own ARP table/backend or
 * can we use the ARP neighbor table in another way, maybe after your changes?

We thought that re-using existing infrastructure would be smarter, but if
you disagree, please tell us so - we would like to get this feature finally
upstream and need your input to make the neccesary changes.

Thanks
Simon


On Thu, May 17, 2012 at 07:53:54PM +0800, Marek Lindner wrote:

Re: [PATCHv2] batman-adv: Remove batadv_ vararginline functions

Marek Lindner — 2012-05-22T04:43:06

Applied in revision dfacdc0.

Thanks,
Marek

[PATCHv2] batman-adv: Remove batadv_ vararg inlinefunctions

Sven Eckelmann — 2012-05-20T08:55:38

gcc doesn't support the inlining of functions using vararg. Sparse fails to
build the source when having such functions marked using the keyword "inline".

This problem was introduced in 3b896e321c49e3cbbfd540f537c007db883c3900

Signed-off-by: Sven Eckelmann <sven-KaDOiPu9UxWEi8DpZVb4nw< at >public.gmane.org>
---
I've decided that we should it revert for now and hope for a better solution in
the future. The old patch didn't worked at all for .._DEBUG=y all builds.

 bat_debugfs.c |    5 ++++-
 main.h        |   39 +++++++++++++--------------------------
 2 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/bat_debugfs.c b/bat_debugfs.c
index c3f7e2f..87349f4 100644
--- a/bat_debugfs.c
+++ b/bat_debugfs.c
< at >< at > -74,13 +74,16 < at >< at > static int batadv_fdebug_log(struct debug_log *debug_log, const char *fmt, ...)
 return 0;
 }
 
-int batadv_debug_log(struct bat_priv *bat_priv, const char *fmt, va_list args)
+int batadv_debug_log(struct bat_priv *bat_priv, const char *fmt, ...)
 {
+va_list args;
 char tmp_log_buf[256];
 
+va_start(args, fmt);
 vscnprintf(tmp_log_buf, sizeof(tmp_log_buf), fmt, args);
 batadv_fdebug_log(bat_priv->debug_log, "[%10u] %s",
   jiffies_to_msecs(jiffies), tmp_log_buf);
+va_end(args);
 
 return 0;
 }
diff --git a/main.h b/main.h
index 977de45..b850eeb 100644
--- a/main.h
+++ b/main.h
< at >< at > -187,36 +187,23 < at >< at > int batadv_algo_select(struct bat_priv *bat_priv, char *name);
 int batadv_algo_seq_print_text(struct seq_file *seq, void *offset);
 
 #ifdef CONFIG_BATMAN_ADV_DEBUG
-int batadv_debug_log(struct bat_priv *bat_priv, const char *fmt, va_list args);
-
-static inline void batadv_vdbg(int type, struct bat_priv *bat_priv,
-       const char *fmt, va_list args)
-{
-if (atomic_read(&bat_priv->log_level) & type)
-batadv_debug_log(bat_priv, fmt, args);
-}
-
+int batadv_debug_log(struct bat_priv *bat_priv, const char *fmt, ...)
+__printf(2, 3);
+
+#define batadv_dbg(type, bat_priv, fmt, arg...)\
+do {\
+if (atomic_read(&bat_priv->log_level) & type)\
+batadv_debug_log(bat_priv, fmt, ## arg);\
+}\
+while (0)
 #else /* !CONFIG_BATMAN_ADV_DEBUG */
-
-static inline void batadv_vdbg(int type __always_unused,
-       struct bat_priv *bat_priv __always_unused,
-       const char *fmt __always_unused,
-       va_list args __always_unused)
-{
-}
-
-#endif
-
 __printf(3, 4)
-static inline void batadv_dbg(int type, struct bat_priv *bat_priv,
-       const char *fmt, ...)
+static inline void batadv_dbg(int type __always_unused,
+      struct bat_priv *bat_priv __always_unused,
+      const char *fmt __always_unused, ...)
 {
-va_list args;
-
-va_start(args, fmt);
-batadv_vdbg(type, bat_priv, fmt, args);
-va_end(args);
 }
+#endif
 
 #define batadv_info(net_dev, fmt, arg...)\
 do {\

Re: [PATCH] batman-adv: Revert Distributed ARP Table

Marek Lindner — 2012-05-19T07:45:28

Applied in revision 206af11.

Thanks,
Marek

[PATCH] batman-adv: Avoid gcc inline problems withvararg functions

Sven Eckelmann — 2012-05-19T07:37:55

gcc doesn't support the inlining of functions using vararg. Sparse fails to
build the source when having such functions marked using the keyword "inline".

This problem was introduced in 3b896e321c49e3cbbfd540f537c007db883c3900

Signed-off-by: Sven Eckelmann <sven-KaDOiPu9UxWEi8DpZVb4nw< at >public.gmane.org>
---
 main.h |   20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/main.h b/main.h
index 977de45..4721c86 100644
--- a/main.h
+++ b/main.h
< at >< at > -196,6 +196,17 < at >< at > static inline void batadv_vdbg(int type, struct bat_priv *bat_priv,
 batadv_debug_log(bat_priv, fmt, args);
 }
 
+__printf(3, 4)
+static inline void batadv_dbg(int type, struct bat_priv *bat_priv,
+       const char *fmt, ...)
+{
+va_list args;
+
+va_start(args, fmt);
+batadv_vdbg(type, bat_priv, fmt, args);
+va_end(args);
+}
+
 #else /* !CONFIG_BATMAN_ADV_DEBUG */
 
 static inline void batadv_vdbg(int type __always_unused,
< at >< at > -205,19 +216,14 < at >< at > static inline void batadv_vdbg(int type __always_unused,
 {
 }
 
-#endif
-
 __printf(3, 4)
 static inline void batadv_dbg(int type, struct bat_priv *bat_priv,
        const char *fmt, ...)
 {
-va_list args;
-
-va_start(args, fmt);
-batadv_vdbg(type, bat_priv, fmt, args);
-va_end(args);
 }
 
+#endif
+
 #define batadv_info(net_dev, fmt, arg...)\
 do {\
 struct net_device *_netdev = (net_dev);                 \

Re: [PATCH] batman-adv: Revert Distributed ARP Table

Sven Eckelmann — 2012-05-19T06:53:16

I've attached the updated patch that is compatible with your changes in 
distributed-arp-table.c to my patches.

Kind regards,
Sven

Re: [PATCH] batman-adv: Revert Distributed ARP Table

Marek Lindner — 2012-05-19T06:11:42

Applied in revision d5a6caf.

Thanks,
Marek

Re: [PATCH 13/13] batman-adv: Use typedef instead ofdefine for type dat_addr_t

Marek Lindner — 2012-05-18T16:03:22

Applied in revision 551c540.

Thanks,
Marek

Re: [PATCH] batman-adv: Prefix bat_sysfs localstatic functions with batadv_

Marek Lindner — 2012-05-18T16:01:21

Applied in revision 34f20d6.

Thanks,
Marek

[PATCH] batman-adv: Prefix bat_sysfs local staticfunctions with batadv_

Sven Eckelmann — 2012-05-18T15:16:13

All non-static symbols of batman-adv were prefixed with batadv_ to avoid
collisions with other symbols of the kernel. Other symbols of batman-adv
should use the same prefix to keep the naming scheme consistent.

This was actually part of patch used to create the commit
98881e49493eb1a6ae2330d861386432064b2222.

Signed-off-by: Sven Eckelmann <sven-KaDOiPu9UxWEi8DpZVb4nw< at >public.gmane.org>

This is the alternative version of this patch... that keeps the functionality
for ELP

 bat_sysfs.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bat_sysfs.c b/bat_sysfs.c
index 336a61d..07fde83 100644
--- a/bat_sysfs.c
+++ b/bat_sysfs.c
< at >< at > -123,8 +123,9 < at >< at > ssize_t batadv_show_##_name(struct kobject *kobj,\
 
 
 #define BAT_ATTR_HIF_STORE_UINT(_name, _min, _max, _post_func)\
-ssize_t store_##_name(struct kobject *kobj, struct attribute *attr,\
-      char *buff, size_t count)\
+ssize_t batadv_store_##_name(struct kobject *kobj,\
+     struct attribute *attr, char *buff,\
+     size_t count)\
 {\
 struct net_device *net_dev = batadv_kobj_to_netdev(kobj);\
 struct hard_iface *hard_iface;\
< at >< at > -142,8 +143,8 < at >< at > ssize_t store_##_name(struct kobject *kobj, struct attribute *attr,\
 }
 
 #define BAT_ATTR_HIF_SHOW_UINT(_name)\
-ssize_t show_##_name(struct kobject *kobj,\
-     struct attribute *attr, char *buff)\
+ssize_t batadv_show_##_name(struct kobject *kobj,\
+    struct attribute *attr, char *buff)\
 {\
 struct net_device *net_dev = batadv_kobj_to_netdev(kobj);\
 struct hard_iface *hard_iface;\

Re: [PATCH 11/13] batman-adv: Directly print toseq_file in vis

Marek Lindner — 2012-05-18T15:03:26

Applied in revision 6977ef4.

Thanks,
Marek

Re: [PATCH 10/13] batman-adv: Prefix remainingfunction like macros with batadv_

Marek Lindner — 2012-05-18T15:00:01

Applied in revision 52943ab.

Thanks,
Marek

Re: [PATCH 09/13] batman-adv: Replace simplefunction like defines with functions

Marek Lindner — 2012-05-18T14:41:42

Applied in revision 3b896e3.

Thanks,
Marek

Re: [PATCH 06/13] batman-adv: Prefix vis localstatic functions with batadv_

Marek Lindner — 2012-05-18T09:58:56

Applied in revision a371f80.

Thanks,
Marek