tinyrad-url: removing utility

4 files changed, 0 insertions, 362 deletions

diff --git a/Makefile.am b/Makefile.am
index 7c645c5..a70073d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,7 +106,6 @@ EXTRA_PROGRAMS				= examples/seed-by-clock \
 EXTRA                                   = lib/libtinyrad.a \
                                           lib/libtinyrad.la \
                                           src/tinyrad \
-                                          src/tinyrad-url \
                                           src/tinyradproxy \
                                           include/tinyrad.h
 
@@ -210,9 +209,6 @@ if ENABLE_TINYRAD
    bin_PROGRAMS                         += src/tinyrad
    TESTS                                += tests/test-dict-defaults.sh
 endif
-if ENABLE_TINYRAD_URL
-   bin_PROGRAMS                         += src/tinyrad-url
-endif
 if ENABLE_TINYRADPROXY
    sbin_PROGRAMS                        += src/tinyradproxy
 endif
@@ -312,13 +308,6 @@ src_tinyrad_SOURCES			= $(noinst_HEADERS) $(include_HEADERS) \
                                           src/tru/widget-url.c
 
 
-# macros for src/tinyrad-url
-src_tinyrad_url_DEPENDENCIES            = $(lib_LTLIBRARIES) $(noinst_LIBRARIES)
-src_tinyrad_url_LDADD                   = $(lib_LTLIBRARIES) $(noinst_LIBRARIES)
-src_tinyrad_url_SOURCES                 = $(noinst_HEADERS) $(include_HEADERS) \
-                                          src/tinyrad-url.c
-
-
 # macros for src/tinyradproxy
 src_tinyradproxy_DEPENDENCIES           = $(lib_LTLIBRARIES) $(noinst_LIBRARIES)
 src_tinyradproxy_LDADD                  = $(lib_LTLIBRARIES) $(noinst_LIBRARIES)
