projects
/
runtime.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integer type name change.
[runtime.git]
/
apps
/
silcd
/
server.c
diff --git
a/apps/silcd/server.c
b/apps/silcd/server.c
index fab3d975a72344ea6c0c22dc404a0e3c88f060a1..61b4c50dca6239703ae171a18615f6e65693a208 100644
(file)
--- a/
apps/silcd/server.c
+++ b/
apps/silcd/server.c
@@
-845,7
+845,7
@@
SILC_TASK_CALLBACK(silc_server_connect_to_router_final)
SilcBuffer packet;
SilcServerHBContext hb_context;
unsigned char *id_string;
SilcBuffer packet;
SilcServerHBContext hb_context;
unsigned char *id_string;
-
ui
nt32 id_len;
+
SilcUI
nt32 id_len;
SilcIDListData idata;
SilcServerConfigConnParams *param;
SilcIDListData idata;
SilcServerConfigConnParams *param;
@@
-1284,8
+1284,8
@@
SILC_TASK_CALLBACK(silc_server_accept_new_connection_final)
SilcServerHBContext hb_context;
SilcUnknownEntry entry = (SilcUnknownEntry)sock->user_data;
void *id_entry;
SilcServerHBContext hb_context;
SilcUnknownEntry entry = (SilcUnknownEntry)sock->user_data;
void *id_entry;
-
ui
nt32 hearbeat_timeout = server->config->param.keepalive_secs;
-
ui
nt32 num_sockets;
+
SilcUI
nt32 hearbeat_timeout = server->config->param.keepalive_secs;
+
SilcUI
nt32 num_sockets;
SILC_LOG_DEBUG(("Start"));
SILC_LOG_DEBUG(("Start"));
@@
-1317,7
+1317,7
@@
SILC_TASK_CALLBACK(silc_server_accept_new_connection_final)
{
SilcClientEntry client;
SilcServerConfigClient *conn = ctx->cconfig;
{
SilcClientEntry client;
SilcServerConfigClient *conn = ctx->cconfig;
-
ui
nt32 max_per_host = server->config->param.connections_max_per_host;
+
SilcUI
nt32 max_per_host = server->config->param.connections_max_per_host;
/* Check for maximum connections limit */
if (conn->param) {
/* Check for maximum connections limit */
if (conn->param) {
@@
-1383,10
+1383,10
@@
SILC_TASK_CALLBACK(silc_server_accept_new_connection_final)
bool backup_local = FALSE;
bool backup_router = FALSE;
char *backup_replace_ip = NULL;
bool backup_local = FALSE;
bool backup_router = FALSE;
char *backup_replace_ip = NULL;
-
ui
nt16 backup_replace_port = 0;
+
SilcUI
nt16 backup_replace_port = 0;
SilcServerConfigServer *sconn = ctx->sconfig;
SilcServerConfigRouter *rconn = ctx->rconfig;
SilcServerConfigServer *sconn = ctx->sconfig;
SilcServerConfigRouter *rconn = ctx->rconfig;
-
ui
nt32 max_per_host = server->config->param.connections_max_per_host;
+
SilcUI
nt32 max_per_host = server->config->param.connections_max_per_host;
if (ctx->conn_type == SILC_SOCKET_TYPE_ROUTER && rconn) {
if (rconn->param) {
if (ctx->conn_type == SILC_SOCKET_TYPE_ROUTER && rconn) {
if (rconn->param) {
@@
-1562,7
+1562,7
@@
SILC_TASK_CALLBACK(silc_server_packet_process)
SilcIDListData idata;
SilcCipher cipher = NULL;
SilcHmac hmac = NULL;
SilcIDListData idata;
SilcCipher cipher = NULL;
SilcHmac hmac = NULL;
-
ui
nt32 sequence = 0;
+
SilcUI
nt32 sequence = 0;
int ret;
if (!sock)
int ret;
if (!sock)
@@
-2288,7
+2288,7
@@
void silc_server_packet_parse_type(SilcServer server,
/* Creates connection to a remote router. */
void silc_server_create_connection(SilcServer server,
/* Creates connection to a remote router. */
void silc_server_create_connection(SilcServer server,
- const char *remote_host,
ui
nt32 port)
+ const char *remote_host,
SilcUI
nt32 port)
{
SilcServerConnection sconn;
{
SilcServerConnection sconn;
@@
-3026,11
+3026,11
@@
SILC_TASK_CALLBACK(silc_server_channel_key_rekey)
bool silc_server_create_channel_key(SilcServer server,
SilcChannelEntry channel,
bool silc_server_create_channel_key(SilcServer server,
SilcChannelEntry channel,
-
ui
nt32 key_len)
+
SilcUI
nt32 key_len)
{
int i;
unsigned char channel_key[32], hash[32];
{
int i;
unsigned char channel_key[32], hash[32];
-
ui
nt32 len;
+
SilcUI
nt32 len;
SILC_LOG_DEBUG(("Generating channel key"));
SILC_LOG_DEBUG(("Generating channel key"));
@@
-3109,7
+3109,7
@@
SilcChannelEntry silc_server_save_channel_key(SilcServer server,
SilcChannelKeyPayload payload = NULL;
SilcChannelID *id = NULL;
unsigned char *tmp, hash[32];
SilcChannelKeyPayload payload = NULL;
SilcChannelID *id = NULL;
unsigned char *tmp, hash[32];
-
ui
nt32 tmp_len;
+
SilcUI
nt32 tmp_len;
char *cipher;
SILC_LOG_DEBUG(("Start"));
char *cipher;
SILC_LOG_DEBUG(("Start"));
@@
-3281,7
+3281,7
@@
static void silc_server_announce_get_servers(SilcServer server,
}
static SilcBuffer
}
static SilcBuffer
-silc_server_announce_encode_notify(SilcNotifyType notify,
ui
nt32 argc, ...)
+silc_server_announce_encode_notify(SilcNotifyType notify,
SilcUI
nt32 argc, ...)
{
va_list ap;
SilcBuffer p;
{
va_list ap;
SilcBuffer p;
@@
-3531,7
+3531,7
@@
void silc_server_announce_get_channels(SilcServer server,
SilcBuffer *channels,
SilcBuffer *channel_users,
SilcBuffer **channel_users_modes,
SilcBuffer *channels,
SilcBuffer *channel_users,
SilcBuffer **channel_users_modes,
-
ui
nt32 *channel_users_modes_c,
+
SilcUI
nt32 *channel_users_modes_c,
SilcBuffer **channel_topics,
SilcChannelID ***channel_ids,
unsigned long creation_time)
SilcBuffer **channel_topics,
SilcChannelID ***channel_ids,
unsigned long creation_time)
@@
-3540,8
+3540,8
@@
void silc_server_announce_get_channels(SilcServer server,
SilcIDCacheEntry id_cache;
SilcChannelEntry channel;
unsigned char *cid;
SilcIDCacheEntry id_cache;
SilcChannelEntry channel;
unsigned char *cid;
-
ui
nt32 id_len;
-
ui
nt16 name_len;
+
SilcUI
nt32 id_len;
+
SilcUI
nt16 name_len;
int len;
int i = *channel_users_modes_c;
bool announce;
int len;
int i = *channel_users_modes_c;
bool announce;
@@
-3628,7
+3628,7
@@
void silc_server_announce_channels(SilcServer server,
SilcBuffer channels = NULL, channel_users = NULL;
SilcBuffer *channel_users_modes = NULL;
SilcBuffer *channel_topics = NULL;
SilcBuffer channels = NULL, channel_users = NULL;
SilcBuffer *channel_users_modes = NULL;
SilcBuffer *channel_topics = NULL;
-
ui
nt32 channel_users_modes_c = 0;
+
SilcUI
nt32 channel_users_modes_c = 0;
SilcChannelID **channel_ids = NULL;
SILC_LOG_DEBUG(("Announcing channels and channel users"));
SilcChannelID **channel_ids = NULL;
SILC_LOG_DEBUG(("Announcing channels and channel users"));
@@
-3750,14
+3750,14
@@
void silc_server_get_users_on_channel(SilcServer server,
SilcChannelEntry channel,
SilcBuffer *user_list,
SilcBuffer *mode_list,
SilcChannelEntry channel,
SilcBuffer *user_list,
SilcBuffer *mode_list,
-
ui
nt32 *user_count)
+
SilcUI
nt32 *user_count)
{
SilcChannelClientEntry chl;
SilcHashTableList htl;
SilcBuffer client_id_list;
SilcBuffer client_mode_list;
SilcBuffer idp;
{
SilcChannelClientEntry chl;
SilcHashTableList htl;
SilcBuffer client_id_list;
SilcBuffer client_mode_list;
SilcBuffer idp;
-
ui
nt32 list_count = 0, len = 0;
+
SilcUI
nt32 list_count = 0, len = 0;
silc_hash_table_list(channel->user_list, &htl);
while (silc_hash_table_get(&htl, NULL, (void *)&chl))
silc_hash_table_list(channel->user_list, &htl);
while (silc_hash_table_get(&htl, NULL, (void *)&chl))
@@
-3803,11
+3803,11
@@
void silc_server_save_users_on_channel(SilcServer server,
SilcClientID *noadd,
SilcBuffer user_list,
SilcBuffer mode_list,
SilcClientID *noadd,
SilcBuffer user_list,
SilcBuffer mode_list,
-
ui
nt32 user_count)
+
SilcUI
nt32 user_count)
{
int i;
{
int i;
-
ui
nt16 idp_len;
-
ui
nt32 mode;
+
SilcUI
nt16 idp_len;
+
SilcUI
nt32 mode;
SilcClientID *client_id;
SilcClientEntry client;
SilcIDCacheEntry cache;
SilcClientID *client_id;
SilcClientEntry client;
SilcIDCacheEntry cache;
@@
-3894,7
+3894,7
@@
void silc_server_save_users_on_channel(SilcServer server,
SilcSocketConnection silc_server_get_client_route(SilcServer server,
unsigned char *id_data,
SilcSocketConnection silc_server_get_client_route(SilcServer server,
unsigned char *id_data,
-
ui
nt32 id_len,
+
SilcUI
nt32 id_len,
SilcClientID *client_id,
SilcIDListData *idata)
{
SilcClientID *client_id,
SilcIDListData *idata)
{
@@
-3979,8
+3979,8
@@
SilcBuffer silc_server_get_client_channel_list(SilcServer server,
SilcChannelClientEntry chl;
SilcHashTableList htl;
unsigned char *cid;
SilcChannelClientEntry chl;
SilcHashTableList htl;
unsigned char *cid;
-
ui
nt32 id_len;
-
ui
nt16 name_len;
+
SilcUI
nt32 id_len;
+
SilcUI
nt16 name_len;
int len;
silc_hash_table_list(client->channels, &htl);
int len;
silc_hash_table_list(client->channels, &htl);