renamed .h and libs clicon->clixon
This commit is contained in:
parent
baa5611616
commit
79b77943f9
132 changed files with 1240 additions and 1268 deletions
|
|
@ -39,9 +39,9 @@ PLUGINS = $(BE_PLUGIN) $(CLI_PLUGIN) $(NETCONF_PLUGIN)
|
|||
|
||||
all: $(PLUGINS) $(APPNAME).conf
|
||||
|
||||
# Note: clicon.mk has a rule for:
|
||||
# Note: clixon.mk has a rule for:
|
||||
# $(APPNAME.conf)
|
||||
-include $(DESTDIR)$(datarootdir)/clicon/clicon.mk
|
||||
-include $(DESTDIR)$(datarootdir)/clixon/clixon.mk
|
||||
|
||||
CLISPECS = routing_cli.cli
|
||||
|
||||
|
|
@ -82,25 +82,25 @@ distclean: clean
|
|||
rm -f Makefile *~ .depend
|
||||
|
||||
install: $(YANGSPECS) $(CLISPECS) $(BE_PLUGIN) $(CLI_PLUGIN) $(NETCONF_PLUGIN) $(APPNAME).conf
|
||||
install -d $(DESTDIR)$(clicon_SYSCONFDIR)
|
||||
install $(APPNAME).conf $(DESTDIR)$(clicon_SYSCONFDIR)
|
||||
install -d $(DESTDIR)$(clicon_DBSPECDIR)/yang
|
||||
install $(YANGSPECS) $(DESTDIR)$(clicon_DBSPECDIR)/yang
|
||||
install -d $(DESTDIR)$(clicon_LIBDIR)/cli
|
||||
install $(CLI_PLUGIN) $(DESTDIR)$(clicon_LIBDIR)/cli;
|
||||
install -d $(DESTDIR)$(clicon_LIBDIR)/backend
|
||||
install $(BE_PLUGIN) $(DESTDIR)$(clicon_LIBDIR)/backend;
|
||||
install -d $(DESTDIR)$(clicon_LIBDIR)/netconf
|
||||
install $(NETCONF_PLUGIN) $(DESTDIR)$(clicon_LIBDIR)/netconf;
|
||||
install -d $(DESTDIR)$(clicon_LIBDIR)/clispec
|
||||
install $(CLISPECS) $(DESTDIR)$(clicon_LIBDIR)/clispec;
|
||||
install -d $(DESTDIR)$(clicon_LOCALSTATEDIR)
|
||||
install -d $(DESTDIR)$(clixon_SYSCONFDIR)
|
||||
install $(APPNAME).conf $(DESTDIR)$(clixon_SYSCONFDIR)
|
||||
install -d $(DESTDIR)$(clixon_DBSPECDIR)/yang
|
||||
install $(YANGSPECS) $(DESTDIR)$(clixon_DBSPECDIR)/yang
|
||||
install -d $(DESTDIR)$(clixon_LIBDIR)/cli
|
||||
install $(CLI_PLUGIN) $(DESTDIR)$(clixon_LIBDIR)/cli;
|
||||
install -d $(DESTDIR)$(clixon_LIBDIR)/backend
|
||||
install $(BE_PLUGIN) $(DESTDIR)$(clixon_LIBDIR)/backend;
|
||||
install -d $(DESTDIR)$(clixon_LIBDIR)/netconf
|
||||
install $(NETCONF_PLUGIN) $(DESTDIR)$(clixon_LIBDIR)/netconf;
|
||||
install -d $(DESTDIR)$(clixon_LIBDIR)/clispec
|
||||
install $(CLISPECS) $(DESTDIR)$(clixon_LIBDIR)/clispec;
|
||||
install -d $(DESTDIR)$(clixon_LOCALSTATEDIR)
|
||||
|
||||
uninstall:
|
||||
rm -rf $(DESTDIR)$(clicon_SYSCONFDIR)/$(APPNAME).conf
|
||||
rm -rf $(DESTDIR)$(clicon_DBSPECDIR)
|
||||
rm -rf $(DESTDIR)$(clicon_LOCALSTATEDIR)
|
||||
rm -rf $(DESTDIR)$(clicon_LIBDIR)
|
||||
rm -rf $(DESTDIR)$(clixon_SYSCONFDIR)/$(APPNAME).conf
|
||||
rm -rf $(DESTDIR)$(clixon_DBSPECDIR)
|
||||
rm -rf $(DESTDIR)$(clixon_LOCALSTATEDIR)
|
||||
rm -rf $(DESTDIR)$(clixon_LIBDIR)
|
||||
|
||||
install-include:
|
||||
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ docker: $(APPNAME).conf
|
|||
install ../*.cli data/clispec
|
||||
|
||||
clean:
|
||||
rm -f $(APPNAME).conf
|
||||
|
||||
distclean: clean
|
||||
rm -f Makefile *~ .depend
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Main YANG module first parsed by parser (in CLICON_YANG_DIR). eg clicon.yang.
|
||||
|
||||
# Location of configuration-file for default values (this file)
|
||||
CLICON_CONFIGFILE /data/clicon.conf
|
||||
CLICON_CONFIGFILE /data/clixon.conf
|
||||
# Location of YANG module and submodule files. Only if CLICON_DBSPEC_TYPE is YANG
|
||||
CLICON_YANG_DIR /data/yang
|
||||
# Option used to construct initial yang file:
|
||||
|
|
@ -29,17 +29,16 @@ CLICON_CLISPEC_DIR /data/clispec
|
|||
CLICON_ARCHIVE_DIR /data
|
||||
# XXX Name of startup configuration file (in XML)
|
||||
CLICON_STARTUP_CONFIG /data/startup-config
|
||||
# Address family for communicating with clicon_backend (UNIX|IPv4|IPv6)
|
||||
# Address family for communicating with clixon_backend (UNIX|IPv4|IPv6)
|
||||
CLICON_SOCK_FAMILY UNIX
|
||||
# If family above is AF_UNIX: Unix socket for communicating with clicon_backend
|
||||
# If family above is AF_UNIX: Unix socket for communicating with clixon_backend
|
||||
# If family above is AF_INET: IPv4 address
|
||||
CLICON_SOCK /data/routing.sock
|
||||
# Inet socket port for communicating with clicon_backend (only IPv4|IPv6)
|
||||
# Inet socket port for communicating with clixon_backend (only IPv4|IPv6)
|
||||
CLICON_SOCK_PORT 4535
|
||||
# Process-id file
|
||||
CLICON_BACKEND_PIDFILE /data/routing.pidfile
|
||||
|
||||
|
||||
# Save values as XML in database instead of lvec:s.
|
||||
# This is optimized for yang specified applications
|
||||
# But not compatible with key-based application (eg Rost)
|
||||
|
|
|
|||
|
|
@ -35,10 +35,10 @@
|
|||
#include <cligen/cligen.h>
|
||||
|
||||
/* Clicon library functions. */
|
||||
#include <clicon/clicon.h>
|
||||
#include <clixon/clixon.h>
|
||||
|
||||
/* These include signatures for plugin and transaction callbacks. */
|
||||
#include <clicon/clicon_backend.h>
|
||||
#include <clixon/clixon_backend.h>
|
||||
|
||||
/*! This is called on validate (and commit). Check validity of candidate
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -2,20 +2,20 @@
|
|||
*
|
||||
Copyright (C) 2009-2013 Olof Hagsand and Benny Holmgren
|
||||
|
||||
This file is part of CLICON.
|
||||
This file is part of CLIXON.
|
||||
|
||||
CLICON is free software; you can redistribute it and/or modify
|
||||
CLIXON is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
CLICON is distributed in the hope that it will be useful,
|
||||
CLIXON is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with CLICON; see the file LICENSE. If not, see
|
||||
along with CLIXON; see the file LICENSE. If not, see
|
||||
<http://www.gnu.org/licenses/>.
|
||||
|
||||
*
|
||||
|
|
@ -38,8 +38,8 @@
|
|||
|
||||
/* clicon */
|
||||
#include <cligen/cligen.h>
|
||||
#include <clicon/clicon.h>
|
||||
#include <clicon/clicon_cli.h>
|
||||
#include <clixon/clixon.h>
|
||||
#include <clixon/clixon_cli.h>
|
||||
|
||||
/*
|
||||
* Plugin initialization
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@
|
|||
#include <sys/param.h>
|
||||
|
||||
#include <cligen/cligen.h>
|
||||
#include <clicon/clicon.h>
|
||||
#include <clicon/clicon_netconf.h>
|
||||
#include <clixon/clixon.h>
|
||||
#include <clixon/clixon_netconf.h>
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue