Re: [B.A.T.M.A.N.] [PATCHv2 3/6] batman-adv: reorder packet types

[Marek Lindner]

On Saturday, April 20, 2013 03:52:26 Simon Wunderlich wrote:
 @@ -892,6 +892,25 @@ static int batadv_check_unicast_ttvn(struct
 batadv_priv *bat_priv, return 1;
  }
  
 +int batadv_recv_unhandled_unicast_packet(struct sk_buff *skb,
 +struct batadv_hard_iface *recv_if)
 +{
 +   struct batadv_unicast_packet *unicast_packet;
 +   struct batadv_priv *bat_priv = netdev_priv(recv_if-soft_iface);
 +   int check, hdr_size = sizeof(*unicast_packet);
 +
 +   check = batadv_check_unicast_packet(bat_priv, skb, hdr_size);
 +   if (check  0)
 +   return NET_RX_DROP;
 +
 +   /* we don't know about this type, drop it. */
 +   unicast_packet = (struct batadv_unicast_packet *)skb-data;
 +   if (batadv_is_my_mac(bat_priv, unicast_packet-dest))
 +   return NET_RX_DROP;
 +
 +   return batadv_route_unicast_packet(skb, recv_if);
 +}

Kernel doc ?


Cheers,
Marek

[B.A.T.M.A.N.] [PATCHv2 3/6] batman-adv: reorder packet types

[Simon Wunderlich]

Reordering the packet type numbers allows us to handle unicast
packets in a general way - even if we don't know the specific packet
type, we can still forward it. There was already code handling
this for a couple of unicast packets, and this is the more
generalized version to do that.

Signed-off-by: Simon Wunderlich s...@hrz.tu-chemnitz.de
---
 main.c|   20 +++-
 packet.h  |   34 +-
 routing.c |   19 +++
 routing.h |2 ++
 4 files changed, 61 insertions(+), 14 deletions(-)

diff --git a/main.c b/main.c
index 5c76d6f..5c0a8db 100644
--- a/main.c
+++ b/main.c
@@ -328,6 +328,9 @@ static void batadv_recv_handler_init(void)
for (i = 0; i  ARRAY_SIZE(batadv_rx_handler); i++)
batadv_rx_handler[i] = batadv_recv_unhandled_packet;
 
+   for (i = BATADV_UNICAST_MIN; i = BATADV_UNICAST_MAX; i++)
+   batadv_rx_handler[i] = batadv_recv_unhandled_unicast_packet;
+
/* compile time checks for struct member offsets */
BUILD_BUG_ON(offsetof(struct batadv_unicast_4addr_packet, src) != 10);
BUILD_BUG_ON(offsetof(struct batadv_unicast_packet, dest) != 4);
@@ -336,18 +339,20 @@ static void batadv_recv_handler_init(void)
BUILD_BUG_ON(offsetof(struct batadv_icmp_packet, dst) != 4);
BUILD_BUG_ON(offsetof(struct batadv_icmp_packet_rr, dst) != 4);
 
-   /* batman icmp packet */
-   batadv_rx_handler[BATADV_ICMP] = batadv_recv_icmp_packet;
+   /* broadcast packet */
+   batadv_rx_handler[BATADV_BCAST] = batadv_recv_bcast_packet;
+
+   /* unicast packets ... */
/* unicast with 4 addresses packet */
batadv_rx_handler[BATADV_UNICAST_4ADDR] = batadv_recv_unicast_packet;
/* unicast packet */
batadv_rx_handler[BATADV_UNICAST] = batadv_recv_unicast_packet;
/* fragmented unicast packet */
batadv_rx_handler[BATADV_UNICAST_FRAG] = batadv_recv_ucast_frag_packet;
-   /* broadcast packet */
-   batadv_rx_handler[BATADV_BCAST] = batadv_recv_bcast_packet;
/* unicast tvlv packet */
batadv_rx_handler[BATADV_UNICAST_TVLV] = batadv_recv_unicast_tvlv;
+   /* batman icmp packet */
+   batadv_rx_handler[BATADV_ICMP] = batadv_recv_icmp_packet;
 }
 
 int
@@ -355,7 +360,12 @@ batadv_recv_handler_register(uint8_t packet_type,
 int (*recv_handler)(struct sk_buff *,
 struct batadv_hard_iface *))
 {
-   if (batadv_rx_handler[packet_type] != batadv_recv_unhandled_packet)
+   int (*curr)(struct sk_buff *,
+   struct batadv_hard_iface *);
+   curr = batadv_rx_handler[packet_type];
+
+   if ((curr != batadv_recv_unhandled_packet) 
+   (curr != batadv_recv_unhandled_unicast_packet))
return -EBUSY;
 
batadv_rx_handler[packet_type] = recv_handler;
diff --git a/packet.h b/packet.h
index 8ec9cf7..c90856d 100644
--- a/packet.h
+++ b/packet.h
@@ -22,18 +22,34 @@
 
 /**
  * enum batadv_packettype - types for batman-adv encapsulated packets
+ * @BATADV_IV_OGM: originator messages for B.A.T.M.A.N. IV
+ * @BATADV_BCAST: broadcast packets carrying broadcast payload
+ * @BATADV_CODED: network coded packets
+ *
+ * @BATADV_UNICAST: unicast packets carrying unicast payload traffic
+ * @BATADV_UNICAST_FRAG: unicast packets carrying a fragment of the original
+ * payload packet
+ * @BATADV_UNICAST_4ADDR: unicast packet including the originator address of
+ * the sender
+ * @BATADV_ICMP: unicast packet like IP ICMP used for ping or traceroute
  * @BATADV_UNICAST_TVLV: unicast packet carrying TVLV containers
+ *
  */
+
 enum batadv_packettype {
-   BATADV_IV_OGM   = 0x01,
-   BATADV_ICMP = 0x02,
-   BATADV_UNICAST  = 0x03,
-   BATADV_BCAST= 0x04,
-   BATADV_VIS  = 0x05,
-   BATADV_UNICAST_FRAG = 0x06,
-   BATADV_UNICAST_4ADDR= 0x09,
-   BATADV_CODED= 0x0a,
-   BATADV_UNICAST_TVLV = 0x0b,
+   /* 0x00 - 0x3f: local packets or special rules for handling */
+   BATADV_IV_OGM   = 0x00,
+   BATADV_BCAST= 0x01,
+   BATADV_CODED= 0x02,
+   /* 0x40 - 0x7f: unicast */
+#define BATADV_UNICAST_MIN 0x40
+   BATADV_UNICAST  = 0x40,
+   BATADV_UNICAST_FRAG = 0x41,
+   BATADV_UNICAST_4ADDR= 0x42,
+   BATADV_ICMP = 0x43,
+   BATADV_UNICAST_TVLV = 0x44,
+#define BATADV_UNICAST_MAX 0x7f
+   /* 0x80 - 0xff: reserved */
 };
 
 /**
diff --git a/routing.c b/routing.c
index d48f9f9..b63a002 100644
--- a/routing.c
+++ b/routing.c
@@ -892,6 +892,25 @@ static int batadv_check_unicast_ttvn(struct batadv_priv 
*bat_priv,
return 1;
 }
 
+int batadv_recv_unhandled_unicast_packet(struct sk_buff *skb,
+struct batadv_hard_iface *recv_if)
+{
+   struct