diff --git a/acinclude.m4 b/acinclude.m4
index cc01489..87343ad 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -39,14 +39,12 @@ AC_DEFUN([AC_TINYRAD_COMMON],[dnl
    AC_REQUIRE([AC_TINYRAD_DOCUMENTATION])
    AC_REQUIRE([AC_TINYRAD_LIBTINYRAD])
    AC_REQUIRE([AC_TINYRAD_TINYRAD])
-   AC_REQUIRE([AC_TINYRAD_TINYRAD_URL])
    AC_REQUIRE([AC_TINYRAD_TINYRADPROXY])
 
    ENABLE_TINYRAD_COMMON="no"
    if   test "x${ENABLE_DOCUMENATION}" = "xyes";then ENABLE_TINYRAD_COMMON="yes"
    elif test "x${ENABLE_LIBTINYRAD}"   = "xyes";then ENABLE_TINYRAD_COMMON="yes"
    elif test "x${ENABLE_TINYRAD}"      = "xyes";then ENABLE_TINYRAD_COMMON="yes"
-   elif test "x${ENABLE_TINYRAD_URL}"  = "xyes";then ENABLE_TINYRAD_COMMON="yes"
    elif test "x${ENABLE_TINYRADPROXY}" = "xyes";then ENABLE_TINYRAD_COMMON="yes"
    fi;
 
@@ -216,37 +214,6 @@ AC_DEFUN([AC_TINYRAD_TINYRAD],[dnl
 ])dnl
 
 
-# AC_TINYRAD_TINYRAD_URL()
-# ______________________________________________________________________________
-AC_DEFUN([AC_TINYRAD_TINYRAD_URL],[dnl
-
-   AC_REQUIRE([AC_TINYRAD_UTILITIES])
-
-   enableval=""
-   AC_ARG_ENABLE(
-      tinyrad-url,
-      [AS_HELP_STRING([--enable-tinyrad-url], [enable tinyrad-url utility])],
-      [ ETINYRADURL=$enableval ],
-      [ ETINYRADURL=$enableval ]
-   )
-
-   if test "x${ETINYRADURL}" == "xyes";then
-      ENABLE_TINYRAD_URL="yes"
-   elif test "x${ETINYRADURL}" == "xno";then
-      ENABLE_TINYRAD_URL="no"
-   elif test "x${ENABLE_UTILITIES}" == "xyes";then
-      ENABLE_TINYRAD_URL="yes"
-   elif test "x${ENABLE_UTILITIES}" == "xno";then
-      ENABLE_TINYRAD_URL="no"
-   else
-      ENABLE_TINYRAD_URL="no"
-   fi
-
-   AM_CONDITIONAL([ENABLE_TINYRAD_URL],  [test "$ENABLE_TINYRAD_URL" = "yes"])
-   AM_CONDITIONAL([DISABLE_TINYRAD_URL], [test "$ENABLE_TINYRAD_URL" = "no"])
-])dnl
-
-
 # AC_TINYRAD_TINYRADPROXY()
 # ______________________________________________________________________________
 AC_DEFUN([AC_TINYRAD_TINYRADPROXY],[dnl
diff --git a/configure.ac b/configure.ac
index 1bb778d..ef2eac8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,7 +196,6 @@ AC_TINYRAD_LIBTINYRAD
 AC_TINYRAD_UTILITIES
 AC_TINYRAD_TINYRAD
 AC_TINYRAD_TINYRADPROXY
-AC_TINYRAD_TINYRAD_URL
 AC_TINYRAD_EXAMPLES
 AC_TINYRAD_DOCUMENTATION
 AC_TINYRAD_COMMON
@@ -224,7 +223,6 @@ AC_MSG_NOTICE([      Build examples             ${ENABLE_EXAMPLES}])
 AC_MSG_NOTICE([      Install extra docs         ${ENABLE_DOCUMENATION}])
 AC_MSG_NOTICE([      Install libtinyrad.la      ${ENABLE_LIBTINYRAD}])
 AC_MSG_NOTICE([      Install tinyrad            ${ENABLE_TINYRAD}])
-AC_MSG_NOTICE([      Install tinyrad-url        ${ENABLE_TINYRAD_URL}])
 AC_MSG_NOTICE([      Install tinyradproxy       ${ENABLE_TINYRADPROXY}])
 AC_MSG_NOTICE([      Install common files       ${ENABLE_TINYRAD_COMMON}])
 AC_MSG_NOTICE([ ])
diff --git a/src/tinyrad-url.c b/src/tinyrad-url.c
deleted file mode 100644
index 00d432a..0000000
--- a/src/tinyrad-url.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- *  Tiny RADIUS Client Library
- *  Copyright (C) 2021 David M. Syzdek <david@syzdek.net>.
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are
- *  met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of David M. Syzdek nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- *  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- *  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- *  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DAVID M. SYZDEK BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- *  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- *  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- *  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- *  SUCH DAMAGE.
- */
-#define _SRC_UTILITIES_TINYRAD_URL_C 1
-
-
-///////////////
-//           //
-//  Headers  //
-//           //
-///////////////
-#pragma mark - Headers
-
-#include <tinyrad_utils.h>
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <arpa/inet.h>
-
-
-///////////////////
-//               //
-//  Definitions  //
-//               //
-///////////////////
-#pragma mark - Definitions
-
-#undef PROGRAM_NAME
-#define PROGRAM_NAME "tinyrad-url"
-
-
-//////////////////
-//              //
-//  Prototypes  //
-//              //
-//////////////////
-#pragma mark - Prototypes
-
-int main( int argc, char * argv[] );
-
-int my_print_urldesc( TinyRadURLDesc * trudp);
-void my_usage( void );
-
-
-/////////////////
-//             //
-//  Functions  //
-//             //
-/////////////////
-#pragma mark - Functions
-
-int main(int argc, char * argv[])
-{
-   int                        opt;
-   int                        c;
-   int                        rc;
-   int                        pos;
-   int                        opt_index;
-   int                        resolve;
-   unsigned                   opts;
-   uint32_t                   tr_opts;
-   TinyRadURLDesc *           trudp;
-   TinyRadURLDesc **          trudpp;
-   TinyRadURLDesc *           trudp_next;
-
-   // getopt options
-   static char          short_opt[] = "d:46hqrVv";
-   static struct option long_opt[] =
-   {
-      {"debug",            optional_argument, NULL, 'd' },
-      {"help",             no_argument,       NULL, 'h' },
-      {"quiet",            no_argument,       NULL, 'q' },
-      {"silent",           no_argument,       NULL, 'q' },
-      {"version",          no_argument,       NULL, 'V' },
-      {"verbose",          no_argument,       NULL, 'v' },
-      {"resolve",          no_argument,       NULL, 'r' },
-      { NULL, 0, NULL, 0 }
-   };
-
-   trutils_initialize(PROGRAM_NAME);
-
-   opts        = 0;
-   tr_opts     = 0;
-   resolve     = 0;
-   trudp       = NULL;
-   trudp_next  = NULL;
-
-   while((c = getopt_long(argc, argv, short_opt, long_opt, &opt_index)) != -1)
-   {
-      switch(c)
-      {
-         case -1:       /* no more arguments */
-         case 0:        /* long options toggles */
-         break;
-
-         case '4':
-         tr_opts |= TRAD_IPV4;
-         break;
-
-         case '6':
-         tr_opts |= TRAD_IPV6;
-         break;
-
-         case 'd':
-         opt = ((optarg)) ? (int)strtol(optarg, NULL, 0) : TRAD_DEBUG_ANY;
-         tinyrad_set_option(NULL, TRAD_OPT_DEBUG_LEVEL, &opt);
-         break;
-
-         case 'h':
-         my_usage();
-         return(0);
-
-         case 'q':
-         opts |=  TRUTILS_OPT_QUIET;
-         opts &= ~TRUTILS_OPT_VERBOSE;
-         break;
-
-         case 'r':
-         resolve = 1;
-         break;
-
-         case 'V':
-         trutils_version();
-         return(0);
-
-         case 'v':
-         opts |=  TRUTILS_OPT_VERBOSE;
-         opts &= ~TRUTILS_OPT_QUIET;
-         break;
-
-         case '?':
-         fprintf(stderr, "Try `%s --help' for more information.\n", PROGRAM_NAME);
-         return(1);
-
-         default:
-         fprintf(stderr, "%s: unrecognized option `--%c'\n", PROGRAM_NAME, c);
-         fprintf(stderr, "Try `%s --help' for more information.\n", PROGRAM_NAME);
-         return(1);
-      };
-   };
-
-   // argument checks
-   if (optind >= argc)
-   {
-      fprintf(stderr, "%s: missing required argument\n", PROGRAM_NAME);
-      fprintf(stderr, "Try `%s --help' for more information.\n", PROGRAM_NAME);
-      return(1);
-   };
-
-   // parse and resolve URLs
-   trudpp = &trudp;
-   for(pos = optind; (pos < argc); pos++)
-   {
-      if ((rc = tinyrad_urldesc_parse(argv[pos], trudpp)) != TRAD_SUCCESS)
-      {
-         if (!(opts & TRUTILS_OPT_QUIET))
-         {
-            fprintf(stderr, "%s: %s: %s\n", PROGRAM_NAME, argv[pos], tinyrad_strerror(rc));
-            fprintf(stderr, "Try `%s --help' for more information.\n", PROGRAM_NAME);
-         };
-         return(1);
-      };
-      if ((resolve))
-      {
-         if ((rc = tinyrad_urldesc_resolve(*trudpp, tr_opts)) != TRAD_SUCCESS)
-         {
-            if (!(opts & TRUTILS_OPT_QUIET))
-            {
-               fprintf(stderr, "%s: %s: %s\n", PROGRAM_NAME, argv[pos], tinyrad_strerror(rc));
-               fprintf(stderr, "Try `%s --help' for more information.\n", PROGRAM_NAME);
-            };
-            return(1);
-         };
-      };
-      trudpp = &(*trudpp)->trud_next;
-   };
-
-   // exit if not displaying output
-   if (!(opts & TRUTILS_OPT_VERBOSE))
-   {
-      tinyrad_urldesc_free(trudp);
-      return(0);
-   };
-
-   // display URLs
-   trudp_next = trudp;
-   while ((trudp_next))
-   {
-      if ((my_print_urldesc(trudp_next)))
-      {
-         tinyrad_urldesc_free(trudp);
-         return(1);
-      };
-      trudp_next = trudp_next->trud_next;
-   };
-
-   tinyrad_urldesc_free(trudp);
-
-   return(0);
-}
-
-
-int my_print_urldesc( TinyRadURLDesc * trudp)
-{
-   int                        pos;
-   char *                     str;
-   const char *               scheme;
-   struct sockaddr_storage *  sas;
-   char                       addr[INET6_ADDRSTRLEN];
-
-   if ((str = tinyrad_urldesc2str(trudp)) == NULL)
-   {
-      fprintf(stderr, "%s: out of virtual memory\n", PROGRAM_NAME);
-      tinyrad_urldesc_free(trudp);
-      return(1);
-   };
-   switch(trudp->trud_opts & TRAD_SCHEME)
-   {
-      case TRAD_RADIUS:          scheme = "radius (RFC2865 RADIUS)"; break;;
-      case TRAD_RADIUS_ACCT:     scheme = "radius-acct (RFC2866 RADIUS Accounting)"; break;;
-      case TRAD_RADIUS_DYNAUTH:  scheme = "radius-dynauth (RFC2866 RADIUS Dynamic Authorization)"; break;;
-      case TRAD_RADSEC:          scheme = "radsec (RFC6614/RFC7360 RADIUS TLS/DTLS)"; break;;
-      default:                   scheme = "Unknown or unsupported URL scheme";  break;
-   };
-
-   printf("%s\n", str);
-   printf("   scheme:     %s\n", scheme);
-   printf("   host:       %s\n", trudp->trud_host);
-   printf("   port:       %i\n", trudp->trud_port);
-   printf("   secret:     %s\n", (((trudp->trud_secret)) ? trudp->trud_secret : "n/a"));
-   printf("   protocol:   %s\n", ((trudp->trud_opts & TRAD_TCP)) ? "tcp" : "udp");
-   if ( ((trudp->trud_sockaddrs)) && ((trudp->trud_sockaddrs[0])) )
-   {
-      for(pos = 0; ((trudp->trud_sockaddrs[pos])); pos++)
-      {
-         sas = trudp->trud_sockaddrs[pos];
-         switch(sas->ss_family)
-         {
-            case AF_INET:  inet_ntop(sas->ss_family, &((struct sockaddr_in  *)sas)->sin_addr,  addr, sizeof(addr)); break;
-            case AF_INET6: inet_ntop(sas->ss_family, &((struct sockaddr_in6 *)sas)->sin6_addr, addr, sizeof(addr)); break;
-            default:
-            addr[0] = '\0';
-            break;
-         };
-         printf("   %s%s\n", ((!(pos)) ? "addresses:  " : "            "), addr);
-      };
-   };
-   printf("\n");
-
-   tinyrad_free(str);
-
-   return(0);
-}
-
-
-void my_usage(void)
-{
-   printf("Usage: %s [OPTIONS] url url ... url\n", PROGRAM_NAME);
-   printf("Options:\n");
-   printf("  -4                                        use IPv4 addresses\n");
-   printf("  -6                                        use IPv6 addresses\n");
-   printf("  -d level, --debug=level                   print debug messages\n");
-   printf("  -h, --help                                print this help and exit\n");
-   printf("  -q, --quiet, --silent                     do not print messages\n");
-   printf("  -V, --version                             print version number and exit\n");
-   printf("  -v, --verbose                             print verbose messages\n");
-   printf("  -r, --resolve                             resolve URLs\n");
-   printf("\n");
-   printf("URL Syntax:\n");
-   printf("  radius://hostport/[secret][?proto]         use RFC2865 (udp/port 1812)\n");
-   printf("  radius-acct://hostport/[secret][?proto]    use RFC2866 (udp/port 1813)\n");
-   printf("  radsec://hostport/[?proto]                 use RFC6614/RFC7360 (tcp/port 2083)\n");
-   printf("  radius-dynauth://hostport/[secret][?proto] use RFC5176 (udp/port 3799)\n");
-   printf("\n");
-   printf("  where:\n");
-   printf("     'hostport' is a host name with an optional ':portnumber'\n");
-   printf("     'secret' is the RADIUS secret encoded using character encoding in RFC3986\n");
-   printf("     'proto' is communication protocol used by the connection (UDP or TCP)\n");
-   printf("\n");
-   return;
-}
-
-
-/* end of source */