The following commit has been merged in the next branch: commit ea3699d183fa47c3229125fc2fa150614bbfb013 Author: Sven Eckelmann sven@narfation.org Date: Thu May 17 17:18:33 2012 +0200
batctl: Revert Distributed ARP Table
David S. Miller did not like the idea of batman-adv modifying and reading the ARP table and refused to pull this feature. It has to be rewritten after an acceptable solution was found.
This reverts following commits: * batman-adv: add UNICAST_4ADDR packet type * batman-adv: add a new log level for DAT debugging * batman-adv: Distributed ARP Table - create DHT helper functions * batman-adv: Distributed ARP Table - add ARP parsing functions * batman-adv: Distributed ARP Table - add snooping functions for ARP messages * batman-adv: Distributed ARP Table - increase default soft_iface ARP table timeout * batman-adv: Distributed ARP Table - add compile option
Signed-off-by: Sven Eckelmann sven@narfation.org
diff --git a/packet.h b/packet.h index 307dbb3..0ee1af7 100644 --- a/packet.h +++ b/packet.h @@ -25,22 +25,14 @@ #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_UNICAST_FRAG = 0x06, - BAT_TT_QUERY = 0x07, - BAT_ROAM_ADV = 0x08, - BAT_UNICAST_4ADDR = 0x09 -}; - -enum bat_subtype { - BAT_P_DATA = 0x01, - BAT_P_DAT_DHT_GET = 0x02, - BAT_P_DAT_DHT_PUT = 0x03, - BAT_P_DAT_CACHE_REPLY = 0x04 + 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 };
/* this file is included by batctl which needs these defines */ @@ -168,12 +160,6 @@ struct unicast_packet { uint8_t dest[ETH_ALEN]; } __packed;
-struct unicast_4addr_packet { - struct unicast_packet u; - uint8_t src[ETH_ALEN]; - uint8_t subtype; -} __packed; - struct unicast_frag_packet { struct batman_header header; uint8_t ttvn; /* destination translation table version number */