commits January 2013

commits@lists.open-mesh.org

1 participants
119 discussions

[alfred] master: alfred: Fix warnings about mixing (un-)signed types in comparisons (7be13eb)
by postmaster＠open-mesh.org 11 Jan '13

11 Jan '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 7be13eb63177b237ab2e7c525bd88ccf2bf7e20e Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Fri Jan 4 09:53:42 2013 +0100 alfred: Fix warnings about mixing (un-)signed types in comparisons Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> >--------------------------------------------------------------- 7be13eb63177b237ab2e7c525bd88ccf2bf7e20e alfred.h | 2 +- client.c | 2 +- recv.c | 2 +- send.c | 2 +- unix_sock.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/alfred.h b/alfred.h index 82c997d..4f1a89f 100644 --- a/alfred.h +++ b/alfred.h @@ -125,7 +125,7 @@ int alfred_client_set_data(struct globals *globals); int recv_alfred_packet(struct globals *globals); /* send.c */ int push_data(struct globals *globals, uint8_t *destination, - int max_source_level, int type_filter); + enum data_source max_source_level, int type_filter); int announce_master(struct globals *globals); int push_local_data(struct globals *globals); int sync_data(struct globals *globals); diff --git a/client.c b/client.c index 700c96e..527d78d 100644 --- a/client.c +++ b/client.c @@ -63,7 +63,7 @@ int alfred_client_request_data(struct globals *globals) data_len = ntohs(data->length); /* would it fit? it should! */ - if (data_len > sizeof(buf) - headlen) + if (data_len > (int)(sizeof(buf) - headlen)) break; /* read the data */ diff --git a/recv.c b/recv.c index e99acdc..609fa2a 100644 --- a/recv.c +++ b/recv.c @@ -50,7 +50,7 @@ int process_alfred_push_data(struct globals *globals, struct ethhdr *ethhdr, data_len = ntohs(data->length); /* check if enough data is available */ - if (data_len + sizeof(*data) > len) + if ((int)(data_len + sizeof(*data)) > len) break; dataset = hash_find(globals->data_hash, data); diff --git a/send.c b/send.c index cef20e0..ffd9df9 100644 --- a/send.c +++ b/send.c @@ -49,7 +49,7 @@ int announce_master(struct globals *globals) } int push_data(struct globals *globals, uint8_t *destination, - int max_source_level, int type_filter) + enum data_source max_source_level, int type_filter) { struct hash_it_t *hashit = NULL; uint8_t buf[9000]; diff --git a/unix_sock.c b/unix_sock.c index 799b5a8..7277d69 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -98,14 +98,14 @@ int unix_sock_add_data(struct globals *globals, struct alfred_packet *packet) len = ntohs(packet->length); - if (len < sizeof(*data)) + if (len < (int)sizeof(*data)) return -1; data = (struct alfred_data *)(packet + 1); data_len = ntohs(data->length); memcpy(data->source, globals->hwaddr, sizeof(globals->hwaddr)); - if (data_len + sizeof(*data) > len) + if ((int)(data_len + sizeof(*data)) > len) return -1; dataset = hash_find(globals->data_hash, data);

1 0

[alfred] master: alfred: Break out of set_data loop when buffer is full (1bc232f)
by postmaster＠open-mesh.org 11 Jan '13

11 Jan '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 1bc232f74222cda17c0e31ec77b155530290abb6 Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Fri Jan 4 09:59:03 2013 +0100 alfred: Break out of set_data loop when buffer is full The current limit for data the client program can supply is 9000 bytes. But client programs providing more than 9000 bytes before they close their socket would create an endless loop and therefore block the complete daemon program. Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> >--------------------------------------------------------------- 1bc232f74222cda17c0e31ec77b155530290abb6 client.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client.c b/client.c index 527d78d..31929a7 100644 --- a/client.c +++ b/client.c @@ -114,6 +114,9 @@ int alfred_client_set_data(struct globals *globals) while (!feof(stdin)) { ret = fread(&buf[len], 1, sizeof(buf) - len, stdin); len += ret; + + if (sizeof(buf) == len) + break; } packet->type = ALFRED_PUSH_DATA;

1 0

[alfred] master: alfred: Only start when listening on batman-adv soft-interfaces (241cda1)
by postmaster＠open-mesh.org 11 Jan '13

