diff options
Diffstat (limited to 'src/util/test_server_disconnect.c')
-rw-r--r-- | src/util/test_server_disconnect.c | 48 |
1 files changed, 20 insertions, 28 deletions
diff --git a/src/util/test_server_disconnect.c b/src/util/test_server_disconnect.c index 8ab8ef35b..03d57a222 100644 --- a/src/util/test_server_disconnect.c +++ b/src/util/test_server_disconnect.c | |||
@@ -46,8 +46,7 @@ static int ok; | |||
46 | 46 | ||
47 | 47 | ||
48 | static void | 48 | static void |
49 | finish_up (void *cls, | 49 | finish_up (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
50 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
51 | { | 50 | { |
52 | GNUNET_assert (ok == 5); | 51 | GNUNET_assert (ok == 5); |
53 | ok = 0; | 52 | ok = 0; |
@@ -64,8 +63,7 @@ notify_disconnect (void *cls, struct GNUNET_SERVER_Client *clientarg) | |||
64 | return; | 63 | return; |
65 | GNUNET_assert (ok == 4); | 64 | GNUNET_assert (ok == 4); |
66 | ok = 5; | 65 | ok = 5; |
67 | GNUNET_SCHEDULER_add_now (&finish_up, | 66 | GNUNET_SCHEDULER_add_now (&finish_up, NULL); |
68 | NULL); | ||
69 | } | 67 | } |
70 | 68 | ||
71 | 69 | ||
@@ -73,6 +71,7 @@ static void | |||
73 | server_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 71 | server_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
74 | { | 72 | { |
75 | struct GNUNET_SERVER_Client *argclient = cls; | 73 | struct GNUNET_SERVER_Client *argclient = cls; |
74 | |||
76 | GNUNET_assert (ok == 3); | 75 | GNUNET_assert (ok == 3); |
77 | ok = 4; | 76 | ok = 4; |
78 | GNUNET_SERVER_client_disconnect (argclient); | 77 | GNUNET_SERVER_client_disconnect (argclient); |
@@ -89,8 +88,7 @@ recv_cb (void *cls, | |||
89 | ok = 3; | 88 | ok = 3; |
90 | GNUNET_SERVER_client_keep (client); | 89 | GNUNET_SERVER_client_keep (client); |
91 | GNUNET_SCHEDULER_add_now (&server_disconnect, client); | 90 | GNUNET_SCHEDULER_add_now (&server_disconnect, client); |
92 | GNUNET_assert (sizeof (struct GNUNET_MessageHeader) == | 91 | GNUNET_assert (sizeof (struct GNUNET_MessageHeader) == ntohs (message->size)); |
93 | ntohs (message->size)); | ||
94 | GNUNET_assert (MY_TYPE == ntohs (message->type)); | 92 | GNUNET_assert (MY_TYPE == ntohs (message->type)); |
95 | GNUNET_SERVER_receive_done (client, GNUNET_OK); | 93 | GNUNET_SERVER_receive_done (client, GNUNET_OK); |
96 | } | 94 | } |
@@ -103,10 +101,8 @@ static struct GNUNET_SERVER_MessageHandler handlers[] = { | |||
103 | 101 | ||
104 | 102 | ||
105 | static size_t | 103 | static size_t |
106 | transmit_initial_message (void *cls, | 104 | transmit_initial_message (void *cls, size_t size, void *buf) |
107 | size_t size, | 105 | { |
108 | void *buf) | ||
109 | { | ||
110 | struct GNUNET_MessageHeader msg; | 106 | struct GNUNET_MessageHeader msg; |
111 | 107 | ||
112 | GNUNET_assert (ok == 1); | 108 | GNUNET_assert (ok == 1); |
@@ -123,10 +119,10 @@ static void | |||
123 | task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 119 | task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
124 | { | 120 | { |
125 | struct sockaddr_in sa; | 121 | struct sockaddr_in sa; |
126 | struct sockaddr * sap[2]; | 122 | struct sockaddr *sap[2]; |
127 | socklen_t slens[2]; | 123 | socklen_t slens[2]; |
128 | 124 | ||
129 | sap[0] = (struct sockaddr*) &sa; | 125 | sap[0] = (struct sockaddr *) &sa; |
130 | slens[0] = sizeof (sa); | 126 | slens[0] = sizeof (sa); |
131 | sap[1] = NULL; | 127 | sap[1] = NULL; |
132 | slens[1] = 0; | 128 | slens[1] = 0; |
@@ -136,29 +132,25 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
136 | #endif | 132 | #endif |
137 | sa.sin_family = AF_INET; | 133 | sa.sin_family = AF_INET; |
138 | sa.sin_port = htons (PORT); | 134 | sa.sin_port = htons (PORT); |
139 | server = GNUNET_SERVER_create (NULL, | 135 | server = GNUNET_SERVER_create (NULL, NULL, sap, slens, TIMEOUT, GNUNET_NO); |
140 | NULL, | ||
141 | sap, | ||
142 | slens, | ||
143 | TIMEOUT, | ||
144 | GNUNET_NO); | ||
145 | GNUNET_assert (server != NULL); | 136 | GNUNET_assert (server != NULL); |
146 | GNUNET_SERVER_add_handlers (server, handlers); | 137 | GNUNET_SERVER_add_handlers (server, handlers); |
147 | GNUNET_SERVER_disconnect_notify (server, ¬ify_disconnect, NULL); | 138 | GNUNET_SERVER_disconnect_notify (server, ¬ify_disconnect, NULL); |
148 | cfg = GNUNET_CONFIGURATION_create (); | 139 | cfg = GNUNET_CONFIGURATION_create (); |
149 | GNUNET_CONFIGURATION_set_value_number (cfg, "test-server", "PORT", PORT); | 140 | GNUNET_CONFIGURATION_set_value_number (cfg, "test-server", "PORT", PORT); |
150 | GNUNET_CONFIGURATION_set_value_string (cfg, "test-server", "HOSTNAME", "localhost"); | 141 | GNUNET_CONFIGURATION_set_value_string (cfg, "test-server", "HOSTNAME", |
151 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", "localhost"); | 142 | "localhost"); |
152 | cc = GNUNET_CLIENT_connect ("test-server", | 143 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", |
153 | cfg); | 144 | "localhost"); |
145 | cc = GNUNET_CLIENT_connect ("test-server", cfg); | ||
154 | GNUNET_assert (cc != NULL); | 146 | GNUNET_assert (cc != NULL); |
155 | GNUNET_assert (NULL != | 147 | GNUNET_assert (NULL != |
156 | GNUNET_CLIENT_notify_transmit_ready (cc, | 148 | GNUNET_CLIENT_notify_transmit_ready (cc, |
157 | sizeof (struct GNUNET_MessageHeader), | 149 | sizeof (struct |
158 | TIMEOUT, | 150 | GNUNET_MessageHeader), |
159 | GNUNET_YES, | 151 | TIMEOUT, GNUNET_YES, |
160 | &transmit_initial_message, | 152 | &transmit_initial_message, |
161 | NULL)); | 153 | NULL)); |
162 | } | 154 | } |
163 | 155 | ||
164 | 156 | ||