[Olsr-cvs] olsrd-current/src/cfgparser olsrd_conf.c,1.43,1.44

[Thomas Lopatic]

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

Modified Files:
	olsrd_conf.c 
Log Message:
Use HNA routing table with ETX. Support "<?lua= ... ?>" in TAS. Let
users override the minimal HELLO validity time. Secure session cookies
in TAS.


Index: olsrd_conf.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/olsrd_conf.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** olsrd_conf.c	23 Oct 2005 19:01:04 -0000	1.43
--- olsrd_conf.c	15 Nov 2005 23:46:20 -0000	1.44
***************
*** 310,313 ****
--- 310,323 ----
  	
        /* HELLO interval */
+ 
+       if (io->hello_params.validity_time < 0.0)
+       {
+         if (cnf->lq_level == 0)
+           io->hello_params.validity_time = NEIGHB_HOLD_TIME;
+ 
+         else
+           io->hello_params.validity_time = cnf->lq_wsize * io->hello_params.emission_interval;
+       }
+ 
        if(io->hello_params.emission_interval < cnf->pollrate ||
  	 io->hello_params.emission_interval > io->hello_params.validity_time)
***************
*** 317,334 ****
  	}
  
-       if (cnf->lq_level > 0)
-       {
-         float want = cnf->lq_wsize * io->hello_params.emission_interval;
- 
-         if (io->hello_params.validity_time < want)
-         {
-           io->hello_params.validity_time = want;
- 
-           fprintf(stderr,
-                   "WARNING: %s HELLO validity time set to %.1f seconds!\n",
-                   in->name, want);
-         }
-       }
- 
        /* TC interval */
        if(io->tc_params.emission_interval < cnf->pollrate ||
--- 327,330 ----
***************
*** 496,500 ****
  
    io->hello_params.emission_interval = HELLO_INTERVAL;
!   io->hello_params.validity_time = NEIGHB_HOLD_TIME;
    io->tc_params.emission_interval = TC_INTERVAL;
    io->tc_params.validity_time = TOP_HOLD_TIME;
--- 492,496 ----
  
    io->hello_params.emission_interval = HELLO_INTERVAL;
!   io->hello_params.validity_time = -1.0;
    io->tc_params.emission_interval = TC_INTERVAL;
    io->tc_params.validity_time = TOP_HOLD_TIME;