projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More client library rewrites.
[silc.git]
/
lib
/
silcclient
/
client_channel.c
diff --git
a/lib/silcclient/client_channel.c
b/lib/silcclient/client_channel.c
index c843b63b9c3a558350f69e362efac5e73ed61336..37cd5a78e38bb499382e9e60c046f9b5c4da676c 100644
(file)
--- a/
lib/silcclient/client_channel.c
+++ b/
lib/silcclient/client_channel.c
@@
-480,7
+480,7
@@
SilcBool silc_client_add_channel_private_key(SilcClient client,
/* Produce the key material */
keymat = silc_ske_process_key_material_data(key, key_len, 16, 256, 16,
/* Produce the key material */
keymat = silc_ske_process_key_material_data(key, key_len, 16, 256, 16,
- c
lient
->sha1hash);
+ c
onn->internal
->sha1hash);
if (!keymat)
return FALSE;
if (!keymat)
return FALSE;
@@
-670,7
+670,8
@@
SilcChannelUser silc_client_on_channel(SilcChannelEntry channel,
return NULL;
}
return NULL;
}
-/* Adds client to channel */
+/* Adds client to channel. Returns TRUE if user was added or is already
+ added to the channel, FALSE on error. */
SilcBool silc_client_add_to_channel(SilcChannelEntry channel,
SilcClientEntry client_entry,
SilcBool silc_client_add_to_channel(SilcChannelEntry channel,
SilcClientEntry client_entry,
@@
-679,7
+680,7
@@
SilcBool silc_client_add_to_channel(SilcChannelEntry channel,
SilcChannelUser chu;
if (silc_client_on_channel(channel, client_entry))
SilcChannelUser chu;
if (silc_client_on_channel(channel, client_entry))
- return
FALS
E;
+ return
TRU
E;
chu = silc_calloc(1, sizeof(*chu));
if (!chu)
chu = silc_calloc(1, sizeof(*chu));
if (!chu)