commits

commits@lists.open-mesh.org

1 participants
12298 discussions

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

08 Oct '09

Author: marek Date: 2009-09-12 17:28:23 +0000 (Sat, 12 Sep 2009) New Revision: 1436 Modified: trunk/batman-adv-kernelland/device.c trunk/batman-adv-kernelland/main.c Log: [batman-adv] Remove compatibility code for pre 2.6 kernel versions The earliest version of linux which is compatible to batman-adv-kernelland is 2.6.20. Their are patches available in debian for batman-adv-kernelland 0.1 to make it build against linux 2.6.15, but they cannot be ported to current trunk due to changes to the working queues. To have "support" for much older versions isn't needed and can be removed without loosing any functionality. As result the only remaining LINUX_VERSION_CODE dependend precomiler code beside compat.h is for netdevice_ops support in soft-interface.c and result code checking of unregister_chrdev in device.c. For a possible merge into linux compat.h and all appearances of LINUX_VERSION_CODE should be removed according to checkpatch.pl. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Modified: trunk/batman-adv-kernelland/device.c =================================================================== --- trunk/batman-adv-kernelland/device.c 2009-09-11 17:56:56 UTC (rev 1435) +++ trunk/batman-adv-kernelland/device.c 2009-09-12 17:28:23 UTC (rev 1436) @@ -26,9 +26,7 @@ #include "compat.h" -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) static struct class *batman_class; -#endif static int Major; /* Major number assigned to our device driver */ @@ -65,13 +63,6 @@ return 0; } -#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 0; - } -#else batman_class = class_create(THIS_MODULE, "batman-adv"); if (IS_ERR(batman_class)) { @@ -81,7 +72,6 @@ device_create(batman_class, NULL, MKDEV(tmp_major, 0), NULL, "batman-adv"); -#endif Major = tmp_major; return 1; @@ -94,12 +84,8 @@ if (!Major) return; -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) - devfs_remove("batman-adv", 0); -#else device_destroy(batman_class, MKDEV(Major, 0)); class_destroy(batman_class); -#endif /* Unregister the device */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) Modified: trunk/batman-adv-kernelland/main.c =================================================================== --- trunk/batman-adv-kernelland/main.c 2009-09-11 17:56:56 UTC (rev 1435) +++ trunk/batman-adv-kernelland/main.c 2009-09-12 17:28:23 UTC (rev 1436) @@ -203,20 +203,12 @@ void inc_module_count(void) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) - MOD_INC_USE_COUNT; -#else try_module_get(THIS_MODULE); -#endif } void dec_module_count(void) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) - MOD_DEC_USE_COUNT; -#else module_put(THIS_MODULE); -#endif } int addr_to_string(char *buff, uint8_t *addr)

1 0

r1435 - trunk/batman/linux
by postmaster＠open-mesh.net 08 Oct '09

08 Oct '09

Author: marek Date: 2009-09-11 17:56:56 +0000 (Fri, 11 Sep 2009) New Revision: 1435 Modified: trunk/batman/linux/tun.c Log: [batman] add iptables MSS CLAMP rule in mangle table as suggested by Michael Rack Modified: trunk/batman/linux/tun.c =================================================================== --- trunk/batman/linux/tun.c 2009-09-11 17:56:53 UTC (rev 1434) +++ trunk/batman/linux/tun.c 2009-09-11 17:56:56 UTC (rev 1435) @@ -40,6 +40,9 @@ #define IPTABLES_ADD_MASQ "iptables -t nat -A POSTROUTING -o %s -j MASQUERADE" #define IPTABLES_DEL_MASQ "iptables -t nat -D POSTROUTING -o %s -j MASQUERADE" +#define IPTABLES_ADD_MSS "iptables -t mangle -I POSTROUTING -p tcp --tcp-flags SYN,RST SYN -o %s -j TCPMSS --clamp-mss-to-pmtu" +#define IPTABLES_DEL_MSS "iptables -t mangle -D POSTROUTING -p tcp --tcp-flags SYN,RST SYN -o %s -j TCPMSS --clamp-mss-to-pmtu" + #define IPTABLES_ADD_ACC "iptables -t nat -I POSTROUTING -s %s/%i -j ACCEPT" #define IPTABLES_DEL_ACC "iptables -t nat -D POSTROUTING -s %s/%i -j ACCEPT" @@ -101,17 +104,23 @@ } void add_nat_rule(char *dev) { - char cmd[100]; + char cmd[150]; sprintf(cmd, IPTABLES_ADD_MASQ, dev); exec_iptables_rule(cmd, ROUTE_ADD); + + sprintf(cmd, IPTABLES_ADD_MSS, dev); + exec_iptables_rule(cmd, ROUTE_ADD); } void del_nat_rule(char *dev) { - char cmd[100]; + char cmd[150]; sprintf(cmd, IPTABLES_DEL_MASQ, dev); exec_iptables_rule(cmd, ROUTE_DEL); + + sprintf(cmd, IPTABLES_ADD_MSS, dev); + exec_iptables_rule(cmd, ROUTE_DEL); } void hna_local_update_nat(uint32_t hna_ip, uint8_t netmask, int8_t route_action) {

