aboutsummaryrefslogtreecommitdiff
path: root/src/util/test_client.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-08-15 21:46:35 +0000
committerChristian Grothoff <christian@grothoff.org>2011-08-15 21:46:35 +0000
commit502af2167f7c218366666ca4944bd7cc54b5b19a (patch)
treea91fec5cc9769d260640bd91c6633cb9cf395524 /src/util/test_client.c
parent03af5a603b7cc53432249d5854cd412aa90dde0d (diff)
downloadgnunet-502af2167f7c218366666ca4944bd7cc54b5b19a.tar.gz
gnunet-502af2167f7c218366666ca4944bd7cc54b5b19a.zip
indentation
Diffstat (limited to 'src/util/test_client.c')
-rw-r--r--src/util/test_client.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/util/test_client.c b/src/util/test_client.c
index 3851744c2..9c2abb016 100644
--- a/src/util/test_client.c
+++ b/src/util/test_client.c
@@ -79,8 +79,7 @@ echo_cb (void *cls,
79 79
80 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 80 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
81 "Receiving message from client, bouncing back\n"); 81 "Receiving message from client, bouncing back\n");
82 GNUNET_assert (sizeof (struct GNUNET_MessageHeader) == 82 GNUNET_assert (sizeof (struct GNUNET_MessageHeader) == ntohs (message->size));
83 ntohs (message->size));
84 cc = GNUNET_malloc (sizeof (struct CopyContext)); 83 cc = GNUNET_malloc (sizeof (struct CopyContext));
85 cc->client = client; 84 cc->client = client;
86 cpy = GNUNET_malloc (ntohs (message->size)); 85 cpy = GNUNET_malloc (ntohs (message->size));
@@ -107,12 +106,10 @@ recv_bounce (void *cls, const struct GNUNET_MessageHeader *got)
107 struct GNUNET_MessageHeader msg; 106 struct GNUNET_MessageHeader msg;
108 107
109 GNUNET_assert (got != NULL); /* timeout */ 108 GNUNET_assert (got != NULL); /* timeout */
110 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 109 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving bounce, checking content\n");
111 "Receiving bounce, checking content\n");
112 msg.type = htons (MY_TYPE); 110 msg.type = htons (MY_TYPE);
113 msg.size = htons (sizeof (struct GNUNET_MessageHeader)); 111 msg.size = htons (sizeof (struct GNUNET_MessageHeader));
114 GNUNET_assert (0 == 112 GNUNET_assert (0 == memcmp (got, &msg, sizeof (struct GNUNET_MessageHeader)));
115 memcmp (got, &msg, sizeof (struct GNUNET_MessageHeader)));
116 GNUNET_CLIENT_disconnect (client, GNUNET_YES); 113 GNUNET_CLIENT_disconnect (client, GNUNET_YES);
117 client = NULL; 114 client = NULL;
118 GNUNET_SERVER_destroy (server); 115 GNUNET_SERVER_destroy (server);
@@ -125,6 +122,7 @@ static size_t
125make_msg (void *cls, size_t size, void *buf) 122make_msg (void *cls, size_t size, void *buf)
126{ 123{
127 struct GNUNET_MessageHeader *msg = buf; 124 struct GNUNET_MessageHeader *msg = buf;
125
128 GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader)); 126 GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader));
129 msg->type = htons (MY_TYPE); 127 msg->type = htons (MY_TYPE);
130 msg->size = htons (sizeof (struct GNUNET_MessageHeader)); 128 msg->size = htons (sizeof (struct GNUNET_MessageHeader));
@@ -137,10 +135,10 @@ static void
137task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 135task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
138{ 136{
139 struct sockaddr_in sa; 137 struct sockaddr_in sa;
140 struct sockaddr * sap[2]; 138 struct sockaddr *sap[2];
141 socklen_t slens[2]; 139 socklen_t slens[2];
142 140
143 sap[0] = (struct sockaddr*) &sa; 141 sap[0] = (struct sockaddr *) &sa;
144 slens[0] = sizeof (sa); 142 slens[0] = sizeof (sa);
145 sap[1] = NULL; 143 sap[1] = NULL;
146 slens[1] = 0; 144 slens[1] = 0;
@@ -153,7 +151,7 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
153 server = GNUNET_SERVER_create (NULL, 151 server = GNUNET_SERVER_create (NULL,
154 NULL, 152 NULL,
155 sap, 153 sap,
156 slens, 154 slens,
157 GNUNET_TIME_relative_multiply 155 GNUNET_TIME_relative_multiply
158 (GNUNET_TIME_UNIT_MILLISECONDS, 10000), 156 (GNUNET_TIME_UNIT_MILLISECONDS, 10000),
159 GNUNET_NO); 157 GNUNET_NO);
@@ -187,8 +185,7 @@ check ()
187 185
188 cfg = GNUNET_CONFIGURATION_create (); 186 cfg = GNUNET_CONFIGURATION_create ();
189 GNUNET_CONFIGURATION_set_value_number (cfg, MYNAME, "PORT", PORT); 187 GNUNET_CONFIGURATION_set_value_number (cfg, MYNAME, "PORT", PORT);
190 GNUNET_CONFIGURATION_set_value_string (cfg, 188 GNUNET_CONFIGURATION_set_value_string (cfg, MYNAME, "HOSTNAME", "localhost");
191 MYNAME, "HOSTNAME", "localhost");
192 GNUNET_CONFIGURATION_set_value_string (cfg, 189 GNUNET_CONFIGURATION_set_value_string (cfg,
193 "resolver", "HOSTNAME", "localhost"); 190 "resolver", "HOSTNAME", "localhost");
194 ok = 1; 191 ok = 1;