[GNUnet-SVN] r4946 - GNUnet/src/applications/pingpong

[gnunet]

Author: grothoff
Date: 2007-06-08 00:45:02 -0600 (Fri, 08 Jun 2007)
New Revision: 4946

Modified:
   GNUnet/src/applications/pingpong/pingpong.c
Log:
more PONG stats

Modified: GNUnet/src/applications/pingpong/pingpong.c
===================================================================
--- GNUnet/src/applications/pingpong/pingpong.c 2007-06-08 06:24:20 UTC (rev 
4945)
+++ GNUnet/src/applications/pingpong/pingpong.c 2007-06-08 06:45:02 UTC (rev 
4946)
@@ -106,6 +106,10 @@
 
 static int stat_pongSent;
 
+static int stat_plaintextPongSent;
+
+static int stat_plaintextPongFailed;
+
 static int stat_plaintextPingSent;
 
 static int stat_ciphertextPingSent;
@@ -184,6 +188,7 @@
   EncName enc;
 #endif
   P2P_pingpong_MESSAGE * pmsg;
+  int ret;
 
   if (ntohs(hmsg->size) != sizeof(P2P_pingpong_MESSAGE) ) {
     GE_LOG(ectx,
@@ -213,12 +218,21 @@
   pmsg->header.type = htons(p2p_PROTO_PONG);
   /* allow using a different transport for sending the reply, the
      transport may have been uni-directional! */
-  if ( (tsession != NULL) &&
-       (OK == coreAPI->sendPlaintext(tsession,
-                                    (char*) pmsg,
-                                    sizeof(P2P_pingpong_MESSAGE))) )
-    return OK;
-  return sendPlaintext(sender, pmsg);
+  ret = SYSERR;
+  if (tsession != NULL)
+    ret = coreAPI->sendPlaintext(tsession,
+                                (char*) pmsg,
+                                sizeof(P2P_pingpong_MESSAGE));
+  if (ret != OK)
+    ret = sendPlaintext(sender, pmsg);
+  if (ret == OK) {
+    if (stats != NULL)
+      stats->change(stat_plaintextPongSent, 1);
+  } else {
+    if (stats != NULL)
+      stats->change(stat_plaintextPongFailed, 1);
+  }
+  return ret;    
 }
 
 /**
@@ -496,6 +510,10 @@
       = stats->create(gettext_noop("# plaintext PING messages sent"));
     stat_ciphertextPingSent
       = stats->create(gettext_noop("# encrypted PING messages sent"));
+    stat_plaintextPongSent
+      = stats->create(gettext_noop("# plaintext PONG messages sent"));
+    stat_plaintextPongFailed
+      = stats->create(gettext_noop("# plaintext PONG transmissions failed"));
 
   }
   pingPongLock = capi->getConnectionModuleLock();