--- gvpe/src/conf.C	2008/08/10 01:34:36	1.46
+++ gvpe/src/conf.C	2011/02/15 13:31:23	1.54
@@ -59,7 +59,8 @@
 
 struct configuration conf;
 
-u8 best_protocol (u8 protset)
+u8
+best_protocol (u8 protset)
 {
   if (protset & PROT_IPv4  ) return PROT_IPv4;
   if (protset & PROT_ICMPv4) return PROT_ICMPv4;
@@ -70,7 +71,8 @@
   return 0;
 }
 
-const char *strprotocol (u8 protocol)
+const char *
+strprotocol (u8 protocol)
 {
   if (protocol & PROT_IPv4  ) return "rawip";
   if (protocol & PROT_ICMPv4) return "icmp";
@@ -105,25 +107,6 @@
   return true;
 }
 
-void
-conf_node::print ()
-{
-  printf ("%4d  fe:fd:80:00:0%1x:%02x  %c  %-8.8s  %-10.10s  %s%s%d\n",
-          id,
-          id >> 8, id & 0xff,
-          compress ? 'Y' : 'N',
-          connectmode   == C_ONDEMAND ? "ondemand"
-          : connectmode == C_NEVER    ? "never"
-          : connectmode == C_ALWAYS   ? "always"
-          : connectmode == C_DISABLED ? "disabled"
-          :                             "",
-          nodename,
-          hostname ? hostname : "",
-          hostname ? ":" : "",
-          hostname ? udp_port : 0
-          );
-}
-
 conf_node::~conf_node ()
 {
 #if 0
@@ -142,11 +125,13 @@
 #endif
 }
 
-void configuration::init ()
+void
+configuration::init ()
 {
   memset (this, 0, sizeof (*this));
 
   mtu       = DEFAULT_MTU;
+  nfmark    = 0;
   rekey     = DEFAULT_REKEY;
   keepalive = DEFAULT_KEEPALIVE;
   llevel    = L_INFO;
@@ -179,22 +164,27 @@
   conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
 }
 
-void configuration::cleanup()
+void
+configuration::cleanup ()
 {
   if (rsa_key)
     RSA_free (rsa_key);
 
   rsa_key = 0;
 
-  free (pidfilename);   pidfilename   = 0;
-  free (ifname);        ifname        = 0;
+  free (pidfilename);        pidfilename        = 0;
+  free (ifname);             ifname             = 0;
 #if ENABLE_HTTP_PROXY
-  free (proxy_host);    proxy_host    = 0;
-  free (proxy_auth);    proxy_auth    = 0;
+  free (proxy_host);         proxy_host         = 0;
+  free (proxy_auth);         proxy_auth         = 0;
 #endif
 #if ENABLE_DNS
-  free (dns_forw_host); dns_forw_host = 0;
+  free (dns_forw_host);      dns_forw_host      = 0;
 #endif
+  free (script_if_up);       script_if_up       = 0;
+  free (script_node_up);     script_node_up     = 0;
+  free (script_node_change); script_node_change = 0;
+  free (script_node_down);   script_node_down   = 0;
 }
 
 void
@@ -332,10 +322,14 @@
     conf.keepalive = atoi (val);
   else if (!strcmp (var, "mtu"))
     conf.mtu = atoi (val);
+  else if (!strcmp (var, "nfmark"))
+    conf.nfmark = atoi (val);
   else if (!strcmp (var, "if-up"))
     free (conf.script_if_up), conf.script_if_up = strdup (val);
   else if (!strcmp (var, "node-up"))
     free (conf.script_node_up), conf.script_node_up = strdup (val);
+  else if (!strcmp (var, "node-change"))
+    free (conf.script_node_change), conf.script_node_change = strdup (val);
   else if (!strcmp (var, "node-down"))
     free (conf.script_node_down), conf.script_node_down = strdup (val);
   else if (!strcmp (var, "pid-file"))
@@ -488,7 +482,8 @@
   return 0;
 }
 
-void conf_node::finalise ()
+void
+conf_node::finalise ()
 {
   if (max_queue < 1)
     {
@@ -496,14 +491,15 @@
       max_queue = 1;
     }
 
-  if (routerprio && (connectmode != C_ALWAYS && connectmode != C_DISABLED))
+  if (routerprio > 1 && (connectmode != C_ALWAYS && connectmode != C_DISABLED))
     {
       //slog (L_WARN, _("%s: has non-zero router-priority but either 'never' or 'ondemand' as connectmode, setting it to 'always'."), nodename);
       connectmode = C_ALWAYS;
     }
 }
 
-void configuration_parser::parse_argv ()
+void
+configuration_parser::parse_argv ()
 {
   for (int i = 0; i < argc; ++i)
     {
@@ -620,7 +616,8 @@
     (*i)->finalise ();
 }
 
-char *configuration::config_filename (const char *name, const char *dflt)
+char *
+configuration::config_filename (const char *name, const char *dflt)
 {
   char *fname;
 
@@ -637,6 +634,26 @@
 }
 
 void
+conf_node::print ()
+{
+  printf ("%4d  fe:fd:80:00:0%1x:%02x  %c  %-8.8s  %-10.10s   %02x  %s%s%d\n",
+          id,
+          id >> 8, id & 0xff,
+          compress ? 'Y' : 'N',
+          connectmode   == C_ONDEMAND ? "ondemand"
+          : connectmode == C_NEVER    ? "never"
+          : connectmode == C_ALWAYS   ? "always"
+          : connectmode == C_DISABLED ? "disabled"
+          :                             "",
+          nodename,
+          protocols,
+          hostname ? hostname : "",
+          hostname ? ":" : "",
+          hostname ? udp_port : 0
+          );
+}
+
+void
 configuration::print ()
 {
   printf (_("\nConfiguration\n\n"));
@@ -650,8 +667,8 @@
   printf (_("rsa key size:       %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
   printf ("\n");
 
-  printf ("%4s  %-17s %s %-8.8s  %-10.10s  %s\n",
-          _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
+  printf ("%4s  %-17s %s %-8.8s  %-10.10s  %04s %s\n",
+          _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Prot"), _("Host:Port"));
 
   for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i)
     (*i)->print ();
@@ -671,4 +688,3 @@
   cleanup ();
 }
 
-