B.A.T.M.A.N July 2009

b.a.t.m.a.n@lists.open-mesh.org

14 participants
34 discussions

[B.A.T.M.A.N.] [batman-adv] Cleanup soft_interface.[ch]

by Andrew Lunn

Make soft-interface.[ch] clean with respect to the 2.6.29 checkpatch script. Exceptions are long lines with debug_log and using KERNEL_VERSION. Signed-off-by: Andrew Lunn <andrew.lunn(a)ascom.ch> Index: batman-adv-kernelland/soft-interface.c =================================================================== --- batman-adv-kernelland/soft-interface.c (revision 1351) +++ batman-adv-kernelland/soft-interface.c (working copy) @@ -17,10 +17,6 @@ * */ - - - - #include "main.h" #include "soft-interface.h" #include "hard-interface.h" @@ -33,30 +29,23 @@ #include <linux/etherdevice.h> #include "compat.h" +static uint16_t bcast_seqno = 1; /* give own bcast messages seq numbers to avoid + * broadcast storms */ +static int32_t skb_packets; +static int32_t skb_bad_packets; +static int32_t lock_dropped; - - - -static uint16_t bcast_seqno = 1; /* give own bcast messages seq numbers to avoid broadcast storms */ -static int32_t skb_packets = 0; -static int32_t skb_bad_packets = 0; -static int32_t lock_dropped = 0; - -unsigned char mainIfAddr[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -static unsigned char mainIfAddr_default[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - - - - +unsigned char mainIfAddr[ETH_ALEN]; +static unsigned char mainIfAddr_default[ETH_ALEN]; static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd); -static void bat_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info); +static void bat_get_drvinfo(struct net_device *dev, + struct ethtool_drvinfo *info); static u32 bat_get_msglevel(struct net_device *dev); static void bat_set_msglevel(struct net_device *dev, u32 value); static u32 bat_get_link(struct net_device *dev); static u32 bat_get_rx_csum(struct net_device *dev); static int bat_set_rx_csum(struct net_device *dev, u32 data); - static const struct ethtool_ops bat_ethtool_ops = { .get_settings = bat_get_settings, .get_drvinfo = bat_get_drvinfo, @@ -67,7 +56,6 @@ .set_rx_csum = bat_set_rx_csum }; - void set_main_if_addr(uint8_t *addr) { memcpy(mainIfAddr, addr, ETH_ALEN); @@ -90,11 +78,7 @@ if (result < 0) return result; } - /* TODO: remove this later. it's just for verification. */ - if ((skb_packets & 0xFF) == 0) /* report every 256 packets */ - debug_log(LOG_TYPE_NOTICE, "(%d/%d skbs had to be re-expanded)\n", skb_bad_packets, skb_packets); - skb_push(skb, len); return 0; } @@ -132,7 +116,8 @@ dev->features |= NETIF_F_NO_CSUM; dev->mtu = hardif_min_mtu(); - dev->hard_header_len = BAT_HEADER_LEN; /* reserve more space in the skbuff for our header */ + dev->hard_header_len = BAT_HEADER_LEN; /* reserve more space in the + * skbuff for our header */ /* generate random address */ *(u16 *)dev_addr = __constant_htons(0x00FF); @@ -207,7 +192,8 @@ /* batman packet type: broadcast */ bcast_packet->packet_type = BAT_BCAST; - /* hw address of first interface is the orig mac because only this mac is known throughout the mesh */ + /* hw address of first interface is the orig mac because only + * this mac is known throughout the mesh */ memcpy(bcast_packet->orig, mainIfAddr, ETH_ALEN); /* set broadcast sequence number */ bcast_packet->seqno = htons(bcast_seqno); @@ -220,8 +206,10 @@ /* unicast packet */ } else { - /* simply spin_lock()ing can deadlock when the lock is already hold. */ - /* TODO: defer the work in a working queue instead of dropping */ + /* simply spin_lock()ing can deadlock when the lock is already + * hold. */ + /* TODO: defer the work in a working queue instead of + * dropping */ if (!spin_trylock(&orig_hash_lock)) { lock_dropped++; debug_log(LOG_TYPE_NOTICE, "%d packets dropped because lock was hold\n", lock_dropped); @@ -229,14 +217,16 @@ } /* get routing information */ - orig_node = ((struct orig_node *)hash_find(orig_hash, ethhdr->h_dest)); + orig_node = ((struct orig_node *)hash_find(orig_hash, + ethhdr->h_dest)); /* check for hna host */ if (orig_node == NULL) orig_node = transtable_search(ethhdr->h_dest); - if ((orig_node != NULL) && (orig_node->batman_if != NULL) && (orig_node->router != NULL)) { - + if ((orig_node != NULL) && + (orig_node->batman_if != NULL) && + (orig_node->router != NULL)) { if (my_skb_push(skb, sizeof(struct unicast_packet)) < 0) goto unlock; @@ -254,12 +244,12 @@ if (orig_node->batman_if->if_active != IF_ACTIVE) goto unlock; - send_raw_packet(skb->data, skb->len, orig_node->batman_if->net_dev->dev_addr, orig_node->router->addr, orig_node->batman_if); - + send_raw_packet(skb->data, skb->len, + orig_node->batman_if->net_dev->dev_addr, + orig_node->router->addr, + orig_node->batman_if); } else { - goto unlock; - } spin_unlock(&orig_hash_lock); @@ -271,10 +261,8 @@ unlock: spin_unlock(&orig_hash_lock); - dropped: priv->stats.tx_dropped++; - end: kfree_skb(skb); return 0; @@ -327,7 +315,8 @@ return 0; } -static void bat_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) +static void bat_get_drvinfo(struct net_device *dev, + struct ethtool_drvinfo *info) { strcpy(info->driver, "B.A.T.M.A.N. advanced"); strcpy(info->version, SOURCE_VERSION); @@ -359,4 +348,3 @@ { return -EOPNOTSUPP; } - Index: batman-adv-kernelland/soft-interface.h =================================================================== --- batman-adv-kernelland/soft-interface.h (revision 1351) +++ batman-adv-kernelland/soft-interface.h (working copy) @@ -17,10 +17,6 @@ * */ - - - - void set_main_if_addr(uint8_t *addr); int main_if_was_up(void); void interface_setup(struct net_device *dev);

13 years, 8 months

