aboutsummaryrefslogtreecommitdiff
path: root/src/chat
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-04-14 20:21:41 +0000
committerChristian Grothoff <christian@grothoff.org>2013-04-14 20:21:41 +0000
commitce52e258a28a17f5c319549fda1b5fbb8f6169a7 (patch)
treea1198190a418df4c35f2ccd19139f4f67e0c240b /src/chat
parentacc6f8a81932a50650ab2aa2d52d6f873f8a2060 (diff)
downloadgnunet-ce52e258a28a17f5c319549fda1b5fbb8f6169a7.tar.gz
gnunet-ce52e258a28a17f5c319549fda1b5fbb8f6169a7.zip
renaming GNUNET_PSEUDONYM_-API to GNUNET_FS_pseudonym-API
Diffstat (limited to 'src/chat')
-rw-r--r--src/chat/chat.c4
-rw-r--r--src/chat/gnunet-chat.c24
2 files changed, 14 insertions, 14 deletions
diff --git a/src/chat/chat.c b/src/chat/chat.c
index cdcf282e2..19f5d0a96 100644
--- a/src/chat/chat.c
+++ b/src/chat/chat.c
@@ -264,7 +264,7 @@ process_result (struct GNUNET_CHAT_Room *room,
264 GNUNET_CRYPTO_hash (&join_msg->public_key, 264 GNUNET_CRYPTO_hash (&join_msg->public_key,
265 sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), 265 sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
266 &pos->id); 266 &pos->id);
267 GNUNET_PSEUDONYM_add (room->cfg, &pos->id, meta); 267 GNUNET_FS_pseudonym_add (room->cfg, &pos->id, meta);
268 pos->next = room->members; 268 pos->next = room->members;
269 room->members = pos; 269 room->members = pos;
270 if (GNUNET_NO == room->is_joined) 270 if (GNUNET_NO == room->is_joined)
@@ -665,7 +665,7 @@ GNUNET_CHAT_join_room (const struct GNUNET_CONFIGURATION_Handle *cfg,
665 GNUNET_CRYPTO_hash (&pub_key, 665 GNUNET_CRYPTO_hash (&pub_key,
666 sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), 666 sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
667 me); 667 me);
668 GNUNET_PSEUDONYM_add (cfg, me, member_info); 668 GNUNET_FS_pseudonym_add (cfg, me, member_info);
669 client = GNUNET_CLIENT_connect ("chat", cfg); 669 client = GNUNET_CLIENT_connect ("chat", cfg);
670 if (NULL == client) 670 if (NULL == client)
671 { 671 {
diff --git a/src/chat/gnunet-chat.c b/src/chat/gnunet-chat.c
index 8e6ba9bc2..f2c7f109a 100644
--- a/src/chat/gnunet-chat.c
+++ b/src/chat/gnunet-chat.c
@@ -125,14 +125,14 @@ receive_cb (void *cls, struct GNUNET_CHAT_Room *room,
125 nick = GNUNET_strdup (_("anonymous")); 125 nick = GNUNET_strdup (_("anonymous"));
126 else 126 else
127 { 127 {
128 if (GNUNET_OK != GNUNET_PSEUDONYM_get_info (cfg, 128 if (GNUNET_OK != GNUNET_FS_pseudonym_get_info (cfg,
129 sender, NULL, NULL, &non_unique_nick, &nick_is_a_dup) 129 sender, NULL, NULL, &non_unique_nick, &nick_is_a_dup)
130 || (nick_is_a_dup == GNUNET_YES)) 130 || (nick_is_a_dup == GNUNET_YES))
131 { 131 {
132 GNUNET_free (non_unique_nick); 132 GNUNET_free (non_unique_nick);
133 non_unique_nick = GNUNET_strdup (_("anonymous")); 133 non_unique_nick = GNUNET_strdup (_("anonymous"));
134 } 134 }
135 nick = GNUNET_PSEUDONYM_name_uniquify (cfg, sender, non_unique_nick, NULL); 135 nick = GNUNET_FS_pseudonym_name_uniquify (cfg, sender, non_unique_nick, NULL);
136 GNUNET_free (non_unique_nick); 136 GNUNET_free (non_unique_nick);
137 } 137 }
138 138
@@ -204,14 +204,14 @@ confirmation_cb (void *cls, struct GNUNET_CHAT_Room *room,
204 char *unique_nick; 204 char *unique_nick;
205 int nick_is_a_dup; 205 int nick_is_a_dup;
206 206
207 if (GNUNET_OK != GNUNET_PSEUDONYM_get_info (cfg, 207 if (GNUNET_OK != GNUNET_FS_pseudonym_get_info (cfg,
208 receiver, NULL, NULL, &nick, &nick_is_a_dup) 208 receiver, NULL, NULL, &nick, &nick_is_a_dup)
209 || (nick_is_a_dup == GNUNET_YES)) 209 || (nick_is_a_dup == GNUNET_YES))
210 { 210 {
211 GNUNET_free (nick); 211 GNUNET_free (nick);
212 nick = GNUNET_strdup (_("anonymous")); 212 nick = GNUNET_strdup (_("anonymous"));
213 } 213 }
214 unique_nick = GNUNET_PSEUDONYM_name_uniquify (cfg, receiver, nick, NULL); 214 unique_nick = GNUNET_FS_pseudonym_name_uniquify (cfg, receiver, nick, NULL);
215 GNUNET_free (nick); 215 GNUNET_free (nick);
216 FPRINTF (stdout, _("'%s' acknowledged message #%d\n"), unique_nick, orig_seq_number); 216 FPRINTF (stdout, _("'%s' acknowledged message #%d\n"), unique_nick, orig_seq_number);
217 GNUNET_free (unique_nick); 217 GNUNET_free (unique_nick);
@@ -244,14 +244,14 @@ member_list_cb (void *cls, const struct GNUNET_CONTAINER_MetaData *member_info,
244 GNUNET_CRYPTO_hash (member_id, 244 GNUNET_CRYPTO_hash (member_id,
245 sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), 245 sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
246 &id); 246 &id);
247 if (GNUNET_OK != GNUNET_PSEUDONYM_get_info (cfg, 247 if (GNUNET_OK != GNUNET_FS_pseudonym_get_info (cfg,
248 &id, NULL, NULL, &non_unique_nick, &nick_is_a_dup) 248 &id, NULL, NULL, &non_unique_nick, &nick_is_a_dup)
249 || (nick_is_a_dup == GNUNET_YES)) 249 || (nick_is_a_dup == GNUNET_YES))
250 { 250 {
251 GNUNET_free (non_unique_nick); 251 GNUNET_free (non_unique_nick);
252 non_unique_nick = GNUNET_strdup (_("anonymous")); 252 non_unique_nick = GNUNET_strdup (_("anonymous"));
253 } 253 }
254 nick = GNUNET_PSEUDONYM_name_uniquify (cfg, &id, non_unique_nick, NULL); 254 nick = GNUNET_FS_pseudonym_name_uniquify (cfg, &id, non_unique_nick, NULL);
255 GNUNET_free (non_unique_nick); 255 GNUNET_free (non_unique_nick);
256 256
257 FPRINTF (stdout, 257 FPRINTF (stdout,
@@ -320,7 +320,7 @@ do_join (const char *arg, const void *xtra)
320 FPRINTF (stdout, "%s", _("Could not change username\n")); 320 FPRINTF (stdout, "%s", _("Could not change username\n"));
321 return GNUNET_SYSERR; 321 return GNUNET_SYSERR;
322 } 322 }
323 if ((GNUNET_OK != GNUNET_PSEUDONYM_get_info (cfg, 323 if ((GNUNET_OK != GNUNET_FS_pseudonym_get_info (cfg,
324 &me, NULL, NULL, &my_name, &my_name_is_a_dup)) || 324 &me, NULL, NULL, &my_name, &my_name_is_a_dup)) ||
325 (my_name_is_a_dup == GNUNET_YES)) 325 (my_name_is_a_dup == GNUNET_YES))
326 { 326 {
@@ -362,7 +362,7 @@ do_nick (const char *msg, const void *xtra)
362 FPRINTF (stdout, "%s", _("Could not change username\n")); 362 FPRINTF (stdout, "%s", _("Could not change username\n"));
363 return GNUNET_SYSERR; 363 return GNUNET_SYSERR;
364 } 364 }
365 if ((GNUNET_OK != GNUNET_PSEUDONYM_get_info (cfg, 365 if ((GNUNET_OK != GNUNET_FS_pseudonym_get_info (cfg,
366 &me, NULL, NULL, &my_name, &my_name_is_a_dup)) || 366 &me, NULL, NULL, &my_name, &my_name_is_a_dup)) ||
367 (my_name_is_a_dup == GNUNET_YES)) 367 (my_name_is_a_dup == GNUNET_YES))
368 { 368 {
@@ -391,14 +391,14 @@ do_names (const char *msg, const void *xtra)
391 GNUNET_CRYPTO_hash (&pos->pkey, 391 GNUNET_CRYPTO_hash (&pos->pkey,
392 sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), 392 sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
393 &pid); 393 &pid);
394 if (GNUNET_OK != GNUNET_PSEUDONYM_get_info (cfg, 394 if (GNUNET_OK != GNUNET_FS_pseudonym_get_info (cfg,
395 &pid, NULL, NULL, &name, &name_is_a_dup) 395 &pid, NULL, NULL, &name, &name_is_a_dup)
396 || (name_is_a_dup == GNUNET_YES)) 396 || (name_is_a_dup == GNUNET_YES))
397 { 397 {
398 GNUNET_free (name); 398 GNUNET_free (name);
399 name = GNUNET_strdup (_("anonymous")); 399 name = GNUNET_strdup (_("anonymous"));
400 } 400 }
401 unique_name = GNUNET_PSEUDONYM_name_uniquify (cfg, &pid, name, NULL); 401 unique_name = GNUNET_FS_pseudonym_name_uniquify (cfg, &pid, name, NULL);
402 GNUNET_free (name); 402 GNUNET_free (name);
403 FPRINTF (stdout, "`%s' ", unique_name); 403 FPRINTF (stdout, "`%s' ", unique_name);
404 GNUNET_free (unique_name); 404 GNUNET_free (unique_name);
@@ -436,7 +436,7 @@ do_send_pm (const char *msg, const void *xtra)
436 user = GNUNET_strdup (msg); 436 user = GNUNET_strdup (msg);
437 strstr (user, " ")[0] = '\0'; 437 strstr (user, " ")[0] = '\0';
438 msg += strlen (user) + 1; 438 msg += strlen (user) + 1;
439 if (GNUNET_OK != GNUNET_PSEUDONYM_name_to_id (cfg, user, &uid)) 439 if (GNUNET_OK != GNUNET_FS_pseudonym_name_to_id (cfg, user, &uid))
440 { 440 {
441 FPRINTF (stderr, 441 FPRINTF (stderr,
442 _("Unknown user `%s'. Make sure you specify its numeric suffix, if any.\n"), 442 _("Unknown user `%s'. Make sure you specify its numeric suffix, if any.\n"),
@@ -691,7 +691,7 @@ run (void *cls, char *const *args, const char *cfgfile,
691 ret = -1; 691 ret = -1;
692 return; 692 return;
693 } 693 }
694 if ((GNUNET_OK != GNUNET_PSEUDONYM_get_info (cfg, 694 if ((GNUNET_OK != GNUNET_FS_pseudonym_get_info (cfg,
695 &me, NULL, NULL, &my_name, &my_name_is_a_dup)) || 695 &me, NULL, NULL, &my_name, &my_name_is_a_dup)) ||
696 (my_name_is_a_dup == GNUNET_YES)) 696 (my_name_is_a_dup == GNUNET_YES))
697 { 697 {