commits November 2010

commits@lists.open-mesh.org

1 participants
95 discussions

batctl; branch, next, updated. v2010.1.0-15-g25dec90
by postmaster＠open-mesh.org 04 Nov '10

04 Nov '10

The following commit has been merged in the next branch: commit 25dec908eeeca865abe33748e4af57dde9cd688c Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Thu Nov 4 14:03:43 2010 +0100 batctl: Convert strtok to reentrant safe strtok_r Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/bisect.c b/bisect.c index 2fa15f0..b7d8969 100644 --- a/bisect.c +++ b/bisect.c @@ -466,7 +466,7 @@ err: static int parse_log_file(char *file_path) { FILE *fd; - char line_buff[MAX_LINE], *start_ptr, *tok_ptr; + char line_buff[MAX_LINE], *start_ptr, *start_ptr_safe, *tok_ptr; char *neigh, *iface_addr, *orig, *prev_sender, rt_flag; int line_count = 0, tq, ttl, seqno, i, res, max; @@ -483,12 +483,12 @@ static int parse_log_file(char *file_path) line_count++; if (strstr(start_ptr, "Received BATMAN packet via NB")) { - tok_ptr = strtok(start_ptr, " "); + strtok_r(start_ptr, " ", &start_ptr_safe); neigh = iface_addr = orig = prev_sender = NULL; seqno = tq = ttl = -1; for (i = 0; i < 21; i++) { - tok_ptr = strtok(NULL, " "); + tok_ptr = strtok_r(NULL, " ", &start_ptr_safe); if (!tok_ptr) break; @@ -547,11 +547,11 @@ static int parse_log_file(char *file_path) max = 3; } - tok_ptr = strtok(start_ptr, " "); + strtok_r(start_ptr, " ", &start_ptr_safe); orig = neigh = prev_sender = NULL; for (i = 0; i < max; i++) { - tok_ptr = strtok(NULL, " "); + tok_ptr = strtok_r(NULL, " ", &start_ptr_safe); if (!tok_ptr) break; diff --git a/vis.c b/vis.c index 4bc5954..7fba1ab 100644 --- a/vis.c +++ b/vis.c @@ -186,7 +186,7 @@ static int format(char *mesh_iface, const struct funcs *funcs) char *line = NULL; char *orig, *from; char *duplet; - char *line_save_ptr; + char *line_save_ptr, *component_save_ptr; char *duplet_save_ptr; char *endptr; char *value; @@ -207,12 +207,12 @@ static int format(char *mesh_iface, const struct funcs *funcs) duplet_save_ptr = line_save_ptr; while ((duplet = strtok_r(NULL, ",", &duplet_save_ptr)) != NULL) { - flag = strtok(duplet, " "); + flag = strtok_r(duplet, " ", &component_save_ptr); if (!flag) continue; if (!strcmp(flag, "TQ")) { - from = strtok(NULL, " "); - value = strtok(NULL, " "); + from = strtok_r(NULL, " ", &component_save_ptr); + value = strtok_r(NULL, " ", &component_save_ptr); tq = strtoul(value, &endptr, 0); funcs->print_tq(orig, from, tq); continue; @@ -221,13 +221,13 @@ static int format(char *mesh_iface, const struct funcs *funcs) /* We have an HNA record */ if (!with_HNA) continue; - from = strtok(NULL, " "); + from = strtok_r(NULL, " ", &component_save_ptr); funcs->print_HNA(orig, from); continue; } if (!strcmp(flag, "SEC") && with_2nd) { /* We found a secondary interface MAC address. */ - from = strtok(NULL, " "); + from = strtok_r(NULL, " ", &component_save_ptr); funcs->print_2nd(orig, from); } if (!strcmp(flag, "PRIMARY") && with_2nd) { -- batctl

1 0

batctl; branch, next, updated. v2010.1.0-15-g25dec90
by postmaster＠open-mesh.org 04 Nov '10

04 Nov '10

The following commit has been merged in the next branch: commit d3fdbf4b3aeb5c75da38d737b15de4d00a80da69 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Thu Nov 4 14:03:40 2010 +0100 batctl: Don't print uninitialised traceroute times The time_delta array is only initialised when no error occurs or only the select fails. This means that we may print uninitialised or output from previous ttl levels. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/traceroute.c b/traceroute.c index 0dc796a..f80ca4d 100644 --- a/traceroute.c +++ b/traceroute.c @@ -135,6 +135,7 @@ int traceroute(char *mesh_iface, int argc, char **argv) for (i = 0; i < NUM_PACKETS; i++) { icmp_packet_out.seqno = htons(++seq_counter); + time_delta[i] = 0.0; if (write(trace_fd, (char *)&icmp_packet_out, sizeof(icmp_packet_out)) < 0) { printf("Error - can't write to batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); @@ -151,10 +152,8 @@ int traceroute(char *mesh_iface, int argc, char **argv) res = select(trace_fd + 1, &read_socket, NULL, NULL, &tv); - if (res <= 0) { - time_delta[i] = 0.0; + if (res <= 0) continue; - } read_len = read(trace_fd, (char *)&icmp_packet_in, sizeof(icmp_packet_in)); -- batctl

1 0

batctl; branch, next, updated. v2010.1.0-15-g25dec90
by postmaster＠open-mesh.org 04 Nov '10

04 Nov '10

The following commit has been merged in the next branch: commit ca6b9b112e07d1ec85aa3c07b080d1f6ebf8cc65 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Thu Nov 4 14:03:41 2010 +0100 batctl: Remove unused variables Different variables aren't used after they are set. We can discard them without changing the behavior visible to the outside. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/functions.c b/functions.c index cff8b52..ce046ba 100644 --- a/functions.c +++ b/functions.c @@ -126,7 +126,6 @@ int read_file(char *dir, char *fname, int read_opt, float last_seen; char full_path[500], *buff_ptr, *space_ptr, extra_char; size_t len = 0; - ssize_t read; FILE *fp = NULL; if (read_opt & USE_BAT_HOSTS) @@ -154,7 +153,7 @@ open: system("clear"); read: - while ((read = getline(&line_ptr, &len, fp)) != -1) { + while (getline(&line_ptr, &len, fp) != -1) { /* the buffer will be handled elsewhere */ if (read_opt & USE_READ_BUFF) break; diff --git a/tcpdump.c b/tcpdump.c index da7e368..7511b40 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -91,7 +91,7 @@ static void dump_arp(unsigned char *packet_buff, ssize_t buff_len, int time_prin LEN_CHECK((size_t)buff_len, sizeof(struct ether_arp), "ARP"); if (!time_printed) - time_printed = print_time(); + print_time(); arphdr = (struct ether_arp *)packet_buff; @@ -122,7 +122,7 @@ static void dump_ip(unsigned char *packet_buff, ssize_t buff_len, int time_print LEN_CHECK((size_t)buff_len, (size_t)(iphdr->ihl * 4), "IP"); if (!time_printed) - time_printed = print_time(); + print_time(); switch (iphdr->protocol) { case IPPROTO_ICMP: @@ -257,7 +257,7 @@ static void dump_batman_ogm(unsigned char *packet_buff, ssize_t buff_len, int re batman_packet = (struct batman_packet *)(packet_buff + sizeof(struct ether_header)); if (!time_printed) - time_printed = print_time(); + print_time(); printf("BAT %s: ", get_name_by_macaddr((struct ether_addr *)batman_packet->orig, read_opt)); @@ -274,17 +274,15 @@ static void dump_batman_ogm(unsigned char *packet_buff, ssize_t buff_len, int re static void dump_batman_icmp(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) { - struct ether_header *ether_header; struct icmp_packet *icmp_packet; char *name; LEN_CHECK((size_t)buff_len - sizeof(struct ether_header), sizeof(struct icmp_packet), "BAT ICMP"); - ether_header = (struct ether_header *)packet_buff; icmp_packet = (struct icmp_packet *)(packet_buff + sizeof(struct ether_header)); if (!time_printed) - time_printed = print_time(); + print_time(); printf("BAT %s > ", get_name_by_macaddr((struct ether_addr *)icmp_packet->orig, read_opt)); @@ -372,13 +370,11 @@ static void dump_batman_bcast(unsigned char *packet_buff, ssize_t buff_len, int static void dump_batman_frag(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) { - struct ether_header *ether_header; struct unicast_frag_packet *unicast_frag_packet; LEN_CHECK((size_t)buff_len - ETH_HLEN, sizeof(struct unicast_frag_packet), "BAT FRAG"); LEN_CHECK((size_t)buff_len - ETH_HLEN - sizeof(struct unicast_frag_packet), (size_t)ETH_HLEN, "BAT FRAG (unpacked)"); - ether_header = (struct ether_header *)packet_buff; unicast_frag_packet = (struct unicast_frag_packet *)(packet_buff + ETH_HLEN); if (!time_printed) diff --git a/vis.c b/vis.c index ad612ff..4bc5954 100644 --- a/vis.c +++ b/vis.c @@ -183,7 +183,6 @@ static FILE *open_vis(char *mesh_iface) static int format(char *mesh_iface, const struct funcs *funcs) { size_t len = 0; - ssize_t read; char *line = NULL; char *orig, *from; char *duplet; @@ -202,7 +201,7 @@ static int format(char *mesh_iface, const struct funcs *funcs) if (funcs->print_header) funcs->print_header(); - while ((read = getline(&line, &len, fp)) != -1) { + while (getline(&line, &len, fp) != -1) { /* First MAC address is the originator */ orig = strtok_r(line, ",", &line_save_ptr); -- batctl

1 0

batctl; branch, next, updated. v2010.1.0-15-g25dec90
by postmaster＠open-mesh.org 04 Nov '10

04 Nov '10

The following commit has been merged in the next branch: commit 1fbf987d58d83654ddf343df329d53d5f603ee09 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Thu Nov 4 14:03:42 2010 +0100 batctl: Initialise timeout before usage in error case Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/ping.c b/ping.c index 288bd01..1ed8fac 100644 --- a/ping.c +++ b/ping.c @@ -180,6 +180,9 @@ int ping(char *mesh_iface, int argc, char **argv) packet_len, packet_len + 28); while (!is_aborted) { + tv.tv_sec = timeout; + tv.tv_usec = 0; + if (loop_count == 0) break; @@ -195,9 +198,6 @@ int ping(char *mesh_iface, int argc, char **argv) start_timer(); - tv.tv_sec = timeout; - tv.tv_usec = 0; - FD_ZERO(&read_socket); FD_SET(ping_fd, &read_socket); -- batctl

1 0

batctl; branch, next, updated. v2010.1.0-15-g25dec90
by postmaster＠open-mesh.org 04 Nov '10

04 Nov '10

The following commit has been merged in the next branch: commit b1b8e8b0c233eca361141d486b2e4315a90524ed Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Thu Nov 4 14:03:43 2010 +0100 batctl: Re-add ping interval after each loop The option -i for ping had no visible effect. We can simply change it back to the old behaviour from battool times. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/ping.c b/ping.c index 1ed8fac..ef5d2af 100644 --- a/ping.c +++ b/ping.c @@ -74,7 +74,7 @@ int ping(char *mesh_iface, int argc, char **argv) ssize_t read_len; 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, rr = 0, i; + int loop_count = -1, loop_interval = 0, timeout = 1, rr = 0, i; unsigned int seq_counter = 0, packets_out = 0, packets_in = 0, packets_loss; char *dst_string, *mac_string, *rr_string; double time_delta; @@ -292,9 +292,10 @@ int ping(char *mesh_iface, int argc, char **argv) } sleep: - if ((tv.tv_sec != 0) || (tv.tv_usec != 0)) + if (loop_interval > 0) + sleep(loop_interval); + else if ((tv.tv_sec != 0) || (tv.tv_usec != 0)) select(0, NULL, NULL, NULL, &tv); - } if (packets_out == 0) -- batctl

1 0

batctl; branch, next, updated. v2010.1.0-15-g25dec90
by postmaster＠open-mesh.org 04 Nov '10

04 Nov '10

The following commit has been merged in the next branch: commit da7a796e1fd46247fe3c8c657e94e59447c83c73 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Thu Nov 4 14:03:39 2010 +0100 batctl: Correct format strings for 8 bit ttl Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/tcpdump.c b/tcpdump.c index 92a5262..da7e368 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -334,7 +334,7 @@ static void dump_batman_ucast(unsigned char *packet_buff, ssize_t buff_len, int printf("BAT %s > ", get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt)); - printf("%s: UCAST, ttl %hu, ", + printf("%s: UCAST, ttl %hhu, ", get_name_by_macaddr((struct ether_addr *)unicast_packet->dest, read_opt), unicast_packet->ttl); @@ -387,7 +387,7 @@ static void dump_batman_frag(unsigned char *packet_buff, ssize_t buff_len, int r printf("BAT %s > ", get_name_by_macaddr((struct ether_addr *)unicast_frag_packet->orig, read_opt)); - printf("%s: FRAG, seq %hu, ttl %hu, flags [%c], ", + printf("%s: FRAG, seq %hu, ttl %hhu, flags [%c], ", get_name_by_macaddr((struct ether_addr *)unicast_frag_packet->dest, read_opt), ntohs(unicast_frag_packet->seqno), unicast_frag_packet->ttl, (unicast_frag_packet->flags & UNI_FRAG_HEAD ? 'H' : '.')); diff --git a/traceroute.c b/traceroute.c index dc97a01..0dc796a 100644 --- a/traceroute.c +++ b/traceroute.c @@ -199,9 +199,9 @@ int traceroute(char *mesh_iface, int argc, char **argv) } if (!bat_host) - printf("%2hu: %s", icmp_packet_out.ttl, (return_mac ? return_mac : "*")); + printf("%2hhu: %s", icmp_packet_out.ttl, (return_mac ? return_mac : "*")); else - printf("%2hu: %s (%s)", icmp_packet_out.ttl, bat_host->name, return_mac); + printf("%2hhu: %s (%s)", icmp_packet_out.ttl, bat_host->name, return_mac); for (i = 0; i < NUM_PACKETS; i++) { if (time_delta[i]) -- batctl

1 0

batctl; branch, master, updated. v2010.1.0-72-g5888951
by postmaster＠open-mesh.org 04 Nov '10

04 Nov '10

The following commit has been merged in the master branch: commit 9238c9ad07dd1bd6c812d6af2167291324240f6d Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Thu Nov 4 14:03:43 2010 +0100 batctl: Re-add ping interval after each loop The option -i for ping had no visible effect. We can simply change it back to the old behaviour from battool times. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/ping.c b/ping.c index 1ed8fac..ef5d2af 100644 --- a/ping.c +++ b/ping.c @@ -74,7 +74,7 @@ int ping(char *mesh_iface, int argc, char **argv) ssize_t read_len; 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, rr = 0, i; + int loop_count = -1, loop_interval = 0, timeout = 1, rr = 0, i; unsigned int seq_counter = 0, packets_out = 0, packets_in = 0, packets_loss; char *dst_string, *mac_string, *rr_string; double time_delta; @@ -292,9 +292,10 @@ int ping(char *mesh_iface, int argc, char **argv) } sleep: - if ((tv.tv_sec != 0) || (tv.tv_usec != 0)) + if (loop_interval > 0) + sleep(loop_interval); + else if ((tv.tv_sec != 0) || (tv.tv_usec != 0)) select(0, NULL, NULL, NULL, &tv); - } if (packets_out == 0) -- batctl

1 0

batctl; branch, master, updated. v2010.1.0-72-g5888951
by postmaster＠open-mesh.org 04 Nov '10

04 Nov '10

The following commit has been merged in the master branch: commit 58889510f5ee490867f02629d56b57897327d489 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Thu Nov 4 14:03:43 2010 +0100 batctl: Convert strtok to reentrant safe strtok_r Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/bisect.c b/bisect.c index 2fa15f0..b7d8969 100644 --- a/bisect.c +++ b/bisect.c @@ -466,7 +466,7 @@ err: static int parse_log_file(char *file_path) { FILE *fd; - char line_buff[MAX_LINE], *start_ptr, *tok_ptr; + char line_buff[MAX_LINE], *start_ptr, *start_ptr_safe, *tok_ptr; char *neigh, *iface_addr, *orig, *prev_sender, rt_flag; int line_count = 0, tq, ttl, seqno, i, res, max; @@ -483,12 +483,12 @@ static int parse_log_file(char *file_path) line_count++; if (strstr(start_ptr, "Received BATMAN packet via NB")) { - tok_ptr = strtok(start_ptr, " "); + strtok_r(start_ptr, " ", &start_ptr_safe); neigh = iface_addr = orig = prev_sender = NULL; seqno = tq = ttl = -1; for (i = 0; i < 21; i++) { - tok_ptr = strtok(NULL, " "); + tok_ptr = strtok_r(NULL, " ", &start_ptr_safe); if (!tok_ptr) break; @@ -547,11 +547,11 @@ static int parse_log_file(char *file_path) max = 3; } - tok_ptr = strtok(start_ptr, " "); + strtok_r(start_ptr, " ", &start_ptr_safe); orig = neigh = prev_sender = NULL; for (i = 0; i < max; i++) { - tok_ptr = strtok(NULL, " "); + tok_ptr = strtok_r(NULL, " ", &start_ptr_safe); if (!tok_ptr) break; diff --git a/vis.c b/vis.c index 4bc5954..7fba1ab 100644 --- a/vis.c +++ b/vis.c @@ -186,7 +186,7 @@ static int format(char *mesh_iface, const struct funcs *funcs) char *line = NULL; char *orig, *from; char *duplet; - char *line_save_ptr; + char *line_save_ptr, *component_save_ptr; char *duplet_save_ptr; char *endptr; char *value; @@ -207,12 +207,12 @@ static int format(char *mesh_iface, const struct funcs *funcs) duplet_save_ptr = line_save_ptr; while ((duplet = strtok_r(NULL, ",", &duplet_save_ptr)) != NULL) { - flag = strtok(duplet, " "); + flag = strtok_r(duplet, " ", &component_save_ptr); if (!flag) continue; if (!strcmp(flag, "TQ")) { - from = strtok(NULL, " "); - value = strtok(NULL, " "); + from = strtok_r(NULL, " ", &component_save_ptr); + value = strtok_r(NULL, " ", &component_save_ptr); tq = strtoul(value, &endptr, 0); funcs->print_tq(orig, from, tq); continue; @@ -221,13 +221,13 @@ static int format(char *mesh_iface, const struct funcs *funcs) /* We have an HNA record */ if (!with_HNA) continue; - from = strtok(NULL, " "); + from = strtok_r(NULL, " ", &component_save_ptr); funcs->print_HNA(orig, from); continue; } if (!strcmp(flag, "SEC") && with_2nd) { /* We found a secondary interface MAC address. */ - from = strtok(NULL, " "); + from = strtok_r(NULL, " ", &component_save_ptr); funcs->print_2nd(orig, from); } if (!strcmp(flag, "PRIMARY") && with_2nd) { -- batctl

1 0

batctl; branch, master, updated. v2010.1.0-72-g5888951
by postmaster＠open-mesh.org 04 Nov '10

04 Nov '10

The following commit has been merged in the master branch: commit fa2ed89e935cb882074f75d24e08224cc6f52916 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Thu Nov 4 14:03:41 2010 +0100 batctl: Remove unused variables Different variables aren't used after they are set. We can discard them without changing the behavior visible to the outside. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/functions.c b/functions.c index cff8b52..ce046ba 100644 --- a/functions.c +++ b/functions.c @@ -126,7 +126,6 @@ int read_file(char *dir, char *fname, int read_opt, float last_seen; char full_path[500], *buff_ptr, *space_ptr, extra_char; size_t len = 0; - ssize_t read; FILE *fp = NULL; if (read_opt & USE_BAT_HOSTS) @@ -154,7 +153,7 @@ open: system("clear"); read: - while ((read = getline(&line_ptr, &len, fp)) != -1) { + while (getline(&line_ptr, &len, fp) != -1) { /* the buffer will be handled elsewhere */ if (read_opt & USE_READ_BUFF) break; diff --git a/tcpdump.c b/tcpdump.c index 8898cf8..08a662a 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -91,7 +91,7 @@ static void dump_arp(unsigned char *packet_buff, ssize_t buff_len, int time_prin LEN_CHECK((size_t)buff_len, sizeof(struct ether_arp), "ARP"); if (!time_printed) - time_printed = print_time(); + print_time(); arphdr = (struct ether_arp *)packet_buff; @@ -122,7 +122,7 @@ static void dump_ip(unsigned char *packet_buff, ssize_t buff_len, int time_print LEN_CHECK((size_t)buff_len, (size_t)(iphdr->ihl * 4), "IP"); if (!time_printed) - time_printed = print_time(); + print_time(); switch (iphdr->protocol) { case IPPROTO_ICMP: @@ -257,7 +257,7 @@ static void dump_batman_ogm(unsigned char *packet_buff, ssize_t buff_len, int re batman_packet = (struct batman_packet *)(packet_buff + sizeof(struct ether_header)); if (!time_printed) - time_printed = print_time(); + print_time(); printf("BAT %s: ", get_name_by_macaddr((struct ether_addr *)batman_packet->orig, read_opt)); @@ -275,17 +275,15 @@ static void dump_batman_ogm(unsigned char *packet_buff, ssize_t buff_len, int re static void dump_batman_icmp(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) { - struct ether_header *ether_header; struct icmp_packet *icmp_packet; char *name; LEN_CHECK((size_t)buff_len - sizeof(struct ether_header), sizeof(struct icmp_packet), "BAT ICMP"); - ether_header = (struct ether_header *)packet_buff; icmp_packet = (struct icmp_packet *)(packet_buff + sizeof(struct ether_header)); if (!time_printed) - time_printed = print_time(); + print_time(); printf("BAT %s > ", get_name_by_macaddr((struct ether_addr *)icmp_packet->orig, read_opt)); @@ -373,13 +371,11 @@ static void dump_batman_bcast(unsigned char *packet_buff, ssize_t buff_len, int static void dump_batman_frag(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) { - struct ether_header *ether_header; struct unicast_frag_packet *unicast_frag_packet; LEN_CHECK((size_t)buff_len - ETH_HLEN, sizeof(struct unicast_frag_packet), "BAT FRAG"); LEN_CHECK((size_t)buff_len - ETH_HLEN - sizeof(struct unicast_frag_packet), (size_t)ETH_HLEN, "BAT FRAG (unpacked)"); - ether_header = (struct ether_header *)packet_buff; unicast_frag_packet = (struct unicast_frag_packet *)(packet_buff + ETH_HLEN); if (!time_printed) diff --git a/vis.c b/vis.c index ad612ff..4bc5954 100644 --- a/vis.c +++ b/vis.c @@ -183,7 +183,6 @@ static FILE *open_vis(char *mesh_iface) static int format(char *mesh_iface, const struct funcs *funcs) { size_t len = 0; - ssize_t read; char *line = NULL; char *orig, *from; char *duplet; @@ -202,7 +201,7 @@ static int format(char *mesh_iface, const struct funcs *funcs) if (funcs->print_header) funcs->print_header(); - while ((read = getline(&line, &len, fp)) != -1) { + while (getline(&line, &len, fp) != -1) { /* First MAC address is the originator */ orig = strtok_r(line, ",", &line_save_ptr); -- batctl

1 0

batctl; branch, master, updated. v2010.1.0-72-g5888951
by postmaster＠open-mesh.org 04 Nov '10

04 Nov '10

The following commit has been merged in the master branch: commit fde4a5e975959d5fe36cfaa4001c4f40ff3664d0 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Thu Nov 4 14:03:42 2010 +0100 batctl: Initialise timeout before usage in error case Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/ping.c b/ping.c index 288bd01..1ed8fac 100644 --- a/ping.c +++ b/ping.c @@ -180,6 +180,9 @@ int ping(char *mesh_iface, int argc, char **argv) packet_len, packet_len + 28); while (!is_aborted) { + tv.tv_sec = timeout; + tv.tv_usec = 0; + if (loop_count == 0) break; @@ -195,9 +198,6 @@ int ping(char *mesh_iface, int argc, char **argv) start_timer(); - tv.tv_sec = timeout; - tv.tv_usec = 0; - FD_ZERO(&read_socket); FD_SET(ping_fd, &read_socket); -- batctl

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2010