commits September 2013

commits@lists.open-mesh.org

1 participants
91 discussions

[batctl] next: batctl: Don't fail rebuild when header is removed (4c5c86e)
by postmaster＠open-mesh.org 13 Sep '13

13 Sep '13

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 4c5c86ec1bba9eb41ba3e74c2312cdcbe5a787cc Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Sep 10 23:12:01 2013 +0200 batctl: Don't fail rebuild when header is removed The *.d depends files for make just list the files used when building an object file. Removing a file listed in such a dependency file causes make to search for a way to recreate it. This usually cannot work because these files aren't autogenerated. The gcc option -MP can be used to generate empty rule for these files. Removing a file in a dependency list will then execute this empty rule and continue with the execution of the creation of the object file. This compilation process will then automatically correct the dependency file. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 4c5c86ec1bba9eb41ba3e74c2312cdcbe5a787cc Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9e7c5be..166dcf8 100755 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ OBJ_BISECT = bisect_iv.o MANPAGE = man/batctl.8 # batctl flags and options -CFLAGS += -pedantic -Wall -W -std=gnu99 -fno-strict-aliasing -MD +CFLAGS += -pedantic -Wall -W -std=gnu99 -fno-strict-aliasing -MD -MP CPPFLAGS += -D_GNU_SOURCE LDLIBS += -lm

1 0

[batctl] next: batctl: Fix type of new neighbor buffer in _seqno_trace_neigh_add (2091ab8)
by postmaster＠open-mesh.org 13 Sep '13

13 Sep '13

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 2091ab83e9bb3dd4a710566541ce3433f21a8471 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Sep 10 23:12:00 2013 +0200 batctl: Fix type of new neighbor buffer in _seqno_trace_neigh_add Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 2091ab83e9bb3dd4a710566541ce3433f21a8471 bisect_iv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bisect_iv.c b/bisect_iv.c index 0dbc2ef..c0f9420 100644 --- a/bisect_iv.c +++ b/bisect_iv.c @@ -1040,7 +1040,7 @@ static void seqno_trace_print(struct list_head_first *trace_list, char *trace_or static int _seqno_trace_neigh_add(struct seqno_trace_neigh *seqno_trace_mom, struct seqno_trace_neigh *seqno_trace_child) { - struct seqno_trace_neigh *data_ptr; + struct seqno_trace_neigh **data_ptr; data_ptr = malloc((seqno_trace_mom->num_neighbors + 1) * sizeof(struct seqno_trace_neigh *)); if (!data_ptr) @@ -1053,7 +1053,7 @@ static int _seqno_trace_neigh_add(struct seqno_trace_neigh *seqno_trace_mom, } seqno_trace_mom->num_neighbors++; - seqno_trace_mom->seqno_trace_neigh = (void *)data_ptr; + seqno_trace_mom->seqno_trace_neigh = data_ptr; seqno_trace_mom->seqno_trace_neigh[seqno_trace_mom->num_neighbors - 1] = seqno_trace_child; return 1; }

1 0

[batctl] next: batctl: Fix error handling jump in interface when batadv not loaded (2b8d81c)
by postmaster＠open-mesh.org 13 Sep '13

13 Sep '13

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 2b8d81caf4aad4f0e73d5157ff9b963512197b55 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Sep 10 23:11:59 2013 +0200 batctl: Fix error handling jump in interface when batadv not loaded The jump to the path_buffer free must be taken when batman-adv was not loaded because it has to free path_buff which was allocated earlier Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 2b8d81caf4aad4f0e73d5157ff9b963512197b55 sys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys.c b/sys.c index 3258105..7c694a2 100644 --- a/sys.c +++ b/sys.c @@ -237,7 +237,7 @@ int interface(char *mesh_iface, int argc, char **argv) if (!file_exists(module_ver_path)) { fprintf(stderr, "Error - batman-adv module has not been loaded\n"); - goto err; + goto err_buff; } fprintf(stderr, "Error - interface type not supported by batman-adv: %s\n", argv[i]);

1 0

[batctl] next: batctl: Remove legacy types u64 and caddr_t (0a88d31)
by postmaster＠open-mesh.org 13 Sep '13

13 Sep '13

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 0a88d31bd917981a1ff482fd154ca4165ffc216e Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Sep 10 23:11:57 2013 +0200 batctl: Remove legacy types u64 and caddr_t The definition of u64 was not obtained from the correct source to always use 64 bit. Instead uint64_t can be used. Also caddr_t is obsolete BSDism and void* should be used instead. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 0a88d31bd917981a1ff482fd154ca4165ffc216e ioctl.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ioctl.c b/ioctl.c index 26bb482..3d5b50d 100644 --- a/ioctl.c +++ b/ioctl.c @@ -30,13 +30,12 @@ #include <linux/if.h> #include <linux/sockios.h> #include <linux/ethtool.h> +#include <stdint.h> #include "main.h" #include "ioctl.h" #include "debugfs.h" -typedef unsigned long long u64; - /* code borrowed from ethtool */ static int statistics_custom_get(int fd, struct ifreq *ifr) { @@ -47,7 +46,7 @@ static int statistics_custom_get(int fd, struct ifreq *ifr) int err, ret = EXIT_FAILURE; drvinfo.cmd = ETHTOOL_GDRVINFO; - ifr->ifr_data = (caddr_t)&drvinfo; + ifr->ifr_data = (void *)&drvinfo; err = ioctl(fd, SIOCETHTOOL, ifr); if (err < 0) { fprintf(stderr, "Error - can't open driver information: %s\n", strerror(errno)); @@ -59,7 +58,7 @@ static int statistics_custom_get(int fd, struct ifreq *ifr) goto success; sz_str = n_stats * ETH_GSTRING_LEN; - sz_stats = n_stats * sizeof(u64); + sz_stats = n_stats * sizeof(uint64_t); strings = calloc(1, sz_str + sizeof(struct ethtool_gstrings)); stats = calloc(1, sz_stats + sizeof(struct ethtool_stats)); @@ -71,7 +70,7 @@ static int statistics_custom_get(int fd, struct ifreq *ifr) strings->cmd = ETHTOOL_GSTRINGS; strings->string_set = ETH_SS_STATS; strings->len = n_stats; - ifr->ifr_data = (caddr_t)strings; + ifr->ifr_data = (void *)strings; err = ioctl(fd, SIOCETHTOOL, ifr); if (err < 0) { fprintf(stderr, "Error - can't get stats strings information: %s\n", strerror(errno)); @@ -80,7 +79,7 @@ static int statistics_custom_get(int fd, struct ifreq *ifr) stats->cmd = ETHTOOL_GSTATS; stats->n_stats = n_stats; - ifr->ifr_data = (caddr_t) stats; + ifr->ifr_data = (void *) stats; err = ioctl(fd, SIOCETHTOOL, ifr); if (err < 0) { fprintf(stderr, "Error - can't get stats information: %s\n", strerror(errno));

1 0

[batctl] next: batctl: Add include guards to avoid redundant declarations or include loops (2e15205)
by postmaster＠open-mesh.org 11 Sep '13

11 Sep '13

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 2e1520528d0473c399a8849b33730668d6f52362 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Sep 10 23:11:56 2013 +0200 batctl: Add include guards to avoid redundant declarations or include loops Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 2e1520528d0473c399a8849b33730668d6f52362 allocate.h | 4 ++-- bat-hosts.h | 4 ++-- bisect_iv.h | 5 +++++ debug.h | 4 ++++ functions.h | 5 ++++- ioctl.h | 4 ++++ main.h | 5 +++++ ping.h | 5 ++++- sys.h | 4 ++++ tcpdump.h | 4 ++++ traceroute.h | 5 ++++- translate.h | 5 ++++- 12 files changed, 46 insertions(+), 8 deletions(-) diff --git a/allocate.h b/allocate.h index 72a41f7..0f335e2 100644 --- a/allocate.h +++ b/allocate.h @@ -20,8 +20,8 @@ */ -#ifndef _ALLOCATE_H -#define _ALLOCATE_H 1 +#ifndef _BATCTL_ALLOCATE_H +#define _BATCTL_ALLOCATE_H /* debug allocate wrapper to keep hash.c happy */ diff --git a/bat-hosts.h b/bat-hosts.h index 0439a46..74a4ce5 100644 --- a/bat-hosts.h +++ b/bat-hosts.h @@ -21,8 +21,8 @@ -#ifndef _BAT_HOSTS_H -#define _BAT_HOSTS_H 1 +#ifndef _BATCTL_BAT_HOSTS_H +#define _BATCTL_BAT_HOSTS_H #include <netinet/ether.h> diff --git a/bisect_iv.h b/bisect_iv.h index b2e14f6..c4e6df2 100644 --- a/bisect_iv.h +++ b/bisect_iv.h @@ -19,6 +19,9 @@ * */ +#ifndef _BATCTL_BISECT_IV_H +#define _BATCTL_BISECT_IV_H + #include "list-batman.h" #define NAME_LEN 18 @@ -95,3 +98,5 @@ struct seqno_trace { char print; struct seqno_trace_neigh seqno_trace_neigh; }; + +#endif diff --git a/debug.h b/debug.h index 2427ece..7b9cfc5 100644 --- a/debug.h +++ b/debug.h @@ -19,6 +19,8 @@ * */ +#ifndef _BATCTL_DEBUG_H +#define _BATCTL_DEBUG_H #define DEBUG_BATIF_PATH_FMT "%s/batman_adv/%s" #define DEBUG_VIS_DATA "vis_data" @@ -48,3 +50,5 @@ extern const struct debug_table_data batctl_debug_tables[BATCTL_TABLE_NUM]; int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv); int log_print(char *mesh_iface, int argc, char **argv); + +#endif diff --git a/functions.h b/functions.h index f9c8191..6720a1b 100644 --- a/functions.h +++ b/functions.h @@ -19,7 +19,8 @@ * */ - +#ifndef _BATCTL_FUNCTIONS_H +#define _BATCTL_FUNCTIONS_H #include <netinet/if_ether.h> @@ -55,3 +56,5 @@ enum { COMPAT_FILTER = 0x80, SKIP_HEADER = 0x100, }; + +#endif diff --git a/ioctl.h b/ioctl.h index 3bc20d7..5d62f72 100644 --- a/ioctl.h +++ b/ioctl.h @@ -19,5 +19,9 @@ * */ +#ifndef _BATCTL_IOCTL_H +#define _BATCTL_IOCTL_H int ioctl_statistics_get(char *mesh_iface); + +#endif diff --git a/main.h b/main.h index b8fd0c4..8bd529c 100644 --- a/main.h +++ b/main.h @@ -19,6 +19,9 @@ * */ +#ifndef _BATCTL_MAIN_H +#define _BATCTL_MAIN_H + #ifndef SOURCE_VERSION #define SOURCE_VERSION "2013.4.0" #endif @@ -37,3 +40,5 @@ #define BIT(nr) (1UL << (nr)) /* linux kernel compat */ extern char module_ver_path[]; + +#endif diff --git a/ping.h b/ping.h index abe7da4..7c91d5d 100644 --- a/ping.h +++ b/ping.h @@ -19,6 +19,9 @@ * */ - +#ifndef _BATCTL_PING_H +#define _BATCTL_PING_H int ping(char *mesh_iface, int argc, char **argv); + +#endif diff --git a/sys.h b/sys.h index a7187af..9ca1bec 100644 --- a/sys.h +++ b/sys.h @@ -19,6 +19,8 @@ * */ +#ifndef _BATCTL_SYS_H +#define _BATCTL_SYS_H #define SYS_BATIF_PATH_FMT "/sys/class/net/%s/mesh/" #define SYS_LOG_LEVEL "log_level" @@ -65,3 +67,5 @@ int interface(char *mesh_iface, int argc, char **argv); int handle_loglevel(char *mesh_iface, int argc, char **argv); int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv); int handle_gw_setting(char *mesh_iface, int argc, char **argv); + +#endif diff --git a/tcpdump.h b/tcpdump.h index 719f998..33d84e2 100644 --- a/tcpdump.h +++ b/tcpdump.h @@ -19,6 +19,8 @@ * */ +#ifndef _BATCTL_TCPDUMP_H +#define _BATCTL_TCPDUMP_H #include <netpacket/packet.h> #include <net/ethernet.h> @@ -107,3 +109,5 @@ struct prism_header { #define RADIOTAP_HEADER_LEN sizeof(struct radiotap_header) int tcpdump(int argc, char **argv); + +#endif diff --git a/traceroute.h b/traceroute.h index 8aae468..5ec1308 100644 --- a/traceroute.h +++ b/traceroute.h @@ -19,6 +19,9 @@ * */ - +#ifndef _BATCTL_TRACEROUTE_H +#define _BATCTL_TRACEROUTE_H int traceroute(char *mesh_iface, int argc, char **argv); + +#endif diff --git a/translate.h b/translate.h index 1220a20..320ad0e 100644 --- a/translate.h +++ b/translate.h @@ -19,6 +19,9 @@ * */ - +#ifndef _BATCTL_TRANSLATE_H +#define _BATCTL_TRANSLATE_H int translate(char *mesh_iface, int argc, char **argv); + +#endif

1 0

[batctl] next: batctl: Mark all local functions as static (aad6168)
by postmaster＠open-mesh.org 11 Sep '13

11 Sep '13

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit aad616848b2ed00ae71c44cda13bef7fb1a03d14 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Sep 10 23:11:55 2013 +0200 batctl: Mark all local functions as static Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- aad616848b2ed00ae71c44cda13bef7fb1a03d14 debug.c | 2 +- main.c | 2 +- ping.c | 4 ++-- traceroute.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debug.c b/debug.c index c879603..1e6807f 100644 --- a/debug.c +++ b/debug.c @@ -84,7 +84,7 @@ const struct debug_table_data batctl_debug_tables[BATCTL_TABLE_NUM] = { }, }; -void debug_table_usage(int debug_table) +static void debug_table_usage(int debug_table) { fprintf(stderr, "Usage: batctl [options] %s|%s [parameters]\n", batctl_debug_tables[debug_table].opt_long, batctl_debug_tables[debug_table].opt_short); diff --git a/main.c b/main.c index 7d667d3..222a58f 100644 --- a/main.c +++ b/main.c @@ -44,7 +44,7 @@ char mesh_dfl_iface[] = "bat0"; char module_ver_path[] = "/sys/module/batman_adv/version"; -void print_usage(void) +static void print_usage(void) { int i, opt_indent; diff --git a/ping.c b/ping.c index 5d6b7e9..162458c 100644 --- a/ping.c +++ b/ping.c @@ -42,7 +42,7 @@ char is_aborted = 0; -void ping_usage(void) +static void ping_usage(void) { fprintf(stderr, "Usage: batctl [options] ping [parameters] mac|bat-host|host_name|IPv4_address \n"); fprintf(stderr, "parameters:\n"); @@ -54,7 +54,7 @@ void ping_usage(void) fprintf(stderr, " \t -T don't try to translate mac to originator address\n"); } -void sig_handler(int sig) +static void sig_handler(int sig) { switch (sig) { case SIGINT: diff --git a/traceroute.c b/traceroute.c index 38d3796..9820a20 100644 --- a/traceroute.c +++ b/traceroute.c @@ -41,7 +41,7 @@ #define NUM_PACKETS 3 -void traceroute_usage(void) +static void traceroute_usage(void) { fprintf(stderr, "Usage: batctl [options] traceroute [parameters] mac|bat-host|host_name|IPv4_address \n"); fprintf(stderr, "parameters:\n");

1 0

[batctl] next: batctl: Avoid assigning const buffer to non-const pointer (55509e5)
by postmaster＠open-mesh.org 11 Sep '13

11 Sep '13

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 55509e580241c1483ea406a11aedc412c9b0a7d1 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Sep 10 23:11:54 2013 +0200 batctl: Avoid assigning const buffer to non-const pointer Strings in C are tried to be saved in the .rodata by the compiler/linker. This section is readonly as the name suggests. Pointer to these strings should therefore be const. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 55509e580241c1483ea406a11aedc412c9b0a7d1 functions.c | 8 +++++--- functions.h | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/functions.c b/functions.c index 2a2f392..bd4da59 100644 --- a/functions.c +++ b/functions.c @@ -124,7 +124,8 @@ int file_exists(const char *fpath) return stat(fpath, &st) == 0; } -static void file_open_problem_dbg(char *dir, char *fname, char *full_path) +static void file_open_problem_dbg(const char *dir, const char *fname, + const char *full_path) { const char **ptr; struct stat st; @@ -162,7 +163,7 @@ static void file_open_problem_dbg(char *dir, char *fname, char *full_path) } } -int read_file(char *dir, char *fname, int read_opt, +int read_file(const char *dir, const char *fname, int read_opt, float orig_timeout, float watch_interval, size_t header_lines) { struct ether_addr *mac_addr; @@ -296,7 +297,8 @@ out: return res; } -int write_file(char *dir, char *fname, char *arg1, char *arg2) +int write_file(const char *dir, const char *fname, const char *arg1, + const char *arg2) { int fd = 0, res = EXIT_FAILURE; char full_path[500]; diff --git a/functions.h b/functions.h index d88c494..f9c8191 100644 --- a/functions.h +++ b/functions.h @@ -34,9 +34,10 @@ char *ether_ntoa_long(const struct ether_addr *addr); char *get_name_by_macaddr(struct ether_addr *mac_addr, int read_opt); char *get_name_by_macstr(char *mac_str, int read_opt); int file_exists(const char *fpath); -int read_file(char *dir, char *path, int read_opt, +int read_file(const char *dir, const char *path, int read_opt, float orig_timeout, float watch_interval, size_t header_lines); -int write_file(char *dir, char *fname, char *arg1, char *arg2); +int write_file(const char *dir, const char *fname, const char *arg1, + const char *arg2); struct ether_addr *translate_mac(char *mesh_iface, struct ether_addr *mac); struct ether_addr *resolve_mac(const char *asc);

1 0

[batctl] next: batctl: Fix inconsistent use of _GNU_SOURCE (db34e02)
by postmaster＠open-mesh.org 11 Sep '13

11 Sep '13

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit db34e02adf3f6421153ea4807108eb24796f2f7d Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Sep 10 23:11:53 2013 +0200 batctl: Fix inconsistent use of _GNU_SOURCE Either all or no source file should define _GNU_SOURCE to avoid incompatible types or function declarations. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- db34e02adf3f6421153ea4807108eb24796f2f7d Makefile | 1 + bat-hosts.c | 1 - functions.c | 1 - vis.c | 1 - 4 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 233f453..9e7c5be 100755 --- a/Makefile +++ b/Makefile @@ -30,6 +30,7 @@ MANPAGE = man/batctl.8 # batctl flags and options CFLAGS += -pedantic -Wall -W -std=gnu99 -fno-strict-aliasing -MD +CPPFLAGS += -D_GNU_SOURCE LDLIBS += -lm # disable verbose output diff --git a/bat-hosts.c b/bat-hosts.c index f0adb9c..ee862da 100644 --- a/bat-hosts.c +++ b/bat-hosts.c @@ -21,7 +21,6 @@ -#define _GNU_SOURCE #include <stdio.h> #include <stdint.h> #include <limits.h> diff --git a/functions.c b/functions.c index 0359287..2a2f392 100644 --- a/functions.c +++ b/functions.c @@ -20,7 +20,6 @@ */ -#define _GNU_SOURCE #include <netinet/ether.h> #include <arpa/inet.h> #include <sys/socket.h> diff --git a/vis.c b/vis.c index 33c7a7f..add93fd 100644 --- a/vis.c +++ b/vis.c @@ -19,7 +19,6 @@ * */ -#define _GNU_SOURCE #include <stdio.h> #include <stdlib.h> #include <stdint.h>

1 0

[batctl] next: batctl: Fix possible buffer overflow when using strncat (f1e262c)
by postmaster＠open-mesh.org 11 Sep '13

11 Sep '13

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit f1e262c80941ab1b4342999cd200840db6683a62 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Sep 10 23:11:52 2013 +0200 batctl: Fix possible buffer overflow when using strncat The length field (n) of strncat is used to specify the length of the buffer without the \0 delimiter. strncat will add it even when it will write it to the limit of n bytes was written. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- f1e262c80941ab1b4342999cd200840db6683a62 bat-hosts.c | 2 +- functions.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bat-hosts.c b/bat-hosts.c index 04e7a9b..f0adb9c 100644 --- a/bat-hosts.c +++ b/bat-hosts.c @@ -194,7 +194,7 @@ void bat_hosts_init(int read_opt) strncpy(confdir, homedir, CONF_DIR_LEN); confdir[CONF_DIR_LEN - 1] = '\0'; - strncat(confdir, &bat_hosts_path[i][1], CONF_DIR_LEN - strlen(confdir)); + strncat(confdir, &bat_hosts_path[i][1], CONF_DIR_LEN - strlen(confdir) - 1); } else { strncpy(confdir, bat_hosts_path[i], CONF_DIR_LEN); confdir[CONF_DIR_LEN - 1] = '\0'; diff --git a/functions.c b/functions.c index cc05a48..0359287 100644 --- a/functions.c +++ b/functions.c @@ -180,7 +180,7 @@ int read_file(char *dir, char *fname, int read_opt, strncpy(full_path, dir, strlen(dir)); full_path[strlen(dir)] = '\0'; - strncat(full_path, fname, sizeof(full_path) - strlen(full_path)); + strncat(full_path, fname, sizeof(full_path) - strlen(full_path) - 1); open: line = 0; @@ -305,7 +305,7 @@ int write_file(char *dir, char *fname, char *arg1, char *arg2) strncpy(full_path, dir, strlen(dir)); full_path[strlen(dir)] = '\0'; - strncat(full_path, fname, sizeof(full_path) - strlen(full_path)); + strncat(full_path, fname, sizeof(full_path) - strlen(full_path) - 1); fd = open(full_path, O_WRONLY);

1 0

[alfred] master: alfred: Add missing includes and remove unused includes (5599105)
by postmaster＠open-mesh.org 09 Sep '13

09 Sep '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 559910594681908a4ccc0f4bf7b18a882d65193a Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Mon Sep 9 17:46:01 2013 +0200 alfred: Add missing includes and remove unused includes Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> >--------------------------------------------------------------- 559910594681908a4ccc0f4bf7b18a882d65193a alfred.h | 6 ++---- batadv_query.c | 11 ++++++++--- client.c | 12 +++++------- debugfs.c | 10 ++++------ debugfs.h | 3 --- hash.c | 5 +++-- main.c | 11 ++++------- netsock.c | 14 ++++++++------ recv.c | 19 +++++++++++-------- send.c | 17 ++++++----------- server.c | 10 ++++++---- unix_sock.c | 14 +++++++++----- util.c | 6 ++++-- vis/vis.c | 15 +++++++++++++++ vis/vis.h | 20 +++----------------- 15 files changed, 88 insertions(+), 85 deletions(-) diff --git a/alfred.h b/alfred.h index c82483c..a244c64 100644 --- a/alfred.h +++ b/alfred.h @@ -23,12 +23,10 @@ #define SOURCE_VERSION "2013.4.0" #endif -#include <stdint.h> -#include <linux/if_ether.h> -#include <netinet/ether.h> +#include <net/ethernet.h> #include <netinet/in.h> +#include <stdint.h> #include <time.h> -#include "hash.h" #include "list.h" #include "packet.h" diff --git a/batadv_query.c b/batadv_query.c index db1aed5..83083a1 100644 --- a/batadv_query.c +++ b/batadv_query.c @@ -20,11 +20,16 @@ */ #include "batadv_query.h" -#include "debugfs.h" -#include <stdio.h> +#include <errno.h> +#include <net/ethernet.h> #include <netinet/ether.h> +#include <netinet/in.h> +#include <stddef.h> +#include <stdio.h> #include <stdlib.h> -#include <errno.h> +#include <string.h> +#include <sys/types.h> +#include "debugfs.h" #define DEBUG_BATIF_PATH_FMT "%s/batman_adv/%s" #define DEBUG_TRANSTABLE_GLOBAL "transtable_global" diff --git a/client.c b/client.c index a535f5a..3c1916c 100644 --- a/client.c +++ b/client.c @@ -19,17 +19,15 @@ * */ +#include <ctype.h> +#include <errno.h> +#include <netinet/in.h> +#include <stdint.h> #include <stdio.h> -#include <stdlib.h> -#include <getopt.h> #include <string.h> #include <unistd.h> -#include <errno.h> -#include <arpa/inet.h> -#include <sys/select.h> -#include <sys/time.h> -#include <ctype.h> #include "alfred.h" +#include "packet.h" int alfred_client_request_data(struct globals *globals) { diff --git a/debugfs.c b/debugfs.c index 5a0431f..e62978b 100644 --- a/debugfs.c +++ b/debugfs.c @@ -19,14 +19,12 @@ */ #include "debugfs.h" -#include <stdio.h> -#include <stdlib.h> #include <errno.h> -#include <sys/vfs.h> -#include <sys/types.h> +#include <stdio.h> +#include <string.h> +#include <sys/mount.h> #include <sys/stat.h> -#include <fcntl.h> -#include <unistd.h> +#include <sys/statfs.h> #ifndef DEBUGFS_MAGIC #define DEBUGFS_MAGIC 0x64626720 diff --git a/debugfs.h b/debugfs.h index 4008c37..6307a9b 100644 --- a/debugfs.h +++ b/debugfs.h @@ -21,9 +21,6 @@ #ifndef __DEBUGFS_H__ #define __DEBUGFS_H__ -#include <sys/mount.h> -#include <string.h> - #ifndef MAX_PATH # define MAX_PATH 256 #endif diff --git a/hash.c b/hash.c index 8d487eb..940a11f 100644 --- a/hash.c +++ b/hash.c @@ -20,8 +20,9 @@ */ -#include <stdio.h> /* NULL */ -#include <stdlib.h> /* free() */ +#include "hash.h" +#include <stdlib.h> +#include <stdio.h> #include "alfred.h" /* clears the hash */ diff --git a/main.c b/main.c index 86acfb7..4f39948 100644 --- a/main.c +++ b/main.c @@ -19,17 +19,14 @@ * */ +#include <getopt.h> +#include <signal.h> #include <stdio.h> #include <stdlib.h> -#include <getopt.h> #include <string.h> -#include <unistd.h> -#include <errno.h> -#include <arpa/inet.h> -#include <sys/select.h> -#include <sys/time.h> -#include <signal.h> #include "alfred.h" +#include "packet.h" + static void alfred_usage(void) { diff --git a/netsock.c b/netsock.c index 381d9b0..39281af 100644 --- a/netsock.c +++ b/netsock.c @@ -19,17 +19,19 @@ * */ -#include <stdio.h> -#include <string.h> -#include <unistd.h> -#include <fcntl.h> +#include <sys/socket.h> #include <errno.h> -#include <stdlib.h> +#include <fcntl.h> +#include <net/if.h> #include <netinet/in.h> +#include <stdio.h> +#include <string.h> #include <sys/ioctl.h> -#include <linux/if.h> +#include <sys/socket.h> +#include <unistd.h> #include "alfred.h" #include "batadv_query.h" +#include "packet.h" const struct in6_addr in6addr_localmcast = {{{ 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/recv.c b/recv.c index 7541632..5ed4a62 100644 --- a/recv.c +++ b/recv.c @@ -19,19 +19,22 @@ * */ +#include <errno.h> +#include <net/ethernet.h> +#include <netinet/in.h> +#include <stdint.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> +#include <sys/socket.h> +#include <sys/time.h> +#include <time.h> #include <unistd.h> -#include <fcntl.h> -#include <errno.h> -#include <stdlib.h> -#include <netinet/in.h> -#include <sys/ioctl.h> -#include <linux/if.h> -#include <linux/if_packet.h> -#include <arpa/inet.h> #include "alfred.h" #include "batadv_query.h" +#include "hash.h" +#include "list.h" +#include "packet.h" static int finish_alfred_push_data(struct globals *globals, struct ether_addr mac, diff --git a/send.c b/send.c index d6920f8..607afa1 100644 --- a/send.c +++ b/send.c @@ -19,19 +19,14 @@ * */ -#include <stdio.h> -#include <string.h> -#include <unistd.h> -#include <fcntl.h> -#include <errno.h> -#include <stdlib.h> #include <netinet/in.h> -#include <sys/ioctl.h> -#include <linux/if.h> -#include <linux/if_packet.h> -#include <linux/if_ether.h> -#include <linux/filter.h> +#include <stddef.h> +#include <stdint.h> +#include <string.h> +#include <sys/socket.h> #include "alfred.h" +#include "hash.h" +#include "packet.h" int announce_master(struct globals *globals) { diff --git a/server.c b/server.c index 02eab42..0d8e6c8 100644 --- a/server.c +++ b/server.c @@ -19,17 +19,19 @@ * */ +#include <errno.h> +#include <net/ethernet.h> +#include <stddef.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> -#include <getopt.h> #include <string.h> -#include <unistd.h> -#include <errno.h> -#include <arpa/inet.h> #include <sys/select.h> #include <sys/time.h> +#include <time.h> #include "alfred.h" #include "batadv_query.h" +#include "hash.h" static int server_compare(void *d1, void *d2) { diff --git a/unix_sock.c b/unix_sock.c index c778a61..8bff2e1 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -19,17 +19,21 @@ * */ +#include <errno.h> +#include <net/ethernet.h> +#include <netinet/in.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <errno.h> -#include <unistd.h> -#include <arpa/inet.h> -#include <sys/time.h> -#include <sys/types.h> #include <sys/socket.h> +#include <sys/time.h> #include <sys/un.h> +#include <time.h> +#include <unistd.h> #include "alfred.h" +#include "hash.h" +#include "packet.h" int unix_sock_open_daemon(struct globals *globals, char *path) { diff --git a/util.c b/util.c index 5405c84..3c50964 100644 --- a/util.c +++ b/util.c @@ -19,10 +19,12 @@ * */ -#include <sys/time.h> -#include <time.h> +#include <stddef.h> #include <stdint.h> #include <stdlib.h> +#include <sys/time.h> +#include <time.h> +#include "alfred.h" int time_diff(struct timespec *tv1, struct timespec *tv2, struct timespec *tvdiff) { diff --git a/vis/vis.c b/vis/vis.c index 3d0c5f0..5247b31 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -20,6 +20,21 @@ */ #include "vis.h" +#include <dirent.h> +#include <errno.h> +#include <getopt.h> +#include <linux/if.h> +#include <netinet/in.h> +#include <signal.h> +#include <stddef.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/ioctl.h> +#include <sys/socket.h> +#include <sys/un.h> +#include <unistd.h> +#include "debugfs.h" char *read_file(char *fname) { diff --git a/vis/vis.h b/vis/vis.h index 3423066..d4a49d0 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -19,25 +19,11 @@ * */ -#include <stdio.h> -#include <stdint.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> -#include <errno.h> -#include <getopt.h> -#include <signal.h> -#include <dirent.h> -#include <sys/ioctl.h> -#include <sys/types.h> #include <sys/socket.h> -#include <sys/un.h> -#include <linux/if.h> -#include <netinet/ether.h> -#include <netinet/in.h> -#include "../packet.h" +#include <linux/if_ether.h> +#include <stdint.h> #include "../list.h" -#include "debugfs.h" +#include "../packet.h" #ifndef SOURCE_VERSION

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 September 2013