diff options
author | Christian Grothoff <christian@grothoff.org> | 2021-03-06 12:25:58 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2021-03-06 12:25:58 +0100 |
commit | c94699a87444a84734b5b13c2231bc9775a6399a (patch) | |
tree | 8bc999c5e7ee410f58be15503af0f8d53bdb7cf4 /src/social | |
parent | b55bf14f025059239456b8f2676a33e317cb5fc9 (diff) | |
download | gnunet-secushare-c94699a87444a84734b5b13c2231bc9775a6399a.tar.gz gnunet-secushare-c94699a87444a84734b5b13c2231bc9775a6399a.zip |
Tobias Platen wrote:
I took the gnunet-secushare repository which currently does not build.
So I wrote a patch.
Diffstat (limited to 'src/social')
-rw-r--r-- | src/social/gnunet-service-social.c | 7 | ||||
-rw-r--r-- | src/social/gnunet-social.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/social/gnunet-service-social.c b/src/social/gnunet-service-social.c index 6fd2383..c7a40e6 100644 --- a/src/social/gnunet-service-social.c +++ b/src/social/gnunet-service-social.c | |||
@@ -1252,6 +1252,7 @@ static int | |||
1252 | app_place_save (const char *app_id, | 1252 | app_place_save (const char *app_id, |
1253 | const struct PlaceEnterRequest *ereq) | 1253 | const struct PlaceEnterRequest *ereq) |
1254 | { | 1254 | { |
1255 | int ret=0; | ||
1255 | if (GNUNET_SYSERR == app_place_add (app_id, ereq)) | 1256 | if (GNUNET_SYSERR == app_place_add (app_id, ereq)) |
1256 | { | 1257 | { |
1257 | GNUNET_assert (0); | 1258 | GNUNET_assert (0); |
@@ -1696,6 +1697,7 @@ handle_client_host_enter (void *cls, | |||
1696 | if (0 == memcmp (&hreq->place_pub_key, &empty_pub_key, | 1697 | if (0 == memcmp (&hreq->place_pub_key, &empty_pub_key, |
1697 | sizeof (empty_pub_key))) | 1698 | sizeof (empty_pub_key))) |
1698 | { // no public key set: create new private key & save the place | 1699 | { // no public key set: create new private key & save the place |
1700 | #if 0 | ||
1699 | struct GNUNET_CRYPTO_EddsaPrivateKey * | 1701 | struct GNUNET_CRYPTO_EddsaPrivateKey * |
1700 | place_key = GNUNET_CRYPTO_eddsa_key_create (); | 1702 | place_key = GNUNET_CRYPTO_eddsa_key_create (); |
1701 | hreq->place_key = *place_key; | 1703 | hreq->place_key = *place_key; |
@@ -1704,6 +1706,8 @@ handle_client_host_enter (void *cls, | |||
1704 | GNUNET_free (place_key); | 1706 | GNUNET_free (place_key); |
1705 | 1707 | ||
1706 | app_place_save (app_id, (const struct PlaceEnterRequest *) hreq); | 1708 | app_place_save (app_id, (const struct PlaceEnterRequest *) hreq); |
1709 | #endif | ||
1710 | abort(); //FIXME | ||
1707 | } | 1711 | } |
1708 | 1712 | ||
1709 | switch (host_enter (hreq, &hst)) | 1713 | switch (host_enter (hreq, &hst)) |
@@ -3670,7 +3674,8 @@ identity_recv_ego (void *cls, struct GNUNET_IDENTITY_Ego *id_ego, | |||
3670 | { | 3674 | { |
3671 | ego = GNUNET_malloc (sizeof (*ego)); | 3675 | ego = GNUNET_malloc (sizeof (*ego)); |
3672 | } | 3676 | } |
3673 | ego->key = *(GNUNET_IDENTITY_ego_get_private_key (id_ego)); | 3677 | //XXX ego->key = *(GNUNET_IDENTITY_ego_get_private_key (id_ego)); |
3678 | abort(); | ||
3674 | size_t name_size = strlen (name) + 1; | 3679 | size_t name_size = strlen (name) + 1; |
3675 | ego->name = GNUNET_malloc (name_size); | 3680 | ego->name = GNUNET_malloc (name_size); |
3676 | GNUNET_memcpy (ego->name, name, name_size); | 3681 | GNUNET_memcpy (ego->name, name, name_size); |
diff --git a/src/social/gnunet-social.c b/src/social/gnunet-social.c index f934894..8feb8c9 100644 --- a/src/social/gnunet-social.c +++ b/src/social/gnunet-social.c | |||
@@ -1402,7 +1402,7 @@ main (int argc, char *const *argv) | |||
1402 | 1402 | ||
1403 | res = GNUNET_PROGRAM_run (argc, argv, help, usage, options, &run, NULL); | 1403 | res = GNUNET_PROGRAM_run (argc, argv, help, usage, options, &run, NULL); |
1404 | 1404 | ||
1405 | GNUNET_free ((void *) argv); | 1405 | //GNUNET_free ((void *) argv); |
1406 | 1406 | ||
1407 | if (GNUNET_OK == res) | 1407 | if (GNUNET_OK == res) |
1408 | return ret; | 1408 | return ret; |