X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-session.c;h=00aac69d7cc2464328cdf95570cefc3254da1edd;hb=c19ce12fca7560d3712d4e1661e06be3592baf75;hp=16fc69bbccd574071c39a966c64fe7e52f3e8d25;hpb=4521c1e7ae5371ab9d639adc617d17fb4e8ded0c;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-session.c b/src/afb-session.c
index 16fc69bb..00aac69d 100644
--- a/src/afb-session.c
+++ b/src/afb-session.c
@@ -26,6 +26,7 @@
 #include <string.h>
 #include <uuid/uuid.h>
 #include <errno.h>
+#include <unistd.h>
 
 #include "afb-session.h"
 #include "afb-hook.h"
@@ -59,7 +60,7 @@ struct cookie
 struct afb_session
 {
 	struct afb_session *next; /**< link to the next */
-	unsigned refcount;      /**< external reference count of the session */
+	unsigned refcount;      /**< count of reference to the session */
 	int timeout;            /**< timeout of the session */
 	time_t expiration;	/**< expiration time of the token */
 	pthread_mutex_t mutex;  /**< mutex of the session */
@@ -106,7 +107,56 @@ static inline time_t time_now()
 static void new_uuid(char uuid[SIZEUUID])
 {
 	uuid_t newuuid;
+
+#if defined(USE_UUID_GENERATE)
 	uuid_generate(newuuid);
+#else
+	struct timespec ts;
+	static uint16_t pid;
+	static uint16_t counter;
+	static char state[32];
+	static struct random_data rdata;
+
+	int32_t x;
+	clock_gettime(CLOCK_MONOTONIC_RAW, &ts);
+	if (pid == 0) {
+		pid = (uint16_t)getpid();
+		counter = (uint16_t)(ts.tv_nsec >> 8);
+		rdata.state = NULL;
+		initstate_r((((unsigned)pid) << 16) + ((unsigned)counter),
+					state, sizeof state, &rdata);
+	}
+	ts.tv_nsec ^= (long)ts.tv_sec;
+	if (++counter == 0)
+		counter = 1;
+
+	newuuid[0] = (char)(ts.tv_nsec >> 24);
+	newuuid[1] = (char)(ts.tv_nsec >> 16);
+	newuuid[2] = (char)(ts.tv_nsec >> 8);
+	newuuid[3] = (char)(ts.tv_nsec);
+
+	newuuid[4] = (char)(pid >> 8);
+	newuuid[5] = (char)(pid);
+
+	random_r(&rdata, &x);
+	newuuid[6] = (char)(((x >> 16) & 0x0f) | 0x40); /* pseudo-random version */
+	newuuid[7] = (char)(x >> 8);
+
+	random_r(&rdata, &x);
+	newuuid[8] = (char)(((x >> 16) & 0x3f) | 0x80); /* variant RFC4122 */
+	newuuid[9] = (char)(x >> 8);
+
+	random_r(&rdata, &x);
+	newuuid[10] = (char)(x >> 16);
+	newuuid[11] = (char)(x >> 8);
+
+	random_r(&rdata, &x);
+	newuuid[12] = (char)(x >> 16);
+	newuuid[13] = (char)(x >> 8);
+
+	newuuid[14] = (char)(counter >> 8);
+	newuuid[15] = (char)(counter);
+#endif
 	uuid_unparse_lower(newuuid, uuid);
 }
 
@@ -524,7 +574,7 @@ int afb_session_check_token (struct afb_session *session, const char *token)
 {
 	int r;
 
-	session_unlock(session);
+	session_lock(session);
 	r = !session->closed
 	  && session->expiration >= NOW
 	  && !(session->token[0] && strcmp (token, session->token));
@@ -535,7 +585,7 @@ int afb_session_check_token (struct afb_session *session, const char *token)
 /* generate a new token and update client context */
 void afb_session_new_token (struct afb_session *session)
 {
-	session_unlock(session);
+	session_lock(session);
 	new_uuid(session->token);
 	session_update_expiration(session, NOW);
 	afb_hook_session_renew(session);