11 Jan '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 241cda1d3ecc501eb67cbfc5dc144c7cc17f7023 Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Thu Jan 3 16:51:08 2013 +0100 alfred: Only start when listening on batman-adv soft-interfaces Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> >--------------------------------------------------------------- 241cda1d3ecc501eb67cbfc5dc144c7cc17f7023 batadv_query.c | 37 +++++++++++++++++++++++++++++++++++++ batadv_query.h | 1 + server.c | 4 ++++ 3 files changed, 42 insertions(+) diff --git a/batadv_query.c b/batadv_query.c index e56ad60..1390f57 100644 --- a/batadv_query.c +++ b/batadv_query.c @@ -29,6 +29,43 @@ #define DEBUG_TRANSTABLE_GLOBAL "transtable_global" #define DEBUG_ORIGINATORS "originators" +int batadv_interface_check(char *mesh_iface) +{ + char *debugfs_mnt; + char full_path[MAX_PATH+1]; + FILE *f; + + debugfs_mnt = debugfs_mount(NULL); + if (!debugfs_mnt) { + fprintf(stderr, "Could not find debugfs path\n"); + return -1; + } + + debugfs_make_path(DEBUG_BATIF_PATH_FMT "/" DEBUG_TRANSTABLE_GLOBAL, + mesh_iface, full_path, sizeof(full_path)); + f = fopen(full_path, "r"); + if (!f) { + fprintf(stderr, + "Could not find %s for interface %s. Make sure it is a valid batman-adv soft-interface\n", + DEBUG_TRANSTABLE_GLOBAL, mesh_iface); + return -1; + } + fclose(f); + + debugfs_make_path(DEBUG_BATIF_PATH_FMT "/" DEBUG_ORIGINATORS, + mesh_iface, full_path, sizeof(full_path)); + f = fopen(full_path, "r"); + if (!f) { + fprintf(stderr, + "Could not find %s for interface %s. Make sure it is a valid batman-adv soft-interface\n", + DEBUG_ORIGINATORS, mesh_iface); + return -1; + } + fclose(f); + + return 0; +} + struct ether_addr *translate_mac(char *mesh_iface, struct ether_addr *mac) { enum { diff --git a/batadv_query.h b/batadv_query.h index d4a3b79..f2a1f32 100644 --- a/batadv_query.h +++ b/batadv_query.h @@ -25,5 +25,6 @@ struct ether_addr *translate_mac(char *mesh_iface, struct ether_addr *mac); uint8_t get_tq(char *mesh_iface, struct ether_addr *mac); +int batadv_interface_check(char *mesh_iface); #endif diff --git a/server.c b/server.c index 91a65e6..55844c2 100644 --- a/server.c +++ b/server.c @@ -29,6 +29,7 @@ #include <sys/select.h> #include <sys/time.h> #include "alfred.h" +#include "batadv_query.h" static int server_compare(void *d1, void *d2) { @@ -169,6 +170,9 @@ int alfred_server(struct globals *globals) return -1; } + if (batadv_interface_check(globals->interface) < 0) + return -1; + if (netsock_open(globals)) return -1;

1 0

[alfred] master: alfred: Query the tq value for servers from batman-adv (918c077)
by postmaster＠open-mesh.org 11 Jan '13

