Merge branch 'niit' into tunnel
authorHenning Rogge <hrogge@googlemail.com>
Wed, 13 Jan 2010 15:39:38 +0000 (16:39 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Wed, 13 Jan 2010 15:39:38 +0000 (16:39 +0100)
1  2 
src/cfgparser/olsrd_conf.c
src/cfgparser/oparse.y
src/linux/kernel_routes.c
src/main.c
src/olsr_cfg.h

Simple merge
Simple merge
Simple merge
diff --cc src/main.c
Simple merge
diff --cc src/olsr_cfg.h
@@@ -250,20 -249,9 +249,20 @@@ struct olsrd_config 
  
    char *lock_file;
  
-   char *niit_if;
+   bool use_niit;
    int niit_if_index;
  
 +  /*many potential parameters or helper variables for smartgateway*/
 +  bool smart_gateway_active;
 +  uint32_t smart_gateway_uplink;
 +  uint32_t smart_gateway_downlink;
 +  struct interface ipip_base_if;
 +  int ipip_if_index;
 +  bool ipip_if_up;
 +  bool ipip_base_orig_down;
 +  unsigned long int ipip_remote_address;
 +  const char *ipip_name;
 +
    int ioctl_s;                         /* Socket used for ioctl calls */
  #if LINUX_POLICY_ROUTING
    int rtnl_s;                          /* Socket used for rtnetlink messages */