Add parameters for smart gateway system

diff --git a/src/build_msg.c b/src/build_msg.c
index 5b4725c..c48f506 100644 (file)
--- a/src/build_msg.c
+++ b/src/build_msg.c
@@ -45,6 +45,7 @@
 #include "log.h"
 #include "mantissa.h"
 #include "net_olsr.h"
+#include "gateway.h"
 
 #define BMSG_DBGLVL 5
 
@@ -1048,7 +1049,7 @@ serialize_hna4(struct interface *ifp)
 
     if (olsr_cnf->smart_gateway_active && h->net.prefix_len == 0) {
       /* this is the default route, overwrite it with the smart gateway */
-      ip_addr.v4 = olsr_cnf->smart_gateway_netmask.v4;
+      ip_addr.v4 = smart_gateway_netmask.v4;
     }
     else {
       olsr_prefix_to_netmask(&ip_addr, h->net.prefix_len);
@@ -1142,7 +1143,7 @@ serialize_hna6(struct interface *ifp)
     olsr_prefix_to_netmask(&tmp_netmask, h->net.prefix_len);
     if (olsr_cnf->smart_gateway_active && h->net.prefix_len == 0) {
       /* this is the default gateway, so overwrite it with the smart one */
-      tmp_netmask = olsr_cnf->smart_gateway_netmask;
+      tmp_netmask = smart_gateway_netmask;
     }
     else {
       olsr_prefix_to_netmask(&tmp_netmask, h->net.prefix_len);

diff --git a/src/cfgparser/oparse.y b/src/cfgparser/oparse.y
index 75b91e8..f8df3aa 100644 (file)
--- a/src/cfgparser/oparse.y
+++ b/src/cfgparser/oparse.y
@@ -213,6 +213,8 @@ static int add_ipv6_addr(YYSTYPE ipaddr_arg, YYSTYPE prefixlen_arg)
 %token TOK_MIN_TC_VTIME
 %token TOK_LOCK_FILE
 %token TOK_USE_NIIT
+%token TOK_SMART_GW
+%token TOK_SMART_GW_SPEED
 
 %token TOK_HOSTLABEL
 %token TOK_NETLABEL
@@ -278,6 +280,8 @@ stmt:       idebug
           | amin_tc_vtime
           | alock_file
           | suse_niit
+          | bsmart_gw
+          | ismart_gw_speed
 ;
 
 block:      TOK_HNA4 hna4body
@@ -1119,7 +1123,7 @@ anat_thresh: TOK_LQ_NAT_THRESH TOK_FLOAT
 
 bclear_screen: TOK_CLEAR_SCREEN TOK_BOOLEAN
 {
-  PARSER_DEBUG_PRINTF("Clear screen %s\n", olsr_cnf->clear_screen ? "enabled" : "disabled");
+  PARSER_DEBUG_PRINTF("Clear screen %s\n", $2->boolean ? "enabled" : "disabled");
   olsr_cnf->clear_screen = $2->boolean;
   free($2);
 }
@@ -1133,6 +1137,24 @@ suse_niit: TOK_USE_NIIT TOK_STRING
 }
 ;
 
+bsmart_gw: TOK_SMART_GW TOK_BOOLEAN
+{
+       PARSER_DEBUG_PRINTF("Smart gateway system: %s\n", $2->boolean ? "enabled" : "disabled");
+       olsr_cnf->smart_gateway_active = $2->boolean;
+       free($2);
+}
+;
+
+ismart_gw_speed: TOK_SMART_GW_SPEED TOK_INTEGER TOK_INTEGER
+{
+       PARSER_DEBUG_PRINTF("Smart gateway speed: %u uplink/%u downlink kbit/s\n", $2->integer, $3->integer);
+       olsr_cnf->smart_gateway_uplink = $2->integer;
+       olsr_cnf->smart_gateway_downlink = $3->integer;
+       free($2);
+       free($3);
+}
+;
+
 
 plblock: TOK_PLUGIN TOK_STRING
 {

diff --git a/src/cfgparser/oscan.lex b/src/cfgparser/oscan.lex
index 8bfb4b2..23f2695 100644 (file)
--- a/src/cfgparser/oscan.lex
+++ b/src/cfgparser/oscan.lex
@@ -428,6 +428,16 @@ IPV6ADDR {IPV6PAT1}|{IPV6PAT2}|{IPV6PAT3}|{IPV6PAT4}|{IPV6PAT5}|{IPV6PAT6}|{IPV6
     return TOK_CLEAR_SCREEN;
 }
 
+"SmartGateway" {
+    yylval = NULL;
+    return TOK_SMART_GW;
+}
+
+"SmartGatewaySpeed" {
+    yylval = NULL;
+    return TOK_SMART_GW_SPEED;
+}
+
 "UseNiit" {
     yylval = NULL;
     return TOK_USE_NIIT;

diff --git a/src/gateway.c b/src/gateway.c
index 300eb50..1320b36 100644 (file)
--- a/src/gateway.c
+++ b/src/gateway.c
@@ -15,8 +15,8 @@
 #include "gateway.h"
 
 struct avl_tree gateway_tree;
-
 struct olsr_cookie_info *gw_mem_cookie = NULL;
+union olsr_ip_addr smart_gateway_netmask;
 
 static uint32_t deserialize_gw_speed(uint8_t value) {
   uint32_t speed, exp;
@@ -51,7 +51,7 @@ olsr_init_gateways(void) {
 
   avl_init(&gateway_tree, avl_comp_default);
 
-  memset(&olsr_cnf->smart_gateway_netmask, 0, sizeof(olsr_cnf->smart_gateway_netmask));
+  memset(&smart_gateway_netmask, 0, sizeof(smart_gateway_netmask));
 
   if (olsr_cnf->smart_gateway_active) {
     union olsr_ip_addr gw_net;
@@ -67,7 +67,7 @@ olsr_init_gateways(void) {
       while (ip_prefix_list_remove(&olsr_cnf->hna_entries, &gw_net, prefix));
     }
 
-    ip = (uint8_t *) &olsr_cnf->smart_gateway_netmask;
+    ip = (uint8_t *) &smart_gateway_netmask;
     ip[olsr_cnf->ipsize - 2] = serialize_gw_speed(olsr_cnf->smart_gateway_uplink);
     ip[olsr_cnf->ipsize - 1] = serialize_gw_speed(olsr_cnf->smart_gateway_downlink);
   }

diff --git a/src/gateway.h b/src/gateway.h
index bc42f2e..1a27b6f 100644 (file)
--- a/src/gateway.h
+++ b/src/gateway.h
@@ -41,4 +41,6 @@ void olsr_delete_gateway(union olsr_ip_addr *originator);
 bool olsr_is_smart_gateway(union olsr_ip_addr *net, union olsr_ip_addr *mask);
 void olsr_print_gateway(void);
 
+extern union olsr_ip_addr smart_gateway_netmask;
+
 #endif /* GATEWAY_H_ */

diff --git a/src/olsr.c b/src/olsr.c
index e0fb1ee..5b5d8f1 100644 (file)
--- a/src/olsr.c
+++ b/src/olsr.c
@@ -295,10 +295,8 @@ olsr_init_tables(void)
   /* Initialize HNA set */
   olsr_init_hna_set();
 
-#if 0
-  /* Initialize Layer 1/2 database */
-  olsr_initialize_layer12();
-#endif
+  /* Initialize smart gateways */
+  olsr_init_gateways();
 
   /* Start periodic SPF and RIB recalculation */
   if (olsr_cnf->lq_dinter > 0.0) {

diff --git a/src/olsr_cfg.h b/src/olsr_cfg.h
index 437ce71..f76a4b1 100644 (file)
--- a/src/olsr_cfg.h
+++ b/src/olsr_cfg.h
@@ -256,7 +256,6 @@ struct olsrd_config {
   bool smart_gateway_active;
   uint32_t smart_gateway_uplink;
   uint32_t smart_gateway_downlink;
-  union olsr_ip_addr smart_gateway_netmask;
 
   int ioctl_s;                         /* Socket used for ioctl calls */
 #if LINUX_POLICY_ROUTING