11 Jan '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 918c077f8b37072d39e34ad5f334ded35bb91fc8 Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Thu Jan 3 16:25:18 2013 +0100 alfred: Query the tq value for servers from batman-adv Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> >--------------------------------------------------------------- 918c077f8b37072d39e34ad5f334ded35bb91fc8 Makefile | 2 +- batadv_query.c | 201 ++++++++++++++++++++++++++++++++++++++++++++++ util.c => batadv_query.h | 22 ++--- debugfs.c | 158 ++++++++++++++++++++++++++++++++++++ util.c => debugfs.h | 38 +++++---- recv.c | 10 ++- 6 files changed, 399 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index 9796528..67ff185 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ # alfred build BINARY_NAME = alfred -OBJ = main.o server.o client.o netsock.o send.o recv.o hash.o unix_sock.o util.o +OBJ = main.o server.o client.o netsock.o send.o recv.o hash.o unix_sock.o util.o debugfs.o batadv_query.o # alfred flags and options CFLAGS += -pedantic -Wall -W -std=gnu99 -fno-strict-aliasing -MD diff --git a/batadv_query.c b/batadv_query.c new file mode 100644 index 0000000..e56ad60 --- /dev/null +++ b/batadv_query.c @@ -0,0 +1,201 @@ +/* + * Copyright (C) 2012 B.A.T.M.A.N. contributors: + * + * 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 + * + */ + +#include "batadv_query.h" +#include "debugfs.h" +#include <stdio.h> +#include <netinet/ether.h> +#include <stdlib.h> + +#define DEBUG_BATIF_PATH_FMT "%s/batman_adv/%s" +#define DEBUG_TRANSTABLE_GLOBAL "transtable_global" +#define DEBUG_ORIGINATORS "originators" + +struct ether_addr *translate_mac(char *mesh_iface, struct ether_addr *mac) +{ + enum { + tg_start, + tg_mac, + tg_via, + tg_originator, + } pos; + char full_path[MAX_PATH+1]; + char *debugfs_mnt; + static struct ether_addr in_mac; + struct ether_addr *mac_result, *mac_tmp; + FILE *f = NULL; + size_t len = 0; + char *line = NULL; + char *input, *saveptr, *token; + int line_invalid; + + memcpy(&in_mac, mac, sizeof(in_mac)); + mac_result = &in_mac; + + debugfs_mnt = debugfs_mount(NULL); + if (!debugfs_mnt) + goto out; + + debugfs_make_path(DEBUG_BATIF_PATH_FMT "/" DEBUG_TRANSTABLE_GLOBAL, + mesh_iface, full_path, sizeof(full_path)); + + f = fopen(full_path, "r"); + if (!f) + goto out; + + while (getline(&line, &len, f) != -1) { + line_invalid = 0; + pos = tg_start; + input = line; + + while ((token = strtok_r(input, " \t", &saveptr))) { + input = NULL; + + switch (pos) { + case tg_start: + if (strcmp(token, "*") != 0) + line_invalid = 1; + else + pos = tg_mac; + break; + case tg_mac: + mac_tmp = ether_aton(token); + if (!mac_tmp || memcmp(mac_tmp, &in_mac, + sizeof(in_mac)) != 0) + line_invalid = 1; + else + pos = tg_via; + break; + case tg_via: + if (strcmp(token, "via") == 0) + pos = tg_originator; + break; + case tg_originator: + mac_tmp = ether_aton(token); + if (!mac_tmp) { + line_invalid = 1; + } else { + mac_result = mac_tmp; + goto out; + } + break; + } + + if (line_invalid) + break; + } + } + +out: + if (f) + fclose(f); + free(line); + return mac_result; +} + +uint8_t get_tq(char *mesh_iface, struct ether_addr *mac) +{ + enum { + orig_mac, + orig_lastseen, + orig_tqstart, + orig_tqvalue, + } pos; + char full_path[MAX_PATH+1]; + char *debugfs_mnt; + static struct ether_addr in_mac; + struct ether_addr *mac_tmp; + FILE *f = NULL; + size_t len = 0; + char *line = NULL; + char *input, *saveptr, *token; + int line_invalid; + uint8_t tq = 0; + + memcpy(&in_mac, mac, sizeof(in_mac)); + + debugfs_mnt = debugfs_mount(NULL); + if (!debugfs_mnt) + goto out; + + debugfs_make_path(DEBUG_BATIF_PATH_FMT "/" DEBUG_ORIGINATORS, + mesh_iface, full_path, sizeof(full_path)); + + f = fopen(full_path, "r"); + if (!f) + goto out; + + while (getline(&line, &len, f) != -1) { + line_invalid = 0; + pos = orig_mac; + input = line; + + while ((token = strtok_r(input, " \t", &saveptr))) { + input = NULL; + + switch (pos) { + case orig_mac: + mac_tmp = ether_aton(token); + if (!mac_tmp || memcmp(mac_tmp, &in_mac, + sizeof(in_mac)) != 0) + line_invalid = 1; + else + pos = orig_lastseen; + break; + case orig_lastseen: + pos = orig_tqstart; + break; + case orig_tqstart: + if (strlen(token) == 0) { + line_invalid = 1; + break; + } else if (token[0] != '(') { + line_invalid = 1; + break; + } else if (strlen(token) == 1) { + pos = orig_tqvalue; + break; + } else { + /* fall through */ + token++; + } + case orig_tqvalue: + if (token[strlen(token) - 1] != ')') { + line_invalid = 1; + } else { + token[strlen(token) - 1] = '\0'; + tq = strtol(token, NULL, 10); + goto out; + } + break; + } + + if (line_invalid) + break; + } + } + +out: + if (f) + fclose(f); + free(line); + return tq; +} diff --git a/util.c b/batadv_query.h similarity index 60% copy from util.c copy to batadv_query.h index 0d026b1..d4a3b79 100644 --- a/util.c +++ b/batadv_query.h @@ -1,7 +1,7 @@ /* - * Copyright (C) 2012 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: * - * Simon Wunderlich + * 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 @@ -18,18 +18,12 @@ * 02110-1301, USA * */ +#ifndef _BATADV_QUERY_H +#define _BATADV_QUERY_H -#include <sys/time.h> +#include <stdint.h> -int time_diff(struct timeval *tv1, struct timeval *tv2, - struct timeval *tvdiff) { - tvdiff->tv_sec = tv1->tv_sec - tv2->tv_sec; - if (tv1->tv_usec < tv2->tv_usec) { - tvdiff->tv_usec = 1000000 + tv1->tv_usec - tv2->tv_usec; - tvdiff->tv_sec -= 1; - } else { - tvdiff->tv_usec = tv1->tv_usec - tv2->tv_usec; - } +struct ether_addr *translate_mac(char *mesh_iface, struct ether_addr *mac); +uint8_t get_tq(char *mesh_iface, struct ether_addr *mac); - return (tvdiff->tv_sec >= 0); -} +#endif diff --git a/debugfs.c b/debugfs.c new file mode 100644 index 0000000..dc2218e --- /dev/null +++ b/debugfs.c @@ -0,0 +1,158 @@ +/* + * Copyright (C) 2009 Clark Williams <williams(a)redhat.com> + * Copyright (C) 2009 Xiao Guangrong <xiaoguangrong(a)cn.fujitsu.com> + * + * 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 "debugfs.h" +#include <stdio.h> +#include <stdlib.h> +#include <errno.h> +#include <sys/vfs.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <unistd.h> + +#ifndef DEBUGFS_MAGIC +#define DEBUGFS_MAGIC 0x64626720 +#endif + +static int debugfs_premounted; +static char debugfs_mountpoint[MAX_PATH+1]; + +static const char *debugfs_known_mountpoints[] = { + "/sys/kernel/debug/", + "/debug/", + NULL, +}; + +/* construct a full path to a debugfs element */ +int debugfs_make_path(const char *fmt, char *mesh_iface, char *buffer, int size) +{ + int len; + + if (strlen(debugfs_mountpoint) == 0) { + buffer[0] = '\0'; + return -1; + } + + len = strlen(debugfs_mountpoint) + strlen(fmt) + 1; + if (len >= size) + return len+1; + + snprintf(buffer, size-1, fmt, debugfs_mountpoint, mesh_iface); + buffer[size - 1] = '\0'; + return 0; +} + +static int debugfs_found; + +/* find the path to the mounted debugfs */ +const char *debugfs_find_mountpoint(void) +{ + const char **ptr; + char type[100]; + FILE *fp; + + if (debugfs_found) + return (const char *)debugfs_mountpoint; + + ptr = debugfs_known_mountpoints; + while (*ptr) { + if (debugfs_valid_mountpoint(*ptr) == 0) { + debugfs_found = 1; + strcpy(debugfs_mountpoint, *ptr); + return debugfs_mountpoint; + } + ptr++; + } + + /* give up and parse /proc/mounts */ + fp = fopen("/proc/mounts", "r"); + if (fp == NULL) { + fprintf(stderr, + "Error - can't open /proc/mounts for read: %s\n", + strerror(errno)); + return NULL; + } + + while (fscanf(fp, "%*s %" + STR(MAX_PATH) + "s %99s %*s %*d %*d\n", + debugfs_mountpoint, type) == 2) { + if (strcmp(type, "debugfs") == 0) + break; + } + fclose(fp); + + if (strcmp(type, "debugfs") != 0) + return NULL; + + debugfs_found = 1; + + return debugfs_mountpoint; +} + +/* verify that a mountpoint is actually a debugfs instance */ + +int debugfs_valid_mountpoint(const char *debugfs) +{ + struct statfs st_fs; + + if (statfs(debugfs, &st_fs) < 0) + return -ENOENT; + else if (st_fs.f_type != (long) DEBUGFS_MAGIC) + return -ENOENT; + + return 0; +} + + +int debugfs_valid_entry(const char *path) +{ + struct stat st; + + if (stat(path, &st)) + return -errno; + + return 0; +} + +/* mount the debugfs somewhere if it's not mounted */ + +char *debugfs_mount(const char *mountpoint) +{ + /* see if it's already mounted */ + if (debugfs_find_mountpoint()) { + debugfs_premounted = 1; + return debugfs_mountpoint; + } + + /* if not mounted and no argument */ + if (mountpoint == NULL) + mountpoint = "/sys/kernel/debug"; + + if (mount(NULL, mountpoint, "debugfs", 0, NULL) < 0) + return NULL; + + /* save the mountpoint */ + strncpy(debugfs_mountpoint, mountpoint, sizeof(debugfs_mountpoint)); + debugfs_found = 1; + + return debugfs_mountpoint; +} diff --git a/util.c b/debugfs.h similarity index 50% copy from util.c copy to debugfs.h index 0d026b1..3981b8b 100644 --- a/util.c +++ b/debugfs.h @@ -1,7 +1,6 @@ /* - * Copyright (C) 2012 B.A.T.M.A.N. contributors: - * - * Simon Wunderlich + * Copyright (C) 2009 Clark Williams <williams(a)redhat.com> + * Copyright (C) 2009 Xiao Guangrong <xiaoguangrong(a)cn.fujitsu.com> * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -19,17 +18,26 @@ * */ -#include <sys/time.h> +#ifndef __DEBUGFS_H__ +#define __DEBUGFS_H__ + +#include <sys/mount.h> +#include <string.h> + +#ifndef MAX_PATH +# define MAX_PATH 256 +#endif + +#ifndef STR +# define _STR(x) #x +# define STR(x) _STR(x) +#endif -int time_diff(struct timeval *tv1, struct timeval *tv2, - struct timeval *tvdiff) { - tvdiff->tv_sec = tv1->tv_sec - tv2->tv_sec; - if (tv1->tv_usec < tv2->tv_usec) { - tvdiff->tv_usec = 1000000 + tv1->tv_usec - tv2->tv_usec; - tvdiff->tv_sec -= 1; - } else { - tvdiff->tv_usec = tv1->tv_usec - tv2->tv_usec; - } +extern const char *debugfs_find_mountpoint(void); +extern int debugfs_valid_mountpoint(const char *debugfs); +extern int debugfs_valid_entry(const char *path); +extern char *debugfs_mount(const char *mountpoint); +extern int debugfs_make_path(const char *fmt, char *mesh_iface, + char *buffer, int size); - return (tvdiff->tv_sec >= 0); -} +#endif /* __DEBUGFS_H__ */ diff --git a/recv.c b/recv.c index 8ddf7ab..bbb6313 100644 --- a/recv.c +++ b/recv.c @@ -32,6 +32,7 @@ #include <linux/if_ether.h> #include <linux/filter.h> #include "alfred.h" +#include "batadv_query.h" int process_alfred_push_data(struct globals *globals, struct ethhdr *ethhdr, struct alfred_packet *packet) @@ -105,6 +106,7 @@ int process_alfred_announce_master(struct globals *globals, struct alfred_packet *packet) { struct server *server; + struct ether_addr *macaddr; if (packet->version != ALFRED_VERSION) return -1; @@ -124,8 +126,12 @@ int process_alfred_announce_master(struct globals *globals, } server->last_seen = time(NULL); - server->tq = 255; - /* TODO: update TQ */ + macaddr = translate_mac(globals->interface, + (struct ether_addr *)server->address); + if (macaddr) + server->tq = get_tq(globals->interface, macaddr); + else + server->tq = 0; if (globals->opmode == OPMODE_SLAVE) set_best_server(globals);

