SILC_NICK_REC *nickrec;
SilcClientEntry client;
SilcChannelEntry channel;
+ char userhost[256];
client = va_arg(va, SilcClientEntry);
channel = va_arg(va, SilcChannelEntry);
}
}
+ memset(userhost, 0, sizeof(userhost));
+ if (client->username)
+ snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
+ client->username, client->hostname);
signal_emit("message join", 4, server, channel->channel_name,
client->nickname,
- client->username == NULL ? "" : client->username);
+ client->username == NULL ? "" : userhost);
}
/*
SILC_NICK_REC *nickrec;
SilcClientEntry client;
SilcChannelEntry channel;
+ char userhost[256];
client = va_arg(va, SilcClientEntry);
channel = va_arg(va, SilcChannelEntry);
+ memset(userhost, 0, sizeof(userhost));
+ if (client->username)
+ snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
+ client->username, client->hostname);
signal_emit("message part", 5, server, channel->channel_name,
- client->nickname, client->username ? client->username : "",
+ client->nickname, client->username ? userhost : "",
client->nickname);
chanrec = silc_channel_find_entry(server, channel);
SilcClientEntry client;
GSList *nicks, *tmp;
char *message;
+ char userhost[256];
client = va_arg(va, SilcClientEntry);
message = va_arg(va, char *);
+ memset(userhost, 0, sizeof(userhost));
+ if (client->username)
+ snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
+ client->username, client->hostname);
signal_emit("message quit", 4, server, client->nickname,
- client->username ? client->username : "",
+ client->username ? userhost : "",
message ? message : "");
nicks = nicklist_get_same_unique(SERVER(server), client);
SilcClientEntry client;
SilcChannelEntry channel;
char *topic;
+ char userhost[256];
client = va_arg(va, SilcClientEntry);
topic = va_arg(va, char *);
signal_emit("channel topic changed", 1, chanrec);
}
+ memset(userhost, 0, sizeof(userhost));
+ snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
+ client->username, client->hostname);
signal_emit("message topic", 5, server, channel->channel_name,
- topic, client->nickname, client->username);
+ topic, client->nickname, userhost);
}
/*
SilcClientEntry client;
SilcChannelEntry channel;
char *channel_name;
+ char userhost[256];
channel = va_arg(va, SilcChannelEntry);
channel_name = va_arg(va, char *);
client = va_arg(va, SilcClientEntry);
+ memset(userhost, 0, sizeof(userhost));
+ snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
+ client->username, client->hostname);
signal_emit("message invite", 4, server, channel ? channel->channel_name :
- channel_name, client->nickname, client->username);
+ channel_name, client->nickname, userhost);
}
/*
static void event_nick(SILC_SERVER_REC *server, va_list va)
{
SilcClientEntry oldclient, newclient;
+ char userhost[256];
oldclient = va_arg(va, SilcClientEntry);
newclient = va_arg(va, SilcClientEntry);
oldclient, oldclient->nickname,
newclient, newclient->nickname);
+ memset(userhost, 0, sizeof(userhost));
+ snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
+ newclient->username, newclient->hostname);
signal_emit("message nick", 4, server, newclient->nickname,
- oldclient->nickname, newclient->username);
+ oldclient->nickname, userhost);
}
/*
uint32 modei;
SilcIdType idtype;
- idtype = va_arg(va, SilcIdType);
+ idtype = va_arg(va, int);
entry = va_arg(va, void *);
modei = va_arg(va, uint32);
(void)va_arg(va, char *);
mode = silc_client_chmode(modei,
channel->channel_key->cipher->name,
- channel->hmac->hmac->name);
+ silc_hmac_get_name(channel->hmac));
chanrec = silc_channel_find_entry(server, channel);
if (chanrec != NULL) {
SilcClientEntry *clients;
uint32 clients_count;
int i;
+ char userhost[256];
(void)va_arg(va, void *);
clients = va_arg(va, SilcClientEntry *);
clients_count = va_arg(va, uint32);
- for (i = 0; i < clients_count; i++)
+ for (i = 0; i < clients_count; i++) {
+ memset(userhost, 0, sizeof(userhost));
+ if (clients[i]->username)
+ snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
+ clients[i]->username, clients[i]->hostname);
signal_emit("message quit", 4, server, clients[i]->nickname,
- clients[i]->username ? clients[i]->username : "",
+ clients[i]->username ? userhost : "",
"server signoff");
+ }
}
/*
WI_ITEM_REC *item)
{
SILC_CHANNEL_REC *chanrec;
+ char userhost[256];
if (!IS_SILC_SERVER(server) || !server->connected)
cmd_return_error(CMDERR_NOT_CONNECTED);
if (chanrec == NULL)
cmd_return_error(CMDERR_CHAN_NOT_FOUND);
+ memset(userhost, 0, sizeof(userhost));
+ snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
+ server->conn->local_entry->username,
+ server->conn->local_entry->hostname);
signal_emit("message part", 5, server, chanrec->name,
- server->nick, server->conn->local_entry->username, "");
+ server->nick, userhost, "");
silc_command_exec(server, "LEAVE", chanrec->name);
signal_stop();
static void command_key(const char *data, SILC_SERVER_REC *server,
WI_ITEM_REC *item)
{
- SilcClientConnection conn = server->conn;
+ SilcClientConnection conn;
SilcClientEntry client_entry = NULL;
SilcChannelEntry channel_entry = NULL;
- uint32 num = 0;
- char *nickname = NULL, *serv = NULL, *tmp;
+ char *nickname = NULL, *tmp;
int command = 0, port = 0, type = 0;
char *hostname = NULL;
KeyInternal internal = NULL;
unsigned char **argv;
uint32 *argv_lens, *argv_types;
- if (!IS_SILC_SERVER(server) || !server->connected)
+ if (!server || !IS_SILC_SERVER(server) || !server->connected)
cmd_return_error(CMDERR_NOT_CONNECTED);
+ conn = server->conn;
+
/* Now parse all arguments */
tmp = g_strconcat("KEY", " ", data, NULL);
silc_parse_command_line(tmp, &argv, &argv_lens, &argv_types, &argc, 7);
if (type == 1) {
if (argv[2][0] == '*') {
- nickname = "*";
+ nickname = strdup("*");
} else {
/* Parse the typed nickname. */
- if (!silc_parse_nickname(argv[2], &nickname, &serv, &num)) {
+ if (!silc_parse_userfqdn(argv[2], &nickname, NULL)) {
printformat_module("fe-common/silc", server, NULL,
MSGLEVEL_CRAP, SILCTXT_BAD_NICK, argv[2]);
return;
/* Find client entry */
client_entry = silc_idlist_get_client(silc_client, conn, nickname,
- serv, num, TRUE);
+ argv[2], TRUE);
if (!client_entry) {
KeyGetClients inter = silc_calloc(1, sizeof(*inter));
inter->server = server;
if (argv[2][0] == '*') {
if (!conn->current_channel) {
- if (nickname)
- silc_free(nickname);
- if (serv)
- silc_free(serv);
+ silc_free(nickname);
cmd_return_error(CMDERR_NOT_JOINED);
}
name = conn->current_channel->channel_name;
channel_entry = silc_client_get_channel(silc_client, conn, name);
if (!channel_entry) {
- if (nickname)
- silc_free(nickname);
- if (serv)
- silc_free(serv);
+ silc_free(nickname);
cmd_return_error(CMDERR_NOT_JOINED);
}
}
}
silc_client_free_private_message_keys(keys, keys_count);
+
} else if (type == 2) {
SilcChannelPrivateKey *keys;
uint32 keys_count;
keys = silc_client_list_channel_private_keys(silc_client, conn,
channel_entry,
&keys_count);
- if (!keys)
- goto out;
-
+
printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
SILCTXT_CH_PRIVATE_KEY_LIST,
channel_entry->channel_name);
+
+ if (!keys)
+ goto out;
+
for (k = 0; k < keys_count; k++) {
memset(buf, 0, sizeof(buf));
strncat(buf, " ", 2);
strcat(buf, " ");
strcat(buf, " ");
- len = strlen(keys[k]->hmac->hmac->name);
- strncat(buf, keys[k]->hmac->hmac->name, len > 16 ? 16 : len);
+ len = strlen(silc_hmac_get_name(keys[k]->hmac));
+ strncat(buf, silc_hmac_get_name(keys[k]->hmac), len > 16 ? 16 : len);
if (len < 16)
for (i = 0; i < 16 - len; i++)
strcat(buf, " ");
}
out:
- if (nickname)
- silc_free(nickname);
- if (serv)
- silc_free(serv);
+ silc_free(nickname);
+}
+
+/* Lists locally saved client and server public keys. */
+
+static void command_listkeys(const char *data, SILC_SERVER_REC *server,
+ WI_ITEM_REC *item)
+{
+
}
void silc_channels_init(void)
command_bind("notice", MODULE_NAME, (SIGNAL_FUNC) command_notice);
command_bind("away", MODULE_NAME, (SIGNAL_FUNC) command_away);
command_bind("key", MODULE_NAME, (SIGNAL_FUNC) command_key);
+ command_bind("listkeys", MODULE_NAME, (SIGNAL_FUNC) command_listkeys);
silc_nicklist_init();
}
command_unbind("notice", (SIGNAL_FUNC) command_notice);
command_unbind("away", (SIGNAL_FUNC) command_away);
command_unbind("key", (SIGNAL_FUNC) command_key);
+ command_unbind("listkeys", (SIGNAL_FUNC) command_listkeys);
silc_nicklist_deinit();
}
projects / silc.git / blobdiff