[B.A.T.M.A.N.] [batman-adv] Cleanup ring_buffer.[ch]

by Andrew Lunn

Make proc.[ch] clean with respect to the 2.6.29 checkpatch script. Signed-off-by: Andrew Lunn <andrew.lunn(a)ascom.ch> Index: batman-adv-kernelland/ring_buffer.c =================================================================== --- batman-adv-kernelland/ring_buffer.c (revision 1351) +++ batman-adv-kernelland/ring_buffer.c (working copy) @@ -17,15 +17,9 @@ * */ - - - - #include "main.h" #include "ring_buffer.h" - - void ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index, uint8_t value) { lq_recv[*lq_index] = value; Index: batman-adv-kernelland/ring_buffer.h =================================================================== --- batman-adv-kernelland/ring_buffer.h (revision 1351) +++ batman-adv-kernelland/ring_buffer.h (working copy) @@ -17,9 +17,5 @@ * */ - - - - -void ring_buffer_set( uint8_t lq_recv[], uint8_t *lq_index, uint8_t value ); -uint8_t ring_buffer_avg( uint8_t lq_recv[] ); +void ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index, uint8_t value); +uint8_t ring_buffer_avg(uint8_t lq_recv[]);

13 years, 8 months

[B.A.T.M.A.N.] [batman-adv] Cleanup main.[ch]

by Andrew Lunn

Make main.[ch] clean with respect to the 2.6.29 checkpatch script. Exceptions are long lines with debug_log and the use of KERNEL_VERSION. Signed-off-by: Andrew Lunn <andrew.lunn(a)ascom.ch> Index: batman-adv-kernelland/main.c =================================================================== --- batman-adv-kernelland/main.c (revision 1351) +++ batman-adv-kernelland/main.c (working copy) @@ -17,7 +17,6 @@ * */ - #include "main.h" #include "proc.h" #include "log.h" @@ -27,13 +26,11 @@ #include "device.h" #include "translation-table.h" #include "hard-interface.h" -#include "vis.h" #include "types.h" +#include "vis.h" #include "hash.h" #include "compat.h" - - struct list_head if_list; struct hlist_head forw_bat_list; struct hlist_head forw_bcast_list; @@ -47,21 +44,19 @@ atomic_t originator_interval; atomic_t vis_interval; atomic_t aggregation_enabled; -int16_t num_hna = 0; -int16_t num_ifs = 0; +int16_t num_hna; +int16_t num_ifs; -struct net_device *soft_device = NULL; +struct net_device *soft_device; -static struct task_struct *kthread_task = NULL; +static struct task_struct *kthread_task; unsigned char broadcastAddr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; -char hna_local_changed = 0; +char hna_local_changed; char module_state = MODULE_INACTIVE; -struct workqueue_struct *bat_event_workqueue = NULL; +struct workqueue_struct *bat_event_workqueue; - - int init_module(void) { int retval; @@ -71,16 +66,19 @@ INIT_HLIST_HEAD(&forw_bat_list); INIT_HLIST_HEAD(&forw_bcast_list); atomic_set(&originator_interval, 1000); - atomic_set(&vis_interval, 1000); /* TODO: raise this later, this is only for debugging now. */ + atomic_set(&vis_interval, 1000);/* TODO: raise this later, this is only + * for debugging now. */ atomic_set(&aggregation_enabled, 1); - /* the name should not be longer than 10 chars - see http://lwn.net/Articles/23634/ */ + /* the name should not be longer than 10 chars - see + * http://lwn.net/Articles/23634/ */ bat_event_workqueue = create_singlethread_workqueue("bat_events"); if (!bat_event_workqueue) return -ENOMEM; - if ((retval = setup_procfs()) < 0) + retval = setup_procfs(); + if (retval < 0) return retval; orig_hash = hash_new(128, compare_orig, choose_orig); @@ -97,7 +95,8 @@ bat_device_init(); /* initialize layer 2 interface */ - soft_device = alloc_netdev(sizeof(struct bat_priv) , "bat%d", interface_setup); + soft_device = alloc_netdev(sizeof(struct bat_priv) , "bat%d", + interface_setup); if (soft_device == NULL) { debug_log(LOG_TYPE_CRIT, "Unable to allocate the batman interface\n"); @@ -114,13 +113,13 @@ hna_local_add(soft_device->dev_addr); start_hardif_check_timer(); - debug_log(LOG_TYPE_CRIT, "B.A.T.M.A.N. advanced %s%s (compability version %i) loaded \n", SOURCE_VERSION, (strlen(REVISION_VERSION) > 3 ? REVISION_VERSION : ""), COMPAT_VERSION); + debug_log(LOG_TYPE_CRIT, "B.A.T.M.A.N. advanced %s%s (compability version %i) loaded \n", + SOURCE_VERSION, + (strlen(REVISION_VERSION) > 3 ? REVISION_VERSION : ""), + COMPAT_VERSION); + return 0; -/* for later use ... -unregister_soft_device: - unregister_netdev(soft_device); -*/ free_soft_device: free_netdev(soft_device); @@ -214,13 +213,11 @@ hardif_remove_interfaces(); synchronize_rcu(); - - } void inc_module_count(void) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) MOD_INC_USE_COUNT; #else try_module_get(THIS_MODULE); @@ -229,7 +226,7 @@ void dec_module_count(void) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) MOD_DEC_USE_COUNT; #else module_put(THIS_MODULE); @@ -238,7 +235,8 @@ int addr_to_string(char *buff, uint8_t *addr) { - return sprintf(buff, "%02x:%02x:%02x:%02x:%02x:%02x", addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]); + return sprintf(buff, "%02x:%02x:%02x:%02x:%02x:%02x", + addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]); } int compare_orig(void *data1, void *data2) @@ -250,7 +248,7 @@ /* hash algorithm from http://en.wikipedia.org/wiki/Hash_table */ int choose_orig(void *data, int32_t size) { - unsigned char *key= data; + unsigned char *key = data; uint32_t hash = 0; size_t i; @@ -264,17 +262,16 @@ hash ^= (hash >> 11); hash += (hash << 15); - return (hash % size); + return hash % size; } - - int is_my_mac(uint8_t *addr) { struct batman_if *batman_if; rcu_read_lock(); list_for_each_entry_rcu(batman_if, &if_list, list) { - if ((batman_if->net_dev != NULL) && (compare_orig(batman_if->net_dev->dev_addr, addr))) { + if ((batman_if->net_dev != NULL) && + (compare_orig(batman_if->net_dev->dev_addr, addr))) { rcu_read_unlock(); return 1; } @@ -286,19 +283,16 @@ int is_bcast(uint8_t *addr) { - return ((addr[0] == (uint8_t)0xff) && (addr[1] == (uint8_t)0xff)); + return (addr[0] == (uint8_t)0xff) && (addr[1] == (uint8_t)0xff); } int is_mcast(uint8_t *addr) { - return (*addr & 0x01); + return *addr & 0x01; } - - MODULE_LICENSE("GPL"); MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); MODULE_SUPPORTED_DEVICE(DRIVER_DEVICE); - Index: batman-adv-kernelland/main.h =================================================================== --- batman-adv-kernelland/main.h (revision 1351) +++ batman-adv-kernelland/main.h (working copy) @@ -27,14 +27,18 @@ #define SOURCE_VERSION "0.2-beta" #define TQ_MAX_VALUE 255 #define JITTER 20 -#define TTL 50 /* Time To Live of broadcast messages */ -#define MAX_ADDR 16 /* number of interfaces which can be added to batman. */ +#define TTL 50 /* Time To Live of broadcast messages */ +#define MAX_ADDR 16 /* number of interfaces which can be added to + * batman. */ - -#define PURGE_TIMEOUT 200000 /* purge originators after time in ms if no valid packet comes in -> TODO: check influence on TQ_LOCAL_WINDOW_SIZE */ +#define PURGE_TIMEOUT 200000 /* purge originators after time in ms if no + * valid packet comes in -> TODO: check + * influence on TQ_LOCAL_WINDOW_SIZE */ #define LOCAL_HNA_TIMEOUT 3600000 -#define TQ_LOCAL_WINDOW_SIZE 64 /* sliding packet range of received originator messages in sequence numbers (should be a multiple of our word size) */ +#define TQ_LOCAL_WINDOW_SIZE 64 /* sliding packet range of received originator + * messages in squence numbers (should be a + * multiple of our word size) */ #define TQ_GLOBAL_WINDOW_SIZE 10 #define TQ_LOCAL_BIDRECT_SEND_MINIMUM 1 #define TQ_LOCAL_BIDRECT_RECV_MINIMUM 1 @@ -45,10 +49,12 @@ #define NUM_WORDS (TQ_LOCAL_WINDOW_SIZE / WORD_BIT_SIZE) #define PACKBUFF_SIZE 2000 -#define LOG_BUF_LEN 8192 /* has to be a power of 2 */ +#define LOG_BUF_LEN 8192 /* has to be a power of 2 */ #define ETH_STR_LEN 20 -#define MAX_AGGREGATION_BYTES 512 /* should not be bigger than 512 bytes or change the size of forw_packet->direct_link_flags */ +#define MAX_AGGREGATION_BYTES 512 /* should not be bigger than 512 bytes or + * change the size of + * forw_packet->direct_link_flags */ #define MAX_AGGREGATION_MS 100 #define MODULE_INACTIVE 0 @@ -60,10 +66,15 @@ * Logging */ -#define LOG_TYPE_CRIT 0 /* highest priority for fatal errors such as blocked sockets / failed packet delivery / programming errors */ -#define LOG_TYPE_WARN 1 /* warnings for small errors like wrong user input / damaged packets / etc */ -#define LOG_TYPE_NOTICE 2 /* notice information for new interfaces / changed settings / new originators / etc */ -#define LOG_TYPE_BATMAN 4 /* all messages related to routing / flooding / broadcasting / etc */ +#define LOG_TYPE_CRIT 0 /* highest priority for fatal errors such as + * blocked sockets / failed packet delivery / + * programming errors */ +#define LOG_TYPE_WARN 1 /* warnings for small errors like wrong user + * input / damaged packets / etc */ +#define LOG_TYPE_NOTICE 2 /* notice information for new interfaces / + * changed settings / new originators / etc */ +#define LOG_TYPE_BATMAN 4 /* all messages related to routing / flooding / + * broadcasting / etc */ #define LOG_TYPE_ROUTES 8 /* route or hna added / changed / deleted */ #define LOG_TYPE_CRIT_NAME "critical" #define LOG_TYPE_WARN_NAME "warnings" @@ -85,6 +96,7 @@ #include <linux/pkt_sched.h> /* schedule types */ #include <linux/workqueue.h> /* workqueue */ #include <net/sock.h> /* struct sock */ +#include <linux/jiffies.h> #include "types.h" extern struct list_head if_list; @@ -109,10 +121,6 @@ extern char module_state; extern struct workqueue_struct *bat_event_workqueue; - - - - void start_purge_timer(void); void activate_module(void); void shutdown_module(void);

