commits

commits@lists.open-mesh.org

1 participants
12298 discussions

r1454 - trunk/batctl
by postmaster＠open-mesh.net 25 Oct '09

25 Oct '09

Author: marek Date: 2009-10-25 00:13:44 +0000 (Sun, 25 Oct 2009) New Revision: 1454 Modified: trunk/batctl/bisect.c trunk/batctl/bisect.h Log: [batctl] bisect - better routing table handling due to add/update/delete detection Modified: trunk/batctl/bisect.c =================================================================== --- trunk/batctl/bisect.c 2009-10-18 11:47:08 UTC (rev 1453) +++ trunk/batctl/bisect.c 2009-10-25 00:13:44 UTC (rev 1454) @@ -73,6 +73,9 @@ { struct bat_node *bat_node; + if (!name) + return NULL; + bat_node = (struct bat_node *)hash_find(node_hash, name); if (bat_node) goto out; @@ -114,11 +117,12 @@ free(bat_node); } -static int routing_table_new(char *orig, char *next_hop, char *old_next_hop) +static int routing_table_new(char *orig, char *next_hop, char *old_next_hop, char rt_flag) { struct bat_node *next_hop_node; - struct rt_table *rt_table, *prev_rt_table; - int i; + struct seqno_event *seqno_event; + struct rt_table *rt_table, *prev_rt_table = NULL; + int i, j; if (!curr_bat_node) { fprintf(stderr, "Routing table change without preceeding OGM - skipping"); @@ -130,18 +134,18 @@ goto err; } - if (!next_hop) { + if ((rt_flag != RT_FLAG_DELETE) && (!next_hop)) { fprintf(stderr, "Invalid next hop found - skipping"); goto err; } - if (!old_next_hop) { + if ((rt_flag == RT_FLAG_UPDATE) && (!old_next_hop)) { fprintf(stderr, "Invalid old next hop found - skipping"); goto err; } next_hop_node = node_get(next_hop); - if (!next_hop_node) + if ((rt_flag != RT_FLAG_DELETE) && (!next_hop_node)) goto err; rt_table = malloc(sizeof(struct rt_table)); @@ -151,19 +155,73 @@ } INIT_LIST_HEAD(&rt_table->list); - rt_table->num_entries = 1; - if (!(list_empty(&curr_bat_node->rt_table_list))) { + if (!(list_empty(&curr_bat_node->rt_table_list))) prev_rt_table = (struct rt_table *)(curr_bat_node->rt_table_list.prev); - rt_table->num_entries = prev_rt_table->num_entries + 1; - /* if we had a route already we just change the entry */ - for (i = 0; i < prev_rt_table->num_entries; i++) { - if (compare_name(orig, prev_rt_table->entries[i].orig)) { - rt_table->num_entries--; - break; + rt_table->num_entries = 1; + + switch (rt_flag) { + case RT_FLAG_ADD: + if (prev_rt_table) + rt_table->num_entries = prev_rt_table->num_entries + 1; + break; + case RT_FLAG_UPDATE: + if (prev_rt_table) { + rt_table->num_entries = prev_rt_table->num_entries + 1; + + /* if we had that route already we just change the entry */ + for (i = 0; i < prev_rt_table->num_entries; i++) { + if (compare_name(orig, prev_rt_table->entries[i].orig)) { + rt_table->num_entries = prev_rt_table->num_entries; + break; + } } } + break; + case RT_FLAG_DELETE: + if (prev_rt_table) { + rt_table->num_entries = prev_rt_table->num_entries + 1; + + /* if we had that route already we just change the entry */ + for (i = 0; i < prev_rt_table->num_entries; i++) { + if (compare_name(orig, prev_rt_table->entries[i].orig)) { + rt_table->num_entries = prev_rt_table->num_entries; + break; + } + } + + if (rt_table->num_entries != prev_rt_table->num_entries) { + fprintf(stderr, + "Found a delete entry of orig '%s' but no previous existing record - skipping", + orig); + goto table_free; + } + + /** + * we need to create a special seqno event as a timer instead + * of an OGM triggered that event + */ + seqno_event = malloc(sizeof(struct seqno_event)); + if (!seqno_event) { + fprintf(stderr, "Could not allocate memory for delete seqno event (out of mem?) - skipping"); + goto table_free; + } + + INIT_LIST_HEAD(&seqno_event->list); + seqno_event->orig = NULL; + seqno_event->neigh = NULL; + seqno_event->prev_sender = NULL; + seqno_event->seqno = -1; + seqno_event->tq = -1; + seqno_event->ttl = -1; + seqno_event->rt_table = NULL; + list_add_tail(&seqno_event->list, &curr_bat_node->event_list); + } + break; + default: + fprintf(stderr, "Unknown rt_flag received: %i - skipping", rt_flag); + goto table_free; } rt_table->entries = malloc(sizeof(struct rt_entry) * rt_table->num_entries); @@ -172,18 +230,40 @@ goto table_free; } - if (!(list_empty(&curr_bat_node->rt_table_list))) - memcpy(rt_table->entries, prev_rt_table->entries, prev_rt_table->num_entries * sizeof(struct rt_entry)); + if (prev_rt_table) { + j = -1; + for (i = 0; i < prev_rt_table->num_entries; i++) { + /* if we have a previously deleted item don't copy it over */ + if (prev_rt_table->entries[i].flags == RT_FLAG_DELETE) { + rt_table->num_entries--; + continue; + } - if ((rt_table->num_entries == 1) || - (rt_table->num_entries != prev_rt_table->num_entries)) { + /** + * if we delete one item the entries are not in sync anymore, + * therefore we need to counters: one for the old and one for + * the new routing table + */ + j++; + + memcpy((char *)&rt_table->entries[j], (char *)&prev_rt_table->entries[i], sizeof(struct rt_entry)); + + if (compare_name(orig, rt_table->entries[j].orig)) { + if (rt_flag != RT_FLAG_DELETE) + rt_table->entries[j].next_hop = next_hop_node; + rt_table->entries[j].flags = rt_flag; + continue; + } + + rt_table->entries[j].flags = 0; + } + } + + if ((rt_table->num_entries == 1) || (rt_table->num_entries != j + 1)) { i = rt_table->num_entries; strncpy(rt_table->entries[i - 1].orig, orig, NAME_LEN); rt_table->entries[i - 1].next_hop = next_hop_node; - } else { - - rt_table->entries[i].next_hop = next_hop_node; - + rt_table->entries[i - 1].flags = rt_flag; } list_add_tail(&rt_table->list, &curr_bat_node->rt_table_list); @@ -274,8 +354,8 @@ { FILE *fd; char line_buff[MAX_LINE], *start_ptr, *tok_ptr; - char *neigh, *iface_addr, *orig, *prev_sender; - int line_count = 0, tq, ttl, seqno, i, res; + char *neigh, *iface_addr, *orig, *prev_sender, rt_flag; + int line_count = 0, tq, ttl, seqno, i, res, max; fd = fopen(file_path, "r"); @@ -339,11 +419,25 @@ if (res < 1) fprintf(stderr, " [file: %s, line: %i]\n", file_path, line_count); - } else if (strstr(start_ptr, "Changing route towards")) { + } else if (strstr(start_ptr, "Adding route towards") || + strstr(start_ptr, "Changing route towards") || + strstr(start_ptr, "Deleting route towards")) { + + rt_flag = RT_FLAG_UPDATE; + max = 12; + + if (strstr(start_ptr, "Adding route towards")) { + rt_flag = RT_FLAG_ADD; + max = 5; + } else if (strstr(start_ptr, "Deleting route towards")) { + rt_flag = RT_FLAG_DELETE; + max = 3; + } + tok_ptr = strtok(start_ptr, " "); orig = neigh = prev_sender = NULL; - for (i = 0; i < 12; i++) { + for (i = 0; i < max; i++) { tok_ptr = strtok(NULL, " "); if (!tok_ptr) break; @@ -351,7 +445,15 @@ switch (i) { case 2: orig = tok_ptr; + if (rt_flag == RT_FLAG_DELETE) + orig[strlen(orig) - 1] = 0; break; + case 4: + if (rt_flag == RT_FLAG_ADD) { + neigh = tok_ptr; + neigh[strlen(neigh) - 2] = 0; + } + break; case 5: neigh = tok_ptr; break; @@ -362,14 +464,20 @@ } } - if (!prev_sender) { - fprintf(stderr, "Broken 'changing route' line found - skipping [file: %s, line: %i]\n", file_path, line_count); +// printf("route (line %i): orig: '%s', neigh: '%s', prev_sender: '%s'\n", +// line_count, orig, neigh, prev_sender); + + if (((rt_flag == RT_FLAG_ADD) && (!neigh)) || + ((rt_flag == RT_FLAG_UPDATE) && (!prev_sender)) || + ((rt_flag == RT_FLAG_DELETE) && (!orig))) { + fprintf(stderr, "Broken '%s route' line found - skipping [file: %s, line: %i]\n", + (rt_flag == RT_FLAG_UPDATE ? "changing" : + (rt_flag == RT_FLAG_ADD ? "adding" : "deleting")), + file_path, line_count); continue; } -// printf("changing route (line %i): orig: '%s', neigh: '%s', prev_sender: '%s'\n", line_count, orig, neigh, prev_sender); - - res = routing_table_new(orig, neigh, prev_sender); + res = routing_table_new(orig, neigh, prev_sender, rt_flag); if (res < 1) fprintf(stderr, " [file: %s, line: %i]\n", file_path, line_count); } @@ -506,6 +614,7 @@ printf("\nChecking host: %s\n", get_name_by_macstr(bat_node->name, read_opt)); + list_for_each_entry(seqno_event, &bat_node->event_list, list) { /** * this received packet did not trigger a routing @@ -520,6 +629,10 @@ if ((seqno_max != -1) && (seqno_event->seqno > seqno_max)) continue; + /* special seqno that indicates an originator timeout */ + if (seqno_event->seqno == -1) + continue; + /** * sometime we change the routing table more than once * with the same seqno @@ -844,6 +957,10 @@ continue; list_for_each_entry(seqno_event, &bat_node->event_list, list) { + /* special seqno that indicates an originator timeout */ + if (seqno_event->seqno == -1) + continue; + if (!compare_name(trace_orig, seqno_event->orig->name)) continue; @@ -875,8 +992,7 @@ { struct bat_node *bat_node; struct seqno_event *seqno_event; - struct rt_table *prev_rt_table = NULL; - int i, j, changed_entry; + int i; printf("Routing tables of originator: %s ", get_name_by_macstr(rt_orig, read_opt)); @@ -910,39 +1026,42 @@ if ((seqno_max != -1) && (seqno_event->seqno > seqno_max)) continue; - printf("rt change triggered by OGM from: %s (tq: %i, ttl: %i, seqno %i", - get_name_by_macstr(seqno_event->orig->name, read_opt), - seqno_event->tq, seqno_event->ttl, seqno_event->seqno); - printf(", neigh: %s", - get_name_by_macstr(seqno_event->neigh->name, read_opt)); - printf(", prev_sender: %s)\n", - get_name_by_macstr(seqno_event->prev_sender->name, read_opt)); + if (seqno_event->orig) { + printf("rt change triggered by OGM from: %s (tq: %i, ttl: %i, seqno %i", + get_name_by_macstr(seqno_event->orig->name, read_opt), + seqno_event->tq, seqno_event->ttl, seqno_event->seqno); + printf(", neigh: %s", + get_name_by_macstr(seqno_event->neigh->name, read_opt)); + printf(", prev_sender: %s)\n", + get_name_by_macstr(seqno_event->prev_sender->name, read_opt)); + } else { + printf("rt change triggered by originator timeout: \n"); + } for (i = 0; i < seqno_event->rt_table->num_entries; i++) { - changed_entry = 1; + printf("%s %s via next hop", + (seqno_event->rt_table->entries[i].flags ? " *" : " "), + get_name_by_macstr(seqno_event->rt_table->entries[i].orig, read_opt)); + printf(" %s", + get_name_by_macstr(seqno_event->rt_table->entries[i].next_hop->name, read_opt)); - if (prev_rt_table) { - for (j = 0; j < prev_rt_table->num_entries; j++) { - if (!compare_name(seqno_event->rt_table->entries[i].orig, prev_rt_table->entries[j].orig)) - continue; - - if (seqno_event->rt_table->entries[i].next_hop != prev_rt_table->entries[j].next_hop) - continue; - - changed_entry = 0; - break; - } + switch (seqno_event->rt_table->entries[i].flags) { + case RT_FLAG_ADD: + printf(" (route added)\n"); + break; + case RT_FLAG_UPDATE: + printf(" (next hop changed)\n"); + break; + case RT_FLAG_DELETE: + printf(" (route deleted)\n"); + break; + default: + printf("\n"); + break; } - - printf("%s %s via next hop", (changed_entry ? " *" : " "), - get_name_by_macstr(seqno_event->rt_table->entries[i].orig, read_opt)); - printf(" %s\n", - get_name_by_macstr(seqno_event->rt_table->entries[i].next_hop->name, read_opt)); } printf("\n"); - - prev_rt_table = seqno_event->rt_table; } out: Modified: trunk/batctl/bisect.h =================================================================== --- trunk/batctl/bisect.h 2009-10-18 11:47:08 UTC (rev 1453) +++ trunk/batctl/bisect.h 2009-10-25 00:13:44 UTC (rev 1454) @@ -23,6 +23,10 @@ #define MAX_LINE 256 #define LOOP_MAGIC_LEN ((2 * NAME_LEN) + (2 * sizeof(int)) - 2) +#define RT_FLAG_ADD 1 +#define RT_FLAG_UPDATE 2 +#define RT_FLAG_DELETE 3 + int bisect(int argc, char **argv); struct bat_node { @@ -41,6 +45,7 @@ struct rt_entry { char orig[NAME_LEN]; struct bat_node *next_hop; + char flags; }; struct seqno_event {

1 0

[git] batman-adv branch, master, updated. f01af72e428717f15f2f612c07fd8ed57da19b7c
by postmaster＠open-mesh.net 18 Oct '09

18 Oct '09

The following commit has been merged in the master branch: commit f01af72e428717f15f2f612c07fd8ed57da19b7c Author: marek <marek@45894c77-fb22-0410-b583-ff6e7d5dbf6c> Date: Sun Oct 18 11:47:08 2009 +0000 [batman-adv] remove last LINUX_VERSION_CODE check outside of compat.h git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1453 45894c77-fb22-0410-b583-ff6e7d5dbf6c diff --git a/soft-interface.c b/soft-interface.c index 08a16e3..fa5289e 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -83,7 +83,7 @@ int my_skb_push(struct sk_buff *skb, unsigned int len) return 0; } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) +#ifdef HAVE_NET_DEVICE_OPS static const struct net_device_ops bat_netdev_ops = { .ndo_open = interface_open, .ndo_stop = interface_release, @@ -93,7 +93,7 @@ static const struct net_device_ops bat_netdev_ops = { .ndo_start_xmit = interface_tx, .ndo_validate_addr = eth_validate_addr }; -#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) */ +#endif void interface_setup(struct net_device *dev) { @@ -102,16 +102,16 @@ void interface_setup(struct net_device *dev) ether_setup(dev); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) +#ifdef HAVE_NET_DEVICE_OPS + dev->netdev_ops = &bat_netdev_ops; +#else dev->open = interface_open; dev->stop = interface_release; dev->get_stats = interface_stats; dev->set_mac_address = interface_set_mac_addr; dev->change_mtu = interface_change_mtu; dev->hard_start_xmit = interface_tx; -#else - dev->netdev_ops = &bat_netdev_ops; -#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) */ +#endif dev->destructor = free_netdev; dev->mtu = hardif_min_mtu(); -- batman-adv

1 0

[git] batman-adv branch, master, updated. f01af72e428717f15f2f612c07fd8ed57da19b7c
by postmaster＠open-mesh.net 18 Oct '09

18 Oct '09

The following commit has been merged in the master branch: commit 60b750e5ad69e7a06b9db09561e89f4b7456ec93 Author: marek <marek@45894c77-fb22-0410-b583-ff6e7d5dbf6c> Date: Sat Oct 17 22:11:17 2009 +0000 [batman-adv] print a warning when an existing mac address is added again git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1452 45894c77-fb22-0410-b583-ff6e7d5dbf6c diff --git a/hard-interface.c b/hard-interface.c index dd5e784..f04d2db 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -70,6 +70,28 @@ int hardif_min_mtu(void) return min_mtu; } +void check_known_mac_addr(uint8_t *addr) +{ + struct batman_if *batman_if; + char mac_string[ETH_STR_LEN]; + + rcu_read_lock(); + list_for_each_entry_rcu(batman_if, &if_list, list) { + if ((batman_if->if_active != IF_ACTIVE) && + (batman_if->if_active != IF_TO_BE_ACTIVATED)) + continue; + + if (!compare_orig(batman_if->net_dev->dev_addr, addr)) + continue; + + addr_to_string(mac_string, addr); + debug_log(LOG_TYPE_WARN, "The newly added mac address (%s) already exists on: %s\n", + mac_string, batman_if->dev); + debug_log(LOG_TYPE_WARN, "It is strongly recommended to keep mac addresses unique to avoid problems!\n"); + } + rcu_read_unlock(); +} + /* adjusts the MTU if a new interface with a smaller MTU appeared. */ void update_min_mtu(void) { @@ -191,6 +213,8 @@ void hardif_activate_interface(struct batman_if *batman_if) goto bind_err; } + check_known_mac_addr(batman_if->net_dev->dev_addr); + 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; -- batman-adv

1 0

[git] batman-adv branch, master, updated. f01af72e428717f15f2f612c07fd8ed57da19b7c
by postmaster＠open-mesh.net 18 Oct '09

18 Oct '09

The following commit has been merged in the master branch: commit fb0d487a472d0d7d45d032c3fda7c9fe21ca5e42 Author: simon <simon@45894c77-fb22-0410-b583-ff6e7d5dbf6c> Date: Sat Oct 17 19:28:57 2009 +0000 announce compile-compatibility for tested kernels in the README git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1450 45894c77-fb22-0410-b583-ff6e7d5dbf6c diff --git a/README b/README index b97a78b..63465c2 100644 --- a/README +++ b/README @@ -6,7 +6,7 @@ BATMAN-ADV The kernel implementation of batman-advanced. It does not depend on any network driver, and can be used on wifi as well as ethernet, vpn, etc ... (anything with ethernet-style layer 2). -It compiles against and should work with Linux 2.6.20 - 2.6.28. Supporting older +It compiles against and should work with Linux 2.6.20 - 2.6.31. Supporting older versions is not planned, but it's probably easy to backport it. If you work on a backport, feel free to contact us. :-) -- batman-adv

1 0

[git] batman-adv branch, master, updated. f01af72e428717f15f2f612c07fd8ed57da19b7c
by postmaster＠open-mesh.net 18 Oct '09

18 Oct '09

The following commit has been merged in the master branch: commit 5f8662734b43eedee4b06d351e6e601b2627df7e Author: simon <simon@45894c77-fb22-0410-b583-ff6e7d5dbf6c> Date: Sat Oct 17 22:01:20 2009 +0000 drop false packets which are found in the padding of Ethernet frames. git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1451 45894c77-fb22-0410-b583-ff6e7d5dbf6c diff --git a/routing.c b/routing.c index 7e40363..c317998 100644 --- a/routing.c +++ b/routing.c @@ -400,6 +400,19 @@ void receive_bat_packet(struct ethhdr *ethhdr, struct batman_packet *batman_pack char is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0, is_broadcast = 0, is_bidirectional, is_single_hop_neigh, is_duplicate; unsigned short if_incoming_seqno; + /* Silently drop when the batman packet is actually not a correct packet. + * + * This might happen if a packet is padded (e.g. Ethernet has a + * minimum frame length of 64 byte) and the aggregation interprets + * it as an additional length. + * + * TODO: A more sane solution would be to have a bit in the batman_packet + * to detect whether the packet is the last packet in an aggregation. + * Here we expect that the padding is always zero (or not 0x01) + */ + if (batman_packet->packet_type != BAT_PACKET) + return; + /* could be changed by schedule_own_packet() */ if_incoming_seqno = atomic_read(&if_incoming->seqno); -- batman-adv

1 0

[git] batman-adv branch, master, updated. f01af72e428717f15f2f612c07fd8ed57da19b7c
by postmaster＠open-mesh.net 18 Oct '09

18 Oct '09

The following commit has been merged in the master branch: commit d12f37978e17567ac05ab34d54b66236d4340f22 Author: simon <simon@45894c77-fb22-0410-b583-ff6e7d5dbf6c> Date: Sat Oct 17 17:58:14 2009 +0000 remove warning when unregistering device as it won't be checked for newer kernels. Adjust style according to checkpatchs (2.6.30) recommendations git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1448 45894c77-fb22-0410-b583-ff6e7d5dbf6c diff --git a/device.c b/device.c index 6383839..c5fc6fe 100644 --- a/device.c +++ b/device.c @@ -79,8 +79,6 @@ int bat_device_setup(void) void bat_device_destroy(void) { - int result = 0; - if (!Major) return; @@ -88,14 +86,7 @@ void bat_device_destroy(void) class_destroy(batman_class); /* Unregister the device */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) - result = unregister_chrdev(Major, DRIVER_DEVICE); -#else unregister_chrdev(Major, DRIVER_DEVICE); -#endif - - if (result < 0) - debug_log(LOG_TYPE_WARN, "Unregistering the character device failed with %d\n", result); Major = 0; } @@ -266,8 +257,8 @@ ssize_t bat_device_write(struct file *file, const char __user *buff, ETH_ALEN); send_raw_packet((unsigned char *)&icmp_packet, - sizeof(struct icmp_packet), - batman_if, orig_node->router->addr); + sizeof(struct icmp_packet), + batman_if, orig_node->router->addr); spin_unlock(&orig_hash_lock); goto out; -- batman-adv

1 0

[git] batman-adv branch, master, updated. f01af72e428717f15f2f612c07fd8ed57da19b7c
by postmaster＠open-mesh.net 18 Oct '09

18 Oct '09

The following commit has been merged in the master branch: commit a8ea1ec663906950aa93b33bf3879c42ae5adff0 Author: simon <simon@45894c77-fb22-0410-b583-ff6e7d5dbf6c> Date: Sat Oct 17 18:08:34 2009 +0000 as routing.c uses cancel_delayed_work_sync(), add compat.h to support kernels < 2.6.23 git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1449 45894c77-fb22-0410-b583-ff6e7d5dbf6c diff --git a/routing.c b/routing.c index 081140e..7e40363 100644 --- a/routing.c +++ b/routing.c @@ -34,6 +34,7 @@ #include "ring_buffer.h" #include "vis.h" #include "aggregation.h" +#include "compat.h" -- batman-adv

1 0

[git] batman-adv branch, master, updated. f01af72e428717f15f2f612c07fd8ed57da19b7c
by postmaster＠open-mesh.net 18 Oct '09

18 Oct '09

The following commit has been merged in the master branch: commit 4fab6a00f5a44ee5ca30e556575d8c707a9b7e61 Author: simon <simon@45894c77-fb22-0410-b583-ff6e7d5dbf6c> Date: Sat Oct 17 17:56:02 2009 +0000 enable pre2.6.25 kernels again by adding compatibility for strict_strto[u]l() git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1447 45894c77-fb22-0410-b583-ff6e7d5dbf6c diff --git a/compat.h b/compat.h index 2f0877c..cd3e71f 100644 --- a/compat.h +++ b/compat.h @@ -60,3 +60,14 @@ #define cancel_delayed_work_sync(wq) cancel_rearming_delayed_work(wq) #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25) +#define strict_strtoul(cp, base, res) \ + ({ \ + int ret = 0; \ + char *endp; \ + *res = simple_strtoul(cp, &endp, base); \ + if (cp == endp) \ + ret = -EINVAL; \ + ret; \ +}) +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25) */ diff --git a/proc.c b/proc.c index 8718079..7677de0 100644 --- a/proc.c +++ b/proc.c @@ -26,6 +26,7 @@ #include "types.h" #include "hash.h" #include "vis.h" +#include "compat.h" uint8_t vis_format = DOT_DRAW; @@ -146,7 +147,7 @@ static ssize_t proc_orig_interval_write(struct file *file, { char *interval_string; int not_copied = 0; - long originator_interval_tmp; + unsigned long originator_interval_tmp; int retval; interval_string = kmalloc(count, GFP_KERNEL); @@ -157,7 +158,7 @@ static ssize_t proc_orig_interval_write(struct file *file, not_copied = copy_from_user(interval_string, buffer, count); interval_string[count - not_copied - 1] = 0; - retval = strict_strtol(interval_string, 10, &originator_interval_tmp); + retval = strict_strtoul(interval_string, 10, &originator_interval_tmp); if (retval) { debug_log(LOG_TYPE_WARN, "New originator interval invalid\n"); goto end; @@ -290,7 +291,7 @@ static ssize_t proc_log_level_write(struct file *instance, { char *log_level_string, *tokptr, *cp; int finished, not_copied = 0; - uint8_t log_level_tmp = 0; + unsigned long log_level_tmp = 0; log_level_string = kmalloc(count, GFP_KERNEL); @@ -300,10 +301,8 @@ static ssize_t proc_log_level_write(struct file *instance, not_copied = copy_from_user(log_level_string, userbuffer, count); log_level_string[count - not_copied - 1] = 0; - log_level_tmp = simple_strtol(log_level_string, &cp, 10); - - if (cp == log_level_string) { - /* was not (beginning with) a number, doing textual parsing */ + if (strict_strtoul(log_level_string, 10, &log_level_tmp) < 0) { + /* was not a number, doing textual parsing */ log_level_tmp = 0; tokptr = log_level_string; @@ -663,7 +662,7 @@ static ssize_t proc_aggr_write(struct file *file, const char __user *buffer, { char *aggr_string; int not_copied = 0; - long aggregation_enabled_tmp; + unsigned long aggregation_enabled_tmp; aggr_string = kmalloc(count, GFP_KERNEL); @@ -673,7 +672,7 @@ static ssize_t proc_aggr_write(struct file *file, const char __user *buffer, not_copied = copy_from_user(aggr_string, buffer, count); aggr_string[count - not_copied - 1] = 0; - strict_strtol(aggr_string, 10, &aggregation_enabled_tmp); + strict_strtoul(aggr_string, 10, &aggregation_enabled_tmp); if ((aggregation_enabled_tmp != 0) && (aggregation_enabled_tmp != 1)) { debug_log(LOG_TYPE_WARN, "Aggregation can only be enabled (1) or disabled (0), given value: %li\n", aggregation_enabled_tmp); -- batman-adv

1 0

[git] batman-adv branch, master, updated. f01af72e428717f15f2f612c07fd8ed57da19b7c
by postmaster＠open-mesh.net 18 Oct '09

18 Oct '09

The following commit has been merged in the master branch: commit 957c36fbdb1d37b4d7b6b2faccb1ce3f34fc50ce Author: simon <simon@45894c77-fb22-0410-b583-ff6e7d5dbf6c> Date: Sat Oct 17 16:28:30 2009 +0000 use random ethernet address generator from the kernel git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1446 45894c77-fb22-0410-b583-ff6e7d5dbf6c diff --git a/soft-interface.c b/soft-interface.c index d916764..08a16e3 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -119,8 +119,7 @@ void interface_setup(struct net_device *dev) * skbuff for our header */ /* generate random address */ - *(u16 *)dev_addr = __constant_htons(0x00FF); - get_random_bytes(dev_addr + sizeof(u16), 4); + random_ether_addr(dev_addr); memcpy(dev->dev_addr, dev_addr, sizeof(dev->dev_addr)); SET_ETHTOOL_OPS(dev, &bat_ethtool_ops); -- batman-adv

1 0

r1453 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 18 Oct '09

18 Oct '09

Author: marek Date: 2009-10-18 11:47:08 +0000 (Sun, 18 Oct 2009) New Revision: 1453 Modified: trunk/batman-adv-kernelland/soft-interface.c Log: [batman-adv] remove last LINUX_VERSION_CODE check outside of compat.h Modified: trunk/batman-adv-kernelland/soft-interface.c =================================================================== --- trunk/batman-adv-kernelland/soft-interface.c 2009-10-17 22:11:17 UTC (rev 1452) +++ trunk/batman-adv-kernelland/soft-interface.c 2009-10-18 11:47:08 UTC (rev 1453) @@ -83,7 +83,7 @@ return 0; } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) +#ifdef HAVE_NET_DEVICE_OPS static const struct net_device_ops bat_netdev_ops = { .ndo_open = interface_open, .ndo_stop = interface_release, @@ -93,7 +93,7 @@ .ndo_start_xmit = interface_tx, .ndo_validate_addr = eth_validate_addr }; -#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) */ +#endif void interface_setup(struct net_device *dev) { @@ -102,16 +102,16 @@ ether_setup(dev); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) +#ifdef HAVE_NET_DEVICE_OPS + dev->netdev_ops = &bat_netdev_ops; +#else dev->open = interface_open; dev->stop = interface_release; dev->get_stats = interface_stats; dev->set_mac_address = interface_set_mac_addr; dev->change_mtu = interface_change_mtu; dev->hard_start_xmit = interface_tx; -#else - dev->netdev_ops = &bat_netdev_ops; -#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) */ +#endif dev->destructor = free_netdev; dev->mtu = hardif_min_mtu();

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits