[GNUnet-SVN] r4957 - GNUnet/src/applications/session

[gnunet]

Author: grothoff
Date: 2007-06-08 14:28:36 -0600 (Fri, 08 Jun 2007)
New Revision: 4957

Modified:
   GNUnet/src/applications/session/connect.c
   GNUnet/src/applications/session/nat-peer.conf
   GNUnet/src/applications/session/sessiontest2.c
   GNUnet/src/applications/session/tcp-peer.conf
Log:
clean up

Modified: GNUnet/src/applications/session/connect.c
===================================================================
--- GNUnet/src/applications/session/connect.c   2007-06-08 20:28:25 UTC (rev 
4956)
+++ GNUnet/src/applications/session/connect.c   2007-06-08 20:28:36 UTC (rev 
4957)
@@ -65,6 +65,8 @@
 
 static int stat_pongSent;
 
+static int stat_pingSent;
+
 /**
  * @brief message for session key exchange.
  */
@@ -523,8 +525,12 @@
         printSKEY(&sk),
         &enc);
 #endif
-  if (stats != NULL)
+  if (stats != NULL) {
+    stats->change(stat_pingSent, 1);
     stats->change(stat_skeySent, 1);
+    /* pong, if present, is accounted for 
+       by caller */
+  }
   if (hello != NULL) {
     coreAPI->sendPlaintext(tsession,
                           (const char*) hello,
@@ -916,6 +922,8 @@
       = stats->create(gettext_noop("# session keys accepted"));
     stat_sessionEstablished
       = stats->create(gettext_noop("# sessions established"));
+    stat_pingSent
+      = stats->create(gettext_noop("# encrypted PING messages sent"));
     stat_pongSent
       = stats->create(gettext_noop("# encrypted PONG messages sent"));
   }

Modified: GNUnet/src/applications/session/nat-peer.conf
===================================================================
--- GNUnet/src/applications/session/nat-peer.conf       2007-06-08 20:28:25 UTC 
(rev 4956)
+++ GNUnet/src/applications/session/nat-peer.conf       2007-06-08 20:28:36 UTC 
(rev 4957)
@@ -8,7 +8,7 @@
 KEEPLOG         = 0
 PIDFILE         = $GNUNETD_HOME/gnunetd.pid
 HOSTS          = $GNUNETD_HOME/data/hosts/
-APPLICATIONS = "advertising"
+APPLICATIONS = "advertising stats"
 TRANSPORTS = "tcp nat"
 
 [LOGGING]

Modified: GNUnet/src/applications/session/sessiontest2.c
===================================================================
--- GNUnet/src/applications/session/sessiontest2.c      2007-06-08 20:28:25 UTC 
(rev 4956)
+++ GNUnet/src/applications/session/sessiontest2.c      2007-06-08 20:28:36 UTC 
(rev 4957)
@@ -194,4 +194,4 @@
   return (ok == 0) ? 1 : 0;
 }
 
-/* end of sessiontest.c */
+/* end of sessiontest2.c */

Modified: GNUnet/src/applications/session/tcp-peer.conf
===================================================================
--- GNUnet/src/applications/session/tcp-peer.conf       2007-06-08 20:28:25 UTC 
(rev 4956)
+++ GNUnet/src/applications/session/tcp-peer.conf       2007-06-08 20:28:36 UTC 
(rev 4957)
@@ -8,7 +8,7 @@
 KEEPLOG         = 0
 PIDFILE         = $GNUNETD_HOME/gnunetd.pid
 HOSTS          = $GNUNETD_HOME/data/hosts/
-APPLICATIONS = "advertising"
+APPLICATIONS = "advertising stats"
 TRANSPORTS = "tcp nat"
 
 [LOGGING]
@@ -20,7 +20,7 @@
 topology = "topology_default"
 
 [NETWORK]
-PORT = 12087
+PORT = 2087
 INTERFACE = eth0
 HELLOEXCHANGE = YES
 TRUSTED = 127.0.0.0/8;