From (spam-protected) Mon Oct 2 10:37:19 2006 From: (spam-protected) (Andreas Tønnesen) Date: Mon, 02 Oct 2006 08:37:19 +0000 Subject: [Olsr-cvs] olsrd-current/src net_olsr.c,1.13,1.14 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16504/src Modified Files: net_olsr.c Log Message: Patch for IPv6 netmask from John Hay Index: net_olsr.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/net_olsr.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** net_olsr.c 10 Jan 2006 20:49:01 -0000 1.13 --- net_olsr.c 2 Oct 2006 08:37:17 -0000 1.14 *************** *** 762,766 **** for(;p > 0; p -= 8) { ! adr->v6.s6_addr[i] = (p < 8) ? 0xff ^ (0xff << p) : 0xff; i++; } --- 762,766 ---- for(;p > 0; p -= 8) { ! adr->v6.s6_addr[i] = (p < 8) ? 0xff ^ (0xff >> p) : 0xff; i++; } *************** *** 800,804 **** for(tmp = adr->v6.s6_addr[i]; tmp > 0; ! tmp = tmp >> 1) prefix++; } --- 800,804 ---- for(tmp = adr->v6.s6_addr[i]; tmp > 0; ! tmp = (tmp << 1) & 0xff) prefix++; } From (spam-protected) Wed Oct 11 22:18:38 2006 From: (spam-protected) (Thomas Lopatic) Date: Wed, 11 Oct 2006 20:18:38 +0000 Subject: [Olsr-cvs] olsrd-current/make Makefile.win32,1.4,1.5 Message-ID: Update of /cvsroot/olsrd/olsrd-current/make In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13397/make Modified Files: Makefile.win32 Log Message: Applied friendly name patch by Sektor. Index: Makefile.win32 =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.win32,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.win32 29 Dec 2005 21:26:31 -0000 1.4 --- Makefile.win32 11 Oct 2006 20:18:35 -0000 1.5 *************** *** 9,13 **** HDRS += $(wildcard src/win32/*.h) ! DEFINES += -DWIN32 LIBS += -mno-cygwin -lws2_32 -liphlpapi INCLUDES += -I$(TOPDIR)/src/win32 --- 9,13 ---- HDRS += $(wildcard src/win32/*.h) ! DEFINES += -DWIN32 -D_WIN32_WINNT=0x0501 LIBS += -mno-cygwin -lws2_32 -liphlpapi INCLUDES += -I$(TOPDIR)/src/win32 From (spam-protected) Wed Oct 11 22:18:38 2006 From: (spam-protected) (Thomas Lopatic) Date: Wed, 11 Oct 2006 20:18:38 +0000 Subject: [Olsr-cvs] olsrd-current/src/win32 ifnet.c,1.30,1.31 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src/win32 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13397/src/win32 Modified Files: ifnet.c Log Message: Applied friendly name patch by Sektor. Index: ifnet.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/win32/ifnet.c,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** ifnet.c 7 Jan 2006 08:16:26 -0000 1.30 --- ifnet.c 11 Oct 2006 20:18:36 -0000 1.31 *************** *** 133,136 **** --- 133,197 ---- } + static int FriendlyNameToMiniIndex(int *MiniIndex, char *String) + { + typedef DWORD (*GETADAPTERSADDRESSES)(ULONG Family, + DWORD Flags, + PVOID Reserved, + PIP_ADAPTER_ADDRESSES pAdapterAddresses, + PULONG pOutBufLen); + unsigned long BuffLen; + unsigned long Res; + IP_ADAPTER_ADDRESSES AdAddr[MAX_INTERFACES], *WalkerAddr; + char FriendlyName[MAX_INTERFACE_NAME_LEN]; + HMODULE h; + GETADAPTERSADDRESSES pfGetAdaptersAddresses; + + h = LoadLibrary("iphlpapi.dll"); + + if (h == NULL) + { + fprintf(stderr, "LoadLibrary() = %08lx", GetLastError()); + return -1; + } + + pfGetAdaptersAddresses = (GETADAPTERSADDRESSES) GetProcAddress(h, "GetAdaptersAddresses"); + + if (pfGetAdaptersAddresses == NULL) + { + fprintf(stderr, "Unable to use adapter friendly name (GetProcAddress() = %08lx)\n", GetLastError()); + return -1; + } + + BuffLen = sizeof (AdAddr); + + Res = pfGetAdaptersAddresses(AF_INET, 0, NULL, AdAddr, &BuffLen); + + if (Res != NO_ERROR) + { + fprintf(stderr, "GetAdaptersAddresses() = %08lx", GetLastError()); + return -1; + } + + for (WalkerAddr = AdAddr; WalkerAddr != NULL; WalkerAddr = WalkerAddr->Next) + { + OLSR_PRINTF(5, "Index = %08x - ", (int)WalkerAddr->IfIndex); + + wcstombs(FriendlyName, WalkerAddr->FriendlyName, MAX_INTERFACE_NAME_LEN); + + OLSR_PRINTF(5, "Friendly name = %s\n", FriendlyName); + + if (strncmp(FriendlyName, String, MAX_INTERFACE_NAME_LEN) == 0) + break; + } + + if (WalkerAddr == NULL) + { + fprintf(stderr, "No such interface: %s!\n", String); + return -1; + } + + *MiniIndex = WalkerAddr->IfIndex & 255; + } + int GetIntInfo(struct InterfaceInfo *Info, char *Name) { *************** *** 149,156 **** } ! if (IntNameToMiniIndex(&MiniIndex, Name) < 0) { ! fprintf(stderr, "No such interface: %s!\n", Name); ! return -1; } --- 210,230 ---- } ! if ((Name[0] != 'i' && Name[0] != 'I') || ! (Name[1] != 'f' && Name[1] != 'F')) { ! if (FriendlyNameToMiniIndex(&MiniIndex, Name) < 0) ! { ! fprintf(stderr, "No such interface: %s!\n", Name); ! return -1; ! } ! } ! ! else ! { ! if (IntNameToMiniIndex(&MiniIndex, Name) < 0) ! { ! fprintf(stderr, "No such interface: %s!\n", Name); ! return -1; ! } } From (spam-protected) Wed Oct 11 22:58:47 2006 From: (spam-protected) (Thomas Lopatic) Date: Wed, 11 Oct 2006 20:58:47 +0000 Subject: [Olsr-cvs] olsrd-current/src/unix ifnet.c,1.38,1.39 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src/unix In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29885/src/unix Modified Files: ifnet.c Log Message: Make TTL index a per-interface value. Index: ifnet.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/unix/ifnet.c,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** ifnet.c 17 Apr 2006 18:31:09 -0000 1.38 --- ifnet.c 11 Oct 2006 20:58:45 -0000 1.39 *************** *** 888,891 **** --- 888,893 ---- ifs.int_mtu -= (olsr_cnf->ip_version == AF_INET6) ? UDP_IPV6_HDRSIZE : UDP_IPV4_HDRSIZE; + ifs.ttl_index = 0; + /* Set up buffer */ net_add_buffer(&ifs); From (spam-protected) Wed Oct 11 22:58:47 2006 From: (spam-protected) (Thomas Lopatic) Date: Wed, 11 Oct 2006 20:58:47 +0000 Subject: [Olsr-cvs] olsrd-current/src/win32 ifnet.c,1.31,1.32 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src/win32 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29885/src/win32 Modified Files: ifnet.c Log Message: Make TTL index a per-interface value. Index: ifnet.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/win32/ifnet.c,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** ifnet.c 11 Oct 2006 20:18:36 -0000 1.31 --- ifnet.c 11 Oct 2006 20:58:45 -0000 1.32 *************** *** 915,918 **** --- 915,920 ---- New->olsr_seqnum = random() & 0xffff; + + New->ttl_index = 0; OLSR_PRINTF(1, "\tInterface %s set up for use with index %d\n\n", From (spam-protected) Wed Oct 11 22:58:47 2006 From: (spam-protected) (Thomas Lopatic) Date: Wed, 11 Oct 2006 20:58:47 +0000 Subject: [Olsr-cvs] olsrd-current/src interfaces.h, 1.33, 1.34 lq_packet.c, 1.20, 1.21 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29885/src Modified Files: interfaces.h lq_packet.c Log Message: Make TTL index a per-interface value. Index: lq_packet.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/lq_packet.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** lq_packet.c 7 Jan 2006 08:16:20 -0000 1.20 --- lq_packet.c 11 Oct 2006 20:58:45 -0000 1.21 *************** *** 152,156 **** struct link_entry *link; static int ttl_list[] = { MAX_TTL, 3, 2, 1, 2, 1, 1, 3, 2, 1, 2, 1, 1, 0 }; - static int ttl_index = 0; // remember that we have generated an LQ TC message; this is --- 152,155 ---- *************** *** 169,176 **** if (olsr_cnf->lq_fish > 0) { ! if (ttl_list[ttl_index] == 0) ! ttl_index = 0; ! lq_tc->comm.ttl = ttl_list[ttl_index++]; OLSR_PRINTF(3, "Creating LQ TC with TTL %d.\n", lq_tc->comm.ttl); --- 168,175 ---- if (olsr_cnf->lq_fish > 0) { ! if (ttl_list[outif->ttl_index] == 0) ! outif->ttl_index = 0; ! lq_tc->comm.ttl = ttl_list[outif->ttl_index++]; OLSR_PRINTF(3, "Creating LQ TC with TTL %d.\n", lq_tc->comm.ttl); Index: interfaces.h =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/interfaces.h,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** interfaces.h 17 Apr 2006 18:31:09 -0000 1.33 --- interfaces.h 11 Oct 2006 20:58:45 -0000 1.34 *************** *** 143,146 **** --- 143,148 ---- struct if_gen_property *gen_properties;/* Generic interface properties */ + int ttl_index; /* index in TTL array for fish-eye */ + struct interface *int_next; }; From (spam-protected) Sat Oct 21 23:39:24 2006 From: (spam-protected) (Bernd Petrovitsch) Date: Sat, 21 Oct 2006 21:39:24 +0000 Subject: [Olsr-cvs] olsrd-current/lib Makefile,1.5,1.6 Message-ID: Update of /cvsroot/olsrd/olsrd-current/lib In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11457/lib Modified Files: Makefile Log Message: * since the powerinfo directory seems to be gone, it makes no sense to keep it in the directory list Index: Makefile =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/lib/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 3 May 2006 08:59:03 -0000 1.5 --- Makefile 21 Oct 2006 21:39:22 -0000 1.6 *************** *** 1,3 **** ! SUBDIRS = dot_draw dyn_gw httpinfo mini nameservice powerinfo secure tas bmf .PHONY: $(SUBDIRS) --- 1,3 ---- ! SUBDIRS = dot_draw dyn_gw httpinfo mini nameservice secure tas bmf .PHONY: $(SUBDIRS) From (spam-protected) Sat Oct 21 23:40:51 2006 From: (spam-protected) (Bernd Petrovitsch) Date: Sat, 21 Oct 2006 21:40:51 +0000 Subject: [Olsr-cvs] olsrd-current .cvsignore,NONE,1.1 Message-ID: Update of /cvsroot/olsrd/olsrd-current In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11936 Added Files: .cvsignore Log Message: * added more .cvsignore files --- NEW FILE: .cvsignore --- olsrd *.d From (spam-protected) Sat Oct 21 23:40:51 2006 From: (spam-protected) (Bernd Petrovitsch) Date: Sat, 21 Oct 2006 21:40:51 +0000 Subject: [Olsr-cvs] olsrd-current/lib/bmf .cvsignore,NONE,1.1 Message-ID: Update of /cvsroot/olsrd/olsrd-current/lib/bmf In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11936/lib/bmf Added Files: .cvsignore Log Message: * added more .cvsignore files --- NEW FILE: .cvsignore --- *.d olsrd_bmf.so.* From (spam-protected) Sat Oct 21 23:21:58 2006 From: (spam-protected) (Bernd Petrovitsch) Date: Sat, 21 Oct 2006 21:21:58 +0000 Subject: [Olsr-cvs] olsrd-current Makefile,1.70,1.71 Message-ID: Update of /cvsroot/olsrd/olsrd-current In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4375 Modified Files: Makefile Log Message: * added a "clean_all" target similar to the other *_all targets Index: Makefile =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/Makefile,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** Makefile 3 May 2006 08:59:16 -0000 1.70 --- Makefile 21 Oct 2006 21:21:55 -0000 1.71 *************** *** 69,73 **** $(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: --- 69,73 ---- $(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_all clean: *************** *** 168,169 **** --- 168,170 ---- build_all: cfgparser olsrd libs install_all: install install_libs + clean_all: uberclean clean_libs From (spam-protected) Sat Oct 21 23:24:48 2006 From: (spam-protected) (Bernd Petrovitsch) Date: Sat, 21 Oct 2006 21:24:48 +0000 Subject: [Olsr-cvs] olsrd-current Makefile.inc,1.3,1.4 Message-ID: Update of /cvsroot/olsrd/olsrd-current In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5525 Modified Files: Makefile.inc Log Message: * tell emacs'ens the correct filetype Index: Makefile.inc =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/Makefile.inc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.inc 2 Jun 2005 14:41:58 -0000 1.3 --- Makefile.inc 21 Oct 2006 21:24:46 -0000 1.4 *************** *** 95,99 **** @echo '************************************' @echo ! # include dependencies -include $(SRCS:%.c=%.d) --- 95,103 ---- @echo '************************************' @echo ! # include dependencies -include $(SRCS:%.c=%.d) + + # Local Variables: + # mode: makefile + # End: From (spam-protected) Sat Oct 21 23:24:48 2006 From: (spam-protected) (Bernd Petrovitsch) Date: Sat, 21 Oct 2006 21:24:48 +0000 Subject: [Olsr-cvs] olsrd-current/make Makefile.fbsd, 1.7, 1.8 Makefile.linux, 1.6, 1.7 Makefile.nbsd, 1.4, 1.5 Makefile.obsd, 1.3, 1.4 Makefile.osx, 1.5, 1.6 Makefile.win32, 1.5, 1.6 Makefile.wince, 1.2, 1.3 Message-ID: Update of /cvsroot/olsrd/olsrd-current/make In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5525/make Modified Files: Makefile.fbsd Makefile.linux Makefile.nbsd Makefile.obsd Makefile.osx Makefile.win32 Makefile.wince Log Message: * tell emacs'ens the correct filetype Index: Makefile.obsd =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.obsd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.obsd 2 Jun 2005 14:41:59 -0000 1.3 --- Makefile.obsd 21 Oct 2006 21:24:46 -0000 1.4 *************** *** 23,24 **** --- 23,28 ---- OS_LIB_PTHREAD = OS_LIB_DYNLOAD = + + # Local Variables: + # mode: makefile + # End: Index: Makefile.wince =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.wince,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.wince 2 Jun 2005 14:41:59 -0000 1.2 --- Makefile.wince 21 Oct 2006 21:24:46 -0000 1.3 *************** *** 21,22 **** --- 21,26 ---- OS_LIB_PTHREAD = OS_LIB_DYNLOAD = + + # Local Variables: + # mode: makefile + # End: Index: Makefile.win32 =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.win32,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.win32 11 Oct 2006 20:18:35 -0000 1.5 --- Makefile.win32 21 Oct 2006 21:24:46 -0000 1.6 *************** *** 104,105 **** --- 104,109 ---- C:/Program\ Files/NSIS/makensis gui\win32\Inst\installer.nsi mv olsr-setup.exe olsr-$(VERS)-setup.exe + + # Local Variables: + # mode: makefile + # End: Index: Makefile.linux =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.linux,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.linux 15 Feb 2006 06:34:04 -0000 1.6 --- Makefile.linux 21 Oct 2006 21:24:46 -0000 1.7 *************** *** 39,40 **** --- 39,44 ---- OS_LIB_PTHREAD = -lpthread OS_LIB_DYNLOAD = -ldl + + # Local Variables: + # mode: makefile + # End: Index: Makefile.osx =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.osx,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.osx 5 Jan 2006 06:04:47 -0000 1.5 --- Makefile.osx 21 Oct 2006 21:24:46 -0000 1.6 *************** *** 27,28 **** --- 27,32 ---- OS_LIB_PTHREAD = OS_LIB_DYNLOAD = + + # Local Variables: + # mode: makefile + # End: Index: Makefile.fbsd =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.fbsd,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.fbsd 22 Jun 2005 20:04:34 -0000 1.7 --- Makefile.fbsd 21 Oct 2006 21:24:46 -0000 1.8 *************** *** 39,40 **** --- 39,44 ---- OS_LIB_PTHREAD = -pthread OS_LIB_DYNLOAD = + + # Local Variables: + # mode: makefile + # End: Index: Makefile.nbsd =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.nbsd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.nbsd 2 Jun 2005 15:34:01 -0000 1.4 --- Makefile.nbsd 21 Oct 2006 21:24:46 -0000 1.5 *************** *** 23,24 **** --- 23,28 ---- OS_LIB_PTHREAD = OS_LIB_DYNLOAD = + + # Local Variables: + # mode: makefile + # End: From (spam-protected) Thu Oct 26 19:54:33 2006 From: (spam-protected) (Bernd Petrovitsch) Date: Thu, 26 Oct 2006 19:54:33 +0200 Subject: [Olsr-cvs] Re: Further olsrd Development In-Reply-To: <453312B2.8090906@lopatic.de> References: <1152537894.18179.50.camel@tara.firmix.at> <1129.148.122.228.245.1152542502.squirrel@webmail.olsr.org> <1160598891.7140.17.camel@gimli.at.home> <35727.194.196.35.3.1160650048.squirrel@webmail.olsr.org> <1160947070.3357.93.camel@gimli.at.home> <453312B2.8090906@lopatic.de> Message-ID: <1161885273.3235.46.camel@gimli.at.home> On Mon, 2006-10-16 at 07:03 +0200, Thomas Lopatic wrote: > Bernd Petrovitsch wrote: > > On Thu, 2006-10-12 at 12:47 +0200, Andreas Tønnesen wrote: > >>> How to accomplish this most easily? > >>> * Just keep sending patches - possibly using `quilt` for patch sets. > >>> * Just send one large patch like the output of `cvs diff` against CVS > >>> HEAD. > >>> * Fill in, please: __________________________________ > >> Giving you CVS access? Just cough up an SF username and I'll add you to > >> the project! > > > > I have one already - "bernd67" > > Do I want that? I don't know .... > > Considering how much time Andreas and I have been able to spend on olsrd > development during the past few months I'd say, yes, you definitely > want that! :-) Given that we (Aaron and /me) actually will start to do something sooner or later, how sould the release policy continue? Relase 0.4.12 and branch it there to have some stable part and "we" work on the HEAD possibly and IMHO very probably breaking occasionally at least the various ports to *BSD, MacOS-X and/or Windows? Or any other strategy? Bernd -- Firmix Software GmbH http://www.firmix.at/ mobil: +43 664 4416156 fax: +43 1 7890849-55 Embedded Linux Development and Services From (spam-protected) Fri Oct 27 00:02:58 2006 From: (spam-protected) (Bernd Petrovitsch) Date: Thu, 26 Oct 2006 22:02:58 +0000 Subject: [Olsr-cvs] olsrd-current/src/linux apm.c,1.14,1.15 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src/linux In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6216/src/linux Modified Files: apm.c Log Message: * fixed complaints from gcc -Wextra Index: apm.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/linux/apm.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** apm.c 7 Apr 2005 18:22:43 -0000 1.14 --- apm.c 26 Oct 2006 22:02:56 -0000 1.15 *************** *** 74,78 **** #define ACPI_PROC "/proc/acpi/info" ! const static char * acpi_info[] = { "/proc/acpi/battery/0/info", --- 74,78 ---- #define ACPI_PROC "/proc/acpi/info" ! static const char * acpi_info[] = { "/proc/acpi/battery/0/info", *************** *** 83,87 **** }; ! const static char * acpi_state[] = { "/proc/acpi/battery/0/status", --- 83,87 ---- }; ! static const char * acpi_state[] = { "/proc/acpi/battery/0/status", *************** *** 96,100 **** ! const static char * acpi_ac[] = { "/proc/acpi/ac_adapter/0/status", --- 96,100 ---- ! static const char * acpi_ac[] = { "/proc/acpi/ac_adapter/0/status", *************** *** 124,128 **** int ! apm_init() { struct olsr_apm_info ainfo; --- 124,128 ---- int ! apm_init(void) { struct olsr_apm_info ainfo; *************** *** 196,200 **** { /* Try re-opening the file */ ! if((apm_procfile = fopen(APM_PROC, "r")) < 0) return 0; fgets(buffer, sizeof(buffer) - 1, apm_procfile); --- 196,200 ---- { /* Try re-opening the file */ ! if((apm_procfile = fopen(APM_PROC, "r")) != NULL) return 0; fgets(buffer, sizeof(buffer) - 1, apm_procfile); *************** *** 323,327 **** static int ! acpi_probe() { char s1[32], s2[32]; --- 323,327 ---- static int ! acpi_probe(void) { char s1[32], s2[32]; From (spam-protected) Fri Oct 27 09:33:31 2006 From: (spam-protected) (=?UTF-8?B?QW5kcmVhcyBUw7hubmVzZW4=?=) Date: Fri, 27 Oct 2006 09:33:31 +0200 Subject: [Olsr-cvs] Re: Further olsrd Development In-Reply-To: <1161885273.3235.46.camel@gimli.at.home> References: <1152537894.18179.50.camel@tara.firmix.at> <1129.148.122.228.245.1152542502.squirrel@webmail.olsr.org> <1160598891.7140.17.camel@gimli.at.home> <35727.194.196.35.3.1160650048.squirrel@webmail.olsr.org> <1160947070.3357.93.camel@gimli.at.home> <453312B2.8090906@lopatic.de> <1161885273.3235.46.camel@gimli.at.home> Message-ID: <4541B64B.3090502@olsr.org> Bernd Petrovitsch wrote: > On Mon, 2006-10-16 at 07:03 +0200, Thomas Lopatic wrote: > >> Bernd Petrovitsch wrote: >> >>> On Thu, 2006-10-12 at 12:47 +0200, Andreas Tønnesen wrote: >>> >>>>> How to accomplish this most easily? >>>>> * Just keep sending patches - possibly using `quilt` for patch sets. >>>>> * Just send one large patch like the output of `cvs diff` against CVS >>>>> HEAD. >>>>> * Fill in, please: __________________________________ >>>>> >>>> Giving you CVS access? Just cough up an SF username and I'll add you to >>>> the project! >>>> >>> I have one already - "bernd67" >>> Do I want that? I don't know .... >>> >> Considering how much time Andreas and I have been able to spend on olsrd >> development during the past few months I'd say, yes, you definitely >> want that! :-) >> > > Given that we (Aaron and /me) actually will start to do something sooner > or later, how sould the release policy continue? > > Relase 0.4.12 and branch it there to have some stable part and "we" work > on the HEAD possibly and IMHO very probably breaking occasionally at > least the various ports to *BSD, MacOS-X and/or Windows? > > Or any other strategy? > > Bernd > There is already a 0.4 branch and head is supposed to be 0.5. I've tried maintaining the 0.4 branch with most fixes, but doubtless not every patch has found it's way in there. Anyways, as I see it you guys can work on head and the 0.4 branch will be the "stable" cvs, but perhaps we should consider merging head into the 0.4 branch now just to make sure all fixes have been adopted...? - Andreas From (spam-protected) Fri Oct 27 14:50:08 2006 From: (spam-protected) (Bernd Petrovitsch) Date: Fri, 27 Oct 2006 14:50:08 +0200 Subject: [Olsr-cvs] Re: Further olsrd Development In-Reply-To: <4541B64B.3090502@olsr.org> References: <1152537894.18179.50.camel@tara.firmix.at> <1129.148.122.228.245.1152542502.squirrel@webmail.olsr.org> <1160598891.7140.17.camel@gimli.at.home> <35727.194.196.35.3.1160650048.squirrel@webmail.olsr.org> <1160947070.3357.93.camel@gimli.at.home> <453312B2.8090906@lopatic.de> <1161885273.3235.46.camel@gimli.at.home> <4541B64B.3090502@olsr.org> Message-ID: <1161953409.23741.1.camel@tara.firmix.at> On Fri, 2006-10-27 at 09:33 +0200, Andreas Tønnesen wrote: [...] > There is already a 0.4 branch and head is supposed to be 0.5. I've > tried maintaining the 0.4 branch with most fixes, but doubtless > not every patch has found it's way in there. > Anyways, as I see it you guys can work on head and the 0.4 branch > will be the "stable" cvs, but perhaps we should consider merging > head into the 0.4 branch now just to make sure all fixes have been > adopted...? That sounds more like: We should make the head to a 0.5 release, branch it as "stable" and have the HEAD as pre-0.6. Bernd -- Firmix Software GmbH http://www.firmix.at/ mobil: +43 664 4416156 fax: +43 1 7890849-55 Embedded Linux Development and Services From (spam-protected) Fri Oct 27 15:06:35 2006 From: (spam-protected) (=?UTF-8?B?QW5kcmVhcyBUw7hubmVzZW4=?=) Date: Fri, 27 Oct 2006 15:06:35 +0200 Subject: [Olsr-cvs] Re: Further olsrd Development In-Reply-To: <1161953409.23741.1.camel@tara.firmix.at> References: <1152537894.18179.50.camel@tara.firmix.at> <1129.148.122.228.245.1152542502.squirrel@webmail.olsr.org> <1160598891.7140.17.camel@gimli.at.home> <35727.194.196.35.3.1160650048.squirrel@webmail.olsr.org> <1160947070.3357.93.camel@gimli.at.home> <453312B2.8090906@lopatic.de> <1161885273.3235.46.camel@gimli.at.home> <4541B64B.3090502@olsr.org> <1161953409.23741.1.camel@tara.firmix.at> Message-ID: <4542045B.6030103@olsr.org> Bernd Petrovitsch wrote: > On Fri, 2006-10-27 at 09:33 +0200, Andreas Tønnesen wrote: > [...] > >> There is already a 0.4 branch and head is supposed to be 0.5. I've >> tried maintaining the 0.4 branch with most fixes, but doubtless >> not every patch has found it's way in there. >> Anyways, as I see it you guys can work on head and the 0.4 branch >> will be the "stable" cvs, but perhaps we should consider merging >> head into the 0.4 branch now just to make sure all fixes have been >> adopted...? >> > > That sounds more like: We should make the head to a 0.5 release, branch > it as "stable" and have the HEAD as pre-0.6. > > Bernd Given the fact that we have been living in 0.4 for the last three years or something, 0.6 seems a bit optimistic. And I also fear there would only be the 0.5.0 release in the whole 0.5 series(there has been 0.5 years release cycles lately). The idea is that 0.5 should introduce new functionality and experimental features and move away for the OLSR RFC while the 0.4 branch is be the "stable" RFC compatible branch. But on the other hand these are just numbers so if everybody disagrees we'll skip this plan :-) - Andreas From (spam-protected) Fri Oct 27 15:49:19 2006 From: (spam-protected) (aaron) Date: Fri, 27 Oct 2006 15:49:19 +0200 Subject: [Olsr-cvs] Re: Further olsrd Development In-Reply-To: <4542045B.6030103@olsr.org> References: <1152537894.18179.50.camel@tara.firmix.at> <1129.148.122.228.245.1152542502.squirrel@webmail.olsr.org> <1160598891.7140.17.camel@gimli.at.home> <35727.194.196.35.3.1160650048.squirrel@webmail.olsr.org> <1160947070.3357.93.camel@gimli.at.home> <453312B2.8090906@lopatic.de> <1161885273.3235.46.camel@gimli.at.home> <4541B64B.3090502@olsr.org> <1161953409.23741.1.camel@tara.firmix.at> <4542045B.6030103@olsr.org> Message-ID: <20061027134919.GA99930@tema.lo-res.org> I guess we should really seperate between new ideas and code cleanup. Bernd is now involved more in the code cleanup section. I will concentrate more on new ideas and optimizations. So, my proposal is that 0.5 is the code cleanup branch while 0.4 is the serious bugfix branch. So changes go from 0.5 to 0.4 if it is really neccessary. (backports) This keeps it all easy... 0.5 is -HEAD and 0.4 only for serious bug / backports. my 2 cents, a. > Given the fact that we have been living in 0.4 for the last > three years or something, 0.6 seems a bit optimistic. And > I also fear there would only be the 0.5.0 release in the whole > 0.5 series(there has been 0.5 years release cycles lately). > The idea is that 0.5 should introduce new functionality > and experimental features and move away for the OLSR RFC > while the 0.4 branch is be the "stable" RFC compatible branch. > > But on the other hand these are just numbers so if everybody > disagrees we'll skip this plan :-) > > - Andreas > > _______________________________________________ > Olsr-cvs mailing list > Olsr-cvs at olsr.org > https://www.olsr.org/mailman/listinfo/olsr-cvs > From (spam-protected) Fri Oct 27 15:56:35 2006 From: (spam-protected) (=?ISO-8859-15?Q?Andreas_T=F8nnesen?=) Date: Fri, 27 Oct 2006 15:56:35 +0200 Subject: [Olsr-cvs] Re: Further olsrd Development In-Reply-To: <20061027134919.GA99930@tema.lo-res.org> References: <1152537894.18179.50.camel@tara.firmix.at> <1129.148.122.228.245.1152542502.squirrel@webmail.olsr.org> <1160598891.7140.17.camel@gimli.at.home> <35727.194.196.35.3.1160650048.squirrel@webmail.olsr.org> <1160947070.3357.93.camel@gimli.at.home> <453312B2.8090906@lopatic.de> <1161885273.3235.46.camel@gimli.at.home> <4541B64B.3090502@olsr.org> <1161953409.23741.1.camel@tara.firmix.at> <4542045B.6030103@olsr.org> <20061027134919.GA99930@tema.lo-res.org> Message-ID: <45421013.4000003@olsr.org> Sounds fair to me. - Andreas aaron wrote: > I guess we should really seperate between new ideas and code cleanup. > Bernd is now involved more in the code cleanup section. I will concentrate > more on new ideas and optimizations. > So, my proposal is that 0.5 is the code cleanup branch while 0.4 is the > serious bugfix branch. > So changes go from 0.5 to 0.4 if it is really neccessary. (backports) > > This keeps it all easy... 0.5 is -HEAD and 0.4 only for serious > bug / backports. > > my 2 cents, > a. > > > >> Given the fact that we have been living in 0.4 for the last >> three years or something, 0.6 seems a bit optimistic. And >> I also fear there would only be the 0.5.0 release in the whole >> 0.5 series(there has been 0.5 years release cycles lately). >> The idea is that 0.5 should introduce new functionality >> and experimental features and move away for the OLSR RFC >> while the 0.4 branch is be the "stable" RFC compatible branch. >> >> But on the other hand these are just numbers so if everybody >> disagrees we'll skip this plan :-) >> >> - Andreas >> >> _______________________________________________ >> Olsr-cvs mailing list >> Olsr-cvs at olsr.org >> https://www.olsr.org/mailman/listinfo/olsr-cvs >> >> From (spam-protected) Sat Oct 28 16:21:28 2006 From: (spam-protected) (Bernd Petrovitsch) Date: Sat, 28 Oct 2006 14:21:28 +0000 Subject: [Olsr-cvs] olsrd-current Makefile,1.71,1.72 Message-ID: Update of /cvsroot/olsrd/olsrd-current In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13470 Modified Files: Makefile Log Message: * lib/powerinfo is long gone Index: Makefile =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/Makefile,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** Makefile 21 Oct 2006 21:21:55 -0000 1.71 --- Makefile 28 Oct 2006 14:21:26 -0000 1.72 *************** *** 146,154 **** $(MAKE) -C lib/dyn_gw install - powerinfo: - $(MAKE) -C lib/powerinfo clean - $(MAKE) -C lib/powerinfo - $(MAKE) -C lib/powerinfo install - secure: $(MAKE) -C lib/secure clean --- 146,149 ---- From (spam-protected) Mon Oct 30 01:42:20 2006 From: (spam-protected) (Bernd Petrovitsch) Date: Mon, 30 Oct 2006 01:42:20 +0100 Subject: [Olsr-cvs] Re: Further olsrd Development In-Reply-To: <45421013.4000003@olsr.org> References: <1152537894.18179.50.camel@tara.firmix.at> <1129.148.122.228.245.1152542502.squirrel@webmail.olsr.org> <1160598891.7140.17.camel@gimli.at.home> <35727.194.196.35.3.1160650048.squirrel@webmail.olsr.org> <1160947070.3357.93.camel@gimli.at.home> <453312B2.8090906@lopatic.de> <1161885273.3235.46.camel@gimli.at.home> <4541B64B.3090502@olsr.org> <1161953409.23741.1.camel@tara.firmix.at> <4542045B.6030103@olsr.org> <20061027134919.GA99930@tema.lo-res.org> <45421013.4000003@olsr.org> Message-ID: <1162168940.3033.42.camel@gimli.at.home> On Fri, 2006-10-27 at 15:56 +0200, Andreas Tønnesen wrote: > Sounds fair to me. Silly question: Which branch should we take for backporting fixes? ---- snip ---- 132}cvs log src/olsr.h RCS file: /cvsroot/olsrd/olsrd-current/src/olsr.h,v Working file: src/olsr.h head: 1.24 branch: locks: strict access list: symbolic names: olsrd-0-4-10: 1.24 olsrd_04: 1.24.0.2 olsrd-0-4-9: 1.21 pre_timerchange: 1.14 olsrd-0-4-8: 1.13 pre_lq: 1.13 pre_cnfchanges: 1.9 rel-0-4-7: 1.1.1.1 olsrd-0-4-7: 1.1.1.1.0.2 start: 1.1.1.1 vendor: 1.1.1 ---- snip ---- Bernd -- Firmix Software GmbH http://www.firmix.at/ mobil: +43 664 4416156 fax: +43 1 7890849-55 Embedded Linux Development and Services From (spam-protected) Mon Oct 30 08:23:02 2006 From: (spam-protected) (=?UTF-8?B?QW5kcmVhcyBUw7hubmVzZW4=?=) Date: Mon, 30 Oct 2006 08:23:02 +0100 Subject: [Olsr-cvs] Re: Further olsrd Development In-Reply-To: <1162168940.3033.42.camel@gimli.at.home> References: <1152537894.18179.50.camel@tara.firmix.at> <1129.148.122.228.245.1152542502.squirrel@webmail.olsr.org> <1160598891.7140.17.camel@gimli.at.home> <35727.194.196.35.3.1160650048.squirrel@webmail.olsr.org> <1160947070.3357.93.camel@gimli.at.home> <453312B2.8090906@lopatic.de> <1161885273.3235.46.camel@gimli.at.home> <4541B64B.3090502@olsr.org> <1161953409.23741.1.camel@tara.firmix.at> <4542045B.6030103@olsr.org> <20061027134919.GA99930@tema.lo-res.org> <45421013.4000003@olsr.org> <1162168940.3033.42.camel@gimli.at.home> Message-ID: <4545A856.2010605@olsr.org> Bernd Petrovitsch wrote: > On Fri, 2006-10-27 at 15:56 +0200, Andreas Tønnesen wrote: > >> Sounds fair to me. >> > > Silly question: Which branch should we take for backporting fixes? > ---- snip ---- > There are only two branches AFAIK: olsrd-0-4-7 and olsrd_04. olsrd-0-4-7 was pretty much an error by me making a branch instead of a tag for 0.4.7 so it should really not be there. olsrd_04 is the 0.4 branch. The rest are just release/codechange tags. - Andreas