diff options
Diffstat (limited to 'src/util/test_server_with_client_unix.c')
-rw-r--r-- | src/util/test_server_with_client_unix.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/util/test_server_with_client_unix.c b/src/util/test_server_with_client_unix.c index 8e994095d..00df21129 100644 --- a/src/util/test_server_with_client_unix.c +++ b/src/util/test_server_with_client_unix.c | |||
@@ -47,6 +47,7 @@ static void | |||
47 | send_done (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 47 | send_done (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
48 | { | 48 | { |
49 | struct GNUNET_SERVER_Client *argclient = cls; | 49 | struct GNUNET_SERVER_Client *argclient = cls; |
50 | |||
50 | GNUNET_assert (ok == 3); | 51 | GNUNET_assert (ok == 3); |
51 | ok++; | 52 | ok++; |
52 | GNUNET_SERVER_receive_done (argclient, GNUNET_OK); | 53 | GNUNET_SERVER_receive_done (argclient, GNUNET_OK); |
@@ -59,21 +60,21 @@ recv_cb (void *cls, | |||
59 | const struct GNUNET_MessageHeader *message) | 60 | const struct GNUNET_MessageHeader *message) |
60 | { | 61 | { |
61 | switch (ok) | 62 | switch (ok) |
62 | { | 63 | { |
63 | case 2: | 64 | case 2: |
64 | ok++; | 65 | ok++; |
65 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply | 66 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply |
66 | (GNUNET_TIME_UNIT_MILLISECONDS, 50), | 67 | (GNUNET_TIME_UNIT_MILLISECONDS, 50), |
67 | &send_done, argclient); | 68 | &send_done, argclient); |
68 | break; | 69 | break; |
69 | case 4: | 70 | case 4: |
70 | ok++; | 71 | ok++; |
71 | GNUNET_CLIENT_disconnect (client, GNUNET_YES); | 72 | GNUNET_CLIENT_disconnect (client, GNUNET_YES); |
72 | GNUNET_SERVER_receive_done (argclient, GNUNET_OK); | 73 | GNUNET_SERVER_receive_done (argclient, GNUNET_OK); |
73 | break; | 74 | break; |
74 | default: | 75 | default: |
75 | GNUNET_assert (0); | 76 | GNUNET_assert (0); |
76 | } | 77 | } |
77 | 78 | ||
78 | } | 79 | } |
79 | 80 | ||
@@ -134,12 +135,12 @@ static void | |||
134 | task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 135 | task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
135 | { | 136 | { |
136 | struct sockaddr_un un; | 137 | struct sockaddr_un un; |
137 | const char * unixpath = "/tmp/testsock"; | 138 | const char *unixpath = "/tmp/testsock"; |
138 | size_t slen = strlen (unixpath); | 139 | size_t slen = strlen (unixpath); |
139 | struct sockaddr * sap[2]; | 140 | struct sockaddr *sap[2]; |
140 | socklen_t slens[2]; | 141 | socklen_t slens[2]; |
141 | 142 | ||
142 | memset(&un, 0, sizeof(un)); | 143 | memset (&un, 0, sizeof (un)); |
143 | un.sun_family = AF_UNIX; | 144 | un.sun_family = AF_UNIX; |
144 | memcpy (un.sun_path, unixpath, slen); | 145 | memcpy (un.sun_path, unixpath, slen); |
145 | un.sun_path[slen] = '\0'; | 146 | un.sun_path[slen] = '\0'; |
@@ -151,7 +152,7 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
151 | #endif | 152 | #endif |
152 | 153 | ||
153 | 154 | ||
154 | sap[0] = (struct sockaddr*) &un; | 155 | sap[0] = (struct sockaddr *) &un; |
155 | slens[0] = sizeof (un); | 156 | slens[0] = sizeof (un); |
156 | sap[1] = NULL; | 157 | sap[1] = NULL; |
157 | slens[1] = 0; | 158 | slens[1] = 0; |
@@ -168,8 +169,7 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
168 | GNUNET_SERVER_disconnect_notify (server, ¬ify_disconnect, cls); | 169 | GNUNET_SERVER_disconnect_notify (server, ¬ify_disconnect, cls); |
169 | cfg = GNUNET_CONFIGURATION_create (); | 170 | cfg = GNUNET_CONFIGURATION_create (); |
170 | 171 | ||
171 | GNUNET_CONFIGURATION_set_value_string (cfg, "test", "UNIXPATH", | 172 | GNUNET_CONFIGURATION_set_value_string (cfg, "test", "UNIXPATH", unixpath); |
172 | unixpath); | ||
173 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", | 173 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", |
174 | "localhost"); | 174 | "localhost"); |
175 | 175 | ||