const char *channels, int automatic)
{
char **list, **tmp;
+ char *channel, *key;
SILC_CHANNEL_REC *chanrec;
+ CHANNEL_SETUP_REC *schannel;
+ GString *tmpstr;
list = g_strsplit(channels, ",", -1);
for (tmp = list; *tmp != NULL; tmp++) {
if (chanrec)
continue;
- silc_command_exec(server, "JOIN", *tmp);
+ channel = *tmp;
+ key = strchr(channel, ' ');
+ if (key != NULL) {
+ *key = '\0';
+ key++;
+ }
+ tmpstr = g_string_new(NULL);
+
+ schannel = channel_setup_find(channel, server->connrec->chatnet);
+ if (key && *key != '\0')
+ g_string_sprintfa(tmpstr, "%s %s", channel, key);
+ else if (schannel && schannel->password && schannel->password[0] != '\0')
+ g_string_sprintfa(tmpstr, "%s %s", channel, schannel->password);
+ else
+ g_string_sprintfa(tmpstr, "%s", channel);
+
+
+ silc_command_exec(server, "JOIN", tmpstr->str);
+ g_string_free(tmpstr, FALSE);
}
g_strfreev(list);
SilcDList clients;
SILC_CHANNEL_REC *chanrec = NULL;
SilcChannelEntry channel_entry = NULL;
- char nickname[128 + 1], *tmp;
+ char *nickname = NULL, *tmp;
int command = 0, port = 0, type = 0;
char *hostname = NULL;
KeyInternal internal = NULL;
if (type == 1) {
if (argv[2][0] == '*') {
- strcpy(nickname, "*");
+ nickname = strdup("*");
} else {
/* Parse the typed nickname. */
- if (!silc_parse_userfqdn(argv[2], nickname, sizeof(nickname), NULL, 0)) {
- printformat_module("fe-common/silc", server, NULL,
- MSGLEVEL_CRAP, SILCTXT_BAD_NICK, argv[2]);
- return;
- }
+ silc_client_nickname_parse(silc_client, conn, argv[2], &nickname);
+ if (!nickname)
+ nickname = strdup(argv[2]);
/* Find client entry */
- clients = silc_client_get_clients_local(silc_client, conn, nickname,
- argv[2]);
+ clients = silc_client_get_clients_local(silc_client, conn, argv[2],
+ FALSE);
if (!clients) {
KeyGetClients inter = silc_calloc(1, sizeof(*inter));
inter->server = server;
inter->data = strdup(data);
inter->nick = strdup(nickname);
inter->item = item;
- silc_client_get_clients(silc_client, conn, nickname, argv[2],
+ silc_client_get_clients(silc_client, conn, nickname, NULL,
silc_client_command_key_get_clients, inter);
goto out;
}
char *name;
if (argv[2][0] == '*') {
- if (!conn->current_channel) {
- silc_free(nickname);
+ if (!conn->current_channel)
cmd_return_error(CMDERR_NOT_JOINED);
- }
name = conn->current_channel->channel_name;
} else {
name = argv[2];
}
chanrec = silc_channel_find(server, name);
- if (chanrec == NULL) {
- silc_free(nickname);
+ if (chanrec == NULL)
cmd_return_error(CMDERR_CHAN_NOT_FOUND);
- }
channel_entry = chanrec->entry;
}
if (!ckeys)
goto out;
+ silc_dlist_start(ckeys);
if (!number || number > silc_dlist_count(ckeys)) {
silc_dlist_uninit(ckeys);
goto out;
silc_client_free_private_message_keys(keys, keys_count);
} else if (type == 2) {
- int k, len;
+ int len;
char buf[1024];
ckeys = silc_client_list_channel_private_keys(silc_client, conn,
if (!ckeys)
goto out;
+ silc_dlist_start(ckeys);
while ((ch = silc_dlist_get(ckeys))) {
memset(buf, 0, sizeof(buf));
strncat(buf, " ", 2);
- len = strlen(silc_cipher_get_name(ch->cipher));
- strncat(buf, silc_cipher_get_name(ch->cipher),
+ len = strlen(silc_cipher_get_name(ch->send_key));
+ strncat(buf, silc_cipher_get_name(ch->send_key),
len > 16 ? 16 : len);
if (len < 16)
for (i = 0; i < 16 - len; i++)
if (!ckeys)
goto out;
+ silc_dlist_start(ckeys);
if (argc == 4) {
chanrec->cur_key++;
if (chanrec->cur_key >= silc_dlist_count(ckeys))
}
out:
+ silc_free(nickname);
return;
}
SilcUInt32 key_len = 0;
int is_server_key = (strstr(pub_filename, "serverkeys") != NULL);
- if (!silc_pkcs_load_public_key((char *)pub_filename, &public_key)) {
+ if (!silc_pkcs_load_public_key((char *)pub_filename, SILC_PKCS_ANY,
+ &public_key)) {
printformat_module("fe-common/silc", NULL, NULL,
MSGLEVEL_CRAP, SILCTXT_LISTKEY_LOADPUB,
pub_filename);
return;
}
- silc_pubkey = silc_pkcs_get_context(SILC_PKCS_SILC, public_key);
+ silc_pubkey = silc_pkcs_public_key_get_pkcs(SILC_PKCS_SILC, public_key);
ident = &silc_pubkey->identifier;
- pk = silc_pkcs_public_key_encode(public_key, &pk_len);
+ pk = silc_pkcs_public_key_encode(NULL, public_key, &pk_len);
+ if (!pk)
+ return;
fingerprint = silc_hash_fingerprint(NULL, pk, pk_len);
babbleprint = silc_hash_babbleprint(NULL, pk, pk_len);
key_len = silc_pkcs_public_key_get_len(public_key);
printformat_module("fe-common/silc", NULL, NULL,
MSGLEVEL_CRAP, SILCTXT_LISTKEY_PUB_BITS,
(unsigned int)key_len);
+ if (ident->version && verbose)
+ printformat_module("fe-common/silc", NULL, NULL,
+ MSGLEVEL_CRAP, SILCTXT_LISTKEY_PUB_VER,
+ ident->version);
if (ident->realname && (!is_server_key || verbose))
printformat_module("fe-common/silc", NULL, NULL,
MSGLEVEL_CRAP, SILCTXT_LISTKEY_PUB_RN,