diff mbox

[04/10] batman-adv: Send neighbor discovery packets

Message ID 1291732778-27441-5-git-send-email-linus.luessing@ascom.ch
State Superseded, archived
Headers show

Commit Message

Linus Lüssing Dec. 7, 2010, 2:39 p.m. UTC 
This patch makes use of the previously introduced periodic tasks per
interface and actually sends neighbor discovery packets on these now.
Note: The TQ values of each neighbor are not being added yet to these NDPs
and also no evaluation of these packets is being done.
---
 hard-interface.c |    5 ++++-
 ndp.c            |   37 ++++++++++++++++++++++++++++++++++++-
 types.h          |    5 +++++
 3 files changed, 45 insertions(+), 2 deletions(-)

Comments

Sven Eckelmann Dec. 7, 2010, 2:51 p.m. UTC | #1 
On Tuesday 07 December 2010 15:39:32 Linus Lüssing wrote:
> +	memcpy(skb_put(skb, packet_len), batman_if->ndp_packet_buff,
> +	       packet_len);
> +
> +	send_skb_packet(skb, batman_if, broadcast_addr);

> --- a/types.h
> +++ b/types.h
> @@ -47,6 +47,7 @@ struct batman_if {
>  	struct packet_type batman_adv_ptype;
>  	struct net_device *soft_iface;
>  	struct rcu_head rcu;
> +	unsigned char *ndp_packet_buff;

Good way to never get included in the linux kernel by David S. Miller.

Best regards,
	Sven
Linus Lüssing Dec. 7, 2010, 8:23 p.m. UTC | #2 
On Tue, Dec 07, 2010 at 03:51:21PM +0100, Sven Eckelmann wrote:
> On Tuesday 07 December 2010 15:39:32 Linus Lüssing wrote:
> > +	memcpy(skb_put(skb, packet_len), batman_if->ndp_packet_buff,
> > +	       packet_len);
> > +
> > +	send_skb_packet(skb, batman_if, broadcast_addr);
> 
> > --- a/types.h
> > +++ b/types.h
> > @@ -47,6 +47,7 @@ struct batman_if {
> >  	struct packet_type batman_adv_ptype;
> >  	struct net_device *soft_iface;
> >  	struct rcu_head rcu;
> > +	unsigned char *ndp_packet_buff;
> 
> Good way to never get included in the linux kernel by David S. Miller.
> 
> Best regards,
> 	Sven

Argh, damn it, you noticed my secret plan and attempt to sabotage
batman-adv's inclussion into the linux kernel...

Well, anyway, thanks for having a glance at it, I'll send a fixup
soon :).

Cheers, Linus
diff mbox

Patch

diff --git a/hard-interface.c b/hard-interface.c
index cb81c13..887f794 100644
--- a/hard-interface.c
+++ b/hard-interface.c
@@ -284,6 +284,7 @@  int hardif_enable_interface(struct batman_if *batman_if, char *iface_name)
 {
 	struct bat_priv *bat_priv;
 	struct batman_packet_ogm *batman_packet_ogm;
+	int ret;
 
 	if (batman_if->if_status != IF_NOT_IN_USE)
 		goto out;
@@ -331,7 +332,9 @@  int hardif_enable_interface(struct batman_if *batman_if, char *iface_name)
 
 	atomic_set(&batman_if->seqno, 1);
 	atomic_set(&batman_if->frag_seqno, 1);
-	ndp_init(batman_if);
+	ret = ndp_init(batman_if);
+	if (ret)
+		goto err;
 
 	bat_info(batman_if->soft_iface, "Adding interface: %s\n",
 		 batman_if->net_dev->name);
diff --git a/ndp.c b/ndp.c
index 2dfb06d..afdf249 100644
--- a/ndp.c
+++ b/ndp.c
@@ -20,10 +20,24 @@  static void ndp_send(struct work_struct *work)
 	struct batman_if *batman_if = container_of(work, struct batman_if,
 							ndp_wq.work);
 	struct bat_priv *bat_priv = netdev_priv(batman_if->soft_iface);
+	struct batman_packet_ndp *ndp_packet = (struct batman_packet_ndp*)
+						batman_if->ndp_packet_buff;
+	int packet_len = sizeof(struct batman_packet_ndp);
+	struct sk_buff *skb;
+
+	ndp_packet->seqno = atomic_read(&batman_if->ndp_seqno);
 
 	bat_dbg(DBG_BATMAN, bat_priv,
 		"batman-adv:Sending ndp packet on interface %s, seqno %d\n",
-		batman_if->net_dev, atomic_read(&batman_if->ndp_seqno));
+		batman_if->net_dev, ntohl(ndp_packet->seqno));
+
+	skb = dev_alloc_skb(packet_len + sizeof(struct ethhdr));
+	skb_reserve(skb, sizeof(struct ethhdr));
+
+	memcpy(skb_put(skb, packet_len), batman_if->ndp_packet_buff,
+	       packet_len);
+
+	send_skb_packet(skb, batman_if, broadcast_addr);
 
 	atomic_inc(&batman_if->ndp_seqno);
 	start_ndp_timer(batman_if);
@@ -31,14 +45,35 @@  static void ndp_send(struct work_struct *work)
 
 int ndp_init(struct batman_if *batman_if)
 {
+	struct batman_packet_ndp *ndp_packet;
+
 	atomic_set(&batman_if->ndp_interval, 500);
 	atomic_set(&batman_if->ndp_seqno, 0);
+
+	batman_if->ndp_packet_buff =
+		kmalloc(ETH_DATA_LEN, GFP_ATOMIC);
+	if (!batman_if->ndp_packet_buff) {
+		printk(KERN_ERR "batman-adv: Can't add "
+			"local interface packet (%s): out of memory\n",
+			batman_if->net_dev->name);
+		goto err;
+	}
+	memset(batman_if->ndp_packet_buff, 0, batman_if->packet_len);
+	ndp_packet = (struct batman_packet_ndp*)
+			batman_if->ndp_packet_buff;
+
+	ndp_packet->packet_type = BAT_PACKET_NDP;
+	ndp_packet->version = COMPAT_VERSION;
+
 	INIT_DELAYED_WORK(&batman_if->ndp_wq, ndp_send);
 
 	return 0;
+err:
+	return 1;
 }
 
 void ndp_free(struct batman_if *batman_if)
 {
 	stop_ndp_timer(batman_if);
+	kfree(batman_if->ndp_packet_buff);
 }
diff --git a/types.h b/types.h
index e8dfdf6..3ea8f2a 100644
--- a/types.h
+++ b/types.h
@@ -47,6 +47,7 @@  struct batman_if {
 	struct packet_type batman_adv_ptype;
 	struct net_device *soft_iface;
 	struct rcu_head rcu;
+	unsigned char *ndp_packet_buff;
 	atomic_t ndp_interval;
 	atomic_t ndp_seqno;
 	struct delayed_work ndp_wq;
@@ -122,6 +123,10 @@  struct neigh_node {
 	struct batman_if *if_incoming;
 };
 
+struct neigh_entry {
+	uint8_t addr[ETH_ALEN];
+	uint8_t rq;
+};
 
 struct bat_priv {
 	atomic_t mesh_state;