Changeset 168

Timestamp:

05/21/06 15:12:42 (3 years ago)

Author:

abauer

Message:

Removed the allowLatestatus and no pending replies options

Files:

• branches/dev-branch/libsyncml/sml_session.c (modified) (3 diffs)
• branches/dev-branch/libsyncml/sml_session.h (modified) (1 diff)
• branches/dev-branch/libsyncml/sml_session_internals.h (modified) (2 diffs)
• branches/dev-branch/tools/syncml-http-server.c (modified) (5 diffs)
• branches/dev-branch/tools/syncml-obex-client.c (modified) (5 diffs)

branches/dev-branch/libsyncml/sml_session.c

@@ -859 +859 @@
-                                break;
-                        case SML_PARSER_RESULT_STATUS:
-
-
-
+
-                        default:
-                                goto error_free_cmd;
@@ -880 +878 @@
-         * wait here for all open statuses, since they have to be added in the correct order and
-         * the status for the open buffer is obviously last */
- || session->noPendingReplies
+
-                while (1) {
-                        unsigned int cmdRef, msgRef = 0;
@@ -1282 +1280 @@
-}
-
-void smlSessionSetAllowLateStatus(SmlSession *session, SmlBool allow)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %i)", __func__, session, allow);
-        smlAssert(session);
-        
-        session->allowLateStatus = allow;
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-}
-
-void smlSessionSetNoPendingReplies(SmlSession *session, SmlBool set)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %i)", __func__, session, set);
-        smlAssert(session);
-        
-        session->noPendingReplies = set;
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-}
-
-void smlSessionSetSendingLimit(SmlSession *session, unsigned int limit)
-{

branches/dev-branch/libsyncml/sml_session.h

@@ -52 +52 @@
-void smlSessionUseStringTable(SmlSession *session, SmlBool useStringtable);
-void smlSessionUseOnlyReplace(SmlSession *session, SmlBool onlyReplace);
-void smlSessionSetAllowLateStatus(SmlSession *session, SmlBool allow);
-void smlSessionSetNoPendingReplies(SmlSession *session, SmlBool set);
-void smlSessionSetSendingLimit(SmlSession *session, unsigned int limit);
-void smlSessionSetReceivingLimit(SmlSession *session, unsigned int limit);

branches/dev-branch/libsyncml/sml_session_internals.h

@@ -30 +30 @@
-        SmlSessionType sessionType;
-        SmlAssembler *assembler;
-        SmlBool allowLateStatus;
-        SmlBool onlyReplace;
-        
@@ -85 +84 @@
-        
-        SmlBool active;
-        
-        /* If this variable is set to TRUE, the session will suspend before
-         * sending a message, to wait for the replies for the commands from the last
-         * message. Be carefull. If you dont add all replies, the session will of course
-         * wait forever */
-        SmlBool noPendingReplies;
-};
-

branches/dev-branch/tools/syncml-http-server.c