1 0

[alfred] tag 'v0.0' created
by postmaster＠open-mesh.org 11 Jan '13

11 Jan '13

Repository : ssh://git@open-mesh.org/alfred New tag : v0.0 Referencing: e143e3ce133a674a226aa66be3fd381302f539dc

1 0

[alfred] master: alfred: Fix client buffer check (6ea9624)
by postmaster＠open-mesh.org 11 Jan '13

11 Jan '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 6ea96243cd6918f8f8cecca5ba92c3fe9c7f6c7e Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Tue Jan 8 18:31:23 2013 +0100 alfred: Fix client buffer check The size of the buffer cannot be checked by using sizeof(*buf) because this is only the size of a single element of this buffer. Therefore the check for the size would always return false and the client would never print any data. Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> >--------------------------------------------------------------- 6ea96243cd6918f8f8cecca5ba92c3fe9c7f6c7e client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client.c b/client.c index 27a5ddb..700c96e 100644 --- a/client.c +++ b/client.c @@ -63,7 +63,7 @@ int alfred_client_request_data(struct globals *globals) data_len = ntohs(data->length); /* would it fit? it should! */ - if (data_len > sizeof(*buf) - headlen) + if (data_len > sizeof(buf) - headlen) break; /* read the data */

1 0

[linux-merge]linux integration; annotated tag, v3.8-rc3, created. v3.8-rc3
by postmaster＠open-mesh.org 10 Jan '13