13 years, 8 months

[B.A.T.M.A.N.] [batman-adv] Cleanup log.[ch]

by Andrew Lunn

Make log.[ch] clean with respect to the 2.6.29 checkpatch script. Signed-off-by: Andrew Lunn <andrew.lunn(a)ascom.ch> Index: batman-adv-kernelland/log.c =================================================================== --- batman-adv-kernelland/log.c (revision 1351) +++ batman-adv-kernelland/log.c (working copy) @@ -17,28 +17,21 @@ * */ - - - - #include "main.h" #include "log.h" - #define LOG_BUF_MASK (log_buf_len-1) #define LOG_BUF(idx) (log_buf[(idx) & LOG_BUF_MASK]) - - static char log_buf[LOG_BUF_LEN]; static int log_buf_len = LOG_BUF_LEN; -static unsigned long log_start = 0; -static unsigned long log_end = 0; -volatile uint8_t log_level = 0; +static unsigned long log_start; +static unsigned long log_end; +uint8_t log_level; static DEFINE_SPINLOCK(logbuf_lock); -struct file_operations proc_log_operations = { +const struct file_operations proc_log_operations = { .open = log_open, .release = log_release, .read = log_read, @@ -48,7 +41,6 @@ static DECLARE_WAIT_QUEUE_HEAD(log_wait); - static void emit_log_char(char c) { LOG_BUF(log_end) = c; @@ -68,7 +60,8 @@ spin_lock_irqsave(&logbuf_lock, flags); va_start(args, fmt); - printed_len = vscnprintf(debug_log_buf, sizeof(debug_log_buf), fmt, args); + printed_len = vscnprintf(debug_log_buf, sizeof(debug_log_buf), fmt, + args); va_end(args); for (p = debug_log_buf; *p != 0; p++) @@ -81,7 +74,6 @@ return 0; } - int debug_log(int type, char *fmt, ...) { va_list args; @@ -92,7 +84,7 @@ if (type == LOG_TYPE_CRIT) { va_start(args, fmt); vscnprintf(tmp_log_buf, sizeof(tmp_log_buf), fmt, args); - printk("batman-adv: %s", tmp_log_buf); + printk(KERN_ERR "batman-adv: %s", tmp_log_buf); va_end(args); } @@ -106,19 +98,20 @@ return retval; } -int log_open(struct inode * inode, struct file * file) +int log_open(struct inode *inode, struct file *file) { inc_module_count(); return 0; } -int log_release(struct inode * inode, struct file * file) +int log_release(struct inode *inode, struct file *file) { dec_module_count(); return 0; } -ssize_t log_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) +ssize_t log_read(struct file *file, char __user *buf, size_t count, + loff_t *ppos) { int error, i = 0; char c; @@ -150,7 +143,7 @@ spin_unlock_irqrestore(&logbuf_lock, flags); - error = __put_user(c,buf); + error = __put_user(c, buf); spin_lock_irqsave(&logbuf_lock, flags); @@ -167,7 +160,8 @@ return error; } -ssize_t log_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) +ssize_t log_write(struct file *file, const char __user *buf, size_t count, + loff_t *ppos) { return count; } @@ -181,4 +175,3 @@ return 0; } - Index: batman-adv-kernelland/log.h =================================================================== --- batman-adv-kernelland/log.h (revision 1351) +++ batman-adv-kernelland/log.h (working copy) @@ -17,18 +17,14 @@ * */ +extern const struct file_operations proc_log_operations; +extern uint8_t log_level; - - - -extern struct file_operations proc_log_operations; -extern volatile uint8_t log_level; - - int debug_log(int type, char *fmt, ...); -int log_open(struct inode * inode, struct file * file); -int log_release(struct inode * inode, struct file * file); -ssize_t log_read(struct file *file, char __user *buf, size_t count, loff_t *ppos); -ssize_t log_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos); +int log_open(struct inode *inode, struct file *file); +int log_release(struct inode *inode, struct file *file); +ssize_t log_read(struct file *file, char __user *buf, size_t count, + loff_t *ppos); +ssize_t log_write(struct file *file, const char __user *buf, size_t count, + loff_t *ppos); unsigned int log_poll(struct file *file, poll_table *wait); -

