removes use of printf

[src/app-framework-binder.git] / src / session.c

diff --git a/src/session.c b/src/session.c
index 11f535b..e30688a 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -184,11 +184,13 @@ struct AFB_clientCtx *ctxClientGetForUuid (const char *uuid)
         }
 
        /* mimic old behaviour */
+/*
+TODO remove? not remove?
        if (sessions.initok == NULL)
                return NULL;
-
+*/
        /* check the uuid if given */
-       if (uuid != NULL && 1 + strlen(uuid) >= sizeof clientCtx->uuid)
+       if (uuid != NULL && strlen(uuid) >= sizeof clientCtx->uuid)
                return NULL;
 
        /* returns a new one */
@@ -243,7 +245,7 @@ void ctxClientClose (struct AFB_clientCtx *clientCtx)
 }
 
 // Sample Generic Ping Debug API
-int ctxTokenCheck (struct AFB_clientCtx *clientCtx, const char *token)
+int ctxTokenCheckLen (struct AFB_clientCtx *clientCtx, const char *token, size_t length)
 {
        assert(clientCtx != NULL);
        assert(token != NULL);
@@ -252,13 +254,20 @@ int ctxTokenCheck (struct AFB_clientCtx *clientCtx, const char *token)
        if (ctxStoreTooOld (clientCtx, NOW))
                return 0;
 
-       if (!clientCtx->token[0] || 0 == strcmp (token, clientCtx->token)) {
-               clientCtx->created = 1; /* creates by default */
-               return 1;
-       }
+       if (clientCtx->token[0] && (length >= sizeof(clientCtx->token) || strncmp (token, clientCtx->token, length) || clientCtx->token[length]))
+               return 0;
+
+       clientCtx->created = 1; /* creates by default */
+       return 1;
+}
+
+// Sample Generic Ping Debug API
+int ctxTokenCheck (struct AFB_clientCtx *clientCtx, const char *token)
+{
+       assert(clientCtx != NULL);
+       assert(token != NULL);
 
-       // Token is not valid let move level of assurance to zero and free attached client handle
-       return 0;
+       return ctxTokenCheckLen(clientCtx, token, strlen(token));
 }
 
 // generate a new token and update client context