diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-01-25 20:44:52 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-01-25 20:44:52 +0000 |
commit | 666b34ae2a1cccd8688e55cc4b2edd2ac8e73b5a (patch) | |
tree | ede8eaaaa2a6c0fa28109f6d1fc2127aa8728eb5 /src/vpn | |
parent | dd61bcd68f58de56d7e0d5e8773017af1cebd966 (diff) | |
download | gnunet-666b34ae2a1cccd8688e55cc4b2edd2ac8e73b5a.tar.gz gnunet-666b34ae2a1cccd8688e55cc4b2edd2ac8e73b5a.zip |
-indent
Diffstat (limited to 'src/vpn')
-rw-r--r-- | src/vpn/test_gnunet_vpn.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/vpn/test_gnunet_vpn.c b/src/vpn/test_gnunet_vpn.c index 22d1b8d94..e43cad5d8 100644 --- a/src/vpn/test_gnunet_vpn.c +++ b/src/vpn/test_gnunet_vpn.c | |||
@@ -82,7 +82,7 @@ static struct CBC cbc; | |||
82 | 82 | ||
83 | 83 | ||
84 | static size_t | 84 | static size_t |
85 | copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) | 85 | copy_buffer (void *ptr, size_t size, size_t nmemb, void *ctx) |
86 | { | 86 | { |
87 | struct CBC *cbc = ctx; | 87 | struct CBC *cbc = ctx; |
88 | 88 | ||
@@ -110,10 +110,10 @@ mhd_ahc (void *cls, | |||
110 | if (0 != strcmp ("GET", method)) | 110 | if (0 != strcmp ("GET", method)) |
111 | return MHD_NO; /* unexpected method */ | 111 | return MHD_NO; /* unexpected method */ |
112 | if (&ptr != *unused) | 112 | if (&ptr != *unused) |
113 | { | 113 | { |
114 | *unused = &ptr; | 114 | *unused = &ptr; |
115 | return MHD_YES; | 115 | return MHD_YES; |
116 | } | 116 | } |
117 | *unused = NULL; | 117 | *unused = NULL; |
118 | fprintf (stderr, "MHD sends respose for request to URL `%s'\n", url); | 118 | fprintf (stderr, "MHD sends respose for request to URL `%s'\n", url); |
119 | response = MHD_create_response_from_buffer (strlen (url), | 119 | response = MHD_create_response_from_buffer (strlen (url), |
@@ -283,7 +283,7 @@ allocation_cb (void *cls, | |||
283 | (unsigned int) PORT); | 283 | (unsigned int) PORT); |
284 | curl = curl_easy_init (); | 284 | curl = curl_easy_init (); |
285 | curl_easy_setopt (curl, CURLOPT_URL, url); | 285 | curl_easy_setopt (curl, CURLOPT_URL, url); |
286 | curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, ©Buffer); | 286 | curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, ©_buffer); |
287 | curl_easy_setopt (curl, CURLOPT_WRITEDATA, &cbc); | 287 | curl_easy_setopt (curl, CURLOPT_WRITEDATA, &cbc); |
288 | curl_easy_setopt (curl, CURLOPT_FAILONERROR, 1); | 288 | curl_easy_setopt (curl, CURLOPT_FAILONERROR, 1); |
289 | curl_easy_setopt (curl, CURLOPT_TIMEOUT, 150L); | 289 | curl_easy_setopt (curl, CURLOPT_TIMEOUT, 150L); |
@@ -461,9 +461,10 @@ main (int argc, char *const *argv) | |||
461 | NULL); | 461 | NULL); |
462 | GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, argvx, | 462 | GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, argvx, |
463 | "test_gnunet_vpn", "nohelp", options, &run, NULL); | 463 | "test_gnunet_vpn", "nohelp", options, &run, NULL); |
464 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stopping Peer\n"); | ||
465 | stop_peer (&p1); | 464 | stop_peer (&p1); |
466 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "DONE\n"); | ||
467 | GNUNET_DISK_directory_remove ("/tmp/gnunet-test-vpn"); | 465 | GNUNET_DISK_directory_remove ("/tmp/gnunet-test-vpn"); |
468 | return global_ret; | 466 | return global_ret; |
469 | } | 467 | } |
468 | |||
469 | /* end of test_gnunet_vpn.c */ | ||
470 | |||