13 years, 8 months

[B.A.T.M.A.N.] [batman-adv] Cleanup hardinterface.[ch]

by Andrew Lunn

Make hardinterface.[ch] clean with respect to the 2.6.29 checkpatch script. Exceptions are long lines with debug_log. Signed-off-by: Andrew Lunn <andrew.lunn(a)ascom.ch> Index: batman-adv-kernelland/hard-interface.c =================================================================== --- batman-adv-kernelland/hard-interface.c (revision 1351) +++ batman-adv-kernelland/hard-interface.c (working copy) @@ -17,10 +17,6 @@ * */ - - - - #include "main.h" #include "hard-interface.h" #include "log.h" @@ -31,15 +27,14 @@ #include "hash.h" #include "compat.h" -#define MIN(x,y) ((x) < (y) ? (x):(y)) +#define MIN(x, y) ((x) < (y) ? (x) : (y)) +static DECLARE_DELAYED_WORK(hardif_check_interfaces_wq, + hardif_check_interfaces_status_wq); +static char avail_ifs; +static char active_ifs; -static DECLARE_DELAYED_WORK(hardif_check_interfaces_wq, hardif_check_interfaces_status_wq); - -static char avail_ifs = 0; -static char active_ifs = 0; - static void hardif_free_interface(struct rcu_head *rcu); int hardif_min_mtu(void) @@ -52,7 +47,8 @@ rcu_read_lock(); list_for_each_entry_rcu(batman_if, &if_list, list) { if (batman_if->if_active == IF_ACTIVE) - min_mtu = MIN(batman_if->net_dev->mtu - BAT_HEADER_LEN, min_mtu); + min_mtu = MIN(batman_if->net_dev->mtu - BAT_HEADER_LEN, + min_mtu); } rcu_read_unlock(); @@ -68,26 +64,26 @@ * if we already have an interface in our interface list and * the current interface is not the primary interface and * the primary interface is not up and - * the primary interface has never been up - don't activate any secondary interface ! + * the primary interface has never been up - don't activate any + * secondary interface ! */ rcu_read_lock(); if ((!list_empty(&if_list)) && - (strncmp(((struct batman_if *)if_list.next)->dev, dev, IFNAMSIZ) != 0) && - !(((struct batman_if *)if_list.next)->if_active == IF_ACTIVE) && - (!main_if_was_up())) { - + strncmp(((struct batman_if *)if_list.next)->dev, dev, IFNAMSIZ) && + !(((struct batman_if *)if_list.next)->if_active == IF_ACTIVE) && + (!main_if_was_up())) { rcu_read_unlock(); goto end; - } rcu_read_unlock(); #ifdef __NET_NET_NAMESPACE_H - if ((net_dev = dev_get_by_name(&init_net, dev)) == NULL) + net_dev = dev_get_by_name(&init_net, dev); #else - if ((net_dev = dev_get_by_name(dev)) == NULL) + net_dev = dev_get_by_name(dev); #endif + if (!net_dev) goto end; if (!(net_dev->flags & IFF_UP)) @@ -108,8 +104,6 @@ if (batman_if->raw_sock != NULL) sock_release(batman_if->raw_sock); - /* batman_if->raw_sock->sk->sk_data_ready = batman_if->raw_sock->sk->sk_user_data; */ - /** * batman_if->net_dev has been acquired by dev_get_by_name() in * proc_interfaces_write() and has to be unreferenced. @@ -124,7 +118,8 @@ batman_if->if_active = IF_INACTIVE; active_ifs--; - debug_log(LOG_TYPE_NOTICE, "Interface deactivated: %s\n", batman_if->dev); + debug_log(LOG_TYPE_NOTICE, "Interface deactivated: %s\n", + batman_if->dev); } /* (re)activate given interface. */ @@ -134,14 +129,20 @@ int retval; #ifdef __NET_NET_NAMESPACE_H - if ((batman_if->net_dev = dev_get_by_name(&init_net, batman_if->dev)) == NULL) + batman_if->net_dev = dev_get_by_name(&init_net, batman_if->dev); #else - if ((batman_if->net_dev = dev_get_by_name(batman_if->dev)) == NULL) + batman_if->net_dev = dev_get_by_name(batman_if->dev); #endif + if (!batman_if->net_dev) goto error; - if ((retval = sock_create_kern(PF_PACKET, SOCK_RAW, __constant_htons(ETH_P_BATMAN), &batman_if->raw_sock)) < 0) { - debug_log(LOG_TYPE_WARN, "Can't create raw socket: %i\n", retval); + retval = sock_create_kern(PF_PACKET, SOCK_RAW, + __constant_htons(ETH_P_BATMAN), + &batman_if->raw_sock); + + if (retval < 0) { + debug_log(LOG_TYPE_WARN, "Can't create raw socket: %i\n", + retval); goto error; } @@ -149,18 +150,25 @@ bind_addr.sll_ifindex = batman_if->net_dev->ifindex; bind_addr.sll_protocol = 0; /* is set by the kernel */ - if ((retval = kernel_bind(batman_if->raw_sock, (struct sockaddr *)&bind_addr, sizeof(bind_addr))) < 0) { - debug_log(LOG_TYPE_WARN, "Can't create bind raw socket: %i\n", retval); + retval = kernel_bind(batman_if->raw_sock, + (struct sockaddr *)&bind_addr, sizeof(bind_addr)); + + if (retval < 0) { + debug_log(LOG_TYPE_WARN, "Can't create bind raw socket: %i\n", + retval); goto error; } - batman_if->raw_sock->sk->sk_user_data = batman_if->raw_sock->sk->sk_data_ready; + batman_if->raw_sock->sk->sk_user_data = + batman_if->raw_sock->sk->sk_data_ready; batman_if->raw_sock->sk->sk_data_ready = batman_data_ready; addr_to_string(batman_if->addr_str, batman_if->net_dev->dev_addr); - memcpy(((struct batman_packet *)(batman_if->packet_buff))->orig, batman_if->net_dev->dev_addr, ETH_ALEN); - memcpy(((struct batman_packet *)(batman_if->packet_buff))->old_orig, batman_if->net_dev->dev_addr, ETH_ALEN); + memcpy(((struct batman_packet *)(batman_if->packet_buff))->orig, + batman_if->net_dev->dev_addr, ETH_ALEN); + memcpy(((struct batman_packet *)(batman_if->packet_buff))->old_orig, + batman_if->net_dev->dev_addr, ETH_ALEN); batman_if->if_active = IF_ACTIVE; active_ifs++; @@ -209,12 +217,41 @@ } } +static int resize_orig(struct orig_node *orig_node, int if_num) +{ + void *data_ptr; + + data_ptr = kmalloc((if_num + 1) * sizeof(TYPE_OF_WORD) * NUM_WORDS, + GFP_KERNEL); + if (!data_ptr) { + debug_log(LOG_TYPE_WARN, "Can't resize orig: out of memory\n"); + return -1; + } + + memcpy(data_ptr, orig_node->bcast_own, + if_num * sizeof(TYPE_OF_WORD) * NUM_WORDS); + kfree(orig_node->bcast_own); + orig_node->bcast_own = data_ptr; + + data_ptr = kmalloc((if_num + 1) * sizeof(uint8_t), GFP_KERNEL); + if (!data_ptr) { + debug_log(LOG_TYPE_WARN, "Can't resize orig: out of memory\n"); + return -1; + } + + memcpy(data_ptr, orig_node->bcast_own_sum, if_num * sizeof(uint8_t)); + kfree(orig_node->bcast_own_sum); + orig_node->bcast_own_sum = data_ptr; + + return 0; +} + + /* adds an interface the interface list and activate it, if possible */ int hardif_add_interface(char *dev, int if_num) { struct batman_if *batman_if; struct batman_packet *batman_packet; - void *data_ptr; struct orig_node *orig_node; struct hash_it_t *hashit = NULL; @@ -229,9 +266,9 @@ batman_if->net_dev = NULL; if ((if_num == 0) && (num_hna > 0)) - batman_if->packet_len = sizeof(struct batman_packet) + num_hna * ETH_ALEN; + batman_if->packet_len = BAT_PACKET_LEN + num_hna * ETH_ALEN; else - batman_if->packet_len = sizeof(struct batman_packet); + batman_if->packet_len = BAT_PACKET_LEN; batman_if->packet_buff = kmalloc(batman_if->packet_len, GFP_KERNEL); @@ -259,27 +296,27 @@ batman_packet->tq = TQ_MAX_VALUE; batman_packet->num_hna = 0; - if (batman_if->packet_len != sizeof(struct batman_packet)) - batman_packet->num_hna = hna_local_fill_buffer(batman_if->packet_buff + sizeof(struct batman_packet), batman_if->packet_len - sizeof(struct batman_packet)); + if (batman_if->packet_len != BAT_PACKET_LEN) { + unsigned char *hna_buff; + int hna_len; + hna_buff = batman_if->packet_buff + BAT_PACKET_LEN; + hna_len = batman_if->packet_len - BAT_PACKET_LEN; + batman_packet->num_hna = hna_local_fill_buffer(hna_buff, + hna_len); + } atomic_set(&batman_if->seqno, 1); - - /* resize all orig nodes because orig_node->bcast_own(_sum) depend on if_num */ + /* resize all orig nodes because orig_node->bcast_own(_sum) depend on + * if_num */ spin_lock(&orig_hash_lock); while (NULL != (hashit = hash_iterate(orig_hash, hashit))) { orig_node = hashit->bucket->data; - - data_ptr = kmalloc((if_num + 1) * sizeof(TYPE_OF_WORD) * NUM_WORDS, GFP_KERNEL); - memcpy(data_ptr, orig_node->bcast_own, if_num * sizeof(TYPE_OF_WORD) * NUM_WORDS); - kfree(orig_node->bcast_own); - orig_node->bcast_own = data_ptr; - - data_ptr = kmalloc((if_num + 1) * sizeof(uint8_t), GFP_KERNEL); - memcpy(data_ptr, orig_node->bcast_own_sum, if_num * sizeof(uint8_t)); - kfree(orig_node->bcast_own_sum); - orig_node->bcast_own_sum = data_ptr; + if (resize_orig(orig_node, if_num) == -1) { + spin_unlock(&orig_hash_lock); + goto out; + } } spin_unlock(&orig_hash_lock); @@ -314,14 +351,15 @@ return; /** - * wait for readers of the interfaces, so update won't be a problem. + * wait for readers of the the interfaces, so update won't be a problem. * this function is not time critical and can wait a bit .... */ synchronize_rcu(); rcu_read_lock(); list_for_each_entry_rcu(batman_if, &if_list, list) { - if ((batman_if->if_active == IF_INACTIVE) && (hardif_is_interface_up(batman_if->dev))) + if ((batman_if->if_active == IF_INACTIVE) && + (hardif_is_interface_up(batman_if->dev))) hardif_activate_interface(batman_if); if (batman_if->if_active == IF_TO_BE_DEACTIVATED) @@ -329,8 +367,10 @@ } rcu_read_unlock(); - /* waiting for activation? if interfaces are available now, we can activate. */ - if ((module_state == MODULE_WAITING) && (hardif_get_active_if_num() > 0)) + /* waiting for activation? if interfaces are available now, we can + * activate. */ + if ((module_state == MODULE_WAITING) && + (hardif_get_active_if_num() > 0)) activate_module(); /* decrease the MTU if a new interface with a smaller MTU appeared. */ @@ -348,11 +388,11 @@ void start_hardif_check_timer(void) { - queue_delayed_work(bat_event_workqueue, &hardif_check_interfaces_wq, 1 * HZ); + queue_delayed_work(bat_event_workqueue, &hardif_check_interfaces_wq, + 1 * HZ); } void destroy_hardif_check_timer(void) { cancel_delayed_work_sync(&hardif_check_interfaces_wq); } - Index: batman-adv-kernelland/hard-interface.h =================================================================== --- batman-adv-kernelland/hard-interface.h (revision 1351) +++ batman-adv-kernelland/hard-interface.h (working copy) @@ -17,14 +17,10 @@ * */ - - #define IF_INACTIVE 0 #define IF_ACTIVE 1 #define IF_TO_BE_DEACTIVATED 2 - - void hardif_remove_interfaces(void); int hardif_add_interface(char *dev, int if_num); void hardif_deactivate_interface(struct batman_if *batman_if);

