[Olsr-cvs] olsrd-current/src/cfgparser cfgfile_gen.c,1.4,1.5

[Bernd Petrovitsch]

Update of /cvsroot/olsrd/olsrd-current/src/cfgparser
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10220/src/cfgparser

Modified Files:
	cfgfile_gen.c 
Log Message:
* applied hunks from Erik Tromps patch at http://home.tiscali.nl/levab001/olsrd-0.4.10.diff

Index: cfgfile_gen.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/cfgfile_gen.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** cfgfile_gen.c	12 Dec 2006 11:22:15 -0000	1.4
--- cfgfile_gen.c	4 Feb 2007 22:37:36 -0000	1.5
***************
*** 317,321 ****
  	    }
  
! 	  fprintf(fd, "    # When multiple links exist between hosts\n    # the weight of interface is used to determine\n    # the link to use. Normally the weight is\n    # automatically calculated by olsrd based\n    # on the characteristics of the interface,\n    # but here you can specify a fixed value.\n    # Olsrd will choose links with the lowest value.\n");
  	  if(in->cnf->weight.fixed)
  	    {
--- 317,331 ----
  	    }
  
!          fprintf(fd, "    # When multiple links exist between hosts\n");
!          fprintf(fd, "    # the weight of interface is used to determine\n");
!          fprintf(fd, "    # the link to use. Normally the weight is\n");
!          fprintf(fd, "    # automatically calculated by olsrd based\n");
!          fprintf(fd, "    # on the characteristics of the interface,\n");
!          fprintf(fd, "    # but here you can specify a fixed value.\n");
!          fprintf(fd, "    # Olsrd will choose links with the lowest value.\n");
!          fprintf(fd, "    # Note:\n");
!          fprintf(fd, "    # Interface weight is used only when LinkQualityLevel is 0.\n");
!          fprintf(fd, "    # For any other value of LinkQualityLevel, the interface ETX\n");
!          fprintf(fd, "    # value is used instead.\n\n");
  	  if(in->cnf->weight.fixed)
  	    {
***************
*** 622,628 ****
  
  	  if(first)
!     	    WRITE_TO_BUF("    # When multiple links exist between hosts\n    # the weight of interface is used to determine\n    # the link to use. Normally the weight is\n")
!           if(first)
!             WRITE_TO_BUF("    # automatically calculated by olsrd based\n    # on the characteristics of the interface,\n    # but here you can specify a fixed value.\n    # Olsrd will choose links with the lowest value.\n")
  	  if(in->cnf->weight.fixed)
  	    {
--- 632,648 ----
  
  	  if(first)
! 	    {
!              WRITE_TO_BUF("    # When multiple links exist between hosts\n");
!              WRITE_TO_BUF("    # the weight of interface is used to determine\n");
!              WRITE_TO_BUF("    # the link to use. Normally the weight is\n")
!              WRITE_TO_BUF("    # automatically calculated by olsrd based\n");
!              WRITE_TO_BUF("    # on the characteristics of the interface,\n");
!              WRITE_TO_BUF("    # but here you can specify a fixed value.\n");
!              WRITE_TO_BUF("    # Olsrd will choose links with the lowest value.\n")
!              WRITE_TO_BUF("    # Note:\n");
!              WRITE_TO_BUF("    # Interface weight is used only when LinkQualityLevel is 0.\n");
!              WRITE_TO_BUF("    # For any other value of LinkQualityLevel, the interface ETX\n");
!              WRITE_TO_BUF("    # value is used instead.\n\n");
!             }
  	  if(in->cnf->weight.fixed)
  	    {