1 0

r1434 - trunk/batman
by postmaster＠open-mesh.net 08 Oct '09

08 Oct '09

Author: marek Date: 2009-09-11 17:56:53 +0000 (Fri, 11 Sep 2009) New Revision: 1434 Modified: trunk/batman/schedule.c Log: [batman] check whether we have a valid "previous ttl" to avoid a TTL of 255 Modified: trunk/batman/schedule.c =================================================================== --- trunk/batman/schedule.c 2009-09-11 17:56:49 UTC (rev 1433) +++ trunk/batman/schedule.c 2009-09-11 17:56:53 UTC (rev 1434) @@ -230,10 +230,10 @@ /* rebroadcast ogm of best ranking neighbor as is */ if (orig_node->router->addr != neigh) { - bat_packet->tq = orig_node->router->tq_avg; - bat_packet->ttl = orig_node->router->last_ttl - 1; + if (orig_node->router->last_ttl) + bat_packet->ttl = orig_node->router->last_ttl - 1; } tq_avg = orig_node->router->tq_avg;

1 0

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

08 Oct '09

Author: marek Date: 2009-09-11 17:56:49 +0000 (Fri, 11 Sep 2009) New Revision: 1433 Modified: trunk/batman-adv-kernelland/send.c Log: [batman-adv] check whether we have a valid "previous ttl" to avoid a TTL of 255 Modified: trunk/batman-adv-kernelland/send.c =================================================================== --- trunk/batman-adv-kernelland/send.c 2009-09-10 16:31:08 UTC (rev 1432) +++ trunk/batman-adv-kernelland/send.c 2009-09-11 17:56:49 UTC (rev 1433) @@ -301,7 +301,9 @@ /* rebroadcast ogm of best ranking neighbor as is */ if (!compare_orig(orig_node->router->addr, ethhdr->h_source)) { batman_packet->tq = orig_node->router->tq_avg; - batman_packet->ttl = orig_node->router->last_ttl - 1; + + if (orig_node->router->last_ttl) + batman_packet->ttl = orig_node->router->last_ttl - 1; } tq_avg = orig_node->router->tq_avg;

1 0

r143 - trunk/batman
by postmaster＠open-mesh.net 08 Oct '09

08 Oct '09

