Use the the peer table iterator correctly

[trust_router.git] / gsscon / gsscon_common.c

diff --git a/gsscon/gsscon_common.c b/gsscon/gsscon_common.c
index d3cc833..b8d4fcf 100755 (executable)
--- a/gsscon/gsscon_common.c
+++ b/gsscon/gsscon_common.c
@@ -131,7 +131,10 @@ static int WriteBuffer (int         inSocket,
     if (!err) {
         const char *ptr = inBuffer;
         do {
-            ssize_t count = write (inSocket, ptr, inBufferLength - bytesWritten);
+            ssize_t count;
+
+            count = write (inSocket, ptr, inBufferLength - bytesWritten);
+
             if (count < 0) {
                 /* Try again on EINTR */
                 if (errno != EINTR) { err = errno; }
@@ -142,7 +145,7 @@ static int WriteBuffer (int         inSocket,
         } while (!err && (bytesWritten < inBufferLength));
     } 
     
-    if (err) { gsscon_print_error (err, "WritBuffer failed"); }
+    if (err) { gsscon_print_error (err, "WriteBuffer failed"); }
 
     return err;
 }
@@ -168,15 +171,16 @@ int gsscon_read_token (int      inSocket,
     if (!err) {
        tokenLength = ntohl (tokenLength);
        token = malloc (tokenLength);
-       memset (token, 0, tokenLength); 
+        if (token==NULL) {
+          err=EIO;
+        } else {
+          memset (token, 0, tokenLength); 
         
-       err = ReadBuffer (inSocket, tokenLength, token);
+          err = ReadBuffer (inSocket, tokenLength, token);
+        }
     }
     
     if (!err) {
-        printf ("Read token:\n");
-        PrintBuffer (token, tokenLength);
-        
        *outTokenLength = tokenLength;
         *outTokenValue = token;        
         token = NULL; /* only free on error */
@@ -210,8 +214,9 @@ int gsscon_write_token (int         inSocket,
     }
     
     if (!err) {
-        printf ("Wrote token:\n");
-        PrintBuffer (inTokenValue, inTokenLength);
+    //    printf ("Wrote token:\n");
+    //    PrintBuffer (inTokenValue, inTokenLength);
+
     } else { 
         gsscon_print_error (err, "gsscon_write_token() failed");
     }
@@ -271,8 +276,8 @@ int gsscon_read_encrypted_token (int                  inSocket,
     if (!err) {
         memcpy (unencryptedToken, outputBuffer.value, outputBuffer.length);
         
-        printf ("Unencrypted token:\n");
-        PrintBuffer (unencryptedToken, outputBuffer.length);
+       // printf ("Unencrypted token:\n");
+        // PrintBuffer (unencryptedToken, outputBuffer.length);
         
        *outTokenLength = outputBuffer.length;
         *outTokenValue = unencryptedToken;
@@ -327,8 +332,8 @@ int gsscon_write_encrypted_token (int                 inSocket,
     }
     
     if (!err) {
-        printf ("Unencrypted token:\n");
-        PrintBuffer (inToken, inTokenLength);
+      //  printf ("Unencrypted token:\n");
+      //  PrintBuffer (inToken, inTokenLength);
        err = gsscon_write_token (inSocket, outputBuffer.value, outputBuffer.length);
     }