- libtool finally annoyed me too much, so I'm nuking it,

- tidy up some output,
- print a warning when running an SSL server with no cert,
- only log each connect/disconnect if the new "-out_conns" switch is used.

diff --git a/demos/tunala/INSTALL b/demos/tunala/INSTALL
index c7328dad34328462870d3e423c75c60881a676ce..a65bbeb8d11b7f99a39acd6f571464471d8f3156 100644 (file)
--- a/demos/tunala/INSTALL
+++ b/demos/tunala/INSTALL
@@ -3,7 +3,7 @@ There are two ways to build this code;
 (1) Manually
 
 (2) Using all-singing all-dancing (all-confusing) autotools, ie. autoconf,
-automake, libtool, and their little friends (autoheader, etc).
+automake, and their little friends (autoheader, etc).
 
 =================
 Building Manually
@@ -51,9 +51,9 @@ this way and the default Makefile isn't sufficient;
 Building Automagically
 ======================
 
-Automagic building is handled courtesy of autoconf, automake, and libtool. There
-is in fact two steps required to build, and only the first has to be done on a
-system with these tools installed (and if I was prepared to bloat out the CVS
+Automagic building is handled courtesy of autoconf, automake, etc. There are in
+fact two steps required to build, and only the first has to be done on a system
+with these tools installed (and if I was prepared to bloat out the CVS
 repository, I could store these extra files, but I'm not).
 
 First step: "autogunk.sh"
@@ -85,18 +85,6 @@ variable prior to running configure, eg.
 would cause "gcc" to be used even if there is an otherwise preferable (to
 autoconf) native compiler on your system.
 
-*IMPORTANT* It's highly recommended to pass "--disable-shared" to the configure
-script. Otherwise, libtool may elect to build most of the code as a
-shared-library, hide various bits of it in dotted directories and generating
-wrapper scripts in place of the linked binary. The autotool stuff, when "make
-install" is run (which you probably won't want to do for this dinky little
-thing) will unravel all that mess and either install a small executable +
-shared-lib or will install a linked executable. Passing the above flag ensures
-this is all done statically even if the platform supports building and using
-shared-libraries. Ie;
-
-    ./configure --disable-shared
-
 After this run "make" and it should build the "tunala" executable.
 
 Notes

diff --git a/demos/tunala/Makefile.am b/demos/tunala/Makefile.am
index 1616004d260e572baa14e2be22a5671853edba1f..706c7806c9d91e38f94a2939b70a600266189a39 100644 (file)
--- a/demos/tunala/Makefile.am
+++ b/demos/tunala/Makefile.am
@@ -1,11 +1,7 @@
 # Our includes come from the OpenSSL build-tree we're in
 INCLUDES               = -I$(top_builddir)/../../include
 
-lib_LTLIBRARIES                = libtunala.la
-
-libtunala_la_SOURCES   = buffer.c cb.c ip.c sm.c breakage.c
-
 bin_PROGRAMS           = tunala
 
-tunala_SOURCES         = tunala.c
-tunala_LDADD           = libtunala.la -L$(top_builddir)/../.. -lssl -lcrypto
+tunala_SOURCES         = tunala.c buffer.c cb.c ip.c sm.c breakage.c
+tunala_LDADD           = -L$(top_builddir)/../.. -lssl -lcrypto

diff --git a/demos/tunala/configure.in b/demos/tunala/configure.in
index 8a6f01fda85daa6e0988ab593549f4db16636428..b2a6ffc756b3d7cb821adaab01c9ab7ce36c5656 100644 (file)
--- a/demos/tunala/configure.in
+++ b/demos/tunala/configure.in
@@ -3,10 +3,10 @@ AC_INIT(tunala.c)
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(tunala, 0.0.1-dev)
 
-dnl Checks for programs.
+dnl Checks for programs. (Though skip libtool)
 AC_PROG_CC
-AC_PROG_LIBTOOL
-AM_PROG_LIBTOOL
+dnl AC_PROG_LIBTOOL
+dnl AM_PROG_LIBTOOL
 
 dnl Checks for libraries.
 AC_CHECK_LIB(dl, dlopen)

diff --git a/demos/tunala/tunala.c b/demos/tunala/tunala.c
index c1c9afe92837e4b1178d1b9d8ab217afa20a2176..90823043aa5eb6a0e65f454f55e115e7b65978bf 100644 (file)
--- a/demos/tunala/tunala.c
+++ b/demos/tunala/tunala.c
@@ -108,6 +108,7 @@ static unsigned int def_verify_depth = 10;
 static int def_out_state = 0;
 static unsigned int def_out_verify = 0;
 static int def_out_totals = 0;
+static int def_out_conns = 0;
 
 static const char *helpstring =
 "\n'Tunala' (A tunneler with a New Zealand accent)\n"
@@ -133,6 +134,7 @@ static const char *helpstring =
 " -v_strict              (do not continue if peer doesn't authenticate)\n"
 " -v_once                (no verification in renegotiates)\n"
 " -v_depth <num>         (limit certificate chain depth, default = 10)\n"
+" -out_conns             (prints client connections and disconnections)\n"
 " -out_state             (prints SSL handshake states)\n"
 " -out_verify <0|1|2|3>  (prints certificate verification states: def=1)\n"
 " -out_totals            (prints out byte-totals when a tunnel closes)\n"
@@ -314,6 +316,7 @@ int main(int argc, char *argv[])
        int out_state = def_out_state;
        unsigned int out_verify = def_out_verify;
        int out_totals = def_out_totals;
+       int out_conns = def_out_conns;
 
 /* Parse command-line arguments */
 next_arg:
@@ -466,6 +469,9 @@ next_arg:
                } else if(strcmp(*argv, "-out_totals") == 0) {
                        out_totals = 1;
                        goto next_arg;
+               } else if(strcmp(*argv, "-out_conns") == 0) {
+                       out_conns = 1;
+                       goto next_arg;
                } else if((strcmp(*argv, "-h") == 0) ||
                                (strcmp(*argv, "-help") == 0) ||
                                (strcmp(*argv, "-?") == 0)) {
@@ -474,11 +480,14 @@ next_arg:
                } else
                        return usage(*argv, 1);
        }
