From 942605d24732c5e41ebb36e84a683b6c9563a74b Mon Sep 17 00:00:00 2001
From: gardners <paul@servalproject.org>
Date: Wed, 28 Mar 2012 13:26:14 +1030
Subject: [PATCH] Removed some debugging, improved MDP PING client output.

---
 commandline.c | 13 +++++++------
 overlay_mdp.c |  1 -
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/commandline.c b/commandline.c
index f44b88af..3938115d 100644
--- a/commandline.c
+++ b/commandline.c
@@ -387,11 +387,6 @@ int app_mdp_ping(int argc,char **argv,struct command_line_option *o)
   } else {
     if (mdp.packetTypeAndFlags!=MDP_ADDRLIST) 
       return WHY("MDP Server returned wrong frame type.");
-    fprintf(stderr,"Server returned list of %d local addresses.\n",
-	    mdp.addrlist.frame_sid_count);
-    int i;
-    for(i=0;i<mdp.addrlist.frame_sid_count;i++)
-      fprintf(stderr,"  %s\n",overlay_render_sid(mdp.addrlist.sids[i]));
   }
 
   /* Bind to MDP socket and await confirmation */
@@ -422,7 +417,8 @@ int app_mdp_ping(int argc,char **argv,struct command_line_option *o)
   unsigned int sequence_number=firstSeq;
 
   /* Get SID that we want to ping.
-     XXX - allow lookup of SID prefixes */
+     XXX - allow lookup of SID prefixes and telephone numbers
+     (that would require MDP lookup of phone numbers, which doesn't yet occur) */
   int i;
   unsigned char ping_sid[SID_SIZE];
   if (strcasecmp(sid,"broadcast")) {
@@ -431,6 +427,11 @@ int app_mdp_ping(int argc,char **argv,struct command_line_option *o)
     for(i=0;i<SID_SIZE;i++) ping_sid[i]=0xff;
   }
 
+  /* XXX Eventually we should try to resolve SID to phone number and vice versa */
+  printf("MDP PING %s (%s): 12 data bytes\n",
+	 overlay_render_sid(ping_sid),
+	 overlay_render_sid(ping_sid));
+
   while(1) {
     /* Now send the ping packets */
     mdp.packetTypeAndFlags=MDP_TX|MDP_NOCRYPT|MDP_NOSIGN;
diff --git a/overlay_mdp.c b/overlay_mdp.c
index ac80fe47..ab4b271a 100644
--- a/overlay_mdp.c
+++ b/overlay_mdp.c
@@ -742,7 +742,6 @@ int overlay_mdp_send(overlay_mdp_frame *mdp,int flags,int timeout_ms)
   int ttl=-1;
   if (!overlay_mdp_recv(mdp,&ttl)) {
     /* If all is well, examine result and return error code provided */
-    WHY("Got a reply from server");
     if ((mdp->packetTypeAndFlags&MDP_TYPE_MASK)==MDP_ERROR)
 	return mdp->error.error;
     else