projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integer type name change.
[silc.git]
/
apps
/
silc
/
silc.c
diff --git
a/apps/silc/silc.c
b/apps/silc/silc.c
index 743be04b03d7583ff7e9c0767116a876ba4064aa..e449af1d89883c03da6294b2bcbcd146017e7f21 100644
(file)
--- a/
apps/silc/silc.c
+++ b/
apps/silc/silc.c
@@
-275,7
+275,7
@@
SILC Secure Internet Live Conferencing, version %s\n",
app = silc_calloc(1, sizeof(*app));
/* Allocate new client */
app = silc_calloc(1, sizeof(*app));
/* Allocate new client */
- app->client = silc = silc_client_alloc(&ops, app);
+ app->client = silc = silc_client_alloc(&ops, app
, silc_version_string
);
if (!silc)
goto fail;
if (!silc)
goto fail;
@@
-284,10
+284,6
@@
SILC Secure Internet Live Conferencing, version %s\n",
/* XXX Read local configuration file */
/* XXX Read local configuration file */
- /* Check ~/.silc directory and public and private keys */
- if (silc_client_check_silc_dir() == FALSE)
- goto fail;
-
/* Get user information */
silc->username = silc_get_username();
silc->hostname = silc_net_localhost();
/* Get user information */
silc->username = silc_get_username();
silc->hostname = silc_net_localhost();
@@
-312,6
+308,10
@@
SILC Secure Internet Live Conferencing, version %s\n",
silc_hmac_register_default();
}
silc_hmac_register_default();
}
+ /* Check ~/.silc directory and public and private keys */
+ if (silc_client_check_silc_dir() == FALSE)
+ goto fail;
+
/* Load public and private key */
if (silc_client_load_keys(silc) == FALSE)
goto fail;
/* Load public and private key */
if (silc_client_load_keys(silc) == FALSE)
goto fail;
@@
-549,7
+549,7
@@
static void silc_client_clear_input(SilcClientInternal app)
static void silc_client_process_message(SilcClientInternal app)
{
unsigned char *data;
static void silc_client_process_message(SilcClientInternal app)
{
unsigned char *data;
-
ui
nt32 len;
+
SilcUI
nt32 len;
SILC_LOG_DEBUG(("Start"));
SILC_LOG_DEBUG(("Start"));
@@
-558,9
+558,9
@@
static void silc_client_process_message(SilcClientInternal app)
if (data[0] == '/' && data[1] != ' ') {
/* Command */
if (data[0] == '/' && data[1] != ' ') {
/* Command */
-
ui
nt32 argc = 0;
+
SilcUI
nt32 argc = 0;
unsigned char **argv, *tmpcmd;
unsigned char **argv, *tmpcmd;
-
ui
nt32 *argv_lens, *argv_types;
+
SilcUI
nt32 *argv_lens, *argv_types;
SilcClientCommand *cmd;
SilcClientCommandContext ctx;
SilcClientCommand *cmd;
SilcClientCommandContext ctx;
@@
-658,9
+658,9
@@
SILC_TASK_CALLBACK(silc_client_run_commands)
cs = app->config->commands;
while(cs) {
cs = app->config->commands;
while(cs) {
-
ui
nt32 argc = 0;
+
SilcUI
nt32 argc = 0;
unsigned char **argv, *tmpcmd;
unsigned char **argv, *tmpcmd;
-
ui
nt32 *argv_lens, *argv_types;
+
SilcUI
nt32 *argv_lens, *argv_types;
SilcClientCommand *cmd;
SilcClientCommandContext ctx;
SilcClientCommand *cmd;
SilcClientCommandContext ctx;