From: Pekka Riikonen Date: Sun, 18 Nov 2001 13:40:36 +0000 (+0000) Subject: updates. X-Git-Tag: 1.2.beta1~1787 X-Git-Url: http://git.silcnet.org/gitweb/?p=crypto.git;a=commitdiff_plain;h=7c8081ba0bade2801be9105db5f34a1f88abfc46 updates. --- diff --git a/README.CVS b/README.CVS index 5fa6246a..e7568ead 100644 --- a/README.CVS +++ b/README.CVS @@ -153,6 +153,13 @@ Following directories currently exist in SILC source tree. Includes SILC server. There can be some extra files that will never appear in public distribution, such as, configuration files. + win32/ + + Includes win32 Toolkit specific files. It includes MSVC++ + Workspace files. The win32/tests includes example code for + use of SILC Toolkit and SILC Client Library on Win32 GUI + application. + Howto Compile SILC Source Tree ============================== diff --git a/apps/silcer/src/Makefile.in b/apps/silcer/src/Makefile.in index 4aeecae4..82a479c5 100644 --- a/apps/silcer/src/Makefile.in +++ b/apps/silcer/src/Makefile.in @@ -16,9 +16,9 @@ # # Makefile.am # -# Author: Pekka Riikonen +# Author: Pekka Riikonen # -# Copyright (C) 2000 - 2001 Pekka Riikonen +# Copyright (C) 2001 Pekka Riikonen # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -141,6 +141,8 @@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ install_sh = @install_sh@ +silc_top_srcdir = ../../ + bin_PROGRAMS = silcer silcer_SOURCES = silcer.cc \ silcerapp.cc \ @@ -153,12 +155,10 @@ silcer_SOURCES = silcer.cc \ silcer_LDADD = @EXTRA_GNOME_LIBS@ -lxml \ - -L/home/priikone/silc/lib -lsilcclient -lsilc + -L$(silc_top_srcdir)/lib -lsilcclient -lsilc silcer_LDFLAGS = -silc_top_srcdir = /home/priikone/silc - INCLUDES = @EXTRA_GNOME_CFLAGS@ -DENABLE_NLS \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DDATADIR=\"$(datadir)\" \ diff --git a/apps/silcer/src/silcerapp.cc b/apps/silcer/src/silcerapp.cc index b73ceb49..fa9e0fc5 100644 --- a/apps/silcer/src/silcerapp.cc +++ b/apps/silcer/src/silcerapp.cc @@ -211,21 +211,34 @@ SilcerApp::SilcerApp(int argc, char **argv) // Initialize SILC Client Library */ silc_client = silc_client_alloc(&ops, NULL, NULL, "SILC-1.0-0.6.2"); - silc_client->realname = "pekka riikonen"; - silc_client->username = "priikone"; - silc_client->hostname = "mun.oma.kone"; + silc_client->realname = "Foo T. Bar"; + silc_client->username = "foobar"; + silc_client->hostname = "foo.bar.foobar.com"; silc_cipher_register_default(); silc_pkcs_register_default(); silc_hash_register_default(); silc_hmac_register_default(); - silc_create_key_pair("rsa", 1024, "kk", "UN=priikone, " - "HN=pelle.kuo.fi.ssh.com", + + // XXXXX + // In real application at this point it would be of course checked + // whether ~/.silc direectory or something exists and key pair exists. + // If not then some firstsetup-wizard would be lauched that creates + // the keypair. In our example we'll always create a key pair. :( + silc_create_key_pair("rsa", 1024, "kk", "UN=foobar, " + "HN=foo.bar.foobar.com", &silc_client->public_key, &silc_client->private_key); + + // We are ready to initialize the SILC Client library. silc_client_init(silc_client); - // Setup SILC scheduler as timeout task + // Setup SILC scheduler as timeout task. This will handle the SILC + // client library every 50 milliseconds. It will actually make the + // SILC client work on background. Gnome::Main::timeout.connect(slot(this, &SilcerApp::silc_scheduler), 50); + // XXXXX + // This is now used to directly connect to silc.silcnet.org router + // XXXXX silc_schedule_task_add(silc_client->schedule, 0, connect_client, silc_client, 0, 1, SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL); @@ -278,6 +291,10 @@ GladeXML *SilcerApp::load_resource(const char *name, const char *filename) gint SilcerApp::silc_scheduler() { + // Run the SILC client once, and return immediately. This function + // is called every 50 milliseconds by the Gnome main loop, to process + // SILC stuff. This function will read data, and write data to network, + // etc. Makes the client library tick! :) silc_client_run_one(silc_client); return 1; } diff --git a/apps/silcer/ui/SilcerFirstsetupDlg.glade b/apps/silcer/ui/SilcerFirstsetupDlg.glade new file mode 100644 index 00000000..25085c52 --- /dev/null +++ b/apps/silcer/ui/SilcerFirstsetupDlg.glade @@ -0,0 +1,439 @@ + + + + + Project2 + project2 + + src + pixmaps + C + True + True + + + + GtkWindow + SilcerFirstsetupDlg + window1 + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + False + True + False + + + GnomeDruid + druid1 + + + GnomeDruidPageStart + druidpagestart1 + Silcer - First Time Setup + Silcer Gnome SILC Client + +You are running the Silcer for first time. This +setup wizard will guide you through the setup +procedure. You will need to do this only once! + +PRESS NEXT TO CONTINUE + 255,255,255 + 0,0,0 + 25,25,112 + 255,255,255 + 255,255,255 + + + + GnomeDruidPageStandard + druidpagestandard1 + Personal Information + 255,255,255 + 25,25,112 + 255,255,255 + + + GtkVBox + GnomeDruidPageStandard:vbox + druid-vbox1 + False + 0 + + 0 + True + True + + + + GtkFrame + frame1 + 5 + + 0.02 + GTK_SHADOW_ETCHED_OUT + + 0 + True + True + + + + GtkTable + table1 + 45 + 5 + 2 + False + 6 + 10 + + + GtkLabel + label2 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkEntry + entry1 + True + True + True + 0 + + + 1 + 2 + 0 + 1 + 0 + 0 + True + False + False + False + True + False + + + + + GtkLabel + label3 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label4 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + + + + GtkEntry + entry2 + True + True + True + 0 + + + 1 + 2 + 1 + 2 + 0 + 0 + True + False + False + False + True + False + + + + + GtkEntry + entry3 + True + True + True + 0 + + + 1 + 2 + 2 + 3 + 0 + 0 + True + False + False + False + True + False + + + + + GtkLabel + label5 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 3 + 4 + 0 + 0 + False + False + False + False + True + False + + + + + GtkEntry + entry4 + True + True + True + 0 + + + 1 + 2 + 3 + 4 + 0 + 0 + True + False + False + False + True + False + + + + + GtkLabel + label6 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 4 + 5 + 0 + 0 + False + False + False + False + True + False + + + + + + + + + GnomeDruidPageStandard + druidpagestandard2 + Authentication Key Generation + 255,255,255 + 25,25,112 + 255,255,255 + + + GtkVBox + GnomeDruidPageStandard:vbox + druid-vbox2 + False + 0 + + 0 + True + True + + + + GtkFrame + frame2 + 5 + 0 + GTK_SHADOW_ETCHED_OUT + + 0 + True + True + + + + GtkVBox + vbox1 + 30 + False + 0 + + + GtkLabel + label7 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkProgressBar + progressbar1 + 0 + 0 + 100 + GTK_PROGRESS_CONTINUOUS + GTK_PROGRESS_LEFT_TO_RIGHT + True + False + %P %% + 0.5 + 0.5 + + 1 + False + False + + + + + GtkLabel + label8 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + + + + + GnomeDruidPageFinish + druidpagefinish1 + Setup Completed + The Setup Wizard is completed! + +PRESS FINISH TO CONTINUE! + 25,25,112 + 255,255,255 + 255,255,255 + 0,0,0 + 255,255,255 + + + + + diff --git a/distributions b/distributions index e55e5e0f..c628aa46 100644 --- a/distributions +++ b/distributions @@ -53,7 +53,7 @@ toolkit_SUBDIRS=lib irssi silc silcd doc includes win32 toolkit_SUBDIRS_lib=$(COMMONDIRS) toolkit_SUBDIRS_doc=$(COMMONDIRS) toolkit_DISTLABEL=SILC_DIST_TOOLKIT -toolkit_EXTRA_DIST=README.CVS README.WIN32 +toolkit_EXTRA_DIST=README.CVS README.WIN32 silcer # Irssi SILC Client distribution client_SUBDIRS=lib irssi doc includes