commits November 2009

commits@lists.open-mesh.org

1 participants
989 discussions

r1478 - trunk/batctl
by postmaster＠open-mesh.net 08 Nov '09

08 Nov '09

Author: marek Date: 2009-11-08 13:58:57 +0000 (Sun, 08 Nov 2009) New Revision: 1478 Modified: trunk/batctl/tcpdump.c Log: [batctl] Remove unreachable code in tcpdump Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Modified: trunk/batctl/tcpdump.c =================================================================== --- trunk/batctl/tcpdump.c 2009-11-08 13:56:51 UTC (rev 1477) +++ trunk/batctl/tcpdump.c 2009-11-08 13:58:57 UTC (rev 1478) @@ -547,8 +547,6 @@ } - ret = EXIT_SUCCESS; - out: list_for_each_entry_safe(dump_if, dump_if_tmp, &dump_if_list, list) { if (dump_if->raw_sock)

1 0

r1477 - trunk/batctl
by postmaster＠open-mesh.net 08 Nov '09

08 Nov '09

Author: marek Date: 2009-11-08 13:56:51 +0000 (Sun, 08 Nov 2009) New Revision: 1477 Modified: trunk/batctl/ping.c trunk/batctl/tcpdump.c trunk/batctl/traceroute.c Log: [batctl] Correct printf format string conversation Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Modified: trunk/batctl/ping.c =================================================================== --- trunk/batctl/ping.c 2009-11-08 13:54:29 UTC (rev 1476) +++ trunk/batctl/ping.c 2009-11-08 13:56:51 UTC (rev 1477) @@ -148,7 +148,7 @@ icmp_packet_out.ttl = 50; icmp_packet_out.seqno = 0; - printf("PING %s (%s) %zi(%zi) bytes of data\n", dst_string, mac_string, + printf("PING %s (%s) %zu(%zu) bytes of data\n", dst_string, mac_string, sizeof(icmp_packet_out), sizeof(icmp_packet_out) + 28); while (!is_aborted) { @@ -196,7 +196,7 @@ } if ((size_t)read_len < sizeof(icmp_packet_in)) { - printf("Warning - dropping received packet as it is smaller than expected (%zd): %zd\n", + printf("Warning - dropping received packet as it is smaller than expected (%zu): %zd\n", sizeof(icmp_packet_in), read_len); goto sleep; } @@ -204,7 +204,7 @@ switch (icmp_packet_in.msg_type) { case ECHO_REPLY: time_delta = end_timer(); - printf("%zd bytes from %s icmp_seq=%u ttl=%d time=%.2f ms\n", + printf("%zd bytes from %s icmp_seq=%hu ttl=%d time=%.2f ms\n", read_len, dst_string, ntohs(icmp_packet_in.seqno), icmp_packet_in.ttl, time_delta); @@ -216,10 +216,10 @@ packets_in++; break; case DESTINATION_UNREACHABLE: - printf("From %s: Destination Host Unreachable (icmp_seq %u)\n", dst_string, ntohs(icmp_packet_in.seqno)); + printf("From %s: Destination Host Unreachable (icmp_seq %hu)\n", dst_string, ntohs(icmp_packet_in.seqno)); break; case TTL_EXCEEDED: - printf("From %s: Time to live exceeded (icmp_seq %u)\n", dst_string, ntohs(icmp_packet_in.seqno)); + printf("From %s: Time to live exceeded (icmp_seq %hu)\n", dst_string, ntohs(icmp_packet_in.seqno)); break; case PARAMETER_PROBLEM: printf("Error - the batman adv kernel module version (%d) differs from ours (%d)\n", @@ -243,7 +243,7 @@ packets_loss = ((packets_out - packets_in) * 100) / packets_out; printf("--- %s ping statistics ---\n", dst_string); - printf("%d packets transmitted, %d received, %d%% packet loss\n", + printf("%u packets transmitted, %u received, %u%% packet loss\n", packets_out, packets_in, packets_loss); printf("rtt min/avg/max/mdev = %.3f/%.3f/%.3f/%.3f ms\n", min, (packets_in ? (avg / packets_in) : 0.000), max, (max - min)); Modified: trunk/batctl/tcpdump.c =================================================================== --- trunk/batctl/tcpdump.c 2009-11-08 13:54:29 UTC (rev 1476) +++ trunk/batctl/tcpdump.c 2009-11-08 13:56:51 UTC (rev 1477) @@ -45,7 +45,7 @@ #define LEN_CHECK(buff_len, check_len, desc) \ if ((size_t)(buff_len) < (check_len)) { \ - printf("Warning - dropping received %s packet as it is smaller than expected (%zd): %zd\n", \ + printf("Warning - dropping received %s packet as it is smaller than expected (%zu): %zu\n", \ desc, (check_len), (size_t)(buff_len)); \ return; \ } @@ -127,7 +127,7 @@ switch (icmphdr->type) { case ICMP_ECHOREPLY: - printf("%s: ICMP echo reply, id %u, seq %u, length %zd\n", + printf("%s: ICMP echo reply, id %hu, seq %hu, length %zu\n", inet_ntoa(*(struct in_addr *)&iphdr->daddr), ntohs(icmphdr->un.echo.id), ntohs(icmphdr->un.echo.sequence), (size_t)buff_len - (iphdr->ihl * 4)); @@ -142,12 +142,12 @@ tmp_udphdr = (struct udphdr *)(((char *)tmp_iphdr) + (tmp_iphdr->ihl * 4)); printf("%s: ICMP ", inet_ntoa(*(struct in_addr *)&iphdr->daddr)); - printf("%s udp port %u unreachable, length %zd\n", + printf("%s udp port %hu unreachable, length %zu\n", inet_ntoa(*(struct in_addr *)&tmp_iphdr->daddr), ntohs(tmp_udphdr->dest), (size_t)buff_len - (iphdr->ihl * 4)); break; default: - printf("%s: ICMP unreachable %u, length %zd\n", + printf("%s: ICMP unreachable %hhu, length %zu\n", inet_ntoa(*(struct in_addr *)&iphdr->daddr), icmphdr->code, (size_t)buff_len - (iphdr->ihl * 4)); break; @@ -155,18 +155,18 @@ break; case ICMP_ECHO: - printf("%s: ICMP echo request, id %u, seq %u, length %zd\n", + printf("%s: ICMP echo request, id %hu, seq %hu, length %zu\n", inet_ntoa(*(struct in_addr *)&iphdr->daddr), ntohs(icmphdr->un.echo.id), ntohs(icmphdr->un.echo.sequence), (size_t)buff_len - (iphdr->ihl * 4)); break; case ICMP_TIME_EXCEEDED: - printf("%s: ICMP time exceeded in-transit, length %zd\n", + printf("%s: ICMP time exceeded in-transit, length %zu\n", inet_ntoa(*(struct in_addr *)&iphdr->daddr), (size_t)buff_len - (iphdr->ihl * 4)); break; default: - printf("%s: ICMP type %u, length %zd\n", + printf("%s: ICMP type %hhu, length %zu\n", inet_ntoa(*(struct in_addr *)&iphdr->daddr), icmphdr->type, (size_t)buff_len - (iphdr->ihl * 4)); break; @@ -178,7 +178,7 @@ tcphdr = (struct tcphdr *)(packet_buff + (iphdr->ihl * 4)); printf("IP %s.%i > ", inet_ntoa(*(struct in_addr *)&iphdr->saddr), ntohs(tcphdr->source)); - printf("%s.%i: TCP, flags [%c%c%c%c%c%c], length %zd\n", + printf("%s.%i: TCP, flags [%c%c%c%c%c%c], length %zu\n", inet_ntoa(*(struct in_addr *)&iphdr->daddr), ntohs(tcphdr->dest), (tcphdr->fin ? 'F' : '.'), (tcphdr->syn ? 'S' : '.'), (tcphdr->rst ? 'R' : '.'), (tcphdr->psh ? 'P' : '.'), @@ -194,18 +194,18 @@ switch (ntohs(udphdr->dest)) { case 67: 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", + printf("%s.67: BOOTP/DHCP, Request from %s, length %zu\n", inet_ntoa(*(struct in_addr *)&iphdr->daddr), ether_ntoa_long((struct ether_addr *)(((char *)udphdr) + sizeof(struct udphdr) + 28)), (size_t)buff_len - (iphdr->ihl * 4) - sizeof(struct udphdr)); break; case 68: - printf("%s.68: BOOTP/DHCP, Reply, length %zd\n", + printf("%s.68: BOOTP/DHCP, Reply, length %zu\n", inet_ntoa(*(struct in_addr *)&iphdr->daddr), (size_t)buff_len - (iphdr->ihl * 4) - sizeof(struct udphdr)); break; default: - printf("%s.%i: UDP, length %zd\n", + printf("%s.%i: UDP, length %zu\n", inet_ntoa(*(struct in_addr *)&iphdr->daddr), ntohs(udphdr->dest), (size_t)buff_len - (iphdr->ihl * 4) - sizeof(struct udphdr)); break; @@ -236,7 +236,7 @@ printf("BAT %s: ", get_name_by_macaddr((struct ether_addr *)batman_packet->orig, read_opt)); - printf("OGM via neigh %s, seqno %d, tq %3d, ttl %2d, v %d, flags [%c%c], length %zd\n", + printf("OGM via neigh %s, seqno %d, tq %3d, ttl %2d, v %d, flags [%c%c], length %zu\n", get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt), ntohs(batman_packet->seqno), batman_packet->tq, batman_packet->ttl, batman_packet->version, @@ -264,25 +264,25 @@ switch (icmp_packet->msg_type) { case ECHO_REPLY: - printf("%s: ICMP echo reply, id %u, seq %u, ttl %2d, v %d, length %zd\n", + printf("%s: ICMP echo reply, id %hhu, seq %hu, ttl %2d, v %d, length %zu\n", name, icmp_packet->uid, ntohs(icmp_packet->seqno), icmp_packet->ttl, icmp_packet->version, (size_t)buff_len - sizeof(struct ether_header)); break; case ECHO_REQUEST: - printf("%s: ICMP echo request, id %u, seq %u, ttl %2d, v %d, length %zd\n", + printf("%s: ICMP echo request, id %hhu, seq %hu, ttl %2d, v %d, length %zu\n", name, icmp_packet->uid, ntohs(icmp_packet->seqno), icmp_packet->ttl, icmp_packet->version, (size_t)buff_len - sizeof(struct ether_header)); break; case TTL_EXCEEDED: - printf("%s: ICMP time exceeded in-transit, id %u, seq %u, ttl %2d, v %d, length %zd\n", + printf("%s: ICMP time exceeded in-transit, id %hhu, seq %hu, ttl %2d, v %d, length %zu\n", name, icmp_packet->uid, ntohs(icmp_packet->seqno), icmp_packet->ttl, icmp_packet->version, (size_t)buff_len - sizeof(struct ether_header)); break; default: - printf("%s: ICMP type %u, length %zd\n", + printf("%s: ICMP type %hhu, length %zu\n", name, icmp_packet->msg_type, (size_t)buff_len - sizeof(struct ether_header)); break; } @@ -305,7 +305,7 @@ printf("BAT %s > ", get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt)); - printf("%s: UCAST, ttl %u, ", + printf("%s: UCAST, ttl %hu, ", get_name_by_macaddr((struct ether_addr *)unicast_packet->dest, read_opt), unicast_packet->ttl); @@ -321,7 +321,7 @@ buff_len - (2 * sizeof(struct ether_header)) - sizeof(struct unicast_packet), 1); break; default: - printf(" unknown payload ether type: %u\n", ntohs(ether_header->ether_type)); + printf(" unknown payload ether type: %hu\n", ntohs(ether_header->ether_type)); break; } } @@ -343,7 +343,7 @@ printf("BAT %s: ", get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt)); - printf("BCAST, orig %s, seqno %u, ", + printf("BCAST, orig %s, seqno %hu, ", get_name_by_macaddr((struct ether_addr *)bcast_packet->orig, read_opt), ntohs(bcast_packet->seqno)); @@ -359,7 +359,7 @@ buff_len - (2 * sizeof(struct ether_header)) - sizeof(struct bcast_packet), 1); break; default: - printf(" unknown payload ether type: %u\n", ntohs(ether_header->ether_type)); + printf(" unknown payload ether type: %hu\n", ntohs(ether_header->ether_type)); break; } } @@ -492,7 +492,7 @@ } if ((size_t)read_len < sizeof(struct ether_header)) { - printf("Warning - dropping received packet as it is smaller than expected (%zd): %zd\n", + printf("Warning - dropping received packet as it is smaller than expected (%zu): %zd\n", sizeof(struct ether_header), read_len); continue; } @@ -538,7 +538,7 @@ break; default: - printf("Warning - packet contains unknown ether type: %u\n", ether_type); + printf("Warning - packet contains unknown ether type: %hu\n", ether_type); break; } Modified: trunk/batctl/traceroute.c =================================================================== --- trunk/batctl/traceroute.c 2009-11-08 13:54:29 UTC (rev 1476) +++ trunk/batctl/traceroute.c 2009-11-08 13:56:51 UTC (rev 1477) @@ -114,7 +114,7 @@ icmp_packet_out.msg_type = ECHO_REQUEST; icmp_packet_out.seqno = 0; - printf("traceroute to %s (%s), %d hops max, %zd byte packets\n", + printf("traceroute to %s (%s), %d hops max, %zu byte packets\n", dst_string, mac_string, TTL_MAX, sizeof(icmp_packet_out)); for (icmp_packet_out.ttl = 1; !dst_reached && icmp_packet_out.ttl < TTL_MAX; icmp_packet_out.ttl++) { @@ -139,7 +139,7 @@ if (res <= 0) { if (i == 0) - printf("%2u: ", icmp_packet_out.ttl); + printf("%2hu: ", icmp_packet_out.ttl); printf(" * "); fflush(stdout); @@ -154,7 +154,7 @@ } if ((size_t)read_len < sizeof(icmp_packet_in)) { - printf("Warning - dropping received packet as it is smaller than expected (%zd): %zd\n", + printf("Warning - dropping received packet as it is smaller than expected (%zu): %zd\n", sizeof(icmp_packet_in), read_len); continue; } @@ -176,10 +176,10 @@ bat_host = bat_hosts_find_by_mac((char *)&icmp_packet_in.orig); if (!bat_host) - printf("%2u: %s %.3f ms", + printf("%2hu: %s %.3f ms", icmp_packet_out.ttl, return_mac, time_delta); else - printf("%2u: %s (%s) %.3f ms", + printf("%2hu: %s (%s) %.3f ms", icmp_packet_out.ttl, bat_host->name, return_mac, time_delta); if (icmp_packet_in.msg_type == ECHO_REPLY)

1 0

r1476 - trunk/batctl
by postmaster＠open-mesh.net 08 Nov '09

08 Nov '09

Author: marek Date: 2009-11-08 13:54:29 +0000 (Sun, 08 Nov 2009) New Revision: 1476 Modified: trunk/batctl/ping.c Log: [batctl] Prevent division by zero when no packets were send We will try to print a statistic even when we receive a sigterm or sigint before we send any data or started to count the send data. This means that the we try to calculate the data loss by dividing through zero as it is the number of send packets. This is not possible and we must check for that corner case. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Modified: trunk/batctl/ping.c =================================================================== --- trunk/batctl/ping.c 2009-11-08 01:15:11 UTC (rev 1475) +++ trunk/batctl/ping.c 2009-11-08 13:54:29 UTC (rev 1476) @@ -72,7 +72,7 @@ fd_set read_socket; int ret = EXIT_FAILURE, ping_fd = 0, res, optchar, found_args = 1; int loop_count = -1, loop_interval = 1, timeout = 1; - unsigned int seq_counter = 0, packets_out = 0, packets_in = 0; + unsigned int seq_counter = 0, packets_out = 0, packets_in = 0, packets_loss; char *dst_string, *mac_string; double time_delta; float min = 0.0, max = 0.0, avg = 0.0; @@ -237,9 +237,14 @@ } + if (packets_out == 0) + packets_loss = 0; + else + packets_loss = ((packets_out - packets_in) * 100) / packets_out; + printf("--- %s ping statistics ---\n", dst_string); printf("%d packets transmitted, %d received, %d%% packet loss\n", - packets_out, packets_in, (((packets_out - packets_in) * 100) / packets_out)); + packets_out, packets_in, packets_loss); printf("rtt min/avg/max/mdev = %.3f/%.3f/%.3f/%.3f ms\n", min, (packets_in ? (avg / packets_in) : 0.000), max, (max - min));

1 0

r1475 - in tags: . batctl-0.2
by postmaster＠open-mesh.net 08 Nov '09

08 Nov '09

Author: simon Date: 2009-11-08 01:15:11 +0000 (Sun, 08 Nov 2009) New Revision: 1475 Added: tags/batctl-0.2/ tags/batctl-0.2/hash.c tags/batctl-0.2/hash.h tags/batctl-0.2/list-batman.c tags/batctl-0.2/list-batman.h tags/batctl-0.2/packet.h Removed: tags/batctl-0.2/hash.c tags/batctl-0.2/hash.h tags/batctl-0.2/list-batman.c tags/batctl-0.2/list-batman.h tags/batctl-0.2/packet.h Log: tag batctl-0.2 Property changes on: tags/batctl-0.2 ___________________________________________________________________ Added: svn:mergeinfo + Deleted: tags/batctl-0.2/hash.c =================================================================== --- trunk/batctl/hash.c 2009-11-08 01:12:51 UTC (rev 1473) +++ tags/batctl-0.2/hash.c 2009-11-08 01:15:11 UTC (rev 1475) @@ -1 +0,0 @@ -link ../batman/hash.c \ No newline at end of file Copied: tags/batctl-0.2/hash.c (from rev 1473, trunk/batman/hash.c) =================================================================== --- tags/batctl-0.2/hash.c (rev 0) +++ tags/batctl-0.2/hash.c 2009-11-08 01:15:11 UTC (rev 1475) @@ -0,0 +1,319 @@ +/* + * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * + * Simon Wunderlich, Marek Lindner + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + */ + + +#include <stdio.h> /* NULL */ +#include "hash.h" +#include "allocate.h" + + +/* clears the hash */ +void hash_init(struct hashtable_t *hash) +{ + int i; + + hash->elements = 0; + + for (i = 0; i < hash->size; i++) + hash->table[i] = NULL; +} + +/* remove the hash structure. if hashdata_free_cb != NULL, + * this function will be called to remove the elements inside of the hash. + * if you don't remove the elements, memory might be leaked. */ +void hash_delete(struct hashtable_t *hash, hashdata_free_cb free_cb) +{ + struct element_t *bucket, *last_bucket; + int i; + + for (i = 0; i < hash->size; i++) { + + bucket = hash->table[i]; + while (bucket != NULL) { + + if (free_cb != NULL) + free_cb(bucket->data); + + last_bucket = bucket; + bucket = bucket->next; + debugFree(last_bucket, 1301); + + } + + } + + hash_destroy(hash); +} + +/* free only the hashtable and the hash itself. */ +void hash_destroy(struct hashtable_t *hash) +{ + debugFree(hash->table, 1302); + debugFree(hash, 1303); +} + +/* iterate though the hash. first element is selected with iter_in NULL. + * use the returned iterator to access the elements until hash_it_t returns NULL. */ +struct hash_it_t *hash_iterate(struct hashtable_t *hash, struct hash_it_t *iter_in) +{ + struct hash_it_t *iter; + + if (iter_in == NULL) { + iter = debugMalloc(sizeof(struct hash_it_t), 301); + iter->index = -1; + iter->bucket = NULL; + iter->prev_bucket = NULL; + } else + iter= iter_in; + + /* sanity checks first (if our bucket got deleted in the last iteration): */ + if (iter->bucket != NULL) { + if (iter->first_bucket != NULL) { + + /* we're on the first element and it got removed after the last iteration. */ + if ((*iter->first_bucket) != iter->bucket) { + + /* there are still other elements in the list */ + if ((*iter->first_bucket) != NULL) { + iter->prev_bucket = NULL; + iter->bucket = (*iter->first_bucket); + iter->first_bucket = &hash->table[iter->index]; + return iter; + } else { + iter->bucket = NULL; + } + + } + + } else if (iter->prev_bucket != NULL) { + + /* we're not on the first element, and the bucket got removed after the last iteration. + * the last bucket's next pointer is not pointing to our actual bucket anymore. + * select the next. */ + if (iter->prev_bucket->next != iter->bucket) + iter->bucket = iter->prev_bucket; + + } + + } + + /* now as we are sane, select the next one if there is some */ + if (iter->bucket != NULL) { + if (iter->bucket->next != NULL) { + iter->prev_bucket = iter->bucket; + iter->bucket = iter->bucket->next; + iter->first_bucket = NULL; + return iter; + } + } + /* if not returned yet, we've reached the last one on the index and have to search forward */ + + iter->index++; + /* go through the entries of the hash table */ + while (iter->index < hash->size) { + + if ((hash->table[iter->index]) == NULL) { + iter->index++; + continue; + } + + iter->prev_bucket = NULL; + iter->bucket = hash->table[iter->index]; + iter->first_bucket = &hash->table[iter->index]; + return iter; /* if this table entry is not null, return it */ + } + + /* nothing to iterate over anymore */ + debugFree(iter, 1304); + return NULL; +} + +/* allocates and clears the hash */ +struct hashtable_t *hash_new(int size, hashdata_compare_cb compare, hashdata_choose_cb choose) +{ + struct hashtable_t *hash; + + hash = debugMalloc(sizeof(struct hashtable_t), 302); + if (!hash) + return NULL; + + hash->size= size; + hash->table= debugMalloc(sizeof(struct element_t *) * size, 303); + + if (!hash->table) { + debugFree(hash, 1305); + return NULL; + } + + hash_init(hash); + hash->compare = compare; + hash->choose = choose; + return hash; +} + +/* adds data to the hashtable. returns 0 on success, -1 on error */ +int hash_add(struct hashtable_t *hash, void *data) +{ + int index; + struct element_t *bucket, *prev_bucket = NULL; + + index = hash->choose(data, hash->size); + bucket = hash->table[index]; + + while (bucket != NULL) { + if (hash->compare(bucket->data, data)) + return -1; + + prev_bucket = bucket; + bucket= bucket->next; + } + + /* found the tail of the list, add new element */ + bucket = debugMalloc(sizeof(struct element_t),304); + + if (!bucket) + return -1; + + /* init the new bucket */ + bucket->data = data; + bucket->next = NULL; + + /* and link it */ + if (prev_bucket == NULL) { + hash->table[index] = bucket; + } else { + prev_bucket->next = bucket; + } + + hash->elements++; + return 0; +} + +/* finds data, based on the key in keydata. returns the found data on success, or NULL on error */ +void *hash_find(struct hashtable_t *hash, void *keydata) +{ + int index; + struct element_t *bucket; + + index = hash->choose(keydata , hash->size); + bucket = hash->table[index]; + + while (bucket != NULL) { + if (hash->compare(bucket->data, keydata)) + return bucket->data; + + bucket = bucket->next; + } + + return NULL; +} + +/* remove bucket (this might be used in hash_iterate() if you already found the bucket + * you want to delete and don't need the overhead to find it again with hash_remove(). + * But usually, you don't want to use this function, as it fiddles with hash-internals. */ +void *hash_remove_bucket(struct hashtable_t *hash, struct hash_it_t *hash_it_t) +{ + void *data_save; + + data_save = hash_it_t->bucket->data; /* save the pointer to the data */ + + if (hash_it_t->prev_bucket != NULL) { + hash_it_t->prev_bucket->next = hash_it_t->bucket->next; + } else if (hash_it_t->first_bucket != NULL) { + (*hash_it_t->first_bucket) = hash_it_t->bucket->next; + } + + debugFree(hash_it_t->bucket, 1306); + + hash->elements--; + return data_save; +} + +/* removes data from hash, if found. returns pointer do data on success, + * so you can remove the used structure yourself, or NULL on error . + * data could be the structure you use with just the key filled, + * we just need the key for comparing. */ +void *hash_remove(struct hashtable_t *hash, void *data) +{ + struct hash_it_t hash_it_t; + + hash_it_t.index = hash->choose(data, hash->size); + hash_it_t.bucket = hash->table[hash_it_t.index]; + hash_it_t.prev_bucket = NULL; + + while (hash_it_t.bucket != NULL) { + if (hash->compare(hash_it_t.bucket->data, data)) { + hash_it_t.first_bucket = (hash_it_t.bucket == hash->table[hash_it_t.index] ? &hash->table[ hash_it_t.index ] : NULL); + return hash_remove_bucket(hash, &hash_it_t); + } + + hash_it_t.prev_bucket = hash_it_t.bucket; + hash_it_t.bucket = hash_it_t.bucket->next; + } + + return NULL; +} + +/* resize the hash, returns the pointer to the new hash or NULL on error. removes the old hash on success. */ +struct hashtable_t *hash_resize(struct hashtable_t *hash, int size) +{ + struct hashtable_t *new_hash; + struct element_t *bucket; + int i; + + /* initialize a new hash with the new size */ + new_hash = hash_new(size, hash->compare, hash->choose); + if (!new_hash) + return NULL; + + /* copy the elements */ + for (i = 0; i < hash->size; i++) { + bucket = hash->table[i]; + while (bucket != NULL) { + hash_add(new_hash, bucket->data); + bucket = bucket->next; + } + } + + hash_delete(hash, NULL); /* remove hash and eventual overflow buckets but not the content itself. */ + return new_hash; +} + +/* print the hash table for debugging */ +/* void hash_debug(struct hashtable_t *hash) { + int i; + struct element_t *bucket; + + for (i = 0; i < hash->size; i++) { + printf("[%d] ", i); + bucket = hash->table[i]; + + while (bucket) { + printf("-> [%10p] ", (void *)bucket); + bucket = bucket->next; + } + + printf("\n"); + + } + printf("\n"); +}*/ + Property changes on: tags/batctl-0.2/hash.c ___________________________________________________________________ Added: svn:mergeinfo + Deleted: tags/batctl-0.2/hash.h =================================================================== --- trunk/batctl/hash.h 2009-11-08 01:12:51 UTC (rev 1473) +++ tags/batctl-0.2/hash.h 2009-11-08 01:15:11 UTC (rev 1475) @@ -1 +0,0 @@ -link ../batman/hash.h \ No newline at end of file Copied: tags/batctl-0.2/hash.h (from rev 1473, trunk/batman/hash.h) =================================================================== --- tags/batctl-0.2/hash.h (rev 0) +++ tags/batctl-0.2/hash.h 2009-11-08 01:15:11 UTC (rev 1475) @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * + * Simon Wunderlich, Marek Lindner + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + */ +#ifndef _BATMAN_HASH_H +#define _BATMAN_HASH_H + + + +typedef int (*hashdata_compare_cb)(void *, void *); +typedef int (*hashdata_choose_cb)(void *, int); +typedef void (*hashdata_free_cb)(void *); + +struct element_t { + void *data; /* pointer to the data */ + struct element_t *next; /* overflow bucket pointer */ +}; + +struct hash_it_t { + int index; + struct element_t *bucket; + struct element_t *prev_bucket; + struct element_t **first_bucket; +}; + +struct hashtable_t { + struct element_t **table; /* the hashtable itself, with the buckets */ + int elements; /* number of elements registered */ + int size; /* size of hashtable */ + hashdata_compare_cb compare; /* callback to a compare function. + * should compare 2 element datas for their keys, + * return 0 if same and not 0 if not same */ + hashdata_choose_cb choose; /* the hashfunction, should return an index based + * on the key in the data of the first argument + * and the size the second */ +}; + +/* clears the hash */ +void hash_init(struct hashtable_t *hash); + +/* allocates and clears the hash */ +struct hashtable_t *hash_new(int size, hashdata_compare_cb compare, hashdata_choose_cb choose); + +/* remove bucket (this might be used in hash_iterate() if you already found the bucket + * you want to delete and don't need the overhead to find it again with hash_remove(). + * But usually, you don't want to use this function, as it fiddles with hash-internals. */ +void *hash_remove_bucket(struct hashtable_t *hash, struct hash_it_t *hash_it_t); + +/* remove the hash structure. if hashdata_free_cb != NULL, + * this function will be called to remove the elements inside of the hash. + * if you don't remove the elements, memory might be leaked. */ +void hash_delete(struct hashtable_t *hash, hashdata_free_cb free_cb); + +/* free only the hashtable and the hash itself. */ +void hash_destroy(struct hashtable_t *hash); + +/* adds data to the hashtable. returns 0 on success, -1 on error */ +int hash_add(struct hashtable_t *hash, void *data); + +/* removes data from hash, if found. returns pointer do data on success, + * so you can remove the used structure yourself, or NULL on error . + * data could be the structure you use with just the key filled, + * we just need the key for comparing. */ +void *hash_remove(struct hashtable_t *hash, void *data); + +/* finds data, based on the key in keydata. returns the found data on success, or NULL on error */ +void *hash_find(struct hashtable_t *hash, void *keydata); + +/* resize the hash, returns the pointer to the new hash or NULL on error. removes the old hash on success */ +struct hashtable_t *hash_resize(struct hashtable_t *hash, int size); + +/* print the hash table for debugging */ +void hash_debug( struct hashtable_t *hash); + +/* iterate though the hash. first element is selected with iter_in NULL. + * use the returned iterator to access the elements until hash_it_t returns NULL. */ +struct hash_it_t *hash_iterate(struct hashtable_t *hash, struct hash_it_t *iter_in); + +#endif Property changes on: tags/batctl-0.2/hash.h ___________________________________________________________________ Added: svn:mergeinfo + Deleted: tags/batctl-0.2/list-batman.c =================================================================== --- trunk/batctl/list-batman.c 2009-11-08 01:12:51 UTC (rev 1473) +++ tags/batctl-0.2/list-batman.c 2009-11-08 01:15:11 UTC (rev 1475) @@ -1 +0,0 @@ -link ../batman/list-batman.c \ No newline at end of file Copied: tags/batctl-0.2/list-batman.c (from rev 1473, trunk/batman/list-batman.c) =================================================================== --- tags/batctl-0.2/list-batman.c (rev 0) +++ tags/batctl-0.2/list-batman.c 2009-11-08 01:15:11 UTC (rev 1475) @@ -0,0 +1,123 @@ +/* + * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * + * Marek Lindner + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + */ + + + +#include "list-batman.h" + + + +/* + * Insert a new entry between two known consecutive entries. + * + * This is only for internal list manipulation where we know + * the next entries already! + */ +static void __list_add( struct list_head *new, struct list_head *prev, struct list_head *next ) { + + new->next = next; + prev->next = new; + +} + +/** + * list_add - add a new entry + * @new: new entry to be added + * @head: list head to add it after + * + * Insert a new entry after the specified head. + * This is good for implementing stacks. + */ +void list_add( struct list_head *new, struct list_head_first *head ) { + + __list_add( new, (struct list_head *)head, head->next ); + + if ( head->prev == (struct list_head *)head ) + head->prev = new; + +} + +/** + * list_add_tail - add a new entry + * @new: new entry to be added + * @head: list head to add it before + * + * Insert a new entry before the specified head. + * This is useful for implementing queues. + */ +void list_add_tail( struct list_head *new, struct list_head_first *head ) { + + __list_add( new, head->prev, (struct list_head *)head ); + + head->prev = new; + +} + +void list_add_before( struct list_head *prev_node, struct list_head *next_node, struct list_head *new_node ) { + + prev_node->next = new_node; + new_node->next = next_node; + +} + + + +/* + * Delete a list entry by making the next entries + * point to each other. + * + * This is only for internal list manipulation where we know + * the next entries already! + */ +static void __list_del( struct list_head *prev, struct list_head *next ) { + + prev->next = next; + +} + +/** + * list_del - deletes entry from list. + * @entry: the element to delete from the list. + * Note: list_empty on entry does not return true after this, the entry is in an undefined state. + */ +void list_del( struct list_head *prev_entry, struct list_head *entry, struct list_head_first *head ) { + + if ( head->prev == entry ) + head->prev = prev_entry; + + __list_del( prev_entry, entry->next ); + + entry->next = (void *) 0; + +} + + + +/** + * list_empty - tests whether a list is empty + * @head: the list to test. + */ +int list_empty( struct list_head_first *head ) { + + return head->next == (struct list_head *)head; + +} + Property changes on: tags/batctl-0.2/list-batman.c ___________________________________________________________________ Added: svn:mergeinfo + Deleted: tags/batctl-0.2/list-batman.h =================================================================== --- trunk/batctl/list-batman.h 2009-11-08 01:12:51 UTC (rev 1473) +++ tags/batctl-0.2/list-batman.h 2009-11-08 01:15:11 UTC (rev 1475) @@ -1 +0,0 @@ -link ../batman/list-batman.h \ No newline at end of file Copied: tags/batctl-0.2/list-batman.h (from rev 1473, trunk/batman/list-batman.h) =================================================================== --- tags/batctl-0.2/list-batman.h (rev 0) +++ tags/batctl-0.2/list-batman.h 2009-11-08 01:15:11 UTC (rev 1475) @@ -0,0 +1,123 @@ +/* + * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * + * Marek Lindner + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + */ + + +#include <stddef.h> /* offsetof() */ + +#ifndef _LINUX_LIST_H +#define _LINUX_LIST_H + +/* + * XXX: Resolve conflict between this file and <sys/queue.h> on BSD systems. + */ +#ifdef LIST_HEAD +#undef LIST_HEAD +#endif + +/* + * Simple linked list implementation. + * + * Some of the internal functions ("__xxx") are useful when + * manipulating whole lists rather than single entries, as + * sometimes we already know the next entries and we can + * generate better code by using them directly rather than + * using the generic single-entry routines. + */ + +struct list_head { + struct list_head *next; +}; + +struct list_head_first { + struct list_head *next, *prev; +}; + + +void list_add( struct list_head *new, struct list_head_first *head ); +void list_add_tail( struct list_head *new, struct list_head_first *head ); +void list_add_before( struct list_head *prev_node, struct list_head *next_node, struct list_head *new_node ); +void list_del( struct list_head *prev_entry, struct list_head *entry, struct list_head_first *head ); +int list_empty( struct list_head_first *head ); + + + +#define INIT_LIST_HEAD(ptr) do { \ + (ptr)->next = (ptr); \ +} while (0) + +#define INIT_LIST_HEAD_FIRST(ptr) \ + ptr.next = (struct list_head *)&ptr; ptr.prev = (struct list_head *)&ptr; \ + + +/** + * list_entry - get the struct for this entry + * @ptr: the &struct list_head pointer. + * @type: the type of the struct this is embedded in. + * @member: the name of the list_struct within the struct. + */ +#define list_entry(ptr, type, member) \ + ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member))) + +/** + * list_for_each - iterate over a list + * @pos: the &struct list_head to use as a loop counter. + * @head: the head for your list. + */ +#define list_for_each(pos, head) \ + for (pos = (head)->next; pos != (struct list_head *)(head); \ + pos = pos->next) + +/** + * list_for_each_safe - iterate over a list safe against removal of list entry + * @pos: the &struct list_head to use as a loop counter. + * @n: another &struct list_head to use as temporary storage + * @head: the head for your list. + */ +#define list_for_each_safe(pos, n, head) \ + for (pos = (head)->next, n = pos->next; pos != (struct list_head *)(head); \ + pos = n, n = pos->next) + +/** + * list_for_each_entry - iterate over list of given type + * @pos: the type * to use as a loop counter. + * @head: the head for your list. + * @member: the name of the list_struct within the struct. + */ +#define list_for_each_entry(pos, head, member) \ + for (pos = list_entry((head)->next, typeof(*pos), member); \ + &pos->member != (struct list_head *)(head); \ + pos = list_entry(pos->member.next, typeof(*pos), member)) + +/** + * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry + * @pos: the type * to use as a loop counter. + * @n: another type * to use as temporary storage + * @head: the head for your list. + * @member: the name of the list_struct within the struct. + */ +#define list_for_each_entry_safe(pos, n, head, member) \ + for (pos = list_entry((head)->next, typeof(*pos), member), \ + n = list_entry(pos->member.next, typeof(*pos), member); \ + &pos->member != (struct list_head *)(head); \ + pos = n, n = list_entry(n->member.next, typeof(*n), member)) + + +#endif Property changes on: tags/batctl-0.2/list-batman.h ___________________________________________________________________ Added: svn:mergeinfo + Deleted: tags/batctl-0.2/packet.h =================================================================== --- trunk/batctl/packet.h 2009-11-08 01:12:51 UTC (rev 1473) +++ tags/batctl-0.2/packet.h 2009-11-08 01:15:11 UTC (rev 1475) @@ -1 +0,0 @@ -link ../batman-adv-kernelland/packet.h \ No newline at end of file Copied: tags/batctl-0.2/packet.h (from rev 1473, trunk/batman-adv-kernelland/packet.h) =================================================================== --- tags/batctl-0.2/packet.h (rev 0) +++ tags/batctl-0.2/packet.h 2009-11-08 01:15:11 UTC (rev 1475) @@ -0,0 +1,96 @@ +/* + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + */ + +#define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ + +#define BAT_PACKET 0x01 +#define BAT_ICMP 0x02 +#define BAT_UNICAST 0x03 +#define BAT_BCAST 0x04 +#define BAT_VIS 0x05 + +/* this file is included by batctl which needs these defines */ +#define COMPAT_VERSION 8 +#define DIRECTLINK 0x40 +#define VIS_SERVER 0x20 + +/* ICMP message types */ +#define ECHO_REPLY 0 +#define DESTINATION_UNREACHABLE 3 +#define ECHO_REQUEST 8 +#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 { + uint8_t packet_type; + uint8_t version; /* batman version field */ + uint8_t flags; /* 0x40: DIRECTLINK flag, 0x20 VIS_SERVER flag... */ + uint8_t tq; + uint16_t seqno; + uint8_t orig[6]; + uint8_t prev_sender[6]; + uint8_t ttl; + uint8_t num_hna; +} __attribute__((packed)); + +#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 ttl; + uint8_t dst[6]; + uint8_t orig[6]; + uint16_t seqno; + uint8_t uid; +} __attribute__((packed)); + +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 { + uint8_t packet_type; + uint8_t version; /* batman version field */ + uint8_t orig[6]; + uint16_t seqno; +} __attribute__((packed)); + +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 */ +} __attribute__((packed));

1 0

r1474 - in tags: . batman-adv-kernelland-0.2
by postmaster＠open-mesh.net 08 Nov '09

08 Nov '09

Author: simon Date: 2009-11-08 01:13:29 +0000 (Sun, 08 Nov 2009) New Revision: 1474 Added: tags/batman-adv-kernelland-0.2/ Log: tag batman-adv-kernelland 0.2 Property changes on: tags/batman-adv-kernelland-0.2 ___________________________________________________________________ Added: svn:mergeinfo +

1 0

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

08 Nov '09

Author: simon Date: 2009-11-08 01:12:51 +0000 (Sun, 08 Nov 2009) New Revision: 1473 Modified: trunk/batman-adv-kernelland/CHANGELOG Log: style adjustment: add a newline in CHANGELOG Modified: trunk/batman-adv-kernelland/CHANGELOG =================================================================== --- trunk/batman-adv-kernelland/CHANGELOG 2009-11-07 14:10:40 UTC (rev 1472) +++ trunk/batman-adv-kernelland/CHANGELOG 2009-11-08 01:12:51 UTC (rev 1473) @@ -1,4 +1,5 @@ batman-adv 0.2: + * support latest kernels (2.6.20 - 2.6.31) * temporary routing loops / TTL code bug / ghost entries in originator table fixed * internal packet queue for packet aggregation & transmission retry (ARQ)

1 0

[git] batman-adv branch, master, updated. 087625b70d2114b02cc0edb97c7d8edd9d2a9b71
by postmaster＠open-mesh.net 07 Nov '09

07 Nov '09

The following commit has been merged in the master branch: commit 087625b70d2114b02cc0edb97c7d8edd9d2a9b71 Author: marek <marek@45894c77-fb22-0410-b583-ff6e7d5dbf6c> Date: Sat Nov 7 14:10:40 2009 +0000 [batman-adv] update Changelog git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1472 45894c77-fb22-0410-b583-ff6e7d5dbf6c diff --git a/CHANGELOG b/CHANGELOG index 5404359..14a94f7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,18 @@ +batman-adv 0.2: +* support latest kernels (2.6.20 - 2.6.31) +* temporary routing loops / TTL code bug / ghost entries in originator table fixed +* internal packet queue for packet aggregation & transmission retry (ARQ) + for payload broadcasts added +* interface detection converted to event based handling to avoid timers +* major linux coding style adjustments applied +* all kernel version compatibility functions has been moved to compat.h +* use random ethernet address generator from the kernel +* /sys/module/batman_adv/version to export kernel module version +* vis: secondary interface export for dot draw format + JSON output format added +* many bugs (alignment issues, race conditions, deadlocks, etc) squashed + + -- Sat, 07 Nov 2009 15:44:31 +0100 + batman-adv 0.1: * support latest kernels (2.6.20 - 2.6.28) -- batman-adv

1 0

[git] batman-adv branch, master, updated. 087625b70d2114b02cc0edb97c7d8edd9d2a9b71
by postmaster＠open-mesh.net 07 Nov '09

07 Nov '09

The following commit has been merged in the master branch: commit d3f451a65b7db2baca800ccf7385fae1ad26b2b7 Author: simon <simon@45894c77-fb22-0410-b583-ff6e7d5dbf6c> Date: Sat Nov 7 14:04:18 2009 +0000 unlock in bat_device_add_packet() before returning (thanks Sven) git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1471 45894c77-fb22-0410-b583-ff6e7d5dbf6c diff --git a/device.c b/device.c index 45bc1f8..1e7d1f8 100644 --- a/device.c +++ b/device.c @@ -306,6 +306,7 @@ void bat_device_add_packet(struct device_client *device_client, /* while waiting for the lock the device_client could have been * deleted */ if (!device_client_hash[icmp_packet->uid]) { + spin_unlock(&device_client->lock); kfree(device_packet); return; } -- batman-adv

1 0

[git] batman-adv branch, master, updated. 087625b70d2114b02cc0edb97c7d8edd9d2a9b71
by postmaster＠open-mesh.net 07 Nov '09

07 Nov '09

The following commit has been merged in the master branch: commit 6aeee738921420d052b46bf07353089c39edf980 Author: marek <marek@45894c77-fb22-0410-b583-ff6e7d5dbf6c> Date: Sat Nov 7 13:50:40 2009 +0000 Remove unknown escape string \{ Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1470 45894c77-fb22-0410-b583-ff6e7d5dbf6c diff --git a/proc.c b/proc.c index 792a006..aac3df7 100644 --- a/proc.c +++ b/proc.c @@ -541,7 +541,7 @@ static int proc_vis_read(struct seq_file *seq, void *offset) if (current_format == DOT_DRAW) { addr_to_string(tmp_addr_str, info->packet.vis_orig); - seq_printf(seq, "\tsubgraph \"cluster_%s\" \{\n", tmp_addr_str); + seq_printf(seq, "\tsubgraph \"cluster_%s\" {\n", tmp_addr_str); while (if_entries != NULL) { addr_to_string(tmp_addr_str, if_entries->addr); -- batman-adv

1 0

[git] batman-adv branch, master, updated. 087625b70d2114b02cc0edb97c7d8edd9d2a9b71
by postmaster＠open-mesh.net 07 Nov '09

07 Nov '09

The following commit has been merged in the master branch: commit 5c070b66d4726dc25cd82fbe48ee476979103b50 Author: marek <marek@45894c77-fb22-0410-b583-ff6e7d5dbf6c> Date: Sat Nov 7 13:45:41 2009 +0000 Mark local symbols as static Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1469 45894c77-fb22-0410-b583-ff6e7d5dbf6c diff --git a/aggregation.c b/aggregation.c index 5a31e94..9c6e681 100644 --- a/aggregation.c +++ b/aggregation.c @@ -88,7 +88,7 @@ static bool can_aggregate_with(struct batman_packet *new_batman_packet, } /* create a new aggregated packet and add this packet to it */ -void new_aggregated_packet(unsigned char *packet_buff, +static void new_aggregated_packet(unsigned char *packet_buff, int packet_len, unsigned long send_time, bool direct_link, diff --git a/hard-interface.c b/hard-interface.c index fdc5add..5ea35da 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -72,7 +72,7 @@ int hardif_min_mtu(void) return min_mtu; } -void check_known_mac_addr(uint8_t *addr) +static void check_known_mac_addr(uint8_t *addr) { struct batman_if *batman_if; char mac_string[ETH_STR_LEN]; @@ -105,7 +105,7 @@ void update_min_mtu(void) } /* checks if the interface is up. (returns 1 if it is) */ -int hardif_is_interface_up(char *dev) +static int hardif_is_interface_up(char *dev) { struct net_device *net_dev; @@ -176,7 +176,7 @@ void hardif_deactivate_interface(struct batman_if *batman_if) } /* (re)activate given interface. */ -void hardif_activate_interface(struct batman_if *batman_if) +static void hardif_activate_interface(struct batman_if *batman_if) { struct sockaddr_ll bind_addr; int retval; diff --git a/proc.c b/proc.c index b3eb69d..792a006 100644 --- a/proc.c +++ b/proc.c @@ -30,7 +30,7 @@ #include "vis.h" #include "compat.h" -uint8_t vis_format = DOT_DRAW; +static uint8_t vis_format = DOT_DRAW; static struct proc_dir_entry *proc_batman_dir, *proc_interface_file; static struct proc_dir_entry *proc_orig_interval_file, *proc_originators_file; diff --git a/routing.c b/routing.c index 220dbf7..b33cef9 100644 --- a/routing.c +++ b/routing.c @@ -46,7 +46,7 @@ static DECLARE_DELAYED_WORK(purge_orig_wq, purge_orig); static atomic_t data_ready_cond; atomic_t exit_cond; -void start_purge_timer(void) +static void start_purge_timer(void) { queue_delayed_work(bat_event_workqueue, &purge_orig_wq, 1 * HZ); } @@ -618,7 +618,7 @@ void purge_orig(struct work_struct *work) start_purge_timer(); } -int receive_raw_packet(struct socket *raw_sock, unsigned char *packet_buff, int packet_buff_len) +static int receive_raw_packet(struct socket *raw_sock, unsigned char *packet_buff, int packet_buff_len) { struct kvec iov; struct msghdr msg; diff --git a/soft-interface.c b/soft-interface.c index 18e5e8f..d543f50 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -68,7 +68,7 @@ int main_if_was_up(void) return (memcmp(mainIfAddr, mainIfAddr_default, ETH_ALEN) != 0 ? 1 : 0); } -int my_skb_push(struct sk_buff *skb, unsigned int len) +static int my_skb_push(struct sk_buff *skb, unsigned int len) { int result = 0; diff --git a/translation-table.c b/translation-table.c index 9936bc2..c2190e1 100644 --- a/translation-table.c +++ b/translation-table.c @@ -32,7 +32,7 @@ static struct hashtable_t *hna_global_hash; atomic_t hna_local_changed; DEFINE_SPINLOCK(hna_local_hash_lock); -DEFINE_SPINLOCK(hna_global_hash_lock); +static DEFINE_SPINLOCK(hna_global_hash_lock); static DECLARE_DELAYED_WORK(hna_local_purge_wq, hna_local_purge); diff --git a/vis.c b/vis.c index 22235ad..f6c9acb 100644 --- a/vis.c +++ b/vis.c @@ -369,7 +369,7 @@ static int generate_vis_packet(void) return 0; } -void purge_vis_packets(void) +static void purge_vis_packets(void) { struct hash_it_t *hashit = NULL; struct vis_info *info; -- batman-adv

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2009