commits

commits@lists.open-mesh.org

1 participants
12159 discussions

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

17 Oct '09

Author: simon Date: 2009-10-17 17:56:02 +0000 (Sat, 17 Oct 2009) New Revision: 1447 Modified: trunk/batman-adv-kernelland/compat.h trunk/batman-adv-kernelland/proc.c Log: enable pre2.6.25 kernels again by adding compatibility for strict_strto[u]l() Modified: trunk/batman-adv-kernelland/compat.h =================================================================== --- trunk/batman-adv-kernelland/compat.h 2009-10-17 16:28:30 UTC (rev 1446) +++ trunk/batman-adv-kernelland/compat.h 2009-10-17 17:56:02 UTC (rev 1447) @@ -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) */ Modified: trunk/batman-adv-kernelland/proc.c =================================================================== --- trunk/batman-adv-kernelland/proc.c 2009-10-17 16:28:30 UTC (rev 1446) +++ trunk/batman-adv-kernelland/proc.c 2009-10-17 17:56:02 UTC (rev 1447) @@ -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 @@ { 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 @@ 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 @@ { 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 @@ 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 @@ { 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 @@ 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);

1 0

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

17 Oct '09

Author: simon Date: 2009-10-17 16:28:30 +0000 (Sat, 17 Oct 2009) New Revision: 1446 Modified: trunk/batman-adv-kernelland/soft-interface.c Log: use random ethernet address generator from the kernel Modified: trunk/batman-adv-kernelland/soft-interface.c =================================================================== --- trunk/batman-adv-kernelland/soft-interface.c 2009-10-16 23:35:21 UTC (rev 1445) +++ trunk/batman-adv-kernelland/soft-interface.c 2009-10-17 16:28:30 UTC (rev 1446) @@ -119,8 +119,7 @@ * 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);

1 0

r1445 - trunk/batctl
by postmaster＠open-mesh.net 16 Oct '09

16 Oct '09

Author: marek Date: 2009-10-16 23:35:21 +0000 (Fri, 16 Oct 2009) New Revision: 1445 Modified: trunk/batctl/bisect.c Log: [batctl] bisect - add output limitting options to the loop detection Modified: trunk/batctl/bisect.c =================================================================== --- trunk/batctl/bisect.c 2009-10-16 23:35:20 UTC (rev 1444) +++ trunk/batctl/bisect.c 2009-10-16 23:35:21 UTC (rev 1445) @@ -38,9 +38,10 @@ printf("Usage: batctl bisect [options] <file1> <file2> .. <fileN>\n"); printf("options:\n"); printf(" \t -h print this help\n"); + printf(" \t -l run a loop detection of given mac address or bat-host (default)\n"); printf(" \t -n don't convert addresses to bat-host names\n"); printf(" \t -r print routing tables of given mac address or bat-host\n"); - printf(" \t -s seqno range (requires routing table or trace seqno mode)\n"); + printf(" \t -s seqno range to limit the output\n"); printf(" \t -t trace seqnos of given mac address or bat-host\n"); } @@ -459,18 +460,36 @@ return 1; } -static void validate_rt_tables(int read_opt) +static void loop_detection(char *loop_orig, int seqno_min, int seqno_max, int read_opt) { struct bat_node *bat_node; struct seqno_event *seqno_event; struct hash_it_t *hashit = NULL; int i, last_seqno = -1, seqno_count = 0; + char check_orig[NAME_LEN]; - printf("\nAnalyzing routing tables:\n"); + printf("\nAnalyzing routing tables "); + /* if no option was given loop_orig is empty */ + memset(check_orig, 0, NAME_LEN); + if (memcmp(loop_orig, check_orig, NAME_LEN)) + printf("of originator: %s ", + get_name_by_macstr(loop_orig, read_opt)); + + if ((seqno_min == -1) && (seqno_max == -1)) + printf("[all sequence numbers]\n"); + else if (seqno_min == seqno_max) + printf("[sequence number: %i]\n", seqno_min); + else + printf("[sequence number range: %i-%i]\n", seqno_min, seqno_max); + while (NULL != (hashit = hash_iterate(node_hash, hashit))) { bat_node = hashit->bucket->data; + if (memcmp(loop_orig, check_orig, NAME_LEN) && + memcmp(loop_orig, bat_node->name, NAME_LEN) != 0) + continue; + /* we might have no log file from this node */ if (list_empty(&bat_node->event_list)) { fprintf(stderr, "\nNo seqno data from node '%s' - skipping\n", @@ -495,6 +514,12 @@ if (!seqno_event->rt_table) continue; + if ((seqno_min != -1) && (seqno_event->seqno < seqno_min)) + continue; + + if ((seqno_max != -1) && (seqno_event->seqno > seqno_max)) + continue; + /** * sometime we change the routing table more than once * with the same seqno @@ -963,13 +988,20 @@ int ret = EXIT_FAILURE, res, optchar, found_args = 1; int read_opt = USE_BAT_HOSTS, num_parsed_files; int tmp_seqno, seqno_max = -1, seqno_min = -1; - char *trace_orig_ptr = NULL, *rt_orig_ptr = NULL, orig[NAME_LEN], *dash_ptr; + char *trace_orig_ptr = NULL, *rt_orig_ptr = NULL, *loop_orig_ptr = NULL; + char orig[NAME_LEN], *dash_ptr; - while ((optchar = getopt(argc, argv, "hnr:s:t:")) != -1) { + memset(orig, 0, NAME_LEN); + + while ((optchar = getopt(argc, argv, "hl:nr:s:t:")) != -1) { switch (optchar) { case 'h': bisect_usage(); return EXIT_SUCCESS; + case 'l': + loop_orig_ptr = optarg; + found_args += ((*((char*)(optarg - 1)) == optchar ) ? 1 : 2); + break; case 'n': read_opt &= ~USE_BAT_HOSTS; found_args += 1; @@ -1030,6 +1062,12 @@ if ((rt_orig_ptr) && (trace_orig_ptr)) { printf("Error - the 'print routing table' option can't be used together with the the 'trace seqno' option\n"); goto err; + } else if ((loop_orig_ptr) && (trace_orig_ptr)) { + printf("Error - the 'loop detection' option can't be used together with the the 'trace seqno' option\n"); + goto err; + } else if ((loop_orig_ptr) && (rt_orig_ptr)) { + printf("Error - the 'loop detection' option can't be used together with the the 'print routing table' option\n"); + goto err; } else if (rt_orig_ptr) { res = get_orig_addr(rt_orig_ptr, orig); @@ -1040,11 +1078,11 @@ if (res < 1) goto err; - } + } else if (loop_orig_ptr) { + res = get_orig_addr(loop_orig_ptr, orig); - if ((seqno_min > 0) && (!rt_orig_ptr) && (!trace_orig_ptr)) { - printf("Error - the sequence range option can't be used without specifying an originator via print routing tables or the trace mode\n"); - goto err; + if (res < 1) + goto err; } /* we search a specific seqno - no range */ @@ -1076,7 +1114,7 @@ else if (rt_orig_ptr) print_rt_tables(orig, seqno_min, seqno_max, read_opt); else - validate_rt_tables(read_opt); + loop_detection(orig, seqno_min, seqno_max, read_opt); ret = EXIT_SUCCESS;

1 0

r1444 - trunk/batctl
by postmaster＠open-mesh.net 16 Oct '09

16 Oct '09

Author: marek Date: 2009-10-16 23:35:20 +0000 (Fri, 16 Oct 2009) New Revision: 1444 Modified: trunk/batctl/bisect.c Log: [batctl] bisect - pimp routing loop detection Modified: trunk/batctl/bisect.c =================================================================== --- trunk/batctl/bisect.c 2009-10-16 23:35:18 UTC (rev 1443) +++ trunk/batctl/bisect.c 2009-10-16 23:35:20 UTC (rev 1444) @@ -397,15 +397,10 @@ get_name_by_macstr(rt_entry->orig, read_opt), seqno_event->seqno); - /* single hop neighbors won't enter the while loop */ - if (compare_name(rt_entry->orig, rt_entry_tmp->next_hop->name)) - printf(" * %s", - get_name_by_macstr(rt_entry_tmp->next_hop->name, read_opt)); - - while (!compare_name(rt_entry->orig, rt_entry_tmp->next_hop->name)) { + while (1) { next_hop_node = rt_entry_tmp->next_hop; - printf(" * %s", + printf(" -> %s", get_name_by_macstr(next_hop_node->name, read_opt)); /* no more data - path seems[tm] fine */ @@ -421,7 +416,7 @@ /* we are running in a loop */ if (memcmp(curr_loop_magic, next_hop_node->loop_magic, LOOP_MAGIC_LEN) == 0) { - printf(" -> aborted due to loop"); + printf(" aborted due to loop!"); goto out; } @@ -451,6 +446,12 @@ /* no routing entry of orig ?? */ if (!rt_entry_tmp) goto out; + + if (compare_name(rt_entry->orig, rt_entry_tmp->next_hop->name)) { + printf(" -> %s.", + get_name_by_macstr(rt_entry_tmp->next_hop->name, read_opt)); + break; + } } out: @@ -472,19 +473,19 @@ /* we might have no log file from this node */ if (list_empty(&bat_node->event_list)) { - fprintf(stderr, "No seqno data from node '%s' - skipping\n", + fprintf(stderr, "\nNo seqno data from node '%s' - skipping\n", get_name_by_macstr(bat_node->name, read_opt)); continue; } /* or routing tables */ if (list_empty(&bat_node->rt_table_list)) { - fprintf(stderr, "No routing tables from node '%s' - skipping\n", + fprintf(stderr, "\nNo routing tables from node '%s' - skipping\n", get_name_by_macstr(bat_node->name, read_opt)); continue; } - printf("Checking host: %s\n", + 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) { /**

1 0

r1443 - trunk/batctl
by postmaster＠open-mesh.net 16 Oct '09

16 Oct '09

Author: marek Date: 2009-10-16 23:35:18 +0000 (Fri, 16 Oct 2009) New Revision: 1443 Modified: trunk/batctl/bisect.c Log: [batctl] bisect - pimp seqno trace output Modified: trunk/batctl/bisect.c =================================================================== --- trunk/batctl/bisect.c 2009-10-16 23:35:17 UTC (rev 1442) +++ trunk/batctl/bisect.c 2009-10-16 23:35:18 UTC (rev 1443) @@ -515,27 +515,34 @@ } static void seqno_trace_print_neigh(struct seqno_trace_neigh *seqno_trace_neigh, + struct seqno_event *seqno_event_parent, int num_sisters, char *head, int read_opt) { char new_head[MAX_LINE]; int i; - printf("%s%s--- %s [tq: %i, ttl: %i", head, + printf("%s%s- %s [tq: %i, ttl: %i", head, (strlen(head) == 1 ? "" : num_sisters == 0 ? "\\" : "|"), get_name_by_macstr(seqno_trace_neigh->bat_node->name, read_opt), seqno_trace_neigh->seqno_event->tq, seqno_trace_neigh->seqno_event->ttl); printf(", neigh: %s", get_name_by_macstr(seqno_trace_neigh->seqno_event->neigh->name, read_opt)); - printf(", prev_sender: %s]\n", get_name_by_macstr(seqno_trace_neigh->seqno_event->prev_sender->name, read_opt)); + printf(", prev_sender: %s]", get_name_by_macstr(seqno_trace_neigh->seqno_event->prev_sender->name, read_opt)); + if ((seqno_event_parent) && + (seqno_trace_neigh->seqno_event->tq > seqno_event_parent->tq)) + printf(" TQ UP!\n"); + else + printf("\n"); + for (i = 0; i < seqno_trace_neigh->num_neighbors; i++) { snprintf(new_head, sizeof(new_head), "%s%s", - (strlen(head) > 1 ? head : num_sisters == 0 ? " " : head), - (strlen(head) == 1 ? " " : - num_sisters == 0 ? " " : "| ")); + (strlen(head) > 1 ? head : num_sisters == 0 ? " " : head), + (strlen(head) == 1 ? " " : + num_sisters == 0 ? " " : "| ")); - seqno_trace_print_neigh(seqno_trace_neigh->seqno_trace_neigh[i], + seqno_trace_print_neigh(seqno_trace_neigh->seqno_trace_neigh[i], seqno_trace_neigh->seqno_event, seqno_trace_neigh->num_neighbors - i - 1, new_head, read_opt); } } @@ -569,6 +576,7 @@ (seqno_trace->seqno_trace_neigh.num_neighbors == i + 1 ? '\\' : '|')); seqno_trace_print_neigh(seqno_trace->seqno_trace_neigh.seqno_trace_neigh[i], + NULL, seqno_trace->seqno_trace_neigh.num_neighbors - i - 1, head, read_opt); }

1 0

r1442 - trunk/batctl
by postmaster＠open-mesh.net 16 Oct '09

16 Oct '09

Author: marek Date: 2009-10-16 23:35:17 +0000 (Fri, 16 Oct 2009) New Revision: 1442 Modified: trunk/batctl/bisect.c Log: [batctl] bisect - highlight last routing table change Modified: trunk/batctl/bisect.c =================================================================== --- trunk/batctl/bisect.c 2009-10-16 17:59:45 UTC (rev 1441) +++ trunk/batctl/bisect.c 2009-10-16 23:35:17 UTC (rev 1442) @@ -841,7 +841,8 @@ { struct bat_node *bat_node; struct seqno_event *seqno_event; - int i; + struct rt_table *prev_rt_table = NULL; + int i, j, changed_entry; printf("Routing tables of originator: %s ", get_name_by_macstr(rt_orig, read_opt)); @@ -884,13 +885,30 @@ 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", + changed_entry = 1; + + 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; + } + } + + 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:

1 0

r1441 - trunk/batctl
by postmaster＠open-mesh.net 16 Oct '09

16 Oct '09

Author: marek Date: 2009-10-16 17:59:45 +0000 (Fri, 16 Oct 2009) New Revision: 1441 Modified: trunk/batctl/bat-hosts.c Log: [batctl] bisect - fix handling of large bat-host files Modified: trunk/batctl/bat-hosts.c =================================================================== --- trunk/batctl/bat-hosts.c 2009-10-09 17:11:51 UTC (rev 1440) +++ trunk/batctl/bat-hosts.c 2009-10-16 17:59:45 UTC (rev 1441) @@ -59,7 +59,7 @@ return (hash % size); } -static void parse_hosts_file(struct hashtable_t *hash, const char path[]) +static void parse_hosts_file(struct hashtable_t **hash, const char path[]) { FILE *fd; char name[HOST_NAME_MAX_LEN], mac_str[18]; @@ -97,7 +97,7 @@ if (bat_host) { printf("Warning - name already known (changing mac from '%s' to '%s'): %s\n", ether_ntoa(&bat_host->mac_addr), mac_str, name); - hash_remove(hash, bat_host); + hash_remove(*hash, bat_host); free(bat_host); } @@ -111,15 +111,15 @@ memcpy(&bat_host->mac_addr, mac_addr, sizeof(struct ether_addr)); strncpy(bat_host->name, name, HOST_NAME_MAX_LEN - 1); - hash_add(hash, bat_host); + hash_add(*hash, bat_host); - if (hash->elements * 4 > hash->size) { - swaphash = hash_resize(hash, hash->size * 2); + if ((*hash)->elements * 4 > (*hash)->size) { + swaphash = hash_resize((*hash), (*hash)->size * 2); if (swaphash == NULL) printf("Warning - couldn't resize bat hosts hash table\n"); else - hash = swaphash; + *hash = swaphash; } } @@ -158,7 +158,7 @@ confdir[CONF_DIR_LEN - 1] = '\0'; } - parse_hosts_file(host_hash, confdir); + parse_hosts_file(&host_hash, confdir); } }

1 0

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

09 Oct '09

Author: marek Date: 2009-10-09 17:11:51 +0000 (Fri, 09 Oct 2009) New Revision: 1440 Modified: trunk/batman-adv-kernelland/soft-interface.c Log: [batman-adv] remove no checksum flag on bat0 to fix checksumming on certain architectures It is related to the TCP checksum offload function: I am using as embedded platform PCEngines Alix 3d2, that do not support this function (and also qemu virtual machines do not support it). This patch disable the tx checksum offload and everything now works fine for me! Signed-off-by: Andrea Ghittino <a.mailevent(a)gmail.com> Modified: trunk/batman-adv-kernelland/soft-interface.c =================================================================== --- trunk/batman-adv-kernelland/soft-interface.c 2009-09-27 02:21:54 UTC (rev 1439) +++ trunk/batman-adv-kernelland/soft-interface.c 2009-10-09 17:11:51 UTC (rev 1440) @@ -114,7 +114,6 @@ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) */ dev->destructor = free_netdev; - 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 */

1 0

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

08 Oct '09

Author: marek Date: 2009-09-27 02:21:54 +0000 (Sun, 27 Sep 2009) New Revision: 1439 Modified: trunk/batman-adv-kernelland/hard-interface.c trunk/batman-adv-kernelland/routing.c Log: [batman-adv] fixing race condition while handling lots of data The callback batman_data_ready() set the variable data_ready_cond to true before waking up the packet handling thread. When the thread has completed its work it will sleep and sets the variable back to false. When the system has to handle large quantities of traffic the callback might be called several times while the packet handling thread runs. The status variable will be overwritten once the thread is done which might leave packets in the socket buffer. If the socket buffer is full no more packets are accepted and the callback won't be triggered. Therefore the packet receive thread has to reset the variable at the very beginning. Modified: trunk/batman-adv-kernelland/hard-interface.c =================================================================== --- trunk/batman-adv-kernelland/hard-interface.c 2009-09-15 19:24:14 UTC (rev 1438) +++ trunk/batman-adv-kernelland/hard-interface.c 2009-09-27 02:21:54 UTC (rev 1439) @@ -148,7 +148,7 @@ active_ifs--; debug_log(LOG_TYPE_NOTICE, "Interface deactivated: %s\n", - batman_if->dev); + batman_if->dev); } /* (re)activate given interface. */ @@ -209,6 +209,9 @@ if (batman_if->if_num == 0) set_main_if_addr(batman_if->net_dev->dev_addr); + debug_log(LOG_TYPE_NOTICE, "Interface activated: %s\n", + batman_if->dev); + return; bind_err: Modified: trunk/batman-adv-kernelland/routing.c =================================================================== --- trunk/batman-adv-kernelland/routing.c 2009-09-15 19:24:14 UTC (rev 1438) +++ trunk/batman-adv-kernelland/routing.c 2009-09-27 02:21:54 UTC (rev 1439) @@ -625,6 +625,8 @@ wait_event_interruptible(thread_wait, (atomic_read(&data_ready_cond) || atomic_read(&exit_cond))); + atomic_set(&data_ready_cond, 0); + if (kthread_should_stop() || atomic_read(&exit_cond)) break; @@ -950,8 +952,6 @@ } rcu_read_unlock(); - atomic_set(&data_ready_cond, 0); - } kfree(packet_buff);

1 0

r1438 - in trunk/batman-experimental: . lib/bmx_http_info
by postmaster＠open-mesh.net 08 Oct '09

08 Oct '09

Author: axel Date: 2009-09-15 19:24:14 +0000 (Tue, 15 Sep 2009) New Revision: 1438 Modified: trunk/batman-experimental/batman.h trunk/batman-experimental/lib/bmx_http_info/http_info.c trunk/batman-experimental/schedule.c Log: let http_info plugin respond with simple help page to invalid http requests, some other minor changes Modified: trunk/batman-experimental/batman.h =================================================================== --- trunk/batman-experimental/batman.h 2009-09-15 19:22:26 UTC (rev 1437) +++ trunk/batman-experimental/batman.h 2009-09-15 19:24:14 UTC (rev 1438) @@ -230,8 +230,6 @@ #define ARG_NETB "netb" - - #define ARG_THROW "throw" @@ -315,8 +313,6 @@ } __attribute__((packed)); -#define OGM_OGI_MAX 255 - struct bat_packet_ogm { #if __BYTE_ORDER == __LITTLE_ENDIAN @@ -381,8 +377,8 @@ #define EXT_FIELD_TYPE ext_type #define EXT_FIELD_MSG ext_msg -#define EXT_FIELD_LEN def8 /* the size of this TLV extension header in 4 oktet blocks (including this first 4 oktets) */ -#define MIN_TLV_LEN_BYTES 4 /* the minimum size in bytes (1 octet) of a TLV extension message */ +#define EXT_FIELD_LEN_4B def8 /* the size of this TLV extension header in 4 oktet blocks (including this first 4 oktets) */ +#define MIN_TLV_LEN_1B 4 /* the minimum size in bytes (1 octet) of a TLV extension message */ // field accessor for primary interface announcement extension packets #define EXT_PIP_FIELD_RES1 def8 Modified: trunk/batman-experimental/lib/bmx_http_info/http_info.c =================================================================== --- trunk/batman-experimental/lib/bmx_http_info/http_info.c 2009-09-15 19:22:26 UTC (rev 1437) +++ trunk/batman-experimental/lib/bmx_http_info/http_info.c 2009-09-15 19:24:14 UTC (rev 1438) @@ -86,9 +86,32 @@ } else { - dbgf( DBGL_CHANGES, DBGT_INFO, "rcvd illegal %d bytes long HTTP request via fd %d", + dbg( DBGL_CHANGES, DBGT_INFO, "rcvd illegal %d bytes long HTTP request via fd %d", tcp_req_len, cn->fd); + /* + dbg_cn( cn, DBGL_ALL, DBGT_INFO, "rcvd illegal %d bytes long HTTP request via fd %d:\n%s\n", + tcp_req_len, cn->fd, tcp_req_data); + */ + check_apply_parent_option( ADD, OPT_APPLY, 0, get_option( 0,0, ARG_STATUS), 0, cn ); + dbg_printf( cn, "\nillegal HTTP request! Valid requests are:\n\n" ); + + struct list_head *list_pos; + + list_for_each( list_pos, &opt_list ) { + + struct opt_type *opt = (struct opt_type *)list_entry( list_pos, struct opt_data, list ); + + if ( opt->auth_t == A_USR && + opt->opt_t == A_PS0 && + opt->dyn_t != A_INI && + opt->cfg_t == A_ARG ) + { + dbg_printf( cn, "/%s\n\n", opt->long_name ); + + } + } + } } else { Modified: trunk/batman-experimental/schedule.c =================================================================== --- trunk/batman-experimental/schedule.c 2009-09-15 19:22:26 UTC (rev 1437) +++ trunk/batman-experimental/schedule.c 2009-09-15 19:24:14 UTC (rev 1438) @@ -845,7 +845,7 @@ if ( ((struct ext_packet*)(ext_a+ext_p))->EXT_FIELD_TYPE == ext_type ) { if ( ext_attribute[ext_type] & EXT_ATTR_TLV ) - ext_p+= 4*((struct ext_packet*)(ext_a+ext_p))->EXT_FIELD_LEN; + ext_p+= 4*((struct ext_packet*)(ext_a+ext_p))->EXT_FIELD_LEN_4B; else ext_p+= sizeof(struct ext_packet);

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits