From (spam-protected) Thu Jun 2 15:59:15 2005 From: (spam-protected) (Bruno Randolf) Date: Thu, 02 Jun 2005 13:59:15 +0000 Subject: [Olsr-cvs] olsrd-current/lib/dyn_gw/src olsrd_dyn_gw.c,1.17,1.18 Message-ID: Update of /cvsroot/olsrd/olsrd-current/lib/dyn_gw/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15024/lib/dyn_gw/src Modified Files: olsrd_dyn_gw.c Log Message: added include for win32 Index: olsrd_dyn_gw.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/lib/dyn_gw/src/olsrd_dyn_gw.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** olsrd_dyn_gw.c 29 May 2005 12:47:40 -0000 1.17 --- olsrd_dyn_gw.c 2 Jun 2005 13:59:12 -0000 1.18 *************** *** 57,60 **** --- 57,61 ---- #include #include + #include #include #ifdef linux From (spam-protected) Thu Jun 2 16:01:34 2005 From: (spam-protected) (Bruno Randolf) Date: Thu, 02 Jun 2005 14:01:34 +0000 Subject: [Olsr-cvs] olsrd-current/src/olsr_switch Makefile,1.6,1.7 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src/olsr_switch In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16245/src/olsr_switch Modified Files: Makefile Log Message: no need to doy everything yourself - just include Makefile.inc Index: Makefile =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/olsr_switch/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile 31 May 2005 20:37:00 -0000 1.6 --- Makefile 2 Jun 2005 14:01:29 -0000 1.7 *************** *** 1,52 **** ! CC ?= gcc ! BINNAME = olsr_switch ! INCLUDES += -I./.. ! CFLAGS += -O2 -g $(INCLUDES) -Wall -MD -Wmissing-prototypes -Wstrict-prototypes \ ! -Wmissing-declarations -Wsign-compare ! LDFLAGS += ! TOPDIR = ../../ ! ! SRCS = $(wildcard *.c) ! HDRS = $(wildcard *.h) ! OBJS = $(patsubst %.c,%.o,$(SRCS)) ! ! ! # OS detection ! OS = $(shell sh $(TOPDIR)/make/guess_os.sh) ! ifeq ($(OS),UNKNOWN) ! all: help ! else ! ifeq ($(OS),win32) ! WIN32 = 1 ! endif ! all: default_target ! endif ! ! help: ! @echo ! @echo '***** olsr.org olsr_switch Make ****' ! @echo ' Automatic detection of your OS ' ! @echo ' failed! ' ! @echo '************************************' ! @echo ! ! ! # include dependencies ! -include $(SRCS:%.c=%.d) ! ! ifdef WIN32 BINNAME = olsr_switch.exe ! CFLAGS += -DWIN32 -mno-cygwin ! INCLUDES += -I./../win32/ ! SRCS += $(TOPDIR)src/win32/compat.c ! LIBS += -mno-cygwin -lws2_32 -liphlpapi endif default_target: $(OBJS) ! $(CC) $(LDFLAGS) -o $(TOPDIR)$(BINNAME) $(OBJS) $(LIBS) clean: rm -f *.o *.d rm -f *~ ! rm -f $(TOPDIR)$(BINNAME) --- 1,16 ---- + TOPDIR=../.. + include $(TOPDIR)/Makefile.inc ! ifeq ($(OS), win32) BINNAME = olsr_switch.exe ! else ! BINNAME = olsr_switch endif default_target: $(OBJS) ! $(CC) $(LDFLAGS) -o $(TOPDIR)/$(BINNAME) $(OBJS) $(LIBS) clean: rm -f *.o *.d rm -f *~ ! rm -f $(TOPDIR)/$(BINNAME) From (spam-protected) Thu Jun 2 16:42:00 2005 From: (spam-protected) (Bruno Randolf) Date: Thu, 02 Jun 2005 14:42:00 +0000 Subject: [Olsr-cvs] olsrd-current/lib/dyn_gw Makefile,1.18,1.19 Message-ID: Update of /cvsroot/olsrd/olsrd-current/lib/dyn_gw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3509/lib/dyn_gw Modified Files: Makefile Log Message: minor makefile restructurings Index: Makefile =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/lib/dyn_gw/Makefile,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile 25 May 2005 13:50:22 -0000 1.18 --- Makefile 2 Jun 2005 14:41:58 -0000 1.19 *************** *** 45,49 **** include $(TOPDIR)/Makefile.inc ! LIBS += $(OS_PTHREAD) default_target: $(PLUGIN_FULLNAME) --- 45,49 ---- include $(TOPDIR)/Makefile.inc ! LIBS += $(OS_LIB_PTHREAD) default_target: $(PLUGIN_FULLNAME) From (spam-protected) Thu Jun 2 16:42:00 2005 From: (spam-protected) (Bruno Randolf) Date: Thu, 02 Jun 2005 14:42:00 +0000 Subject: [Olsr-cvs] olsrd-current Makefile, 1.61, 1.62 Makefile.inc, 1.2, 1.3 README, 1.11, 1.12 Message-ID: Update of /cvsroot/olsrd/olsrd-current In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3509 Modified Files: Makefile Makefile.inc README Log Message: minor makefile restructurings Index: README =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/README,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** README 26 May 2005 16:11:15 -0000 1.11 --- README 2 Jun 2005 14:41:58 -0000 1.12 *************** *** 216,219 **** --- 216,220 ---- ------------------------------------------------------------ olsrd +/+ +/+ +/+ +/+ +/+ ? + olsr_switch +/+ +/? ? ? ? ? ------------------------------------------------------------ PLUGINS *************** *** 221,225 **** dyn_gw +/+ +/? +/? +/? +/? ? httpinfo +/+ +/+ +/+ +/? +/? ? ! mini +/+ ? +/+ ? ? ? nameservice +/+ +/? +/? +/? +/? ? powerinfo +/+ +/+ +/+ +/? +/? ? --- 222,226 ---- dyn_gw +/+ +/? +/? +/? +/? ? httpinfo +/+ +/+ +/+ +/? +/? ? ! mini +/+ +/? +/+ ? ? ? nameservice +/+ +/? +/? +/? +/? ? powerinfo +/+ +/+ +/+ +/? +/? ? Index: Makefile =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/Makefile,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** Makefile 30 May 2005 13:15:42 -0000 1.61 --- Makefile 2 Jun 2005 14:41:57 -0000 1.62 *************** *** 41,44 **** --- 41,50 ---- include Makefile.inc + LIBS += $(OS_LIB_DYNLOAD) + + ifeq ($(OS), win32) + LDFLAGS += -Wl,--out-implib=libolsrd.a -Wl,--export-all-symbols + endif + VERS = 0.4.10pre Index: Makefile.inc =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/Makefile.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.inc 26 May 2005 11:31:17 -0000 1.2 --- Makefile.inc 2 Jun 2005 14:41:58 -0000 1.3 *************** *** 27,32 **** ifdef OLSRD_PLUGIN # c and ld flags for libraries (plugins) ! CFLAGS += -DOLSR_PLUGIN -fPIC ! LDFLAGS += -shared -fPIC -Wl,-soname,$(PLUGIN_NAME) LDFLAGS += -Wl,--version-script=version-script.txt else --- 27,32 ---- ifdef OLSRD_PLUGIN # c and ld flags for libraries (plugins) ! CFLAGS += -DOLSR_PLUGIN ! LDFLAGS += -shared -Wl,-soname,$(PLUGIN_NAME) LDFLAGS += -Wl,--version-script=version-script.txt else From (spam-protected) Thu Jun 2 16:42:01 2005 From: (spam-protected) (Bruno Randolf) Date: Thu, 02 Jun 2005 14:42:01 +0000 Subject: [Olsr-cvs] olsrd-current/src/cfgparser Makefile,1.19,1.20 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src/cfgparser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3509/src/cfgparser Modified Files: Makefile Log Message: minor makefile restructurings Index: Makefile =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/Makefile,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Makefile 25 May 2005 13:50:22 -0000 1.19 --- Makefile 2 Jun 2005 14:41:59 -0000 1.20 *************** *** 56,61 **** LIBNAME ?= olsrd_cfgparser.so.0.1 BINNAME ?= olsrd_cfgparser - CFLAGS += -fPIC - LDFLAGS += -Wl,--version-script=version-script.txt endif --- 56,59 ---- From (spam-protected) Thu Jun 2 16:42:01 2005 From: (spam-protected) (Bruno Randolf) Date: Thu, 02 Jun 2005 14:42:01 +0000 Subject: [Olsr-cvs] olsrd-current/make Makefile.fbsd, 1.2, 1.3 Makefile.linux, 1.2, 1.3 Makefile.nbsd, 1.2, 1.3 Makefile.obsd, 1.2, 1.3 Makefile.osx, 1.2, 1.3 Makefile.win32, 1.2, 1.3 Makefile.wince, 1.1, 1.2 Message-ID: Update of /cvsroot/olsrd/olsrd-current/make In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3509/make Modified Files: Makefile.fbsd Makefile.linux Makefile.nbsd Makefile.obsd Makefile.osx Makefile.win32 Makefile.wince Log Message: minor makefile restructurings Index: Makefile.obsd =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.obsd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.obsd 25 May 2005 14:16:24 -0000 1.2 --- Makefile.obsd 2 Jun 2005 14:41:59 -0000 1.3 *************** *** 14,16 **** PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER) INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \ ! /sbin/ldconfig \ No newline at end of file --- 14,24 ---- PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER) INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \ ! /sbin/ldconfig ! ! ifdef OLSRD_PLUGIN ! CFLAGS += -fPIC ! LDFLAGS += -fPIC ! endif ! ! OS_LIB_PTHREAD = ! OS_LIB_DYNLOAD = Index: Makefile.wince =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.wince,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.wince 25 May 2005 13:50:22 -0000 1.1 --- Makefile.wince 2 Jun 2005 14:41:59 -0000 1.2 *************** *** 13,14 **** --- 13,22 ---- INCLUDES += -Isrc/win32 -Isrc/win32/ce + + ifdef OLSRD_PLUGIN + CFLAGS += + LDFLAGS += -lolsrd + endif + + OS_LIB_PTHREAD = + OS_LIB_DYNLOAD = Index: Makefile.win32 =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.win32,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.win32 25 May 2005 22:16:57 -0000 1.2 --- Makefile.win32 2 Jun 2005 14:41:59 -0000 1.3 *************** *** 9,19 **** HDRS += $(wildcard src/win32/*.h) - ifdef OLSRD_PLUGIN - LIBS += $(TOPDIR)/src/win32/compat.o - endif - DEFINES += -DWIN32 ! LIBS += -mno-cygwin -Wl,--out-implib=libolsrd.a -Wl,--export-all-symbols -lws2_32 -liphlpapi ! INCLUDES += -I$(TOPDIR)/src/win32 CFLAGS += -mno-cygwin --- 9,14 ---- HDRS += $(wildcard src/win32/*.h) DEFINES += -DWIN32 ! LIBS += -mno-cygwin -lws2_32 -liphlpapi INCLUDES += -I$(TOPDIR)/src/win32 CFLAGS += -mno-cygwin *************** *** 22,26 **** INSTALL_LIB = cp $(PLUGIN_FULLNAME) ../.. ! OS_PTHREAD = olsr-$(VERS).zip: gui/win32/Main/Release/Switch.exe \ --- 17,28 ---- INSTALL_LIB = cp $(PLUGIN_FULLNAME) ../.. ! ifdef OLSRD_PLUGIN ! LDFLAGS += -L$(TOPDIR) ! #LIBS += $(TOPDIR)/src/win32/compat.o ! LIBS += -lolsrd ! endif ! ! OS_LIB_PTHREAD = ! OS_LIB_DYNLOAD = olsr-$(VERS).zip: gui/win32/Main/Release/Switch.exe \ Index: Makefile.fbsd =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.fbsd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.fbsd 25 May 2005 14:16:24 -0000 1.2 --- Makefile.fbsd 2 Jun 2005 14:41:58 -0000 1.3 *************** *** 24,30 **** endif PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER) INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \ /sbin/ldconfig ! OS_PTHREAD = -pthread \ No newline at end of file --- 24,36 ---- endif + ifdef OLSRD_PLUGIN + CFLAGS += -fPIC + LDFLAGS += -fPIC + endif + PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER) INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \ /sbin/ldconfig ! OS_LIB_PTHREAD = -pthread ! OS_LIB_DYNLOAD = -ldl Index: Makefile.linux =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.linux,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.linux 25 May 2005 14:16:24 -0000 1.2 --- Makefile.linux 2 Jun 2005 14:41:59 -0000 1.3 *************** *** 10,18 **** DEFINES = -Dlinux ! LIBS = -ldl PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER) INSTALL_LIB = install -D -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \ /sbin/ldconfig -n $(LIBDIR) ! OS_PTHREAD = -lpthread \ No newline at end of file --- 10,24 ---- DEFINES = -Dlinux ! LIBS = PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER) INSTALL_LIB = install -D -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \ /sbin/ldconfig -n $(LIBDIR) + + ifdef OLSRD_PLUGIN + CFLAGS += -fPIC + LDFLAGS += -fPIC + endif ! OS_LIB_PTHREAD = -lpthread ! OS_LIB_DYNLOAD = -ldl Index: Makefile.osx =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.osx,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.osx 25 May 2005 14:16:24 -0000 1.2 --- Makefile.osx 2 Jun 2005 14:41:59 -0000 1.3 *************** *** 10,16 **** DEFINES = -D__MacOSX__ ! LIBS = -ldl PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER) INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \ ! /sbin/ldconfig \ No newline at end of file --- 10,24 ---- DEFINES = -D__MacOSX__ ! LIBS = PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER) INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \ ! /sbin/ldconfig ! ! ifdef OLSRD_PLUGIN ! CFLAGS += -fPIC ! LDFLAGS += -fPIC ! endif ! ! OS_LIB_PTHREAD = ! OS_LIB_DYNLOAD = Index: Makefile.nbsd =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.nbsd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.nbsd 25 May 2005 14:16:24 -0000 1.2 --- Makefile.nbsd 2 Jun 2005 14:41:59 -0000 1.3 *************** *** 14,16 **** PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER) INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \ ! /sbin/ldconfig \ No newline at end of file --- 14,24 ---- PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER) INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \ ! /sbin/ldconfig ! ! ifdef OLSRD_PLUGIN ! CFLAGS += -fPIC ! LDFLAGS += -fPIC ! endif ! ! OS_LIB_PTHREAD = ! OS_LIB_DYNLOAD = From (spam-protected) Thu Jun 2 16:42:02 2005 From: (spam-protected) (Bruno Randolf) Date: Thu, 02 Jun 2005 14:42:02 +0000 Subject: [Olsr-cvs] olsrd-current/src/olsr_switch Makefile,1.8,1.9 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src/olsr_switch In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3509/src/olsr_switch Modified Files: Makefile Log Message: minor makefile restructurings Index: Makefile =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/olsr_switch/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile 2 Jun 2005 14:07:39 -0000 1.8 --- Makefile 2 Jun 2005 14:41:59 -0000 1.9 *************** *** 4,7 **** --- 4,8 ---- ifeq ($(OS), win32) BINNAME = olsr_switch.exe + OBJS += ../win32/compat.o else BINNAME = olsr_switch From (spam-protected) Thu Jun 2 17:09:39 2005 From: (spam-protected) (Bruno Randolf) Date: Thu, 02 Jun 2005 15:09:39 +0000 Subject: [Olsr-cvs] olsrd-current/make Makefile.fbsd,1.3,1.4 Message-ID: Update of /cvsroot/olsrd/olsrd-current/make In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19830/make Modified Files: Makefile.fbsd Log Message: fixes for freebsd Index: Makefile.fbsd =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.fbsd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.fbsd 2 Jun 2005 14:41:58 -0000 1.3 --- Makefile.fbsd 2 Jun 2005 15:09:37 -0000 1.4 *************** *** 34,36 **** OS_LIB_PTHREAD = -pthread ! OS_LIB_DYNLOAD = -ldl --- 34,36 ---- OS_LIB_PTHREAD = -pthread ! OS_LIB_DYNLOAD = From (spam-protected) Thu Jun 2 17:09:39 2005 From: (spam-protected) (Bruno Randolf) Date: Thu, 02 Jun 2005 15:09:39 +0000 Subject: [Olsr-cvs] olsrd-current README,1.12,1.13 Message-ID: Update of /cvsroot/olsrd/olsrd-current In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19830 Modified Files: README Log Message: fixes for freebsd Index: README =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/README,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** README 2 Jun 2005 14:41:58 -0000 1.12 --- README 2 Jun 2005 15:09:36 -0000 1.13 *************** *** 216,228 **** ------------------------------------------------------------ olsrd +/+ +/+ +/+ +/+ +/+ ? ! olsr_switch +/+ +/? ? ? ? ? ------------------------------------------------------------ PLUGINS dot_draw +/+ +/? +/+ +/+ +/+ ? ! dyn_gw +/+ +/? +/? +/? +/? ? httpinfo +/+ +/+ +/+ +/? +/? ? mini +/+ +/? +/+ ? ? ? ! nameservice +/+ +/? +/? +/? +/? ? ! powerinfo +/+ +/+ +/+ +/? +/? ? secure +/+ +/+ +/+ +/? +/? ? tas +/+ - - - - ? --- 216,228 ---- ------------------------------------------------------------ olsrd +/+ +/+ +/+ +/+ +/+ ? ! olsr_switch +/+ +/? +/+ ? ? ? ------------------------------------------------------------ PLUGINS dot_draw +/+ +/? +/+ +/+ +/+ ? ! dyn_gw +/+ +/? +/- +/? +/? ? httpinfo +/+ +/+ +/+ +/? +/? ? mini +/+ +/? +/+ ? ? ? ! nameservice +/+ +/? +/+ +/? +/? ? ! powerinfo +/+ +/+ +/- +/? +/? ? secure +/+ +/+ +/+ +/? +/? ? tas +/+ - - - - ? From (spam-protected) Thu Jun 2 17:09:39 2005 From: (spam-protected) (Bruno Randolf) Date: Thu, 02 Jun 2005 15:09:39 +0000 Subject: [Olsr-cvs] olsrd-current/lib/dot_draw/src olsrd_dot_draw.c, 1.14, 1.15 olsrd_plugin.c, 1.11, 1.12 Message-ID: Update of /cvsroot/olsrd/olsrd-current/lib/dot_draw/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19830/lib/dot_draw/src Modified Files: olsrd_dot_draw.c olsrd_plugin.c Log Message: fixes for freebsd Index: olsrd_dot_draw.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/lib/dot_draw/src/olsrd_dot_draw.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** olsrd_dot_draw.c 29 May 2005 12:47:40 -0000 1.14 --- olsrd_dot_draw.c 2 Jun 2005 15:09:37 -0000 1.15 *************** *** 58,61 **** --- 58,63 ---- #include #include + #include + #include #include "olsr.h" Index: olsrd_plugin.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/lib/dot_draw/src/olsrd_plugin.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** olsrd_plugin.c 29 May 2005 12:47:40 -0000 1.11 --- olsrd_plugin.c 2 Jun 2005 15:09:37 -0000 1.12 *************** *** 49,52 **** --- 49,54 ---- #include #include + #include + #include #include "olsrd_plugin.h" From (spam-protected) Thu Jun 2 17:34:02 2005 From: (spam-protected) (Bruno Randolf) Date: Thu, 02 Jun 2005 15:34:02 +0000 Subject: [Olsr-cvs] olsrd-current README,1.13,1.14 Message-ID: Update of /cvsroot/olsrd/olsrd-current In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2168 Modified Files: README Log Message: netbsd small fixes and status update Index: README =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/README,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** README 2 Jun 2005 15:09:36 -0000 1.13 --- README 2 Jun 2005 15:33:59 -0000 1.14 *************** *** 216,229 **** ------------------------------------------------------------ olsrd +/+ +/+ +/+ +/+ +/+ ? ! olsr_switch +/+ +/? +/+ ? ? ? ------------------------------------------------------------ PLUGINS dot_draw +/+ +/? +/+ +/+ +/+ ? ! dyn_gw +/+ +/? +/- +/? +/? ? ! httpinfo +/+ +/+ +/+ +/? +/? ? ! mini +/+ +/? +/+ ? ? ? ! nameservice +/+ +/? +/+ +/? +/? ? ! powerinfo +/+ +/+ +/- +/? +/? ? ! secure +/+ +/+ +/+ +/? +/? ? tas +/+ - - - - ? ------------------------------------------------------------ --- 216,229 ---- ------------------------------------------------------------ olsrd +/+ +/+ +/+ +/+ +/+ ? ! olsr_switch +/+ +/? +/+ +/+ ? ? ------------------------------------------------------------ PLUGINS dot_draw +/+ +/? +/+ +/+ +/+ ? ! dyn_gw +/+ +/? +/- +/- +/? ? ! httpinfo +/+ +/+ +/+ +/+ +/? ? ! mini +/+ +/? +/+ +/+ ? ? ! nameservice +/+ +/? +/+ +/+ +/? ? ! powerinfo +/+ +/+ +/- +/- +/? ? ! secure +/+ +/+ +/+ +/+ +/? ? tas +/+ - - - - ? ------------------------------------------------------------ From (spam-protected) Thu Jun 2 17:34:03 2005 From: (spam-protected) (Bruno Randolf) Date: Thu, 02 Jun 2005 15:34:03 +0000 Subject: [Olsr-cvs] olsrd-current/lib/nameservice/src compat.c, 1.1, 1.2 nameservice.h, 1.8, 1.9 Message-ID: Update of /cvsroot/olsrd/olsrd-current/lib/nameservice/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2168/lib/nameservice/src Modified Files: compat.c nameservice.h Log Message: netbsd small fixes and status update Index: nameservice.h =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/lib/nameservice/src/nameservice.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** nameservice.h 29 May 2005 12:47:42 -0000 1.8 --- nameservice.h 2 Jun 2005 15:34:00 -0000 1.9 *************** *** 39,42 **** --- 39,44 ---- #define _NAMESERVICE_PLUGIN + #include + #include "olsr_types.h" #include "interfaces.h" Index: compat.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/lib/nameservice/src/compat.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** compat.c 29 May 2005 12:47:42 -0000 1.1 --- compat.c 2 Jun 2005 15:34:00 -0000 1.2 *************** *** 3,6 **** --- 3,7 ---- #ifndef linux #include + #include /* strndup() is a GNU extention */ *************** *** 8,12 **** strndup(const char *ptr, size_t size) { ! int len = strlen(ptr); char *ret = NULL; --- 9,13 ---- strndup(const char *ptr, size_t size) { ! size_t len = strlen(ptr); char *ret = NULL; From (spam-protected) Thu Jun 2 17:34:03 2005 From: (spam-protected) (Bruno Randolf) Date: Thu, 02 Jun 2005 15:34:03 +0000 Subject: [Olsr-cvs] olsrd-current/make Makefile.nbsd,1.3,1.4 Message-ID: Update of /cvsroot/olsrd/olsrd-current/make In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2168/make Modified Files: Makefile.nbsd Log Message: netbsd small fixes and status update Index: Makefile.nbsd =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.nbsd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.nbsd 2 Jun 2005 14:41:59 -0000 1.3 --- Makefile.nbsd 2 Jun 2005 15:34:01 -0000 1.4 *************** *** 21,24 **** endif ! OS_LIB_PTHREAD = OS_LIB_DYNLOAD = --- 21,24 ---- endif ! OS_LIB_PTHREAD = OS_LIB_DYNLOAD = From (spam-protected) Thu Jun 2 17:49:13 2005 From: (spam-protected) (Bruno Randolf) Date: Thu, 02 Jun 2005 15:49:13 +0000 Subject: [Olsr-cvs] olsrd-current README,1.14,1.15 Message-ID: Update of /cvsroot/olsrd/olsrd-current In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10814 Modified Files: README Log Message: update status for openbsd Index: README =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/README,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** README 2 Jun 2005 15:33:59 -0000 1.14 --- README 2 Jun 2005 15:49:11 -0000 1.15 *************** *** 216,229 **** ------------------------------------------------------------ olsrd +/+ +/+ +/+ +/+ +/+ ? ! olsr_switch +/+ +/? +/+ +/+ ? ? ------------------------------------------------------------ PLUGINS dot_draw +/+ +/? +/+ +/+ +/+ ? ! dyn_gw +/+ +/? +/- +/- +/? ? ! httpinfo +/+ +/+ +/+ +/+ +/? ? ! mini +/+ +/? +/+ +/+ ? ? ! nameservice +/+ +/? +/+ +/+ +/? ? ! powerinfo +/+ +/+ +/- +/- +/? ? ! secure +/+ +/+ +/+ +/+ +/? ? tas +/+ - - - - ? ------------------------------------------------------------ --- 216,229 ---- ------------------------------------------------------------ olsrd +/+ +/+ +/+ +/+ +/+ ? ! olsr_switch +/+ +/? +/+ +/+ +/+ ? ------------------------------------------------------------ PLUGINS dot_draw +/+ +/? +/+ +/+ +/+ ? ! dyn_gw +/+ +/? +/- +/- +/- ? ! httpinfo +/+ +/+ +/+ +/+ +/+ ? ! mini +/+ +/? +/+ +/+ +/+ ? ! nameservice +/+ +/? +/+ +/+ +/+ ? ! powerinfo +/+ +/+ +/- +/- +/- ? ! secure +/+ +/+ +/+ +/+ +/+ ? tas +/+ - - - - ? ------------------------------------------------------------ From (spam-protected) Thu Jun 2 20:52:47 2005 From: (spam-protected) (spoggle) Date: Thu, 02 Jun 2005 18:52:47 +0000 Subject: [Olsr-cvs] olsrd-current/make Makefile.fbsd,1.4,1.5 Message-ID: Update of /cvsroot/olsrd/olsrd-current/make In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13855 Modified Files: Makefile.fbsd Log Message: fixed typo: 'LIBS =+' should be 'LIBS +=' Index: Makefile.fbsd =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.fbsd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.fbsd 2 Jun 2005 15:09:37 -0000 1.4 --- Makefile.fbsd 2 Jun 2005 18:52:44 -0000 1.5 *************** *** 13,17 **** HDRS += $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h) ! LIBS = CFLAGS += -DOLSRD_GLOBAL_CONF_FILE=\"$(CFGFILE)\" --- 13,17 ---- HDRS += $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h) ! LIBS = CFLAGS += -DOLSRD_GLOBAL_CONF_FILE=\"$(CFGFILE)\" *************** *** 20,24 **** CFLAGS += -DSPOOF -I$(INSTALL_PREFIX)/include ! LIBS =+ -L$(INSTALL_PREFIX)/lib -lnet endif --- 20,24 ---- CFLAGS += -DSPOOF -I$(INSTALL_PREFIX)/include ! LIBS += -L$(INSTALL_PREFIX)/lib -lnet endif *************** *** 34,36 **** OS_LIB_PTHREAD = -pthread ! OS_LIB_DYNLOAD = --- 34,36 ---- OS_LIB_PTHREAD = -pthread ! OS_LIB_DYNLOAD = From (spam-protected) Thu Jun 2 21:12:27 2005 From: (spam-protected) (spoggle) Date: Thu, 02 Jun 2005 19:12:27 +0000 Subject: [Olsr-cvs] olsrd-current Makefile,1.62,1.63 Message-ID: Update of /cvsroot/olsrd/olsrd-current In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23996 Modified Files: Makefile Log Message: add build_all and install_all targets to build and install both olsrd and plug-ins Index: Makefile =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/Makefile,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** Makefile 2 Jun 2005 14:41:57 -0000 1.62 --- Makefile 2 Jun 2005 19:12:24 -0000 1.63 *************** *** 68,72 **** $(MAKE) -C $(CFGDIR) ! .PHONY: help libs clean_libs libs_clean clean uberclean install_libs libs_install install_bin install_olsrd install clean: --- 68,72 ---- $(MAKE) -C $(CFGDIR) ! .PHONY: help libs clean_libs libs_clean clean uberclean install_libs libs_install install_bin install_olsrd install build_all install_all clean: *************** *** 153,154 **** --- 153,157 ---- $(MAKE) -C lib/secure $(MAKE) -C lib/secure install + + build_all: cfgparser olsrd libs + install_all: install install_libs From (spam-protected) Fri Jun 3 22:08:23 2005 From: (spam-protected) (spoggle) Date: Fri, 03 Jun 2005 20:08:23 +0000 Subject: [Olsr-cvs] olsrd-current/src/cfgparser olsrd_conf.c,1.39,1.40 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src/cfgparser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20027 Modified Files: olsrd_conf.c Log Message: need to initialize the host emul flag to be certain Index: olsrd_conf.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/olsrd_conf.c,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** olsrd_conf.c 30 May 2005 13:13:39 -0000 1.39 --- olsrd_conf.c 3 Jun 2005 20:08:20 -0000 1.40 *************** *** 161,164 **** --- 161,165 ---- in->configured = OLSR_FALSE; in->interf = NULL; + in->host_emul = OLSR_FALSE; //XXXDNC in = in->next; } From (spam-protected) Fri Jun 3 22:11:30 2005 From: (spam-protected) (spoggle) Date: Fri, 03 Jun 2005 20:11:30 +0000 Subject: [Olsr-cvs] olsrd-current/src/cfgparser olsrd_conf.c,1.40,1.41 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src/cfgparser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21418 Modified Files: olsrd_conf.c Log Message: remove unwanted comment Index: olsrd_conf.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/olsrd_conf.c,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** olsrd_conf.c 3 Jun 2005 20:08:20 -0000 1.40 --- olsrd_conf.c 3 Jun 2005 20:11:28 -0000 1.41 *************** *** 161,165 **** in->configured = OLSR_FALSE; in->interf = NULL; ! in->host_emul = OLSR_FALSE; //XXXDNC in = in->next; } --- 161,165 ---- in->configured = OLSR_FALSE; in->interf = NULL; ! in->host_emul = OLSR_FALSE; in = in->next; } From (spam-protected) Sat Jun 4 02:03:16 2005 From: (spam-protected) (spoggle) Date: Sat, 04 Jun 2005 00:03:16 +0000 Subject: [Olsr-cvs] olsrd-current/make Makefile.fbsd,1.5,1.6 Message-ID: Update of /cvsroot/olsrd/olsrd-current/make In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12926 Modified Files: Makefile.fbsd Log Message: path to man pages is /usr/local/man Index: Makefile.fbsd =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.fbsd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.fbsd 2 Jun 2005 18:52:44 -0000 1.5 --- Makefile.fbsd 4 Jun 2005 00:03:13 -0000 1.6 *************** *** 8,12 **** LIBDIR = $(INSTALL_PREFIX)/lib DOCDIR = $(INSTALL_PREFIX)/share/doc ! MANDIR = $(INSTALL_PREFIX)/share/man SRCS += $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c) --- 8,12 ---- LIBDIR = $(INSTALL_PREFIX)/lib DOCDIR = $(INSTALL_PREFIX)/share/doc ! MANDIR = $(INSTALL_PREFIX)/man SRCS += $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)