projects
/
crypto.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
db89604
)
updates.
author
Pekka Riikonen
<priikone@silcnet.org>
Fri, 7 Sep 2001 19:16:56 +0000
(19:16 +0000)
committer
Pekka Riikonen
<priikone@silcnet.org>
Fri, 7 Sep 2001 19:16:56 +0000
(19:16 +0000)
CHANGES
patch
|
blob
|
history
apps/irssi/src/fe-common/silc/module-formats.c
patch
|
blob
|
history
apps/irssi/src/silc/core/client_ops.c
patch
|
blob
|
history
apps/irssi/src/silc/core/silc-channels.c
patch
|
blob
|
history
apps/silcd/server.c
patch
|
blob
|
history
diff --git
a/CHANGES
b/CHANGES
index 7899d3fc142c588c5ed2fd59bd37a7a487a306af..d53fa3f0dee13760bf99bc53c9ee4ef92c71e108 100644
(file)
--- a/
CHANGES
+++ b/
CHANGES
@@
-1,3
+1,9
@@
+Fri Sep 7 22:16:38 EEST 2001 Pekka Riikonen <priikone@silcnet.org>
+
+ * Fixed various printing bugs on the user interface in the
+ Irssi SILC Client. Minor changes that were forgotten from
+ the release.
+
Fri Sep 7 17:28:37 EEST 2001 Pekka Riikonen <priikone@silcnet.org>
* Fixed the configure.in.pre and the compilation and distribution
Fri Sep 7 17:28:37 EEST 2001 Pekka Riikonen <priikone@silcnet.org>
* Fixed the configure.in.pre and the compilation and distribution
diff --git
a/apps/irssi/src/fe-common/silc/module-formats.c
b/apps/irssi/src/fe-common/silc/module-formats.c
index d542ccc63237edaa0802709cb6edb14f30f8ba3e..8f70760ddd3430dfa16149f84a94952ed2c73be2 100644
(file)
--- a/
apps/irssi/src/fe-common/silc/module-formats.c
+++ b/
apps/irssi/src/fe-common/silc/module-formats.c
@@
-58,7
+58,7
@@
FORMAT_REC fecommon_silc_formats[] = {
{ "whois_idle", " idle : $0", 1, { 0 } },
{ "whowas", "{nick $0} was {nickhost $1} ($2)", 3, { 0, 0, 0 } },
{ "users_header", "Users on {channelhilight $0}", 1, { 0 } },
{ "whois_idle", " idle : $0", 1, { 0 } },
{ "whowas", "{nick $0} was {nickhost $1} ($2)", 3, { 0, 0, 0 } },
{ "users_header", "Users on {channelhilight $0}", 1, { 0 } },
- { "users", " %|{nick $[!20]0} $[!5]1 $2
{comment {hilight $3}}", 4, {
0, 0, 0, 0 } },
+ { "users", " %|{nick $[!20]0} $[!5]1 $2
@$3 {comment {hilight $4}}", 5, { 0,
0, 0, 0, 0 } },
/* Key management and key agreement */
{ NULL, "Key Management And Key Agreement", 0 },
/* Key management and key agreement */
{ NULL, "Key Management And Key Agreement", 0 },
diff --git
a/apps/irssi/src/silc/core/client_ops.c
b/apps/irssi/src/silc/core/client_ops.c
index 79be2e8c7b4eef61cc9c1e9d7bbbcd1e63e4c332..1cc9a1c9456894a6bd088df6c3529c65c67720c4 100644
(file)
--- a/
apps/irssi/src/silc/core/client_ops.c
+++ b/
apps/irssi/src/silc/core/client_ops.c
@@
-114,11
+114,15
@@
void silc_private_message(SilcClient client, SilcClientConnection conn,
char *msg)
{
SILC_SERVER_REC *server;
char *msg)
{
SILC_SERVER_REC *server;
+ char userhost[256];
server = conn == NULL ? NULL : conn->context;
server = conn == NULL ? NULL : conn->context;
+ if (sender->username)
+ snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
+ sender->username, sender->hostname);
signal_emit("message private", 4, server, msg,
sender->nickname ? sender->nickname : "[<unknown>]",
signal_emit("message private", 4, server, msg,
sender->nickname ? sender->nickname : "[<unknown>]",
- sender->username ?
sender->username
: NULL);
+ sender->username ?
userhost
: NULL);
}
/* Notify message to the client. The notify arguments are sent in the
}
/* Notify message to the client. The notify arguments are sent in the
@@
-641,7
+645,7
@@
silc_command_reply(SilcClient client, SilcClientConnection conn,
printformat_module("fe-common/silc", server, channel->channel_name,
MSGLEVEL_CRAP, SILCTXT_USERS,
e->nickname, stat, e->username,
printformat_module("fe-common/silc", server, channel->channel_name,
MSGLEVEL_CRAP, SILCTXT_USERS,
e->nickname, stat, e->username,
- e->realname ? e->realname : "");
+ e->
hostname, e->
realname ? e->realname : "");
if (mode)
silc_free(mode);
}
if (mode)
silc_free(mode);
}
diff --git
a/apps/irssi/src/silc/core/silc-channels.c
b/apps/irssi/src/silc/core/silc-channels.c
index 459dedd6a5d1d332b8c95d61f37703b026652749..9febc67084e5259fa02a8348d68f6379fc204165 100644
(file)
--- a/
apps/irssi/src/silc/core/silc-channels.c
+++ b/
apps/irssi/src/silc/core/silc-channels.c
@@
-138,6
+138,7
@@
static void event_join(SILC_SERVER_REC *server, va_list va)
SILC_NICK_REC *nickrec;
SilcClientEntry client;
SilcChannelEntry channel;
SILC_NICK_REC *nickrec;
SilcClientEntry client;
SilcChannelEntry channel;
+ char userhost[256];
client = va_arg(va, SilcClientEntry);
channel = va_arg(va, SilcChannelEntry);
client = va_arg(va, SilcClientEntry);
channel = va_arg(va, SilcChannelEntry);
@@
-161,9
+162,12
@@
static void event_join(SILC_SERVER_REC *server, va_list va)
}
}
}
}
+ 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,
signal_emit("message join", 4, server, channel->channel_name,
client->nickname,
- client->username == NULL ? "" :
client->username
);
+ client->username == NULL ? "" :
userhost
);
}
/*
}
/*
@@
-176,12
+180,16
@@
static void event_leave(SILC_SERVER_REC *server, va_list va)
SILC_NICK_REC *nickrec;
SilcClientEntry client;
SilcChannelEntry channel;
SILC_NICK_REC *nickrec;
SilcClientEntry client;
SilcChannelEntry channel;
+ char userhost[256];
client = va_arg(va, SilcClientEntry);
channel = va_arg(va, SilcChannelEntry);
client = va_arg(va, SilcClientEntry);
channel = va_arg(va, SilcChannelEntry);
+ if (client->username)
+ snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
+ client->username, client->hostname);
signal_emit("message part", 5, server, channel->channel_name,
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);
client->nickname);
chanrec = silc_channel_find_entry(server, channel);
@@
-201,12
+209,16
@@
static void event_signoff(SILC_SERVER_REC *server, va_list va)
SilcClientEntry client;
GSList *nicks, *tmp;
char *message;
SilcClientEntry client;
GSList *nicks, *tmp;
char *message;
+ char userhost[256];
client = va_arg(va, SilcClientEntry);
message = va_arg(va, char *);
client = va_arg(va, SilcClientEntry);
message = va_arg(va, char *);
+ if (client->username)
+ snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
+ client->username, client->hostname);
signal_emit("message quit", 4, server, client->nickname,
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);
message ? message : "");
nicks = nicklist_get_same_unique(SERVER(server), client);
@@
-228,6
+240,7
@@
static void event_topic(SILC_SERVER_REC *server, va_list va)
SilcClientEntry client;
SilcChannelEntry channel;
char *topic;
SilcClientEntry client;
SilcChannelEntry channel;
char *topic;
+ char userhost[256];
client = va_arg(va, SilcClientEntry);
topic = va_arg(va, char *);
client = va_arg(va, SilcClientEntry);
topic = va_arg(va, char *);
@@
-240,8
+253,10
@@
static void event_topic(SILC_SERVER_REC *server, va_list va)
signal_emit("channel topic changed", 1, chanrec);
}
signal_emit("channel topic changed", 1, chanrec);
}
+ snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
+ client->username, client->hostname);
signal_emit("message topic", 5, server, channel->channel_name,
signal_emit("message topic", 5, server, channel->channel_name,
- topic, client->nickname,
client->username
);
+ topic, client->nickname,
userhost
);
}
/*
}
/*
@@
-253,13
+268,16
@@
static void event_invite(SILC_SERVER_REC *server, va_list va)
SilcClientEntry client;
SilcChannelEntry channel;
char *channel_name;
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);
channel = va_arg(va, SilcChannelEntry);
channel_name = va_arg(va, char *);
client = va_arg(va, SilcClientEntry);
+ snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
+ client->username, client->hostname);
signal_emit("message invite", 4, server, channel ? channel->channel_name :
signal_emit("message invite", 4, server, channel ? channel->channel_name :
- channel_name, client->nickname,
client->username
);
+ channel_name, client->nickname,
userhost
);
}
/*
}
/*
@@
-269,6
+287,7
@@
static void event_invite(SILC_SERVER_REC *server, va_list va)
static void event_nick(SILC_SERVER_REC *server, va_list va)
{
SilcClientEntry oldclient, newclient;
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 = va_arg(va, SilcClientEntry);
newclient = va_arg(va, SilcClientEntry);
@@
-277,8
+296,10
@@
static void event_nick(SILC_SERVER_REC *server, va_list va)
oldclient, oldclient->nickname,
newclient, newclient->nickname);
oldclient, oldclient->nickname,
newclient, newclient->nickname);
+ snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
+ newclient->username, newclient->hostname);
signal_emit("message nick", 4, server, newclient->nickname,
signal_emit("message nick", 4, server, newclient->nickname,
- oldclient->nickname,
newclient->username
);
+ oldclient->nickname,
userhost
);
}
/*
}
/*
@@
-411,15
+432,21
@@
static void event_server_signoff(SILC_SERVER_REC *server, va_list va)
SilcClientEntry *clients;
uint32 clients_count;
int i;
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);
(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,
signal_emit("message quit", 4, server, clients[i]->nickname,
- clients[i]->username ?
clients[i]->username
: "",
+ clients[i]->username ?
userhost
: "",
"server signoff");
"server signoff");
+ }
}
/*
}
/*
@@
-501,6
+528,7
@@
static void command_part(const char *data, SILC_SERVER_REC *server,
WI_ITEM_REC *item)
{
SILC_CHANNEL_REC *chanrec;
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 (!IS_SILC_SERVER(server) || !server->connected)
cmd_return_error(CMDERR_NOT_CONNECTED);
@@
-515,8
+543,11
@@
static void command_part(const char *data, SILC_SERVER_REC *server,
if (chanrec == NULL)
cmd_return_error(CMDERR_CHAN_NOT_FOUND);
if (chanrec == NULL)
cmd_return_error(CMDERR_CHAN_NOT_FOUND);
+ 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,
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();
silc_command_exec(server, "LEAVE", chanrec->name);
signal_stop();
diff --git
a/apps/silcd/server.c
b/apps/silcd/server.c
index 9047fa072da57f3fd3e853bbdc2e4fbc3e04afb7..522423860637c864e4cc1c9811365831db8d41f4 100644
(file)
--- a/
apps/silcd/server.c
+++ b/
apps/silcd/server.c
@@
-868,7
+868,7
@@
SILC_TASK_CALLBACK(silc_server_connect_to_router_final)
silc_buffer_free(packet);
silc_free(id_string);
silc_buffer_free(packet);
silc_free(id_string);
- SILC_LOG_
DEBUG
(("Connected to router %s", sock->hostname));
+ SILC_LOG_
INFO
(("Connected to router %s", sock->hostname));
/* Add the connected router to local server list */
server->standalone = FALSE;
/* Add the connected router to local server list */
server->standalone = FALSE;