[Olsr-cvs] olsrd-current/src interfaces.c, 1.28, 1.29 interfaces.h, 1.32, 1.33 olsr_cfg.h, 1.29, 1.30

[Andreas T�nnesen]

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

Modified Files:
	interfaces.c interfaces.h olsr_cfg.h 
Log Message:
Added new config options NicChgsPollInt and AutoDetectChanges

Index: olsr_cfg.h
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/olsr_cfg.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** olsr_cfg.h	7 Jan 2006 08:16:20 -0000	1.29
--- olsr_cfg.h	17 Apr 2006 18:31:09 -0000	1.30
***************
*** 48,51 ****
--- 48,52 ----
  /* Default valuse not declared in olsr_protocol.h */
  #define DEF_POLLRATE        0.05
+ #define DEF_NICCHGPOLLRT    2.5
  #define DEF_WILL_AUTO       OLSR_TRUE
  #define DEF_ALLOW_NO_INTS   OLSR_TRUE
***************
*** 67,70 ****
--- 68,73 ----
  #define MAX_POLLRATE        10.0
  #define MIN_POLLRATE        0.01
+ #define MAX_NICCHGPOLLRT    100.0
+ #define MIN_NICCHGPOLLRT    1.0
  #define MAX_DEBUGLVL        9
  #define MIN_DEBUGLVL        0
***************
*** 121,124 ****
--- 124,128 ----
    struct olsr_msg_params   hna_params;
    struct olsr_lq_mult      *lq_mult;
+   olsr_bool                autodetect_chg;
  };
  
***************
*** 205,208 ****
--- 209,213 ----
    struct hyst_param        hysteresis_param;
    float                    pollrate;
+   float                    nic_chgs_pollrate;
    olsr_u8_t                tc_redundancy;
    olsr_u8_t                mpr_coverage;

Index: interfaces.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/interfaces.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** interfaces.c	7 Jan 2006 08:16:20 -0000	1.28
--- interfaces.c	17 Apr 2006 18:31:09 -0000	1.29
***************
*** 116,120 ****
    
    /* register network interface update function with scheduler */
!   olsr_register_scheduler_event(&check_interface_updates, NULL, IFCHANGES_POLL_INT, 0, NULL);
  
    return (ifnet == NULL) ? 0 : 1;
--- 116,121 ----
    
    /* register network interface update function with scheduler */
!   olsr_register_scheduler_event(&check_interface_updates, NULL, 
!                                 olsr_cnf->nic_chgs_pollrate, 0, NULL);
  
    return (ifnet == NULL) ? 0 : 1;

Index: interfaces.h
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/interfaces.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** interfaces.h	7 Jan 2006 08:16:20 -0000	1.32
--- interfaces.h	17 Apr 2006 18:31:09 -0000	1.33
***************
*** 155,162 ****
  #define IFCHG_IF_UPDATE        3
  
- /* The rate to poll for interface changes at */
- #define IFCHANGES_POLL_INT     2.5
- 
- 
  /* The interface linked-list */
  extern struct interface *ifnet;
--- 155,158 ----