13 years, 8 months

[B.A.T.M.A.N.] [batman-adv] cleanup device.[ch]

by Andrew Lunn

Make device.[ch] clean with respect to the 2.6.29 checkpatch script. Exceptions are long lines with debug_log and the use of KERNEL_VERSION. Signed-off-by: Andrew Lunn <andrew.lunn(a)ascom.ch> Index: batman-adv-kernelland/device.c =================================================================== --- batman-adv-kernelland/device.c (revision 1351) +++ batman-adv-kernelland/device.c (working copy) @@ -17,10 +17,6 @@ * */ - - - - #include "main.h" #include "device.h" #include "log.h" @@ -34,11 +30,9 @@ static struct class *batman_class; #endif +static int Major; /* Major number assigned to our device driver */ - -static int Major = 0; /* Major number assigned to our device driver */ - -static struct file_operations fops = { +static const struct file_operations fops = { .open = bat_device_open, .release = bat_device_release, .read = bat_device_read, @@ -48,8 +42,6 @@ static struct device_client *device_client_hash[256]; - - void bat_device_init(void) { int i; @@ -66,14 +58,17 @@ return; /* register our device - kernel assigns a free major number */ - if ((tmp_major = register_chrdev(0, DRIVER_DEVICE, &fops)) < 0) { - debug_log(LOG_TYPE_WARN, "Registering the character device failed with %d\n", tmp_major); + tmp_major = register_chrdev(0, DRIVER_DEVICE, &fops); + if (tmp_major < 0) { + debug_log(LOG_TYPE_WARN, "Registering the character device failed with %d\n", + tmp_major); return; } -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) - if (devfs_mk_cdev(MKDEV(tmp_major, 0), S_IFCHR | S_IRUGO | S_IWUGO, "batman-adv", 0)) { - debug_log(LOG_TYPE_WARN, "Could not create /dev/batman-adv\n" ); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) + if (devfs_mk_cdev(MKDEV(tmp_major, 0), S_IFCHR | S_IRUGO | S_IWUGO, + "batman-adv", 0)) { + debug_log(LOG_TYPE_WARN, "Could not create /dev/batman-adv\n"); return; } #else @@ -84,7 +79,8 @@ return; } - device_create(batman_class, NULL, MKDEV(tmp_major, 0), NULL, "batman-adv"); + device_create(batman_class, NULL, MKDEV(tmp_major, 0), NULL, + "batman-adv"); #endif Major = tmp_major; @@ -97,7 +93,7 @@ if (!Major) return; -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) devfs_remove("batman-adv", 0); #else device_destroy(batman_class, MKDEV(Major, 0)); @@ -105,7 +101,7 @@ #endif /* Unregister the device */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) result = unregister_chrdev(Major, DRIVER_DEVICE); #else unregister_chrdev(Major, DRIVER_DEVICE); @@ -154,7 +150,8 @@ int bat_device_release(struct inode *inode, struct file *file) { - struct device_client *device_client = (struct device_client *)file->private_data; + struct device_client *device_client = + (struct device_client *)file->private_data; struct device_packet *device_packet; struct list_head *list_pos, *list_pos_tmp; @@ -162,7 +159,8 @@ /* for all packets in the queue ... */ list_for_each_safe(list_pos, list_pos_tmp, &device_client->queue_list) { - device_packet = list_entry(list_pos, struct device_packet, list); + device_packet = list_entry(list_pos, + struct device_packet, list); list_del(list_pos); kfree(device_packet); @@ -177,9 +175,11 @@ return 0; } -ssize_t bat_device_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) +ssize_t bat_device_read(struct file *file, char __user *buf, size_t count, + loff_t *ppos) { - struct device_client *device_client = (struct device_client *)file->private_data; + struct device_client *device_client = + (struct device_client *)file->private_data; struct device_packet *device_packet; int error; @@ -192,20 +192,23 @@ if (!access_ok(VERIFY_WRITE, buf, count)) return -EFAULT; - error = wait_event_interruptible(device_client->queue_wait, (device_client->queue_len)); + error = wait_event_interruptible(device_client->queue_wait, + device_client->queue_len); if (error) return error; spin_lock(&device_client->lock); - device_packet = list_first_entry(&device_client->queue_list, struct device_packet, list); + device_packet = list_first_entry(&device_client->queue_list, + struct device_packet, list); list_del(&device_packet->list); device_client->queue_len--; spin_unlock(&device_client->lock); - error = __copy_to_user(buf, &device_packet->icmp_packet, sizeof(struct icmp_packet)); + error = __copy_to_user(buf, &device_packet->icmp_packet, + sizeof(struct icmp_packet)); kfree(device_packet); @@ -215,9 +218,11 @@ return sizeof(struct icmp_packet); } -ssize_t bat_device_write(struct file *file, const char __user *buff, size_t len, loff_t *off) +ssize_t bat_device_write(struct file *file, const char __user *buff, + size_t len, loff_t *off) { - struct device_client *device_client = (struct device_client *)file->private_data; + struct device_client *device_client = + (struct device_client *)file->private_data; struct icmp_packet icmp_packet; struct orig_node *orig_node; @@ -229,9 +234,8 @@ if (!access_ok(VERIFY_READ, buff, sizeof(struct icmp_packet))) return -EFAULT; - if (__copy_from_user(&icmp_packet, buff, sizeof(icmp_packet))) { + if (__copy_from_user(&icmp_packet, buff, sizeof(icmp_packet))) return -EFAULT; - } if (icmp_packet.packet_type != BAT_ICMP) { debug_log(LOG_TYPE_NOTICE, "Error - can't send packet from char device: got bogus packet type (expected: BAT_ICMP)\n"); @@ -255,17 +259,19 @@ spin_lock(&orig_hash_lock); orig_node = ((struct orig_node *)hash_find(orig_hash, icmp_packet.dst)); - if ((orig_node != NULL) && (orig_node->batman_if != NULL) && (orig_node->router != NULL)) { + if ((orig_node != NULL) && + (orig_node->batman_if != NULL) && + (orig_node->router != NULL)) { + memcpy(icmp_packet.orig, + orig_node->batman_if->net_dev->dev_addr, ETH_ALEN); - memcpy(icmp_packet.orig, orig_node->batman_if->net_dev->dev_addr, ETH_ALEN); - - send_raw_packet((unsigned char *)&icmp_packet, sizeof(struct icmp_packet), orig_node->batman_if->net_dev->dev_addr, orig_node->router->addr, orig_node->batman_if); - + send_raw_packet((unsigned char *)&icmp_packet, + sizeof(struct icmp_packet), + orig_node->batman_if->net_dev->dev_addr, + orig_node->router->addr, orig_node->batman_if); } else { - icmp_packet.msg_type = DESTINATION_UNREACHABLE; bat_device_add_packet(device_client, &icmp_packet); - } spin_unlock(&orig_hash_lock); @@ -276,7 +282,8 @@ unsigned int bat_device_poll(struct file *file, poll_table *wait) { - struct device_client *device_client = (struct device_client *)file->private_data; + struct device_client *device_client = + (struct device_client *)file->private_data; poll_wait(file, &device_client->queue_wait, wait); @@ -286,7 +293,8 @@ return 0; } -void bat_device_add_packet(struct device_client *device_client, struct icmp_packet *icmp_packet) +void bat_device_add_packet(struct device_client *device_client, + struct icmp_packet *icmp_packet) { struct device_packet *device_packet; @@ -296,11 +304,13 @@ return; INIT_LIST_HEAD(&device_packet->list); - memcpy(&device_packet->icmp_packet, icmp_packet, sizeof(struct icmp_packet)); + memcpy(&device_packet->icmp_packet, icmp_packet, + sizeof(struct icmp_packet)); spin_lock(&device_client->lock); - /* while waiting for the lock the device_client could have been deleted */ + /* while waiting for the lock the device_client could have been + * deleted */ if (device_client_hash[icmp_packet->uid] == NULL) { kfree(device_packet); return; @@ -310,7 +320,8 @@ device_client->queue_len++; if (device_client->queue_len > 100) { - device_packet = list_first_entry(&device_client->queue_list, struct device_packet, list); + device_packet = list_first_entry(&device_client->queue_list, + struct device_packet, list); list_del(&device_packet->list); kfree(device_packet); @@ -324,7 +335,8 @@ void bat_device_receive_packet(struct icmp_packet *icmp_packet) { - if (device_client_hash[icmp_packet->uid] != NULL) - bat_device_add_packet((struct device_client *)device_client_hash[icmp_packet->uid], icmp_packet); + struct device_client *hash = device_client_hash[icmp_packet->uid]; + + if (hash != NULL) + bat_device_add_packet(hash, icmp_packet); } - Index: batman-adv-kernelland/device.h =================================================================== --- batman-adv-kernelland/device.h (revision 1351) +++ batman-adv-kernelland/device.h (working copy) @@ -17,22 +17,18 @@ * */ - - - - #include "types.h" - - void bat_device_init(void); void bat_device_setup(void); void bat_device_destroy(void); int bat_device_open(struct inode *inode, struct file *file); int bat_device_release(struct inode *inode, struct file *file); -ssize_t bat_device_read(struct file *file, char __user *buf, size_t count, loff_t *ppos); -ssize_t bat_device_write(struct file *file, const char __user *buff, size_t len, loff_t *off); +ssize_t bat_device_read(struct file *file, char __user *buf, size_t count, + loff_t *ppos); +ssize_t bat_device_write(struct file *file, const char __user *buff, + size_t len, loff_t *off); unsigned int bat_device_poll(struct file *file, poll_table *wait); -void bat_device_add_packet(struct device_client *device_client, struct icmp_packet *icmp_packet); +void bat_device_add_packet(struct device_client *device_client, + struct icmp_packet *icmp_packet); void bat_device_receive_packet(struct icmp_packet *icmp_packet); -

