SilcClientMessageType type, char *msg, ...)
{
SILC_SERVER_REC *server;
+ char *target = NULL;
va_list va;
char *str;
server = conn == NULL ? NULL : conn->context;
+ switch (conn->context_type) {
+ case SILC_ID_CLIENT:
+ target = (conn->client_entry->nickname[0] ?
+ conn->client_entry->nickname : NULL);
+ break;
+
+ case SILC_ID_CHANNEL:
+ target = conn->channel_entry->channel_name;
+ break;
+ }
+
va_start(va, msg);
str = g_strdup_vprintf(msg, va);
- printtext(server, NULL, MSGLEVEL_CRAP, "%s", str);
+ printtext(server, target, MSGLEVEL_CRAP, "%s", str);
g_free(str);
va_end(va);
}
SilcIdType id_type;
} *GetkeyContext;
-void silc_getkey_cb(bool success, void *context)
+void silc_getkey_cb(SilcBool success, void *context)
{
GetkeyContext getkey = (GetkeyContext)context;
char *entity = (getkey->id_type == SILC_ID_CLIENT ? "user" : "server");
SilcPublicKey local_pubkey;
SilcSILCPublicKey silc_pubkey;
SilcUInt16 port;
- SILC_SERVER_REC *server;
+ SILC_SERVER_REC *server = NULL;
const char *hostname, *ip;
unsigned char *pk;
SilcUInt32 pk_len;
"server" : "client");
int i;
+ server = (SILC_SERVER_REC*)conn->context;
if (conn_type != SILC_CONN_CLIENT) {
- server = (SILC_SERVER_REC*)conn->context;
SILC_VERIFY(server);
if (!server) {
if (completion)
}
}
+ /* If we have pending public key prompt already up */
+ if (server && server->prompt_op) {
+ silc_async_abort(server->prompt_op, NULL, NULL);
+ server->prompt_op = NULL;
+ }
+
if (silc_pkcs_get_type(public_key) != SILC_PKCS_SILC) {
printformat_module("fe-common/silc", NULL, NULL,
MSGLEVEL_CRAP, SILCTXT_PUBKEY_UNSUPPORTED,
silc_pubkey->identifier.realname,
silc_pubkey->identifier.email ?
silc_pubkey->identifier.email : "");
+ else if (conn_type == SILC_CONN_CLIENT &&
+ (silc_pubkey->identifier.realname ||
+ silc_pubkey->identifier.email))
+ printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP,
+ SILCTXT_PUBKEY_RECEIVED_CLIENT, "",
+ silc_pubkey->identifier.realname,
+ silc_pubkey->identifier.email ?
+ silc_pubkey->identifier.email : "");
printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP,
SILCTXT_PUBKEY_FINGERPRINT, entity, fingerprint);
printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP,
format = format_get_text("fe-common/silc", NULL, NULL, NULL,
SILCTXT_PUBKEY_ACCEPT);
silc_keyboard_entry_redirect(verify_public_key_completion,
- format, 0, verify, &server->prompt_op);
+ format, 0, verify,
+ server ? &server->prompt_op : NULL);
g_free(format);
silc_free(fingerprint);
silc_free(babbleprint);
silc_pubkey->identifier.realname,
silc_pubkey->identifier.email ?
silc_pubkey->identifier.email : "");
+ else if (conn_type == SILC_CONN_CLIENT &&
+ (silc_pubkey->identifier.realname ||
+ silc_pubkey->identifier.email))
+ printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP,
+ SILCTXT_PUBKEY_RECEIVED_CLIENT, "",
+ silc_pubkey->identifier.realname,
+ silc_pubkey->identifier.email ?
+ silc_pubkey->identifier.email : "");
printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP,
SILCTXT_PUBKEY_FINGERPRINT, entity, fingerprint);
printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP,
format = format_get_text("fe-common/silc", NULL, NULL, NULL,
SILCTXT_PUBKEY_ACCEPT_ANYWAY);
silc_keyboard_entry_redirect(verify_public_key_completion,
- format, 0, verify, &server->prompt_op);
+ format, 0, verify,
+ server ? &server->prompt_op : NULL);
+
g_free(format);
silc_free(fingerprint);
silc_free(babbleprint);
silc_pubkey->identifier.realname,
silc_pubkey->identifier.email ?
silc_pubkey->identifier.email : "");
+ else if (conn_type == SILC_CONN_CLIENT &&
+ (silc_pubkey->identifier.realname ||
+ silc_pubkey->identifier.email))
+ printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP,
+ SILCTXT_PUBKEY_RECEIVED_CLIENT, "",
+ silc_pubkey->identifier.realname,
+ silc_pubkey->identifier.email ?
+ silc_pubkey->identifier.email : "");
printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP,
SILCTXT_PUBKEY_FINGERPRINT, entity, fingerprint);
printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP,
format = format_get_text("fe-common/silc", NULL, NULL, NULL,
SILCTXT_PUBKEY_ACCEPT_ANYWAY);
silc_keyboard_entry_redirect(verify_public_key_completion,
- format, 0, verify, &server->prompt_op);
+ format, 0, verify,
+ server ? &server->prompt_op : NULL);
g_free(format);
silc_free(fingerprint);
silc_free(babbleprint);
silc_pubkey->identifier.realname,
silc_pubkey->identifier.email ?
silc_pubkey->identifier.email : "");
+ else if (conn_type == SILC_CONN_CLIENT &&
+ (silc_pubkey->identifier.realname ||
+ silc_pubkey->identifier.email))
+ printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP,
+ SILCTXT_PUBKEY_RECEIVED_CLIENT, "",
+ silc_pubkey->identifier.realname,
+ silc_pubkey->identifier.email ?
+ silc_pubkey->identifier.email : "");
printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP,
SILCTXT_PUBKEY_FINGERPRINT, entity, fingerprint);
printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP,
format = format_get_text("fe-common/silc", NULL, NULL, NULL,
SILCTXT_PUBKEY_ACCEPT_ANYWAY);
silc_keyboard_entry_redirect(verify_public_key_completion,
- format, 0, verify, &server->prompt_op);
+ format, 0, verify,
+ server ? &server->prompt_op : NULL);
g_free(format);
silc_free(fingerprint);
silc_free(babbleprint);