Author: marek Date: 2010-01-09 15:44:01 +0100 (Sat, 09 Jan 2010) New Revision: 1542
Modified: trunk/batman-adv-kernelland/gateway_client.c trunk/batman-adv-kernelland/gateway_client.h trunk/batman-adv-kernelland/soft-interface.c Log: batman-adv: send DHCP requests directly to the chosen gw
If the gateway client mode is active batman-adv will send the broadcasted DHCP requests via unicast to the currently selected best gateway. Therefore attached clients can profit from batman's knowledge about the network topology.
Signed-off-by: Marek Lindner lindner_marek@yahoo.de
Modified: trunk/batman-adv-kernelland/gateway_client.c =================================================================== --- trunk/batman-adv-kernelland/gateway_client.c 2010-01-09 14:43:58 UTC (rev 1541) +++ trunk/batman-adv-kernelland/gateway_client.c 2010-01-09 14:44:01 UTC (rev 1542) @@ -20,6 +20,8 @@ #include "main.h" #include "gateway_client.h" #include "gateway_common.h" +#include <linux/ip.h> +#include <linux/udp.h>
LIST_HEAD(gw_list); DEFINE_SPINLOCK(curr_gw_lock); @@ -27,6 +29,20 @@ atomic_t gw_clnt_class; static struct gw_node *curr_gateway;
+void *gw_get_selected(void) +{ + struct gw_node *curr_gateway_tmp = NULL; + + spin_lock(&curr_gw_lock); + curr_gateway_tmp = curr_gateway; + spin_unlock(&curr_gw_lock); + + if (!curr_gateway_tmp) + return NULL; + + return curr_gateway_tmp->orig_node; +} + void gw_deselect(void) { spin_lock(&curr_gw_lock); @@ -333,3 +349,32 @@
return bytes_written; } + +bool gw_is_target(struct sk_buff *skb) +{ + struct ethhdr *ethhdr; + struct iphdr *iphdr; + struct udphdr *udphdr; + + if (atomic_read(&gw_mode) != GW_MODE_CLIENT) + return false; + + if (!curr_gateway) + return false; + + ethhdr = (struct ethhdr *)skb->data; + if (ntohs(ethhdr->h_proto) != ETH_P_IP) + return false; + + iphdr = (struct iphdr *)(skb->data + ETH_HLEN); + + if (iphdr->protocol != IPPROTO_UDP) + return false; + + udphdr = (struct udphdr *)(skb->data + ETH_HLEN + (iphdr->ihl * 4)); + + if (ntohs(udphdr->dest) != 67) + return false; + + return true; +}
Modified: trunk/batman-adv-kernelland/gateway_client.h =================================================================== --- trunk/batman-adv-kernelland/gateway_client.h 2010-01-09 14:43:58 UTC (rev 1541) +++ trunk/batman-adv-kernelland/gateway_client.h 2010-01-09 14:44:01 UTC (rev 1542) @@ -21,9 +21,11 @@
void gw_deselect(void); void gw_election(void); +void *gw_get_selected(void); void gw_check_election(struct orig_node *orig_node); void gw_node_update(struct orig_node *orig_node, uint8_t new_gwflags); void gw_node_delete(struct orig_node *orig_node); void gw_node_purge_deleted(void); void gw_node_list_free(void); int gw_client_fill_buffer_text(unsigned char *buff, int buff_len); +bool gw_is_target(struct sk_buff *skb);
Modified: trunk/batman-adv-kernelland/soft-interface.c =================================================================== --- trunk/batman-adv-kernelland/soft-interface.c 2010-01-09 14:43:58 UTC (rev 1541) +++ trunk/batman-adv-kernelland/soft-interface.c 2010-01-09 14:44:01 UTC (rev 1542) @@ -26,6 +26,7 @@ #include "translation-table.h" #include "types.h" #include "hash.h" +#include "gateway_client.h" #include <linux/ethtool.h> #include <linux/etherdevice.h> #include "compat.h" @@ -181,6 +182,7 @@ uint8_t dstaddr[6]; int data_len = skb->len; unsigned long flags; + bool bcast_dst = false, do_bcast = true;
if (atomic_read(&module_state) != MODULE_ACTIVE) goto dropped; @@ -189,9 +191,14 @@ /* TODO: check this for locks */ hna_local_add(ethhdr->h_source);
+ if (is_bcast(ethhdr->h_dest) || is_mcast(ethhdr->h_dest)) + bcast_dst = true; + + if ((bcast_dst) && gw_is_target(skb)) + do_bcast = false; + /* ethernet packet should be broadcasted */ - if (is_bcast(ethhdr->h_dest) || is_mcast(ethhdr->h_dest)) { - + if (bcast_dst && do_bcast) { if (my_skb_push(skb, sizeof(struct bcast_packet)) < 0) goto dropped;
@@ -219,8 +226,12 @@ /* unicast packet */ } else { spin_lock_irqsave(&orig_hash_lock, flags); + /* get routing information */ - orig_node = ((struct orig_node *)hash_find(orig_hash, + if (bcast_dst) + orig_node = (struct orig_node *)gw_get_selected(); + else + orig_node = ((struct orig_node *)hash_find(orig_hash, ethhdr->h_dest));
/* check for hna host */