* Server transmit context
*/
struct GNUNET_SERVER_TransmitContext *tc;
-
+
/**
* Include friend only HELLOs GNUNET_YES or _NO
*/
* addresses. Removes the file if one the HELLO is mal-formed. If all
* addresses are expired, the HELLO is also removed (but the HELLO
* with the public key is still returned if it was found and valid).
- *
+ *
* The file can contain multiple HELLO messages, but onlu a public and a friend only
* HELLO should be included
*
* @param fn name of the file
- * @param unlink_garbage if GNUNET_YES, try to remove useless files
+ * @param unlink_garbage if #GNUNET_YES, try to remove useless files
* @param r ReadHostFileContext to store the resutl
*/
static void
-read_host_file (const char *fn, int unlink_garbage, struct ReadHostFileContext *r)
+read_host_file (const char *fn,
+ int unlink_garbage,
+ struct ReadHostFileContext *r)
{
char buffer[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1] GNUNET_ALIGN;
unsigned int size_total;
r->hello = NULL;
if (GNUNET_YES != GNUNET_DISK_file_test (fn))
- {
return;
- }
-
size_total = GNUNET_DISK_fn_read (fn, buffer, sizeof (buffer));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Read %u bytes from `%s'\n", size_total, fn);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Read %u bytes from `%s'\n",
+ size_total,
+ fn);
if (size_total < sizeof (struct GNUNET_MessageHeader))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Failed to parse HELLO in file `%s': %s\n"),
fn, "Fail has invalid size");
- if ( (GNUNET_YES == unlink_garbage) &&
+ if ( (GNUNET_YES == unlink_garbage) &&
(0 != UNLINK (fn)) &&
(ENOENT != errno) )
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", fn);
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+ "unlink",
+ fn);
return;
}
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Failed to parse HELLO in file `%s': %s %u \n"),
- fn, "HELLO is invalid and has size of ", size_hello);
- if ((GNUNET_YES == unlink_garbage) &&
+ fn,
+ "HELLO is invalid and has size of ",
+ size_hello);
+ if ((GNUNET_YES == unlink_garbage) &&
(0 != UNLINK (fn)) &&
(ENOENT != errno) )
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", fn);
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+ "unlink",
+ fn);
return;
}
-
+
now = GNUNET_TIME_absolute_get ();
hello_clean = GNUNET_HELLO_iterate_addresses (hello, GNUNET_YES,
&discard_expired, &now);
left = 0;
(void) GNUNET_HELLO_iterate_addresses (hello_clean, GNUNET_NO,
&count_addresses, &left);
-
+
if (0 == left)
{
GNUNET_free (hello_clean);
break;
}
-
+
if (GNUNET_NO == GNUNET_HELLO_is_friend_only (hello_clean))
{
if (NULL == r->hello)
if (0 == left)
{
/* no addresses left, remove from disk */
- if ((GNUNET_YES == unlink_garbage) && (0 != UNLINK (fn)))
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", fn);
+ if ( (GNUNET_YES == unlink_garbage) &&
+ (0 != UNLINK (fn)) )
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+ "unlink",
+ fn);
}
-
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Found `%s' and `%s' HELLO message in file\n",
(NULL != r->hello) ? "public" : "NO public",
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding new peer `%s'\n", GNUNET_i2s (identity));
GNUNET_STATISTICS_update (stats, gettext_noop ("# peers known"), 1,
GNUNET_NO);
- entry = GNUNET_malloc (sizeof (struct HostEntry));
+ entry = GNUNET_new (struct HostEntry);
entry->identity = *identity;
- GNUNET_CONTAINER_multipeermap_put (hostmap, &entry->identity, entry,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multipeermap_put (hostmap, &entry->identity, entry,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
notify_all (entry);
fn = get_host_filename (identity);
if (NULL != fn)
* GNUNET_YES if we should remove files that are broken,
* GNUNET_NO if the directory we are iterating over should
* be treated as read-only by us.
- */
+ */
int remove_files;
/**
filename = strrchr (fullname, DIR_SEPARATOR);
if ((NULL == filename) || (1 > strlen (filename)))
- filename = fullname;
+ filename = fullname;
else
filename ++;
read_host_file (fullname, dsc->remove_files, &r);
if ( (NULL == r.hello) && (NULL == r.friend_only_hello))
- {
- if (GNUNET_YES == dsc->remove_files)
- remove_garbage (fullname);
return GNUNET_OK;
- }
-
if (NULL != r.friend_only_hello)
{
if (GNUNET_OK != GNUNET_HELLO_get_id (r.friend_only_hello, &id_friend))
}
id = id_public;
}
-
+
if ( (NULL != r.hello) && (NULL != r.friend_only_hello) &&
(0 != memcmp (&id_friend, &id_public, sizeof (id_friend))) )
{
remove_garbage (fullname);
return GNUNET_OK;
}
- if (GNUNET_OK == GNUNET_CRYPTO_ecc_public_sign_key_from_string (filename,
+ if (GNUNET_OK == GNUNET_CRYPTO_eddsa_public_key_from_string (filename,
strlen (filename),
&identity.public_key))
{
if ((0 == dsc.matched) && (0 == (++retries & 31)))
GNUNET_log (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
_("Still no peers found in `%s'!\n"), networkIdDirectory);
- GNUNET_SCHEDULER_add_delayed_with_priority (DATA_HOST_FREQ,
+ GNUNET_SCHEDULER_add_delayed_with_priority (DATA_HOST_FREQ,
GNUNET_SCHEDULER_PRIORITY_IDLE,
&cron_scan_directory_data_hosts,
NULL);
{
struct GNUNET_HELLO_Message * res;
struct GNUNET_HELLO_Message * tmp;
- struct GNUNET_CRYPTO_EccPublicSignKey pk;
-
+ struct GNUNET_CRYPTO_EddsaPublicKey pk;
+
if (NULL != friend_hello)
{
res = GNUNET_HELLO_merge (hello, friend_hello);
GNUNET_assert (GNUNET_YES == GNUNET_HELLO_is_friend_only (res));
return res;
}
-
+
if (GNUNET_OK !=
GNUNET_HELLO_get_key (hello, &pk))
{
store_friend_hello = GNUNET_YES;
size += GNUNET_HELLO_size (host->friend_only_hello);
}
-
+
if ((GNUNET_NO == store_hello) && (GNUNET_NO == store_friend_hello))
{
/* no valid addresses, don't put HELLO on disk; in fact,
{
buffer = GNUNET_malloc (size);
pos = 0;
-
+
if (GNUNET_YES == store_hello)
{
memcpy (buffer, host->hello, GNUNET_HELLO_size (host->hello));
pos += GNUNET_HELLO_size (host->friend_only_hello);
}
GNUNET_assert (pos == size);
-
+
if (GNUNET_SYSERR == GNUNET_DISK_fn_write (fn, buffer, size,
GNUNET_DISK_PERM_USER_READ |
GNUNET_DISK_PERM_USER_WRITE |
GNUNET_assert (hs < GNUNET_SERVER_MAX_MESSAGE_SIZE -
sizeof (struct InfoMessage));
memcpy (&im[1], pos->friend_only_hello, hs);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Sending friend-only HELLO with size %u for peer `%4s'\n",
hs, GNUNET_i2s (key));
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Adding no HELLO for peer `%s'\n",
GNUNET_i2s (key));
}
/* We have no public hello */
return GNUNET_YES;
}
-
- if ( (NULL == he->friend_only_hello) &&
+
+ if ( (NULL == he->friend_only_hello) &&
(GNUNET_YES == nc->include_friend_only) )
{
/* We have no friend hello */
return GNUNET_YES;
}
-
+
msg = make_info_message (he, nc->include_friend_only);
GNUNET_SERVER_notification_context_unicast (notify_list,
nc->client,
struct NotifyMessage *nm = (struct NotifyMessage *) message;
struct NotificationContext *nc;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "`%s' message received\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "`%s' message received\n",
"NOTIFY");
nc = GNUNET_malloc (sizeof (struct NotificationContext));
nc->client = client;
nc->include_friend_only = ntohl (nm->include_friend_only);
-
+
GNUNET_CONTAINER_DLL_insert (nc_head, nc_tail, nc);
GNUNET_SERVER_client_mark_monitor (client);
GNUNET_SERVER_notification_context_add (notify_list, client);
* @param cls unused
* @param client server client
*/
-static void
+static void
disconnect_cb (void *cls,struct GNUNET_SERVER_Client *client)
{
struct NotificationContext *cur;
GNUNET_SCHEDULER_shutdown ();
return;
}
-
+
GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
&cron_scan_directory_data_hosts, NULL);
projects / oweals / gnunet.git / blobdiff