Changeset 511

Timestamp:

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

Author:

bellmich

Message:

more aggressive configuration checks for http server transport

Files:

• trunk/libsyncml/transports/http_server.c (modified) (1 diff)
• trunk/tests/check_http.c (modified) (2 diffs)

trunk/libsyncml/transports/http_server.c

@@ -249 +249 @@
-        smlAssert(tsp->transport_data);
-        SmlTransportHttpServerEnv *env = tsp->transport_data;   
+
+        if (!tsp->context)
+        {
+                smlErrorSet(error, SML_ERROR_MISCONFIGURATION,
+                        "HTTP server runs only in asynchronous mode. So the context must be set.");
+                goto error_free_env;
+        }
+        if (!env->port)
+        {
+                smlErrorSet(error, SML_ERROR_MISCONFIGURATION,
+                        "The HTTP server needs a port where it has to run.");
+                goto error_free_env;
+        }
-        
-        g_type_init();
-        
-        smlTrace(TRACE_INTERNAL, "config: port %i, url %s", env->port, env->url);
-        
-        smlTrace(TRACE_INTERNAL, "http server uses context %p.", tsp->context);
+
-        if(!env->ssl_key || !env->ssl_cert) {
-
+
+
+
+
-        } else {
-
+
+
+
+
+
+
-        }
-        if (!env->server) {

trunk/tests/check_http.c

@@ -133 +133 @@
-        fail_unless(smlTransportSetConfigOption(tsp, "URL", "/test", &error), NULL);
-        
+        fail_unless(smlTransportRunAsync(tsp, &error), NULL);
+        fail_unless(error == NULL, NULL);
+
-        fail_unless(smlTransportInitialize(tsp, &error), NULL);
-        fail_unless(error == NULL, NULL);
@@ -156 +159 @@
-        fail_unless(error != NULL, NULL);
-        smlErrorDeref(&error);
+
+        fail_unless(smlTransportRunAsync(tsp, &error), NULL);
+        fail_unless(error == NULL, NULL);
-
-        /* The default config of libsoup can be used to setup a valid transport. */