Changeset 1941928beef9f0cad9a9bf2b4b341523aa01bfa5

Timestamp:

01/17/07 17:48:37 (4 years ago)

Author:

hansp <hansp>

git-committer:

hansp <hansp> 1169074117 +0000

git-parent:

[453d0bc5fd6d8bd133e170e04983aa7ed8ecd2e8]

git-author:

hansp <hansp> 1169074117 +0000

Message:

Adapt to FlowIPService changes.

Files:

• test/test-ip-resolver.c (modified) (3 diffs)
• test/test-shunt-simple-tcp.c (modified) (3 diffs)
• test/test-shunt-simple-udp.c (modified) (3 diffs)
• test/test-tcp-io.c (modified) (2 diffs)
• test/test-tls-tcp-io.c (modified) (2 diffs)

test/test-ip-resolver.c

@@ -55 +55 @@
-
-static void
-FlowIPResolver *ip_resolver, GList *addr_list, GList *name_list
+GList *addr_list, GList *name_list, FlowIPResolver *ip_resolver
-{
-  GList *l;
@@ -114 +114 @@
-  ip_resolver = flow_ip_resolver_new ();
-
-  g_signal_connect (ip_resolver, "resolved", (GCallback) resolved, NULL);
-
-  for (i = 0; resolve_names [i]; i++)
-  {
-
+
+
-  }
-
@@ -131 +130 @@
-      test_end (TEST_RESULT_FAILED, "IP address parser failed");
-
-
+
+
-
-    g_object_unref (ip_addr);

test/test-shunt-simple-tcp.c

@@ -181 +181 @@
-    else if (FLOW_IS_IP_SERVICE (object))
-    {
-
-
-
+
+
+
+
+
+
+
+
-      test_print ("Read: Got remote IP service %s:%d.\n", string, flow_ip_service_get_port (FLOW_IP_SERVICE (object)));
+
+      g_object_unref (ip_addr);
-    }
-    else if (!FLOW_IS_EVENT (object))
@@ -380 +387 @@
-{
-  FlowIPService *loopback_service;
+  FlowIPAddr    *ip_addr;
-  gint           i;
-
@@ -414 +422 @@
-
-  loopback_service = flow_ip_service_new ();
-
+
+
+
-  flow_ip_service_set_port (loopback_service, 2533);
+  flow_ip_service_add_address (loopback_service, ip_addr);
+
+  g_object_unref (ip_addr);
-
-  listener_shunt = flow_open_tcp_listener (loopback_service);

test/test-shunt-simple-udp.c

@@ -186 +186 @@
-    {
-      FlowIPService *ip_service = FLOW_IP_SERVICE (object);
+      FlowIPAddr    *ip_addr;
-      gchar         *addr_str;
-
-
+
+
+
+
+
-      test_print ("Read: Got source address %s:%d\n", addr_str, flow_ip_service_get_port (ip_service));
-      g_free (addr_str);
+
+      g_object_unref (ip_addr);
-    }
-    else if (!FLOW_IS_EVENT (object))
@@ -322 +329 @@
-test_run (void)
-{
-
+
+
-
-  g_random_set_seed (time (NULL));
@@ -356 +364 @@
-
-  sender_service = flow_ip_service_new ();
-
+
+
-  flow_ip_service_set_port (sender_service, 2533);
+  flow_ip_service_add_address (sender_service, ip_addr);
+  g_object_unref (ip_addr);
-
-  recipient_service = flow_ip_service_new ();
-
+
+
-  flow_ip_service_set_port (recipient_service, 2534);
+  flow_ip_service_add_address (recipient_service, ip_addr);
+  g_object_unref (ip_addr);
-
-  sender_shunt = flow_open_udp_port (sender_service);

test/test-tcp-io.c

@@ -332 +332 @@
-test_run (void)
-{
-
+
+
-
-  g_random_set_seed (time (NULL));
@@ -360 +361 @@
-
-  loopback_service = flow_ip_service_new ();
-
+
+
-  flow_ip_service_set_port (loopback_service, 2533);
+  flow_ip_service_add_address (loopback_service, ip_addr);
+  g_object_unref (ip_addr);
-
-  bad_loopback_service = flow_ip_service_new ();
-
+
+
-  flow_ip_service_set_port (bad_loopback_service, 12505);
+  flow_ip_service_add_address (bad_loopback_service, ip_addr);
+  g_object_unref (ip_addr);
-
-  tcp_listener = flow_tcp_io_listener_new ();

test/test-tls-tcp-io.c

@@ -390 +390 @@
-test_run (void)
-{
-
+
+
-
-  g_random_set_seed (time (NULL));
@@ -418 +419 @@
-
-  loopback_service = flow_ip_service_new ();
-
+
+
-  flow_ip_service_set_port (loopback_service, 2533);
+  flow_ip_service_add_address (loopback_service, ip_addr);
+  g_object_unref (ip_addr);
-
-  bad_loopback_service = flow_ip_service_new ();
-
+
+
-  flow_ip_service_set_port (bad_loopback_service, 12505);
+  flow_ip_service_add_address (bad_loopback_service, ip_addr);
+  g_object_unref (ip_addr);
-
-  tls_tcp_listener = flow_tls_tcp_io_listener_new ();