libevht baseline

apps/restconf/Makefile.in

@@ -56,6 +56,7 @@ HOST_VENDOR     = @host_vendor@
 wwwdir  	= @wwwdir@
 wwwuser         = @wwwuser@
 with_libhttp	= @with_libhttp@
+with_evhtp	= @with_evhtp@
 
 SH_SUFFIX	= @SH_SUFFIX@
 CLIXON_MAJOR    = @CLIXON_VERSION_MAJOR@
@@ -71,6 +72,9 @@ LIBS          = -L$(top_srcdir)/lib/src @LIBS@ $(top_srcdir)/lib/src/$(CLIXON_LI
 ifeq ($(with_libhttp),yes)
 LIBS          += -ldl -lpthread 
 endif
+ifeq ($(with_evhtp),yes)
+LIBS          += -lpthread -levent -levent_openssl -lssl -lcrypto
+endif
 
 CPPFLAGS  	= @CPPFLAGS@ -fPIC
 
@@ -81,6 +85,9 @@ APPLS	  = clixon_restconf # fcgi / nginx
 ifeq ($(with_libhttp),yes)
 APPLS	 += clixon_restconf_libhttp
 endif
+ifeq ($(with_evhtp),yes)
+APPLS	 += clixon_restconf_evhtp
+endif
 
 # Common source - not accessible from plugin - independent of fcgi
 APPSRC    = restconf_lib.c
@@ -100,6 +107,11 @@ ifeq ($(with_libhttp),yes)
 APPLIBH  = restconf_libhttp_main.c
 APPLIBHOBJ = $(APPLIBH:.c=.o)
 endif
+ifeq ($(with_evhtp),yes)
+# Evhtp-specific source including main
+APPEVHTPH  = restconf_evhtp_main.c
+APPEVHTPOBJ = $(APPEVHTPH:.c=.o)
+endif
 
 all:	 $(APPLS)
 
@@ -112,6 +124,9 @@ clean:
 ifeq ($(with_libhttp),yes)
 	rm -f $(APPLIBHOBJ)
 endif
+ifeq ($(with_evhtp),yes)
+	rm -f $(APPEVHTPOBJ)
+endif
 
 distclean: clean
 	rm -f Makefile *~ .depend
@@ -148,6 +163,11 @@ clixon_restconf_libhttp : $(APPOBJ) $(APPLIBHOBJ) $(LIBDEPS)
 	$(CC) $(LDFLAGS) $(APPOBJ) $(APPLIBHOBJ) -L. $(LIBS) -o $@
 endif
 
+ifeq ($(with_evhtp),yes)
+clixon_restconf_evhtp : $(APPOBJ) $(APPEVHTPOBJ) $(LIBDEPS)
+	$(CC) $(LDFLAGS) $(APPOBJ) $(APPEVHTPOBJ) -L. $(LIBS) -o $@
+endif
+
 TAGS:
 	find . -name '*.[chyl]' -print | etags -
 

apps/restconf/restconf_evhtp_main.c

@@ -0,0 +1,497 @@
+/*
+ *
+  ***** BEGIN LICENSE BLOCK *****
+ 
+  Copyright (C) 2009-2019 Olof Hagsand
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
+
+  This file is part of CLIXON.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  Alternatively, the contents of this file may be used under the terms of
+  the GNU General Public License Version 3 or later (the "GPL"),
+  in which case the provisions of the GPL are applicable instead
+  of those above. If you wish to allow use of your version of this file only
+  under the terms of the GPL, and not to allow others to
+  use your version of this file under the terms of Apache License version 2, 
+  indicate your decision by deleting the provisions above and replace them with
+  the  notice and other provisions required by the GPL. If you do not delete
+  the provisions above, a recipient may use your version of this file under
+  the terms of any one of the Apache License version 2 or the GPL.
+
+  ***** END LICENSE BLOCK *****
+  
+ */
+
+/* XXX temp constant should go away, */
+#undef _EVHTP_NYI 
+
+#ifdef HAVE_CONFIG_H
+#include "clixon_config.h" /* generated by config & autoconf */
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <signal.h>
+#include <syslog.h>
+#include <fcntl.h>
+#include <time.h>
+#include <limits.h>
+#include <signal.h>
+#include <sys/time.h>
+#include <sys/wait.h>
+#include <assert.h>
+#include <sys/stat.h> /* chmod */
+
+/* evhtp */
+#include <evhtp/evhtp.h>
+#include <evhtp/sslutils.h>
+
+/* cligen */
+#include <cligen/cligen.h>
+
+/* clicon */
+#include <clixon/clixon.h>
+
+/* restconf */
+
+#include "restconf_lib.h"
+#if 0 /* These are all dependent on FCGX */
+#include "restconf_methods.h"
+#include "restconf_methods_get.h"
+#include "restconf_methods_post.h"
+#include "restconf_stream.h"
+#endif
+
+/* Command line options to be passed to getopt(3) */
+#define RESTCONF_OPTS "hD:f:l:p:d:y:a:u:o:P:c:k:"
+
+/* Need global variable to for signal handler XXX */
+static clicon_handle _CLICON_HANDLE = NULL;
+
+/*! Signall terminates process
+ */
+static void
+restconf_sig_term(int arg)
+{
+    static int i=0;
+
+    if (i++ == 0)
+	clicon_log(LOG_NOTICE, "%s: %s: pid: %u Signal %d", 
+		   __PROGRAM__, __FUNCTION__, getpid(), arg);
+    else
+	exit(-1);
+    if (_CLICON_HANDLE){
+#ifdef _EVHTP_NYI 
+	stream_child_freeall(_CLICON_HANDLE);
+#endif
+	restconf_terminate(_CLICON_HANDLE);
+    }
+    clicon_exit_set(); /* checked in event_loop() */
+    exit(-1);
+}
+
+static void
+restconf_sig_child(int arg)
+{
+    int status;
+    int pid;
+
+    if ((pid = waitpid(-1, &status, 0)) != -1 && WIFEXITED(status)){
+#ifdef _EVHTP_NYI
+	;
+#endif
+    }
+}
+
+/*! Generic callback called if no other callbacks are matched
+ */
+static void
+cx_generic_callback(evhtp_request_t *req,
+		    void            *arg)
+{
+    evhtp_connection_t * conn;
+
+    fprintf(stderr, "%s\n", __FUNCTION__);    
+    if (req == NULL){
+	errno = EINVAL;
+	return;
+    }
+    if ((conn = evhtp_request_get_connection(req)) == NULL)
+	return;
+
+    htp_sslutil_add_xheaders(
+        req->headers_out,
+        conn->ssl,
+        HTP_SSLUTILS_XHDR_ALL);
+
+    return evhtp_send_reply(req, EVHTP_RES_OK);
+}
+
+/*! Usage help routine
+ * @param[in]  argv0  command line
+ * @param[in]  h      Clicon handle
+ */
+static void
+usage(clicon_handle h,
+      char         *argv0)
+
+{
+    fprintf(stderr, "usage:%s [options]\n"
+	    "where options are\n"
+            "\t-h \t\t  Help\n"
+	    "\t-D <level>\t  Debug level\n"
+    	    "\t-f <file>\t  Configuration file (mandatory)\n"
+	    "\t-l <s|f<file>> \t  Log on (s)yslog, (f)ile (syslog is default)\n"
+	    "\t-p <dir>\t  Yang directory path (see CLICON_YANG_DIR)\n"
+	    "\t-d <dir>\t  Specify restconf plugin directory dir (default: %s)\n"
+	    "\t-y <file>\t  Load yang spec file (override yang main module)\n"
+    	    "\t-a UNIX|IPv4|IPv6 Internal backend socket family\n"
+    	    "\t-u <path|addr>\t  Internal socket domain path or IP addr (see -a)\n"
+	    "\t-o \"<option>=<value>\" Give configuration option overriding config file (see clixon-config.yang)\n"
+    	    "\t-P <port>\t  HTTPS port (default 443)\n"
+	    "\t-c <cert>\t  SSL server certificate - pemfile (mandatory)\n"
+	    "\t-k <key>\t  SSL private key - privfile (mandatory)\n"
+	    ,
+	    argv0,
+	    clicon_restconf_dir(h)
+	    );
+    exit(0);
+}
+
+/*! Main routine for libhttp restconf
+ */
+int
+main(int    argc,
+     char **argv)
+{
+    int            retval = -1;
+    char	  *argv0 = argv[0];
+    int            c;
+    clicon_handle  h;
+    char          *dir;
+    int            logdst = CLICON_LOG_SYSLOG;
+    yang_stmt     *yspec = NULL;
+    int            finish = 0;
+    int            start = 1;
+    char          *str;
+    clixon_plugin *cp = NULL;
+    uint32_t       id = 0;
+    cvec          *nsctx_global = NULL; /* Global namespace context */
+    size_t         cligen_buflen;
+    size_t         cligen_bufthreshold;
+    uint16_t       port = 443;
+#ifdef _EVHTP_NYI 
+    char          *stream_path;
+#endif
+    evhtp_t           *htp = NULL;
+    struct event_base *evbase = NULL;
+    evhtp_ssl_cfg_t   *ssl_config = NULL;
+    struct stat        f_stat;
+
+    /* In the startup, logs to stderr & debug flag set later */
+    clicon_log_init(__PROGRAM__, LOG_INFO, logdst); 
+
+    /* Create handle */
+    if ((h = clicon_handle_init()) == NULL)
+	goto done;
+
+    _CLICON_HANDLE = h; /* for termination handling */
+
+    while ((c = getopt(argc, argv, RESTCONF_OPTS)) != -1)
+	switch (c) {
+	case 'h':
+	    usage(h, argv0);
+	    break;
+	case 'D' : /* debug */
+	    if (sscanf(optarg, "%d", &debug) != 1)
+		usage(h, argv0);
+	    break;
+	 case 'f': /* override config file */
+	    if (!strlen(optarg))
+		usage(h, argv0);
+	    clicon_option_str_set(h, "CLICON_CONFIGFILE", optarg);
+	    break;
+	 case 'l': /* Log destination: s|e|o */
+	     if ((logdst = clicon_log_opt(optarg[0])) < 0)
+		usage(h, argv0);
+	    if (logdst == CLICON_LOG_FILE &&
+		strlen(optarg)>1 &&
+		clicon_log_file(optarg+1) < 0)
+		goto done;
+	   break;
+	} /* switch getopt */
+
+    /* 
+     * Logs, error and debug to stderr or syslog, set debug level
+     */
+    clicon_log_init(__PROGRAM__, debug?LOG_DEBUG:LOG_INFO, logdst); 
+
+    clicon_debug_init(debug, NULL); 
+    clicon_log(LOG_NOTICE, "%s: %u Started", __PROGRAM__, getpid());
+    if (set_signal(SIGTERM, restconf_sig_term, NULL) < 0){
+	clicon_err(OE_DAEMON, errno, "Setting signal");
+	goto done;
+    }
+    if (set_signal(SIGINT, restconf_sig_term, NULL) < 0){
+	clicon_err(OE_DAEMON, errno, "Setting signal");
+	goto done;
+    }
+    if (set_signal(SIGCHLD, restconf_sig_child, NULL) < 0){
+	clicon_err(OE_DAEMON, errno, "Setting signal");
+	goto done;
+    }
+
+    /* Find and read configfile */
+    if (clicon_options_main(h) < 0)
+	goto done;
+#ifdef _EVHTP_NYI 
+    stream_path = clicon_option_str(h, "CLICON_STREAM_PATH");
+#endif
+    /* Init evhtp ssl config struct */
+    if ((ssl_config = malloc(sizeof(evhtp_ssl_cfg_t))) == NULL){
+	clicon_err(OE_UNIX, errno, "malloc");
+	goto done;
+    }
+    memset(ssl_config, 0, sizeof(evhtp_ssl_cfg_t));
+    ssl_config->ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1;
+    
+    /* Now rest of options, some overwrite option file */
+    optind = 1;
+    opterr = 0;
+    while ((c = getopt(argc, argv, RESTCONF_OPTS)) != -1)
+	switch (c) {
+	case 'h' : /* help */
+	case 'D' : /* debug */
+	case 'f':  /* config file */
+	case 'l':  /* log  */
+	    break; /* see above */
+	case 'p' : /* yang dir path */
+	    if (clicon_option_add(h, "CLICON_YANG_DIR", optarg) < 0)
+		goto done;
+	    break;
+	case 'd':  /* Plugin directory */
+	    if (!strlen(optarg))
+		usage(h, argv0);
+	    clicon_option_str_set(h, "CLICON_RESTCONF_DIR", optarg);
+	    break;
+	case 'y' : /* Load yang spec file (override yang main module) */
+	    clicon_option_str_set(h, "CLICON_YANG_MAIN_FILE", optarg);
+	    break;
+	case 'a': /* internal backend socket address family */
+	    clicon_option_str_set(h, "CLICON_SOCK_FAMILY", optarg);
+	    break;
+	case 'u': /* internal backend socket unix domain path or ip host */
+	    if (!strlen(optarg))
+		usage(h, argv0);
+	    clicon_option_str_set(h, "CLICON_SOCK", optarg);
+	    break;
+	case 'o':{ /* Configuration option */
+	    char          *val;
+	    if ((val = index(optarg, '=')) == NULL)
+		usage(h, argv0);
+	    *val++ = '\0';
+	    if (clicon_option_add(h, optarg, val) < 0)
+		goto done;
+	    break;
+	}
+	case 'P': /* http port */
+	    if (!strlen(optarg))
+		usage(h, argv0);
+	    port=atoi(optarg);
+	    break;
+	case 'c': /* SSL Server Certificate */
+	    ssl_config->pemfile = optarg;
+	    break;
+	case 'k': /* SSL private key */
+	    ssl_config->privfile = optarg;
+	    break;
+        default:
+            usage(h, argv0);
+            break;
+	}
+    argc -= optind;
+    argv += optind;
+
+    /* Check ssl mandatory options */
+    if (ssl_config->pemfile == NULL || ssl_config->privfile == NULL)
+	usage(h, argv0);
+    /* Verify SSL files */
+    if (ssl_config->pemfile == NULL)
+	usage(h, argv0);
+    if (stat(ssl_config->pemfile, &f_stat) != 0) {
+	clicon_err(OE_FATAL, errno, "Cannot load SSL cert '%s'", ssl_config->pemfile);
+	goto done;
+    }
+    if (ssl_config->privfile == NULL) 
+	usage(h, argv0);
+    if (stat(ssl_config->privfile, &f_stat) != 0) {
+	clicon_err(OE_FATAL, errno, "Cannot load SSL key '%s'", ssl_config->privfile);
+	goto done;
+    }
+    //    ssl_verify_mode             = htp_sslutil_verify2opts(optarg);
+    assert(SSL_VERIFY_NONE == 0);
+    /* Access the remaining argv/argc options (after --) w clicon-argv_get() */
+    clicon_argv_set(h, argv0, argc, argv);
+    
+    /* Init cligen buffers */
+    cligen_buflen = clicon_option_int(h, "CLICON_CLI_BUF_START");
+    cligen_bufthreshold = clicon_option_int(h, "CLICON_CLI_BUF_THRESHOLD");
+    cbuf_alloc_set(cligen_buflen, cligen_bufthreshold);
+
+    /* Add (hardcoded) netconf features in case ietf-netconf loaded here
+     * Otherwise it is loaded in netconf_module_load below
+     */
+    if (netconf_module_features(h) < 0)
+	goto done;
+
+    /* Create top-level yang spec and store as option */
+    if ((yspec = yspec_new()) == NULL)
+	goto done;
+    clicon_dbspec_yang_set(h, yspec);
+    /* Treat unknown XML as anydata */
+    if (clicon_option_bool(h, "CLICON_YANG_UNKNOWN_ANYDATA") == 1)
+	xml_bind_yang_unknown_anydata(1);
+    
+    /* Load restconf plugins before yangs are loaded (eg extension callbacks) */
+    if ((dir = clicon_restconf_dir(h)) != NULL)
+	if (clixon_plugins_load(h, CLIXON_PLUGIN_INIT, dir, NULL) < 0)
+	    return -1;
+    /* Create a pseudo-plugin to create extension callback to set the ietf-routing
+     * yang-data extension for api-root top-level restconf function.
+     */
+    if (clixon_pseudo_plugin(h, "pseudo restconf", &cp) < 0)
+	goto done;
+    cp->cp_api.ca_extension = restconf_main_extension_cb;
+
+    /* Load Yang modules
+     * 1. Load a yang module as a specific absolute filename */
+    if ((str = clicon_yang_main_file(h)) != NULL){
+	if (yang_spec_parse_file(h, str, yspec) < 0)
+	    goto done;
+    }
+    /* 2. Load a (single) main module */
+    if ((str = clicon_yang_module_main(h)) != NULL){
+	if (yang_spec_parse_module(h, str, clicon_yang_module_revision(h),
+				   yspec) < 0)
+	    goto done;
+    }
+    /* 3. Load all modules in a directory */
+    if ((str = clicon_yang_main_dir(h)) != NULL){
+	if (yang_spec_load_dir(h, str, yspec) < 0)
+	    goto done;
+    }
+    /* Load clixon lib yang module */
+    if (yang_spec_parse_module(h, "clixon-lib", NULL, yspec) < 0)
+	goto done;
+     /* Load yang module library, RFC7895 */
+    if (yang_modules_init(h) < 0)
+	goto done;
+
+    /* Load yang restconf module */
+    if (yang_spec_parse_module(h, "ietf-restconf", NULL, yspec)< 0)
+	goto done;
+    
+    /* Add netconf yang spec, used as internal protocol */
+    if (netconf_module_load(h) < 0)
+	goto done;
+    
+    /* Add system modules */
+     if (clicon_option_bool(h, "CLICON_STREAM_DISCOVERY_RFC8040") &&
+	 yang_spec_parse_module(h, "ietf-restconf-monitoring", NULL, yspec)< 0)
+	 goto done;
+     if (clicon_option_bool(h, "CLICON_STREAM_DISCOVERY_RFC5277") &&
+	 yang_spec_parse_module(h, "clixon-rfc5277", NULL, yspec)< 0)
+	 goto done;
+
+     /* Here all modules are loaded 
+      * Compute and set canonical namespace context
+      */
+     if (xml_nsctx_yangspec(yspec, &nsctx_global) < 0)
+	 goto done;
+     if (clicon_nsctx_global_set(h, nsctx_global) < 0)
+	 goto done;
+
+     /* Dump configuration options on debug */
+    if (debug)      
+	clicon_option_dump(h, debug);
+
+    /* Call start function in all plugins before we go interactive 
+     */
+     if (clixon_plugin_start_all(h) < 0)
+	 goto done;
+
+    /* Find and read configfile */
+    if (clicon_options_main(h) < 0)
+	goto done;
+
+    /* Init evhtp */
+    if ((evbase = event_base_new()) == NULL){
+	clicon_err(OE_UNIX, errno, "event_base_new");
+	goto done;
+    }
+    /* create a new evhtp_t instance */
+    if ((htp = evhtp_new(evbase, NULL)) == NULL){
+	clicon_err(OE_UNIX, errno, "evhtp_new");
+	goto done;
+    }
+    if (evhtp_ssl_init(htp, ssl_config) < 0){
+	clicon_err(OE_UNIX, errno, "evhtp_new");
+	goto done;
+    }
+    /* * Generic callback called if no other callbacks are matched
+     */
+    evhtp_set_gencb(htp, cx_generic_callback, NULL);
+    /* bind to a socket, optionally with specific protocol support formatting */
+    if (evhtp_bind_socket(htp, "127.0.0.1", port, 128) < 0){
+	clicon_err(OE_UNIX, errno, "evhtp_bind_socket");
+	goto done;
+    }
+
+    event_base_loop(evbase, 0);
+    
+    if (0)
+	while (finish == 0) {
+	finish = 1; /* If zero, dont finish request, initiate new */
+	clicon_debug(1, "------------");
+
+	if (start == 0){
+	    /* Send hello request to backend to get session-id back
+	     * This is done once at the beginning of the session and then this is
+	     * used by the client, even though new TCP sessions are created for
+	     * each message sent to the backend.
+	     */
+	    if (clicon_hello_req(h, &id) < 0)
+		goto done;
+	    clicon_session_id_set(h, id);
+	    start++;
+	}
+	break; /* XXX */
+    }	
+
+
+    /* Use options to select the port and document root among other things.
+     * Use callbacks to add your own hooks.
+     */
+
+    retval = 0;
+ done:
+#ifdef _EVHTP_NYI 
+    stream_child_freeall(h);
+#endif
+    restconf_terminate(h);    
+    return retval;
+}

configure

@@ -634,6 +634,7 @@ CPP
 wwwuser
 wwwdir
 enable_optyangs
+with_evhtp
 with_libhttp
 with_restconf
 SH_SUFFIX
@@ -717,6 +718,7 @@ enable_publish
 with_restconf
 with_wwwuser
 with_libhttp
+with_evhtp
 with_configfile
 with_libxml2
 with_yang_installdir
@@ -1365,15 +1367,19 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-cligen=dir       Use CLIGEN here
+  --with-cligen=dir
   --without-restconf      disable support for restconf
   --with-wwwuser=<user>   Set www user different from www-data
   --with-libhttp          Use libhttp as restconf server
-
+  --with-evhtp            Use evhtp as restconf server
-  --with-configfile=FILE  set default path to config file
+  --with-configfile=FILE  Set default path to config file
-  --with-libxml2          use gnome/libxml2 regex engine
+  --with-libxml2          Use gnome/libxml2 regex engine
-  --with-yang-installdir=DIR  Install Clixon yang files here (default: ${prefix}/share/clixon)
+  --with-yang-installdir=DIR
-  --with-opt-yang-installdir=DIR  Install optional yang files here (default: ${prefix}/share/clixon)
+                          Install Clixon yang files here (default:
+                          ${prefix}/share/clixon)
+  --with-opt-yang-installdir=DIR
+                          Install optional yang files here (default:
+                          ${prefix}/share/clixon)
 
 Some influential environment variables:
   CC          C compiler command
@@ -3300,7 +3306,8 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
  # If yes, compile apps/restconf
-  # If yes, include libhttp server (https://www.libhttp.org/)
+  # If yes, use libhttp+restconf server (https://www.libhttp.org/)
+ # If yes, use libevhp+restconf server (https://github.com/criticalstack/libevhtp)
 
 wwwdir=/www-data
 
@@ -4241,7 +4248,7 @@ SH_SUFFIX=".so"
 
 # Check whether --with-cligen was given.
 if test "${with_cligen+set}" = set; then :
-  withval=$with_cligen;
+  withval=$with_cligen; Use CLIGEN here
 fi
 
 if test "${with_cligen}"; then
@@ -4734,7 +4741,6 @@ fi
 
 if test "${with_wwwuser}"; then
    wwwuser=${with_wwwuser}
-
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: www user is $wwwuser" >&5
 $as_echo "www user is $wwwuser" >&6; }