Author: marek Date: 2006-12-06 02:25:43 +0000 (Wed, 06 Dec 2006) New Revision: 143 Modified: trunk/batman/batman.c Log: - fix crashes in schedule_forward_packet && send_outstanding_packets Modified: trunk/batman/batman.c =================================================================== --- trunk/batman/batman.c 2006-12-06 01:49:21 UTC (rev 142) +++ trunk/batman/batman.c 2006-12-06 02:25:43 UTC (rev 143) @@ -790,42 +790,42 @@ output( "ttl exceeded \n" ); } else { - forw_node_new = alloc_memory(sizeof (struct forw_node)); - INIT_LIST_HEAD(&forw_node_new->list); + /* list_for_each(forw_pos, &forw_list) { + forw_node = list_entry(forw_pos, struct forw_node, list); + if ((int)(forw_node->when - forw_node_new->when) > 0) + break; + } */ - memcpy(&forw_node_new->pack, in, sizeof (struct packet)); + if ( unidirectional ) { - forw_node_new->pack.ttl--; - forw_node_new->when = get_time(); + forw_node_new = alloc_memory(sizeof (struct forw_node)); + INIT_LIST_HEAD(&forw_node_new->list); - if ( hna_buff_len > 0 ) { + memcpy(&forw_node_new->pack, in, sizeof (struct packet)); - forw_node_new->hna_buff = alloc_memory( hna_buff_len ); - forw_node_new->hna_buff_len = hna_buff_len; + forw_node_new->pack.ttl--; + forw_node_new->when = get_time(); - memcpy( forw_node_new->hna_buff, hna_recv_buff, hna_buff_len ); + if ( hna_buff_len > 0 ) { - } else { + forw_node_new->hna_buff = alloc_memory( hna_buff_len ); + forw_node_new->hna_buff_len = hna_buff_len; - forw_node_new->hna_buff = NULL; - forw_node_new->hna_buff_len = 0; + memcpy( forw_node_new->hna_buff, hna_recv_buff, hna_buff_len ); - } + } else { - list_for_each(forw_pos, &forw_list) { - forw_node = list_entry(forw_pos, struct forw_node, list); - if ((int)(forw_node->when - forw_node_new->when) > 0) - break; - } + forw_node_new->hna_buff = NULL; + forw_node_new->hna_buff_len = 0; - if ( unidirectional ) { + } forw_node_new->pack.flags = ( UNIDIRECTIONAL | DIRECTLINK ); if ( if_outgoing != NULL ) { forw_node_new->if_outgoing = if_outgoing; - list_add( &forw_node_new->list, (forw_node == NULL ? &forw_list : forw_pos) ); + list_add( &forw_node_new->list, /* ( forw_node == NULL ? &forw_list : forw_pos )*/ &forw_list ); } else { @@ -845,13 +845,35 @@ batman_if = list_entry(if_pos, struct batman_if, list); + forw_node_new = alloc_memory(sizeof (struct forw_node)); + INIT_LIST_HEAD(&forw_node_new->list); + + memcpy(&forw_node_new->pack, in, sizeof (struct packet)); + + forw_node_new->pack.ttl--; + forw_node_new->when = get_time(); + + if ( hna_buff_len > 0 ) { + + forw_node_new->hna_buff = alloc_memory( hna_buff_len ); + forw_node_new->hna_buff_len = hna_buff_len; + + memcpy( forw_node_new->hna_buff, hna_recv_buff, hna_buff_len ); + + } else { + + forw_node_new->hna_buff = NULL; + forw_node_new->hna_buff_len = 0; + + } + if ( ( direct_link ) && ( if_outgoing == batman_if ) ) forw_node_new->pack.flags = DIRECTLINK; else forw_node_new->pack.flags = 0x00; forw_node_new->if_outgoing = batman_if; - list_add( &forw_node_new->list, (forw_node == NULL ? &forw_list : forw_pos) ); + list_add( &forw_node_new->list, &forw_list ); } @@ -892,8 +914,8 @@ } if ( debug_level == 4 ) { - addr_to_string(forw_node->pack.orig, orig_str, ADDR_STR_LEN); - output("Forwarding packet (originator %s, seqno %d, TTL %d)\n", orig_str, forw_node->pack.seqno, forw_node->pack.ttl); + addr_to_string( forw_node->pack.orig, orig_str, ADDR_STR_LEN ); + output( "Forwarding packet (originator %s, seqno %d, TTL %d) on interface %s\n", orig_str, forw_node->pack.seqno, forw_node->pack.ttl, forw_node->if_outgoing->dev ); } if ( send_packet( send_buff, sizeof (struct packet) + forw_node->hna_buff_len, &forw_node->if_outgoing->broad, forw_node->if_outgoing->udp_send_sock ) < 0 ) {

1 0

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

08 Oct '09

Author: marek Date: 2009-09-10 16:31:08 +0000 (Thu, 10 Sep 2009) New Revision: 1432 Modified: trunk/batman-adv-kernelland/vis.c Log: [batman-adv] can't sleep while holding a spinlock Modified: trunk/batman-adv-kernelland/vis.c =================================================================== --- trunk/batman-adv-kernelland/vis.c 2009-09-09 15:12:08 UTC (rev 1431) +++ trunk/batman-adv-kernelland/vis.c 2009-09-10 16:31:08 UTC (rev 1432) @@ -497,7 +497,7 @@ goto err; } - my_vis_info = kmalloc(1000, GFP_KERNEL); + my_vis_info = kmalloc(1000, GFP_ATOMIC); if (!my_vis_info) { debug_log(LOG_TYPE_CRIT, "Can't initialize vis packet\n"); goto err;

1 0

r1431 - trunk/batctl
by postmaster＠open-mesh.net 08 Oct '09

08 Oct '09

Author: marek Date: 2009-09-09 15:12:08 +0000 (Wed, 09 Sep 2009) New Revision: 1431 Modified: trunk/batctl/bisect.c Log: [batctl] fix regression that came with r1428 Modified: trunk/batctl/bisect.c =================================================================== --- trunk/batctl/bisect.c 2009-09-09 15:07:56 UTC (rev 1430) +++ trunk/batctl/bisect.c 2009-09-09 15:12:08 UTC (rev 1431) @@ -817,7 +817,7 @@ continue; if ((seqno_max != -1) && (seqno_event->seqno > seqno_max)) - break; + continue; res = seqno_trace_add(&trace_list, bat_node, seqno_event);

1 0

r1430 - trunk/batctl
by postmaster＠open-mesh.net 08 Oct '09

08 Oct '09

Author: marek Date: 2009-09-09 15:07:56 +0000 (Wed, 09 Sep 2009) New Revision: 1430 Modified: trunk/batctl/bisect.c trunk/batctl/bisect.h Log: [batctl] rename old_orig to prev_sender to be consistent with the documentation Modified: trunk/batctl/bisect.c =================================================================== --- trunk/batctl/bisect.c 2009-09-09 15:07:52 UTC (rev 1429) +++ trunk/batctl/bisect.c 2009-09-09 15:07:56 UTC (rev 1430) @@ -196,9 +196,9 @@ return 0; } -static int seqno_event_new(char *iface_addr, char *orig, char *old_orig, char *neigh, int seqno, int tq, int ttl) +static int seqno_event_new(char *iface_addr, char *orig, char *prev_sender, char *neigh, int seqno, int tq, int ttl) { - struct bat_node *orig_node, *neigh_node, *old_orig_node; + struct bat_node *orig_node, *neigh_node, *prev_sender_node; struct seqno_event *seqno_event; if (!iface_addr) { @@ -243,8 +243,8 @@ if (!neigh_node) goto err; - old_orig_node = node_get(old_orig); - if (!old_orig_node) + prev_sender_node = node_get(prev_sender); + if (!prev_sender_node) goto err; seqno_event = malloc(sizeof(struct seqno_event)); @@ -256,7 +256,7 @@ INIT_LIST_HEAD(&seqno_event->list); seqno_event->orig = orig_node; seqno_event->neigh = neigh_node; - seqno_event->old_orig = old_orig_node; + seqno_event->prev_sender = prev_sender_node; seqno_event->seqno = seqno; seqno_event->tq = tq; seqno_event->ttl = ttl; @@ -273,7 +273,7 @@ { FILE *fd; char line_buff[MAX_LINE], *start_ptr, *tok_ptr; - char *neigh, *iface_addr, *orig, *old_orig; + char *neigh, *iface_addr, *orig, *prev_sender; int line_count = 0, tq, ttl, seqno, i, res; fd = fopen(file_path, "r"); @@ -290,7 +290,7 @@ if (strstr(start_ptr, "Received BATMAN packet via NB")) { tok_ptr = strtok(start_ptr, " "); - neigh = iface_addr = orig = old_orig = NULL; + neigh = iface_addr = orig = prev_sender = NULL; seqno = tq = ttl = -1; for (i = 0; i < 21; i++) { @@ -312,8 +312,8 @@ orig[strlen(orig) - 1] = 0; break; case 14: - old_orig = tok_ptr; - old_orig[strlen(old_orig) - 1] = 0; + prev_sender = tok_ptr; + prev_sender[strlen(prev_sender) - 1] = 0; break; case 16: seqno = strtol(tok_ptr, NULL, 10); @@ -332,15 +332,15 @@ continue; } -// fprintf(stderr, "received packet (line %i): neigh: '%s', iface_addr: '%s', orig: '%s', old_orig: '%s', seqno: %i, tq: %i, ttl: %i\n", line_count, neigh, iface_addr, orig, old_orig, seqno, tq, ttl); +// fprintf(stderr, "received packet (line %i): neigh: '%s', iface_addr: '%s', orig: '%s', prev_sender: '%s', seqno: %i, tq: %i, ttl: %i\n", line_count, neigh, iface_addr, orig, prev_sender, seqno, tq, ttl); - res = seqno_event_new(iface_addr, orig, old_orig, neigh, seqno, tq, ttl); + res = seqno_event_new(iface_addr, orig, prev_sender, neigh, seqno, tq, ttl); if (res < 1) fprintf(stderr, " [file: %s, line: %i]\n", file_path, line_count); } else if (strstr(start_ptr, "Changing route towards")) { tok_ptr = strtok(start_ptr, " "); - orig = neigh = old_orig = NULL; + orig = neigh = prev_sender = NULL; for (i = 0; i < 12; i++) { tok_ptr = strtok(NULL, " "); @@ -355,20 +355,20 @@ neigh = tok_ptr; break; case 9: - old_orig = tok_ptr; - old_orig[strlen(old_orig) - 2] = 0; + prev_sender = tok_ptr; + prev_sender[strlen(prev_sender) - 2] = 0; break; } } - if (!old_orig) { + if (!prev_sender) { fprintf(stderr, "Broken 'changing route' line found - skipping [file: %s, line: %i]\n", file_path, line_count); continue; } -// printf("changing route (line %i): orig: '%s', neigh: '%s', old_orig: '%s'\n", line_count, orig, neigh, old_orig); +// 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, old_orig); + res = routing_table_new(orig, neigh, prev_sender); if (res < 1) fprintf(stderr, " [file: %s, line: %i]\n", file_path, line_count); } @@ -527,7 +527,7 @@ seqno_trace_neigh->seqno_event->ttl); printf(", neigh: %s", get_name_by_macstr(seqno_trace_neigh->seqno_event->neigh->name, read_opt)); - printf(", old_orig: %s]\n", get_name_by_macstr(seqno_trace_neigh->seqno_event->old_orig->name, read_opt)); + printf(", prev_sender: %s]\n", get_name_by_macstr(seqno_trace_neigh->seqno_event->prev_sender->name, read_opt)); for (i = 0; i < seqno_trace_neigh->num_neighbors; i++) { snprintf(new_head, sizeof(new_head), "%s%s", @@ -625,7 +625,7 @@ return NULL; } -static struct seqno_trace_neigh *seqno_trace_find_neigh(struct bat_node *neigh, struct bat_node *old_orig, +static struct seqno_trace_neigh *seqno_trace_find_neigh(struct bat_node *neigh, struct bat_node *prev_sender, struct seqno_trace_neigh *seqno_trace_neigh) { struct seqno_trace_neigh *seqno_trace_neigh_tmp, *seqno_trace_neigh_ret; @@ -635,10 +635,10 @@ seqno_trace_neigh_tmp = seqno_trace_neigh->seqno_trace_neigh[i]; if ((neigh == seqno_trace_neigh_tmp->bat_node) && - (old_orig == seqno_trace_neigh_tmp->seqno_event->neigh)) + (prev_sender == seqno_trace_neigh_tmp->seqno_event->neigh)) return seqno_trace_neigh_tmp; - seqno_trace_neigh_ret = seqno_trace_find_neigh(neigh, old_orig, seqno_trace_neigh_tmp); + seqno_trace_neigh_ret = seqno_trace_find_neigh(neigh, prev_sender, seqno_trace_neigh_tmp); if (seqno_trace_neigh_ret) return seqno_trace_neigh_ret; @@ -697,7 +697,7 @@ seqno_trace_neigh_tmp = seqno_trace->seqno_trace_neigh.seqno_trace_neigh[i]; if ((seqno_trace_neigh_tmp->seqno_event->neigh == seqno_trace_neigh_new->bat_node) && - (seqno_trace_neigh_tmp->seqno_event->old_orig == seqno_trace_neigh_new->seqno_event->neigh)) { + (seqno_trace_neigh_tmp->seqno_event->prev_sender == seqno_trace_neigh_new->seqno_event->neigh)) { res = seqno_trace_fix_leaf(seqno_trace_neigh_new, &seqno_trace->seqno_trace_neigh, seqno_trace_neigh_tmp); if (res < 1) @@ -772,7 +772,7 @@ } seqno_trace_neigh = seqno_trace_find_neigh(seqno_event->neigh, - seqno_event->old_orig, + seqno_event->prev_sender, &seqno_trace->seqno_trace_neigh); /* no neighbor found to hook up to - adding new root node */ @@ -880,8 +880,8 @@ seqno_event->tq, seqno_event->ttl, seqno_event->seqno); printf(", neigh: %s", get_name_by_macstr(seqno_event->neigh->name, read_opt)); - printf(", old_orig: %s)\n", - get_name_by_macstr(seqno_event->old_orig->name, read_opt)); + printf(", prev_sender: %s)\n", + get_name_by_macstr(seqno_event->prev_sender->name, read_opt)); for (i = 0; i < seqno_event->rt_table->num_entries; i++) { printf(" %s via next hop", Modified: trunk/batctl/bisect.h =================================================================== --- trunk/batctl/bisect.h 2009-09-09 15:07:52 UTC (rev 1429) +++ trunk/batctl/bisect.h 2009-09-09 15:07:56 UTC (rev 1430) @@ -47,7 +47,7 @@ struct list_head list; struct bat_node *orig; struct bat_node *neigh; - struct bat_node *old_orig; + struct bat_node *prev_sender; int seqno; int tq; int ttl;

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits