[commits] [batctl] master: Merge remote-tracking branch 'origin/next' (5f666b6)

postmaster at open-mesh.org postmaster at open-mesh.org
Thu Sep 19 11:33:06 CEST 2013


Repository : ssh://git@open-mesh.org/batctl

On branch  : master

>---------------------------------------------------------------

commit 5f666b69b464d08f8a94161d6f1b5ad9dbf2736a
Merge: 38ae8d7 b64f1c8
Author: Simon Wunderlich <siwu at hrz.tu-chemnitz.de>
Date:   Thu Sep 19 11:32:18 2013 +0200

    Merge remote-tracking branch 'origin/next'
    
    Conflicts:
    	Makefile
    	debug.h
    	vis.c



>---------------------------------------------------------------

5f666b69b464d08f8a94161d6f1b5ad9dbf2736a
 Makefile     |    3 ++-
 allocate.h   |    4 ++--
 bat-hosts.c  |    3 +--
 bat-hosts.h  |    4 ++--
 bisect_iv.c  |    4 ++--
 bisect_iv.h  |    5 +++++
 debug.c      |    2 +-
 debug.h      |    4 ++++
 functions.c  |   13 +++++++------
 functions.h  |   10 +++++++---
 ioctl.c      |   11 +++++------
 ioctl.h      |    4 ++++
 main.c       |    2 +-
 main.h       |    7 ++++++-
 man/batctl.8 |    2 +-
 ping.c       |    4 ++--
 ping.h       |    5 ++++-
 sys.c        |    2 +-
 sys.h        |    4 ++++
 tcpdump.h    |    4 ++++
 traceroute.c |    2 +-
 traceroute.h |    5 ++++-
 translate.h  |    5 ++++-
 23 files changed, 74 insertions(+), 35 deletions(-)

diff --cc Makefile
index 1961298,166dcf8..90d3d79
--- a/Makefile
+++ b/Makefile
@@@ -29,7 -29,8 +29,8 @@@ OBJ_BISECT = bisect_iv.
  MANPAGE = man/batctl.8
  
  # batctl flags and options
- CFLAGS += -Wall -W -std=gnu99 -fno-strict-aliasing -MD
 -CFLAGS += -pedantic -Wall -W -std=gnu99 -fno-strict-aliasing -MD -MP
++CFLAGS += -Wall -W -std=gnu99 -fno-strict-aliasing -MD -MP
+ CPPFLAGS += -D_GNU_SOURCE
  LDLIBS += -lm
  
  # disable verbose output
diff --cc debug.h
index 532c2fe,7b9cfc5..8d9de08
--- a/debug.h
+++ b/debug.h
@@@ -19,8 -19,11 +19,10 @@@
   *
   */
  
+ #ifndef _BATCTL_DEBUG_H
+ #define _BATCTL_DEBUG_H
  
  #define DEBUG_BATIF_PATH_FMT "%s/batman_adv/%s"
 -#define DEBUG_VIS_DATA "vis_data"
  #define DEBUG_TRANSTABLE_GLOBAL "transtable_global"
  #define DEBUG_LOG "log"
  
@@@ -47,4 -50,5 +49,6 @@@ extern const struct debug_table_data ba
  
  int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv);
  int log_print(char *mesh_iface, int argc, char **argv);
 +int print_vis_info(char *mesh_iface);
+ 
+ #endif



More information about the commits mailing list