diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-03-17 18:13:55 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-03-17 18:13:55 +0100 |
commit | 17d34d5e094c2f8a90717b07e3a711d6e2c15903 (patch) | |
tree | 777b5323145a5f4d1f044da29a682799008a11d4 /src/hostlist | |
parent | 3391977e3f92a2ebcafc14ea6374aecd580df873 (diff) | |
download | gnunet-17d34d5e094c2f8a90717b07e3a711d6e2c15903.tar.gz gnunet-17d34d5e094c2f8a90717b07e3a711d6e2c15903.zip |
more renamings relating to 'new' service now just being the 'normal' service
Diffstat (limited to 'src/hostlist')
-rw-r--r-- | src/hostlist/gnunet-daemon-hostlist_client.c | 6 | ||||
-rw-r--r-- | src/hostlist/gnunet-daemon-hostlist_server.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/hostlist/gnunet-daemon-hostlist_client.c b/src/hostlist/gnunet-daemon-hostlist_client.c index a973fcc28..207cc4a81 100644 --- a/src/hostlist/gnunet-daemon-hostlist_client.c +++ b/src/hostlist/gnunet-daemon-hostlist_client.c | |||
@@ -350,7 +350,7 @@ callback_download (void *ptr, | |||
350 | size_t nmemb, | 350 | size_t nmemb, |
351 | void *ctx) | 351 | void *ctx) |
352 | { | 352 | { |
353 | static char download_buffer[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1]; | 353 | static char download_buffer[GNUNET_MAX_MESSAGE_SIZE - 1]; |
354 | const char *cbuf = ptr; | 354 | const char *cbuf = ptr; |
355 | const struct GNUNET_MessageHeader *msg; | 355 | const struct GNUNET_MessageHeader *msg; |
356 | struct HelloOffer *ho; | 356 | struct HelloOffer *ho; |
@@ -373,7 +373,7 @@ callback_download (void *ptr, | |||
373 | left = total; | 373 | left = total; |
374 | while ((left > 0) || (download_pos > 0)) | 374 | while ((left > 0) || (download_pos > 0)) |
375 | { | 375 | { |
376 | cpy = GNUNET_MIN (left, GNUNET_SERVER_MAX_MESSAGE_SIZE - 1 - download_pos); | 376 | cpy = GNUNET_MIN (left, GNUNET_MAX_MESSAGE_SIZE - 1 - download_pos); |
377 | GNUNET_memcpy (&download_buffer[download_pos], cbuf, cpy); | 377 | GNUNET_memcpy (&download_buffer[download_pos], cbuf, cpy); |
378 | cbuf += cpy; | 378 | cbuf += cpy; |
379 | download_pos += cpy; | 379 | download_pos += cpy; |
@@ -1042,7 +1042,7 @@ download_hostlist () | |||
1042 | #if 0 | 1042 | #if 0 |
1043 | CURL_EASY_SETOPT (curl, CURLOPT_VERBOSE, 1); | 1043 | CURL_EASY_SETOPT (curl, CURLOPT_VERBOSE, 1); |
1044 | #endif | 1044 | #endif |
1045 | CURL_EASY_SETOPT (curl, CURLOPT_BUFFERSIZE, GNUNET_SERVER_MAX_MESSAGE_SIZE); | 1045 | CURL_EASY_SETOPT (curl, CURLOPT_BUFFERSIZE, GNUNET_MAX_MESSAGE_SIZE); |
1046 | if (0 == strncmp (current_url, "http", 4)) | 1046 | if (0 == strncmp (current_url, "http", 4)) |
1047 | CURL_EASY_SETOPT (curl, CURLOPT_USERAGENT, "GNUnet"); | 1047 | CURL_EASY_SETOPT (curl, CURLOPT_USERAGENT, "GNUnet"); |
1048 | CURL_EASY_SETOPT (curl, CURLOPT_CONNECTTIMEOUT, 60L); | 1048 | CURL_EASY_SETOPT (curl, CURLOPT_CONNECTTIMEOUT, 60L); |
diff --git a/src/hostlist/gnunet-daemon-hostlist_server.c b/src/hostlist/gnunet-daemon-hostlist_server.c index 48c1a5622..3df6f1ef8 100644 --- a/src/hostlist/gnunet-daemon-hostlist_server.c +++ b/src/hostlist/gnunet-daemon-hostlist_server.c | |||
@@ -489,7 +489,7 @@ connect_handler (void *cls, | |||
489 | return NULL; | 489 | return NULL; |
490 | size = strlen (hostlist_uri) + 1; | 490 | size = strlen (hostlist_uri) + 1; |
491 | if (size + sizeof (struct GNUNET_MessageHeader) >= | 491 | if (size + sizeof (struct GNUNET_MessageHeader) >= |
492 | GNUNET_SERVER_MAX_MESSAGE_SIZE) | 492 | GNUNET_MAX_MESSAGE_SIZE) |
493 | { | 493 | { |
494 | GNUNET_break (0); | 494 | GNUNET_break (0); |
495 | return NULL; | 495 | return NULL; |