@@ -65 +65 @@
-        fprintf (stderr, "\t\t\tyou can use more than one session\n\n");
-        fprintf (stderr, "[--recvLimit <limit>]\t\t\tLimit the size of the receiving buffer to this size (Needed for some phones)\n\n");
-        fprintf (stderr, "[--allowLateStatus]\t\t\tAllows that a phone can send commands before statuses (Needed for some phones)\n\n");
-        fprintf (stderr, "[--maxObjSize <limit>]\t\t\tThe maximum size of a object that we can receive (Needed for some phones)\n\n");
-        fprintf (stderr, "[--noPendingReplies]\t\t\tRequire that no pending replies are allowed (Needed for some phones)\n\n");
-        fprintf (stderr, "[--dumpinfo]\t\t\tPrint info about the phone at the end which can be sent to the developers\n");
-        fprintf (stderr, "Example: %s --port 9999 --sync vcal /events --sync vcard /addressbook --multi --san\n", name);
@@ -232 +230 @@
-unsigned int recvLimit = 0;
-unsigned int maxObjSize = 0;
-SmlBool lateStatus = FALSE;
-SmlBool noPending = FALSE;
-SmlBool dumpinfo = FALSE;
-SmlProtocolVersion sessionVersion = SML_VERSION_UNKNOWN;
@@ -265 +261 @@
-                        if (maxObjSize)
-                                smlSessionSetReceivingMaxObjSize(session, maxObjSize);
-                        
-                        if (lateStatus)
-                                smlSessionSetAllowLateStatus(session, lateStatus);
-                        
-                        if (noPending)
-                                smlSessionSetNoPendingReplies(session, noPending);
-                        break;
-                case SML_MANAGER_SESSION_FINAL:
@@ -405 +395 @@
-                        i += 2;
-                        continue;
-                } else if (!strcmp (arg, "--allowLateStatus")) {
-                        lateStatus = TRUE;
-                } else if (!strcmp (arg, "--noPendingReplies")) {
-                        noPending = TRUE;
-                } else if (!strcmp (arg, "--dumpinfo")) {
-                        dumpinfo = TRUE;
@@ -566 +552 @@
-                        printf("ReceiveLimit: %i\n", recvLimit);
-                        printf("MaxObjSize: %i\n", maxObjSize);
-                        printf("AllowLateStatus: %s\n", lateStatus ? "yes" : "no");
-                        printf("NoPendingReplies: %s\n", noPending ? "yes" : "no");
-                        printf("Connection used: Obex\n");
-                        printf("\nDatabases:\n");

branches/dev-branch/tools/syncml-obex-client.c

@@ -75 +75 @@
-        fprintf (stderr, "[--recvLimit <limit>]\t\t\tLimit the size of the receiving buffer to this size (Needed for some phones)\n\n");
-        fprintf (stderr, "[--maxObjSize <limit>]\t\t\tThe maximum size of a object that we can receive (Needed for some phones)\n\n");
-        fprintf (stderr, "[--allowLateStatus]\t\t\tAllows that a phone can send commands before statuses (Needed for some phones)\n\n");
-        fprintf (stderr, "[--noPendingReplies]\t\t\tRequire that no pending replies are allowed (Needed for some phones)\n\n");
-        fprintf (stderr, "[--noStringTable]\t\t\tDont use wbxml string tables (Needed for some phones)\n\n");
-        fprintf (stderr, "[--dumpinfo]\t\t\tPrint info about the phone at the end which can be sent to the developers\n");
@@ -248 +246 @@
-unsigned int recvLimit = 0;
-unsigned int maxObjSize = 0;
-SmlBool lateStatus = FALSE;
-SmlBool noPending = FALSE;
-SmlBool dumpinfo = FALSE;
-SmlBool noStringTable = FALSE;
@@ -281 +277 @@
-                        if (maxObjSize)
-                                smlSessionSetReceivingMaxObjSize(session, maxObjSize);
-                        
-                        if (lateStatus)
-                                smlSessionSetAllowLateStatus(session, lateStatus);
-                        
-                        if (noPending)
-                                smlSessionSetNoPendingReplies(session, noPending);
-                                
-                        if (noStringTable)
@@ -501 +491 @@
-                                usage (argv[0], 1);
-                        maxObjSize = atoi(argv[i]);
-                } else if (!strcmp (arg, "--allowLateStatus")) {
-                        lateStatus = TRUE;
-                } else if (!strcmp (arg, "--noPendingReplies")) {
-                        noPending = TRUE;
-                } else if (!strcmp (arg, "--noStringTable")) {
-                        noStringTable = TRUE;
@@ -701 +687 @@
-                        printf("ReceiveLimit: %i\n", recvLimit);
-                        printf("MaxObjSize: %i\n", maxObjSize);
-                        printf("AllowLateStatus: %s\n", lateStatus ? "yes" : "no");
-                        printf("NoPendingReplies: %s\n", noPending ? "yes" : "no");
-                        printf("Connection used: Obex\n");
-                        printf("Identifier: %s\n", identifier);