+       /* Run any sanity checks we want here */
+       if(!cert && !dcert && server_mode)
+               fprintf(stderr, "WARNING: you are running an SSL server without "
+                               "a certificate - this may not work!\n");
 
        /* Initialise network stuff */
        if(!ip_initialise())
                return err_str0("ip_initialise failed");
-       err_str0("ip_initialise succeeded");
        /* Create the SSL_CTX */
        if((world.ssl_ctx = initialise_ssl_ctx(server_mode, engine_id,
                        cacert, cert, key, dcert, dkey, cipher_list, dh_file,
@@ -486,20 +495,19 @@ next_arg:
                        verify_mode, verify_depth)) == NULL)
                return err_str1("initialise_ssl_ctx(engine_id=%s) failed",
                        (engine_id == NULL) ? "NULL" : engine_id);
-       err_str1("initialise_ssl_ctx(engine_id=%s) succeeded",
-                       (engine_id == NULL) ? "NULL" : engine_id);
+       if(engine_id)
+               fprintf(stderr, "Info, engine '%s' initialised\n", engine_id);
        /* Create the listener */
        if((world.listen_fd = ip_create_listener(listenhost)) == -1)
                return err_str1("ip_create_listener(%s) failed", listenhost);
-       err_str1("ip_create_listener(%s) succeeded", listenhost);
+       fprintf(stderr, "Info, listening on '%s'\n", listenhost);
        if(!ip_parse_address(proxyhost, &proxy_ip, &proxy_port, 0))
                return err_str1("ip_parse_address(%s) failed", proxyhost);
-       err_str1("ip_parse_address(%s) succeeded", proxyhost);
-       fprintf(stderr, "Info - proxying to %d.%d.%d.%d:%d\n",
+       fprintf(stderr, "Info, proxying to '%s' (%d.%d.%d.%d:%d)\n", proxyhost,
                        (int)proxy_ip[0], (int)proxy_ip[1],
                        (int)proxy_ip[2], (int)proxy_ip[3], (int)proxy_port);
-       fprintf(stderr, "Info - set maxtunnels to %d\n", (int)max_tunnels);
-       fprintf(stderr, "Info - set to operate as an SSL %s\n",
+       fprintf(stderr, "Info, set maxtunnels to %d\n", (int)max_tunnels);
+       fprintf(stderr, "Info, set to operate as an SSL %s\n",
                        (server_mode ? "server" : "client"));
        /* Initialise the rest of the stuff */
        world.tunnels_used = world.tunnels_size = 0;
@@ -534,7 +542,7 @@ main_loop:
                if(!tunala_world_new_item(&world, newfd, proxy_ip,
                                                proxy_port, flipped))
                        fprintf(stderr, "tunala_world_new_item failed\n");
-               else
+               else if(out_conns)
                        fprintf(stderr, "Info, new tunnel opened, now up to "
                                        "%d\n", world.tunnels_used);
        }
@@ -570,7 +578,8 @@ main_loop:
                                                &t_item->sm,SM_CLEAN_IN)));
 skip_totals:
                        tunala_world_del_item(&world, loop);
-                       fprintf(stderr, "Info, tunnel closed, down to %d\n",
+                       if(out_conns)
+                               fprintf(stderr, "Info, tunnel closed, down to %d\n",
                                        world.tunnels_used);
                }
                else {