@@ -4744,7 +4750,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-# This is for libhttp server (https://www.libhttp.org/) to be used as restconf client
+# OBSOLETE: This is for libhttp server (https://www.libhttp.org/) to be used as restconf client
 # Out-of-the box it comes as static lib .a
 
 # Check whether --with-libhttp was given.
@@ -4755,7 +4761,6 @@ else
 fi
 
 
-echo "lib_http: ${with_libhttp}"
 if test "x${with_libhttp}" == xyes; then
    for ac_header in libhttp/libhttp.h
 do :
@@ -4821,6 +4826,81 @@ fi
 
 fi
 
+# This is for libevhtp server (https://github.com/criticalstack/libevhtp)
+
+# Check whether --with-evhtp was given.
+if test "${with_evhtp+set}" = set; then :
+  withval=$with_evhtp;
+else
+  with_evhtp=no
+fi
+
+
+#echo "with_evhtp:${with_evhtp}"
+if test "x${with_evhtp}" == xyes; then
+   for ac_header in evhtp/evhtp.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "evhtp/evhtp.h" "ac_cv_header_evhtp_evhtp_h" "$ac_includes_default"
+if test "x$ac_cv_header_evhtp_evhtp_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_EVHTP_EVHTP_H 1
+_ACEOF
+
+else
+  as_fn_error $? "evhtp header missing. See https://github.com/criticalstack/libevhtp" "$LINENO" 5
+fi
+
+done
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for evhtp_new in -levhtp" >&5
+$as_echo_n "checking for evhtp_new in -levhtp... " >&6; }
+if ${ac_cv_lib_evhtp_evhtp_new+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-levhtp -lpthread -levent -levent_openssl -lssl -lcrypto $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char evhtp_new ();
+int
+main ()
+{
+return evhtp_new ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_evhtp_evhtp_new=yes
+else
+  ac_cv_lib_evhtp_evhtp_new=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_evhtp_evhtp_new" >&5
+$as_echo "$ac_cv_lib_evhtp_evhtp_new" >&6; }
+if test "x$ac_cv_lib_evhtp_evhtp_new" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBEVHTP 1
+_ACEOF
+
+  LIBS="-levhtp $LIBS"
+
+else
+  as_fn_error $? "libevhtp missing" "$LINENO" 5
+fi
+
+fi
+
 # Set default config file location
 CLIXON_DEFAULT_CONFIG=/usr/local/etc/clixon.xml
 

configure.ac

@@ -94,7 +94,8 @@ AC_SUBST(CLIXON_DEFAULT_CONFIG)
 AC_SUBST(LIBS)
 AC_SUBST(SH_SUFFIX)
 AC_SUBST(with_restconf) # If yes, compile apps/restconf
-AC_SUBST(with_libhttp)  # If yes, include libhttp server (https://www.libhttp.org/)
+AC_SUBST(with_libhttp)  # If yes, use libhttp+restconf server (https://www.libhttp.org/)
+AC_SUBST(with_evhtp) # If yes, use libevhp+restconf server (https://github.com/criticalstack/libevhtp)
 AC_SUBST(enable_optyangs) 
 AC_SUBST(wwwdir,/www-data)
 AC_SUBST(wwwuser,www-data)
@@ -146,7 +147,7 @@ fi
 SH_SUFFIX=".so"
 
 # This is for cligen
-AC_ARG_WITH(cligen,  [  --with-cligen=dir       Use CLIGEN here ] )
+AC_ARG_WITH(cligen,  [  --with-cligen=dir],[Use CLIGEN here ] )
 if test "${with_cligen}"; then
   echo "Using CLIGEN here: ${with_cligen}"
   CPPFLAGS="-I${with_cligen}/include ${CPPFLAGS}"
@@ -204,29 +205,39 @@ AC_ARG_WITH([wwwuser],
             [AS_HELP_STRING([--with-wwwuser=<user>],[Set www user different from www-data])])
 if test "${with_wwwuser}"; then
    wwwuser=${with_wwwuser}
-
 fi
 AC_MSG_RESULT(www user is $wwwuser)	
 AC_DEFINE_UNQUOTED(WWWUSER, "$wwwuser", [WWW user for restconf daemon])
 
-# This is for libhttp server (https://www.libhttp.org/) to be used as restconf client
+# OBSOLETE: This is for libhttp server (https://www.libhttp.org/) to be used as restconf client
 # Out-of-the box it comes as static lib .a
 AC_ARG_WITH([libhttp],
-            [AS_HELP_STRING([--with-libhttp          Use libhttp as restconf server])],
+            [AS_HELP_STRING([--with-libhttp],[Use libhttp as restconf server])],
 	    ,
 	    [with_libhttp=no])
 
-echo "lib_http: ${with_libhttp}"
 if test "x${with_libhttp}" == xyes; then
    AC_CHECK_HEADERS(libhttp/libhttp.h,, AC_MSG_ERROR([libhttp header missing. See https://www.libhttp.org]))
    # In github repo default install this is a static lib
    AC_CHECK_LIB(http, httplib_start,, AC_MSG_ERROR([libhttplib missing]),[-lpthread -ldl]) 
 fi
 
+# This is for libevhtp server (https://github.com/criticalstack/libevhtp)
+AC_ARG_WITH([evhtp],
+            [AS_HELP_STRING([--with-evhtp],[Use evhtp as restconf server])],
+	    ,
+	    [with_evhtp=no])
+
+#echo "with_evhtp:${with_evhtp}"
+if test "x${with_evhtp}" == xyes; then
+   AC_CHECK_HEADERS(evhtp/evhtp.h,, AC_MSG_ERROR([evhtp header missing. See https://github.com/criticalstack/libevhtp]))
+   AC_CHECK_LIB(evhtp, evhtp_new,, AC_MSG_ERROR([libevhtp missing]),[-lpthread -levent -levent_openssl -lssl -lcrypto]) 
+fi
+
 # Set default config file location
 CLIXON_DEFAULT_CONFIG=/usr/local/etc/clixon.xml
 AC_ARG_WITH([configfile],
-	    [AS_HELP_STRING([--with-configfile=FILE],[set default path to config file])],
+	    [AS_HELP_STRING([--with-configfile=FILE],[Set default path to config file])],
 	    [CLIXON_DEFAULT_CONFIG="$withval"],)
 
 AC_CHECK_LIB(socket, socket)
@@ -235,7 +246,8 @@ AC_CHECK_LIB(dl, dlopen)
 # This is for libxml2 XSD regex engine
 # Note this only enables the compiling of the code. In order to actually
 # use it you need to set Clixon config option CLICON_YANG_REGEXP to libxml2
-AC_ARG_WITH(libxml2,  [  --with-libxml2          use gnome/libxml2 regex engine ] )
+AC_ARG_WITH([libxml2],
+	[AS_HELP_STRING([--with-libxml2],[Use gnome/libxml2 regex engine])])
 if test "${with_libxml2}"; then
    # Find libxml2 lib
    AC_CHECK_LIB(xml2, xmlRegexpCompile,[], AC_MSG_ERROR([libxml2 not found]))
@@ -254,7 +266,7 @@ AC_MSG_RESULT(Have getsockopt SO_PEERCRED)])
 # Each application designer may need to place YANG_INSTALLDIR in their config:
 # <CLICON_YANG_DIR>$YANG_INSTALLDIR</CLICON_YANG_DIR>
 AC_ARG_WITH(yang-installdir,
-            [  --with-yang-installdir=DIR  Install Clixon yang files here (default: ${prefix}/share/clixon) ],
+            [AS_HELP_STRING([--with-yang-installdir=DIR],[Install Clixon yang files here (default: ${prefix}/share/clixon)])],
 	    [YANG_INSTALLDIR="$withval"],
     	    [YANG_INSTALLDIR="${prefix}/share/clixon"]		
 	    )
@@ -266,7 +278,7 @@ AC_MSG_RESULT(Clixon yang files are installed in ${YANG_INSTALLDIR})
 # that Clixon needs to run (or examples rely on). These may be retreived from
 # elsewhere (eg yangmodels repo)
 AC_ARG_WITH(opt-yang-installdir,
-	    [  --with-opt-yang-installdir=DIR  Install optional yang files here (default: ${prefix}/share/clixon) ],
+	    [AS_HELP_STRING([--with-opt-yang-installdir=DIR],[Install optional yang files here (default: ${prefix}/share/clixon)])],
 	    [OPT_YANG_INSTALLDIR="$withval"],
     	    [OPT_YANG_INSTALLDIR="${prefix}/share/clixon"]		
 	    )