diff options
Diffstat (limited to 'src/social/gnunet-service-social.c')
-rw-r--r-- | src/social/gnunet-service-social.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/social/gnunet-service-social.c b/src/social/gnunet-service-social.c index f888564dc..4541a4e06 100644 --- a/src/social/gnunet-service-social.c +++ b/src/social/gnunet-service-social.c | |||
@@ -501,7 +501,7 @@ cleanup_host (struct Host *hst) | |||
501 | static void | 501 | static void |
502 | cleanup_guest (struct Guest *gst) | 502 | cleanup_guest (struct Guest *gst) |
503 | { | 503 | { |
504 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 504 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
505 | "cleanup_guest, gst = %p\n", | 505 | "cleanup_guest, gst = %p\n", |
506 | gst); | 506 | gst); |
507 | struct Place *plc = &gst->place; | 507 | struct Place *plc = &gst->place; |
@@ -539,7 +539,7 @@ cleanup_place (void *cls) | |||
539 | { | 539 | { |
540 | struct Place *plc = cls; | 540 | struct Place *plc = cls; |
541 | 541 | ||
542 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 542 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
543 | "%p Cleaning up place %s\n", | 543 | "%p Cleaning up place %s\n", |
544 | plc, GNUNET_h2s (&plc->pub_key_hash)); | 544 | plc, GNUNET_h2s (&plc->pub_key_hash)); |
545 | 545 | ||
@@ -1478,7 +1478,7 @@ app_notify_place_end (struct GNUNET_SERVICE_Client *client) | |||
1478 | void | 1478 | void |
1479 | app_notify_ego (struct Ego *ego, struct GNUNET_SERVICE_Client *client) | 1479 | app_notify_ego (struct Ego *ego, struct GNUNET_SERVICE_Client *client) |
1480 | { | 1480 | { |
1481 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 1481 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
1482 | "%p Sending ego notification to client: %s\n", | 1482 | "%p Sending ego notification to client: %s\n", |
1483 | client, ego->name); | 1483 | client, ego->name); |
1484 | 1484 | ||
@@ -1513,7 +1513,7 @@ app_notify_ego_end (struct GNUNET_SERVICE_Client *client) | |||
1513 | int | 1513 | int |
1514 | app_place_entry_notify (void *cls, const struct GNUNET_HashCode *key, void *value) | 1514 | app_place_entry_notify (void *cls, const struct GNUNET_HashCode *key, void *value) |
1515 | { | 1515 | { |
1516 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 1516 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
1517 | "app_place_entry_notify\n"); | 1517 | "app_place_entry_notify\n"); |
1518 | struct GNUNET_MessageHeader * | 1518 | struct GNUNET_MessageHeader * |
1519 | msg = GNUNET_CONTAINER_multihashmap_get (places, key); | 1519 | msg = GNUNET_CONTAINER_multihashmap_get (places, key); |
@@ -1648,7 +1648,7 @@ handle_client_host_enter (void *cls, | |||
1648 | struct HostEnterRequest * | 1648 | struct HostEnterRequest * |
1649 | hreq = (struct HostEnterRequest *) GNUNET_copy_message (&hr->header); | 1649 | hreq = (struct HostEnterRequest *) GNUNET_copy_message (&hr->header); |
1650 | 1650 | ||
1651 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 1651 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
1652 | "handle_client_host_enter\n"); | 1652 | "handle_client_host_enter\n"); |
1653 | 1653 | ||
1654 | uint8_t app_id_size = ntohs (hreq->header.size) - sizeof (*hreq); | 1654 | uint8_t app_id_size = ntohs (hreq->header.size) - sizeof (*hreq); |
@@ -1705,7 +1705,7 @@ handle_client_host_enter (void *cls, | |||
1705 | if (ret != GNUNET_SYSERR) | 1705 | if (ret != GNUNET_SYSERR) |
1706 | { | 1706 | { |
1707 | 1707 | ||
1708 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 1708 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
1709 | "%p Client connected as host to place %s.\n", | 1709 | "%p Client connected as host to place %s.\n", |
1710 | hst, GNUNET_h2s (&plc->pub_key_hash)); | 1710 | hst, GNUNET_h2s (&plc->pub_key_hash)); |
1711 | 1711 | ||
@@ -1767,7 +1767,7 @@ guest_enter (const struct GuestEnterRequest *greq, struct Guest **ret_gst) | |||
1767 | if (NULL != plc_gst) | 1767 | if (NULL != plc_gst) |
1768 | gst = GNUNET_CONTAINER_multihashmap_get (plc_gst, &ego_pub_hash); | 1768 | gst = GNUNET_CONTAINER_multihashmap_get (plc_gst, &ego_pub_hash); |
1769 | 1769 | ||
1770 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 1770 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
1771 | "guest enter, gst = %p\n", | 1771 | "guest enter, gst = %p\n", |
1772 | gst); | 1772 | gst); |
1773 | 1773 | ||
@@ -1808,7 +1808,7 @@ guest_enter (const struct GuestEnterRequest *greq, struct Guest **ret_gst) | |||
1808 | struct GNUNET_PSYC_Message *join_msg = NULL; | 1808 | struct GNUNET_PSYC_Message *join_msg = NULL; |
1809 | uint16_t join_msg_size = 0; | 1809 | uint16_t join_msg_size = 0; |
1810 | 1810 | ||
1811 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 1811 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
1812 | "guest_enter 2\n"); | 1812 | "guest_enter 2\n"); |
1813 | 1813 | ||
1814 | if (sizeof (struct GNUNET_MessageHeader) <= remaining) | 1814 | if (sizeof (struct GNUNET_MessageHeader) <= remaining) |
@@ -1850,14 +1850,14 @@ guest_enter (const struct GuestEnterRequest *greq, struct Guest **ret_gst) | |||
1850 | (void) GNUNET_CONTAINER_multihashmap_put (place_guests, &plc->pub_key_hash, plc_gst, | 1850 | (void) GNUNET_CONTAINER_multihashmap_put (place_guests, &plc->pub_key_hash, plc_gst, |
1851 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); | 1851 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); |
1852 | } | 1852 | } |
1853 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 1853 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
1854 | "Adding guest %p\n", | 1854 | "Adding guest %p\n", |
1855 | gst); | 1855 | gst); |
1856 | (void) GNUNET_CONTAINER_multihashmap_put (plc_gst, &plc->ego_pub_hash, gst, | 1856 | (void) GNUNET_CONTAINER_multihashmap_put (plc_gst, &plc->ego_pub_hash, gst, |
1857 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); | 1857 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); |
1858 | (void) GNUNET_CONTAINER_multihashmap_put (guests, &plc->pub_key_hash, gst, | 1858 | (void) GNUNET_CONTAINER_multihashmap_put (guests, &plc->pub_key_hash, gst, |
1859 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); | 1859 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); |
1860 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 1860 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
1861 | "GNUNET_PSYC_slave_join\n"); | 1861 | "GNUNET_PSYC_slave_join\n"); |
1862 | gst->slave | 1862 | gst->slave |
1863 | = GNUNET_PSYC_slave_join (cfg, &plc->pub_key, &plc->ego_key, | 1863 | = GNUNET_PSYC_slave_join (cfg, &plc->pub_key, &plc->ego_key, |
@@ -1883,7 +1883,7 @@ client_guest_enter (struct Client *c, | |||
1883 | { | 1883 | { |
1884 | struct GNUNET_SERVICE_Client *client = c->client; | 1884 | struct GNUNET_SERVICE_Client *client = c->client; |
1885 | 1885 | ||
1886 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 1886 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
1887 | "handle_client_guest_enter\n"); | 1887 | "handle_client_guest_enter\n"); |
1888 | 1888 | ||
1889 | uint16_t remaining = ntohs (greq->header.size) - sizeof (*greq); | 1889 | uint16_t remaining = ntohs (greq->header.size) - sizeof (*greq); |
@@ -1989,7 +1989,7 @@ gns_result_guest_enter (void *cls, uint32_t rd_count, | |||
1989 | { | 1989 | { |
1990 | struct GuestEnterByNameClosure *gcls = cls; | 1990 | struct GuestEnterByNameClosure *gcls = cls; |
1991 | struct Client *c = gcls->client; | 1991 | struct Client *c = gcls->client; |
1992 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 1992 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
1993 | "%p GNS result: %u records.\n", | 1993 | "%p GNS result: %u records.\n", |
1994 | c, rd_count); | 1994 | c, rd_count); |
1995 | 1995 | ||
@@ -2155,7 +2155,7 @@ handle_client_app_connect (void *cls, | |||
2155 | struct GNUNET_HashCode app_id_hash; | 2155 | struct GNUNET_HashCode app_id_hash; |
2156 | GNUNET_CRYPTO_hash (app_id, app_id_size, &app_id_hash); | 2156 | GNUNET_CRYPTO_hash (app_id, app_id_size, &app_id_hash); |
2157 | 2157 | ||
2158 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 2158 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
2159 | "iterating egos\n"); | 2159 | "iterating egos\n"); |
2160 | GNUNET_CONTAINER_multihashmap_iterate (egos, ego_entry, client); | 2160 | GNUNET_CONTAINER_multihashmap_iterate (egos, ego_entry, client); |
2161 | app_notify_ego_end (client); | 2161 | app_notify_ego_end (client); |
@@ -2225,7 +2225,7 @@ handle_client_place_leave (void *cls, | |||
2225 | struct GNUNET_SERVICE_Client *client = c->client; | 2225 | struct GNUNET_SERVICE_Client *client = c->client; |
2226 | struct Place *plc = c->place; | 2226 | struct Place *plc = c->place; |
2227 | 2227 | ||
2228 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 2228 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
2229 | "handle_client_place_leave\n"); | 2229 | "handle_client_place_leave\n"); |
2230 | 2230 | ||
2231 | if (NULL == plc) | 2231 | if (NULL == plc) |
@@ -3240,7 +3240,7 @@ handle_client_state_get (void *cls, | |||
3240 | uint16_t size = ntohs (req->header.size); | 3240 | uint16_t size = ntohs (req->header.size); |
3241 | const char *name = (const char *) &req[1]; | 3241 | const char *name = (const char *) &req[1]; |
3242 | 3242 | ||
3243 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 3243 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
3244 | "%p State get #%" PRIu64 ": %s\n", | 3244 | "%p State get #%" PRIu64 ": %s\n", |
3245 | plc, GNUNET_ntohll (req->op_id), name); | 3245 | plc, GNUNET_ntohll (req->op_id), name); |
3246 | 3246 | ||
@@ -3293,7 +3293,7 @@ namestore_recv_records_store_result (void *cls, int32_t result, | |||
3293 | struct OperationClosure *opcls = cls; | 3293 | struct OperationClosure *opcls = cls; |
3294 | struct Client *c = opcls->client; | 3294 | struct Client *c = opcls->client; |
3295 | 3295 | ||
3296 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 3296 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
3297 | "namestore_recv_records_store_result\n"); | 3297 | "namestore_recv_records_store_result\n"); |
3298 | // FIXME: client might have been disconnected | 3298 | // FIXME: client might have been disconnected |
3299 | client_send_result (c->client, opcls->op_id, result, err_msg, | 3299 | client_send_result (c->client, opcls->op_id, result, err_msg, |
@@ -3584,7 +3584,7 @@ identity_recv_ego (void *cls, struct GNUNET_IDENTITY_Ego *id_ego, | |||
3584 | if (NULL == id_ego) // end of initial list of egos | 3584 | if (NULL == id_ego) // end of initial list of egos |
3585 | return; | 3585 | return; |
3586 | 3586 | ||
3587 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 3587 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
3588 | "social service received ego %s\n", | 3588 | "social service received ego %s\n", |
3589 | name); | 3589 | name); |
3590 | 3590 | ||
@@ -3636,7 +3636,7 @@ run (void *cls, | |||
3636 | const struct GNUNET_CONFIGURATION_Handle *c, | 3636 | const struct GNUNET_CONFIGURATION_Handle *c, |
3637 | struct GNUNET_SERVICE_Handle *svc) | 3637 | struct GNUNET_SERVICE_Handle *svc) |
3638 | { | 3638 | { |
3639 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 3639 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
3640 | "starting social service\n"); | 3640 | "starting social service\n"); |
3641 | 3641 | ||
3642 | cfg = c; | 3642 | cfg = c; |