10 Jan '13

The annotated tag, v3.8-rc3 has been created at d7150026d19ce56fb285b3d812cd6d5e0bfbe262 (tag) tagging 9931faca02c604c22335f5a935a501bb2ace6e20 (commit) replaces v3.8-rc2 tagged by Linus Torvalds on Wed Jan 9 19:00:05 2013 -0800 - Shortlog ------------------------------------------------------------ Linux 3.8-rc3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJQ7i67AAoJEHm+PkMAQRiGWb4H/jpPGtPKMRNodz3pD6EEvr11 vUibqULkQk8ZZiFw/y19We2DqfIF8g578B/db55FzE22yQi3whnpxUE2O+x0zSDy SeKEDzujVU7TCXflBQ28qDB+P/1u7zLIHhnLltNrx3cqSmzNOmD+482W25UW8YBR FgIVDjVWxVc0ZANF0GozajafJvs9DPzxwZo5CRYnxJ/wgnYFMr8QwdILCYW1r75N aeojIRcp0s4PHe+SzL1grdTSNdNx/bi5bENmVCzTkOlrXMZbPkYluqJUHjzj8Yt3 BuE1FPeK1AKudXkOCo4Vgu7W7Yw1jnal33bAXKLkoHuN1dT7HgyZvLZZdl0b3wE= =XdP/ -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: batman-adv: fix drvinfo strings set in drivers (efccb19)
by postmaster＠open-mesh.org 09 Jan '13

