aboutsummaryrefslogtreecommitdiff
path: root/src/conversation/gnunet-conversation.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/conversation/gnunet-conversation.c')
-rw-r--r--src/conversation/gnunet-conversation.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/conversation/gnunet-conversation.c b/src/conversation/gnunet-conversation.c
index d899ee5ca..925db4665 100644
--- a/src/conversation/gnunet-conversation.c
+++ b/src/conversation/gnunet-conversation.c
@@ -166,9 +166,9 @@ static struct CallList *cl_head;
166static struct CallList *cl_tail; 166static struct CallList *cl_tail;
167 167
168/** 168/**
169 * Desired phone line. 169 * Desired phone line (string to be converted to a hash).
170 */ 170 */
171static unsigned int line; 171static char *line;
172 172
173/** 173/**
174 * Task which handles the commands 174 * Task which handles the commands
@@ -357,7 +357,8 @@ start_phone ()
357 GNUNET_assert (NULL == phone); 357 GNUNET_assert (NULL == phone);
358 phone = GNUNET_CONVERSATION_phone_create (cfg, 358 phone = GNUNET_CONVERSATION_phone_create (cfg,
359 my_caller_id, 359 my_caller_id,
360 &phone_event_handler, NULL); 360 &phone_event_handler,
361 NULL);
361 /* FIXME: get record and print full GNS record info later here... */ 362 /* FIXME: get record and print full GNS record info later here... */
362 if (NULL == phone) 363 if (NULL == phone)
363 { 364 {
@@ -375,8 +376,8 @@ start_phone ()
375 rd.data, 376 rd.data,
376 rd.data_size); 377 rd.data_size);
377 FPRINTF (stdout, 378 FPRINTF (stdout,
378 _("Phone active on line %u. Type `/help' for a list of available commands\n"), 379 _("Phone active at `%s'. Type `/help' for a list of available commands\n"),
379 (unsigned int) line); 380 address);
380 phone_state = PS_LISTEN; 381 phone_state = PS_LISTEN;
381 } 382 }
382} 383}
@@ -687,7 +688,7 @@ do_status (const char *args)
687 break; 688 break;
688 case PS_LISTEN: 689 case PS_LISTEN:
689 FPRINTF (stdout, 690 FPRINTF (stdout,
690 _("We are listening for incoming calls for ego `%s' on line %u.\n"), 691 _("We are listening for incoming calls for ego `%s' on line `%s'.\n"),
691 ego_name, 692 ego_name,
692 line); 693 line);
693 break; 694 break;
@@ -1187,7 +1188,7 @@ identity_cb (void *cls,
1187 return; 1188 return;
1188 } 1189 }
1189 my_caller_id = ego; 1190 my_caller_id = ego;
1190 GNUNET_CONFIGURATION_set_value_number (cfg, 1191 GNUNET_CONFIGURATION_set_value_string (cfg,
1191 "CONVERSATION", 1192 "CONVERSATION",
1192 "LINE", 1193 "LINE",
1193 line); 1194 line);
@@ -1270,7 +1271,7 @@ main (int argc, char *const *argv)
1270 1, &GNUNET_GETOPT_set_string, &ego_name}, 1271 1, &GNUNET_GETOPT_set_string, &ego_name},
1271 {'p', "phone", "LINE", 1272 {'p', "phone", "LINE",
1272 gettext_noop ("sets the LINE to use for the phone"), 1273 gettext_noop ("sets the LINE to use for the phone"),
1273 1, &GNUNET_GETOPT_set_uint, &line}, 1274 1, &GNUNET_GETOPT_set_string, &line},
1274 GNUNET_GETOPT_OPTION_END 1275 GNUNET_GETOPT_OPTION_END
1275 }; 1276 };
1276 int ret; 1277 int ret;