13 years, 8 months

[B.A.T.M.A.N.] [batman-adv] packet.h coding style cleanup

by Andrew Lunn

Make packet.h clean with respect to the 2.6.29 checkpatch script. Also adds one macro, BAT_PACKET_LEN, which is used in other patches to follow. Signed-off-by: Andrew Lunn <andrew.lunn(a)ascom.ch> Index: batman-adv-kernelland/packet.h =================================================================== --- batman-adv-kernelland/packet.h (revision 1349) +++ batman-adv-kernelland/packet.h (working copy) @@ -17,8 +17,6 @@ * */ - - #define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ #define BAT_PACKET 0x01 @@ -32,7 +30,6 @@ #define DIRECTLINK 0x40 #define VIS_SERVER 0x20 - /* ICMP message types */ #define ECHO_REPLY 0 #define DESTINATION_UNREACHABLE 3 @@ -40,13 +37,11 @@ #define TTL_EXCEEDED 11 #define PARAMETER_PROBLEM 12 - /* vis defines */ #define VIS_TYPE_SERVER_SYNC 0 #define VIS_TYPE_CLIENT_UPDATE 1 -struct batman_packet -{ +struct batman_packet { uint8_t packet_type; uint8_t version; /* batman version field */ uint8_t flags; /* 0x40: DIRECTLINK flag, 0x20 VIS_SERVER flag... */ @@ -56,13 +51,15 @@ uint8_t old_orig[6]; uint8_t ttl; uint8_t num_hna; + uint16_t orig_interval; } __attribute__((packed)); -struct icmp_packet -{ +#define BAT_PACKET_LEN sizeof(struct batman_packet) + +struct icmp_packet { uint8_t packet_type; uint8_t version; /* batman version field */ - uint8_t msg_type; /* see ICMP message types above */ + uint8_t msg_type; /* see ICMP message types above */ uint8_t ttl; uint8_t dst[6]; uint8_t orig[6]; @@ -70,31 +67,29 @@ uint8_t uid; } __attribute__((packed)); -struct unicast_packet -{ +struct unicast_packet { uint8_t packet_type; uint8_t version; /* batman version field */ uint8_t dest[6]; uint8_t ttl; } __attribute__((packed)); -struct bcast_packet -{ +struct bcast_packet { uint8_t packet_type; uint8_t version; /* batman version field */ uint8_t orig[6]; uint16_t seqno; } __attribute__((packed)); -struct vis_packet -{ +struct vis_packet { uint8_t packet_type; - uint8_t version; /* batman version field */ - uint8_t vis_type; /* which type of vis-participant sent this? */ - uint8_t seqno; /* sequence number */ - uint8_t entries; /* number of entries behind this struct */ - uint8_t ttl; /* TTL */ - uint8_t vis_orig[6]; /* originator that informs about its neighbours */ - uint8_t target_orig[6]; /* who should receive this packet */ - uint8_t sender_orig[6]; /* who sent or rebroadcasted this packet */ + uint8_t version; /* batman version field */ + uint8_t vis_type; /* which type of vis-participant sent this? */ + uint8_t seqno; /* sequence number */ + uint8_t entries; /* number of entries behind this struct */ + uint8_t ttl; /* TTL */ + uint8_t vis_orig[6]; /* originator that informs about its + * neighbours */ + uint8_t target_orig[6]; /* who should receive this packet */ + uint8_t sender_orig[6]; /* who sent or rebroadcasted this packet */ } __attribute__((packed));

