--- gvpe/src/conf.C	2011/02/08 23:11:35	1.52
+++ gvpe/src/conf.C	2011/02/15 13:31:23	1.54
@@ -107,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
@@ -193,11 +174,11 @@
 
   free (pidfilename);        pidfilename        = 0;
   free (ifname);             ifname             = 0;
-#if ENABLE_HTTP_PROXY                           
+#if ENABLE_HTTP_PROXY
   free (proxy_host);         proxy_host         = 0;
   free (proxy_auth);         proxy_auth         = 0;
-#endif                                          
-#if ENABLE_DNS                                  
+#endif
+#if ENABLE_DNS
   free (dns_forw_host);      dns_forw_host      = 0;
 #endif
   free (script_if_up);       script_if_up       = 0;
@@ -653,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"));
@@ -666,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 ();