09 Jan '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit efccb1977b070208ebca30656102d44ddab2397b Author: Jiri Pirko <jiri(a)resnulli.us> Date: Wed Jan 9 15:30:53 2013 +0800 batman-adv: fix drvinfo strings set in drivers Use strlcpy where possible to ensure the string is \0 terminated. Use always sizeof(string) instead of 32, ETHTOOL_BUSINFO_LEN and custom defines. Use snprintf instead of sprint. Remove unnecessary inits of ->fw_version Remove unnecessary inits of drvinfo struct. Signed-off-by: Jiri Pirko <jiri(a)resnulli.us> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- efccb1977b070208ebca30656102d44ddab2397b soft-interface.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/soft-interface.c b/soft-interface.c index dbbf2b6..e67e013 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -585,10 +585,10 @@ static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) static void batadv_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) { - strcpy(info->driver, "B.A.T.M.A.N. advanced"); - strcpy(info->version, BATADV_SOURCE_VERSION); - strcpy(info->fw_version, "N/A"); - strcpy(info->bus_info, "batman"); + strlcpy(info->driver, "B.A.T.M.A.N. advanced", sizeof(info->driver)); + strlcpy(info->version, BATADV_SOURCE_VERSION, sizeof(info->version)); + strlcpy(info->fw_version, "N/A", sizeof(info->fw_version)); + strlcpy(info->bus_info, "batman", sizeof(info->bus_info)); } static u32 batadv_get_msglevel(struct net_device *dev)

1 0

[batctl] master's head updated: Merge branch 'next' (0e2efdc)
by postmaster＠open-mesh.org 09 Jan '13

09 Jan '13

Repository : ssh://git@open-mesh.org/batctl Branch 'master' now includes: ad16305 batctl: man page - fix undefined macro warning 0e2efdc Merge branch 'next'

1 0

[batctl] master: Merge branch 'next' (0e2efdc)
by postmaster＠open-mesh.org 09 Jan '13

09 Jan '13

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 0e2efdc73c258a50a52ced8dfeff03a5ee4be53d Merge: f927479 ad16305 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Jan 9 15:25:36 2013 +0800 Merge branch 'next' >--------------------------------------------------------------- 0e2efdc73c258a50a52ced8dfeff03a5ee4be53d man/batctl.8 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

1 0

← Newer
1
...
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits January 2013