Changeset 492

Timestamp:

07/15/08 12:25:00 (4 months ago)

Author:

bellmich

Message:

centralized session ID generation and made it safe for all situations

Files:

• trunk/libsyncml/sml_manager.c (modified) (2 diffs)
• trunk/libsyncml/sml_manager.h (modified) (1 diff)
• trunk/libsyncml/sml_manager_internals.h (modified) (1 diff)
• trunk/libsyncml/sml_notification.c (modified) (1 diff)

trunk/libsyncml/sml_manager.c

@@ -646 +646 @@
-                        goto error;
-                }
-                
-                if (atoi(smlSessionGetSessionID(session)) > manager->lastSessionID)
-                        manager->lastSessionID = atoi(smlSessionGetSessionID(session));
-        } else {
-
-
-
-
+
-                smlSessionSetSessionID(session, lastid);
-                smlSafeCFree(&lastid);
@@ -1174 +1168 @@
-        manager->localMaxObjSize = size;
-}
+
+char *smlManagerGetNewSessionID(SmlManager *manager)
+{
+        smlTrace(TRACE_ENTRY, "%s(%p)", __func__, manager);
+        smlAssertMsg(manager, "The manager is required to avoid duplicated session IDs.");
+
+        char *sessionString = NULL;
+        while (sessionString == NULL)
+        {
+                /* create random session ID - glib only supports 32 bit random numbers */
+                guint64 sessionID = (((guint64) g_random_int ()) << 32) + g_random_int ();
+                sessionString = g_strdup_printf("%llu", sessionID);
+                smlTrace(TRACE_INTERNAL, "%s: new potential session ID is %llu.", __func__, sessionID);
+                if (smlManagerSessionFind(manager, sessionString))
+                        smlSafeCFree(&sessionString);
+        }
+        smlTrace(TRACE_EXIT, "%s - %s", __func__, sessionString);
+        return sessionString;
+}

trunk/libsyncml/sml_manager.h

@@ -69 +69 @@
-void smlManagerSetLocalMaxObjSize(SmlManager *manager, unsigned int size);
-
+char *smlManagerGetNewSessionID(SmlManager *manager);
+
-#endif //_SML_MANAGER_H

trunk/libsyncml/sml_manager_internals.h

@@ -28 +28 @@
-        
-        GList *sessions;
-        unsigned int lastSessionID;
-        
-        SmlManagerEventCb eventCallback;

trunk/libsyncml/sml_notification.c

@@ -337 +337 @@
-                goto error_free_assm;
-
-
-
+
-        SmlSession *session = smlSessionNew(san->sessionType, san->type, version, SML_PROTOCOL_SYNCML, san->target, source, sessionString, 0, error);
-        if (!session) {