13 years, 8 months

[B.A.T.M.A.N.] [vis] fixed partial json output

by jonathan mzengeza

Partial output was caused by failing to read the HTTP request. This patch reads the HTTP request into a temporary buffer before discarding it. Signed-off-by: Jonathan Mzengeza <jtmze87(a)gmail.com> Index: vis.c =================================================================== --- vis.c (revision 1343) +++ vis.c (working copy) @@ -566,6 +566,7 @@ buffer_t *last_send = NULL; size_t ret; char* send_buffer = NULL; + char tmp[512]; while ( !is_aborted() ) { @@ -579,6 +580,11 @@ send_buffer = current->dot_buffer; } else { send_buffer = current->json_buffer; + ret = read( thread_data->socket, tmp, sizeof( tmp )); + while ( ret == -1 ) { + ret = read( thread_data->socket, tmp, sizeof( tmp )); + usleep(250); + } } ret = write( thread_data->socket, send_buffer, strlen( send_buffer ) );

13 years, 8 months

[B.A.T.M.A.N.] battools sources in SVN?

by Andrew Lunn

Hi Folks The wiki page: http://open-mesh.org/wiki/Download says: # svn co http://downloads.open-mesh.net/svn/batman/trunk/ # battool (for B.A.T.M.A.N. advanced): check out the complete repository, cd into battool (we're using symlinks here ...) I have a complete checkout of trunk, but there is no battool directory: batman/trunk$ svn info Path: . Repository Root: http://downloads.open-mesh.net/svn/batman Repository UUID: 45894c77-fb22-0410-b583-ff6e7d5dbf6c Revision: 1347 Node Kind: directory Schedule: normal Last Changed Author: marek Last Changed Rev: 1347 Last Changed Date: 2009-07-16 15:15:54 +0200 (Thu, 16 Jul 2009) batman/trunk$ ls batctl batman-adv-kernelland batman-experimental batman batman-debug4.pl vis batman/trunk$ find . -name battool* batman/trunk$ Where have the source for battool gone? Thanks Andrew

13 years, 8 months

[B.A.T.M.A.N.] [batctl] Fix compiler warning in tcpdump.c

by Andrew Lunn

Compiling batctl/tcpdump.c with gcc version 4.3.3 gives a compiler warning. Add a cast to fix this. Signed-off-by: Andrew Lunn <andrew.lunn(a)ascom.ch> Index: batctl/tcpdump.c =================================================================== --- batctl/tcpdump.c (revision 1347) +++ batctl/tcpdump.c (working copy) @@ -191,7 +191,7 @@ switch (ntohs(udphdr->dest)) { case 67: - LEN_CHECK((size_t)buff_len - (iphdr->ihl * 4) - sizeof(struct udphdr), 44, "DHCP"); + LEN_CHECK((size_t)buff_len - (iphdr->ihl * 4) - sizeof(struct udphdr), (size_t) 44, "DHCP"); printf("%s.67: BOOTP/DHCP, Request from %s, length %zd\n", inet_ntoa(*(struct in_addr *)&iphdr->daddr), ether_ntoa_long((struct ether_addr *)(((char *)udphdr) + sizeof(struct udphdr) + 28)),

13 years, 8 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N July 2009