experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

renamed .h and libs clicon->clixon

Browse source
This commit is contained in:
Olof Hagsand 2016-02-28 15:27:36 +01:00
parent baa5611616
commit 79b77943f9
132 changed files with 1240 additions and 1268 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Makefile.in
View file

@ -43,7 +43,7 @@ SUBDIRS = lib apps include etc
.PHONY: doc all clean depend $(SUBDIRS) install loc TAGS .config.status docker .PHONY: doc all clean depend $(SUBDIRS) install loc TAGS .config.status docker
all: $(SUBDIRS) clicon.conf.cpp clicon.mk all: $(SUBDIRS) clixon.conf.cpp clixon.mk
$(SUBDIRS): $(SUBDIRS):
(cd $@ && $(MAKE) $(MFLAGS) all) (cd $@ && $(MAKE) $(MFLAGS) all)
@ -52,19 +52,19 @@ depend:
for i in $(SUBDIRS) doc example; \ for i in $(SUBDIRS) doc example; \
do (cd $$i && $(MAKE) $(MFLAGS) depend); done do (cd $$i && $(MAKE) $(MFLAGS) depend); done
# template clicon.conf file # template clixon.conf file
clicon.conf.cpp: clicon.conf.cpp.cpp clixon.conf.cpp: clixon.conf.cpp.cpp
$(CPP) -P -x assembler-with-cpp -Dprefix=$(prefix) -Dlocalstatedir=$(localstatedir) -Dsysconfdir=$(sysconfdir) -Ddatadir=$(datadir) -Dlibdir=$(libdir) $< > $@ $(CPP) -P -x assembler-with-cpp -Dprefix=$(prefix) -Dlocalstatedir=$(localstatedir) -Dsysconfdir=$(sysconfdir) -Ddatadir=$(datadir) -Dlibdir=$(libdir) $< > $@
clicon.mk: clicon.mk.cpp clixon.mk: clixon.mk.cpp
$(CPP) -P -traditional-cpp -x assembler-with-cpp -Dprefix=$(prefix) -Dlocalstatedir=$(localstatedir) -Dsysconfdir=$(sysconfdir) -Ddatadir=$(datadir) -Dlibdir=$(libdir) $< > $@ $(CPP) -P -traditional-cpp -x assembler-with-cpp -Dprefix=$(prefix) -Dlocalstatedir=$(localstatedir) -Dsysconfdir=$(sysconfdir) -Ddatadir=$(datadir) -Dlibdir=$(libdir) $< > $@
install: clicon.conf.cpp clicon.mk install: clixon.conf.cpp clixon.mk
for i in $(SUBDIRS) doc; \ for i in $(SUBDIRS) doc; \
do (cd $$i && $(MAKE) $(MFLAGS) $@); done; \ do (cd $$i && $(MAKE) $(MFLAGS) $@); done; \
install -d -m 755 $(DESTDIR)$(datadir)/clicon install -d -m 755 $(DESTDIR)$(datadir)/clixon
install -m 755 clicon.conf.cpp $(DESTDIR)$(datadir)/clicon install -m 755 clixon.conf.cpp $(DESTDIR)$(datadir)/clixon
install -m 755 clicon.mk $(DESTDIR)$(datadir)/clicon install -m 755 clixon.mk $(DESTDIR)$(datadir)/clixon
echo "Install for compilation by: make install-include" echo "Install for compilation by: make install-include"
install-include: install-include:
@ -75,8 +75,8 @@ install-include:
uninstall: uninstall:
for i in $(SUBDIRS) doc example; \ for i in $(SUBDIRS) doc example; \
do (cd $$i && $(MAKE) $(MFLAGS) $@); done; do (cd $$i && $(MAKE) $(MFLAGS) $@); done;
rm -f $(datadir)/clicon/clicon.conf.cpp rm -f $(datadir)/clixon/clixon.conf.cpp
rm -f $(datadir)/clicon/clicon.mk rm -f $(datadir)/clixon/clixon.mk
doc: doc:
cd $@; $(MAKE) $(MFLAGS) $@ cd $@; $(MAKE) $(MFLAGS) $@
@ -94,7 +94,7 @@ clean:
distclean: distclean:
rm -f Makefile TAGS config.status config.log *~ .depend rm -f Makefile TAGS config.status config.log *~ .depend
rm -rf Makefile autom4te.cache rm -rf Makefile autom4te.cache
rm -rf clicon.conf.cpp clicon.mk rm -rf clixon.conf.cpp clixon.mk
for i in $(SUBDIRS) doc example; \ for i in $(SUBDIRS) doc example; \
do (cd $$i && $(MAKE) $(MFLAGS) $@); done do (cd $$i && $(MAKE) $(MFLAGS) $@); done

72
README
View file

@ -1,72 +0,0 @@
This README contains information for developers:
1. How to document the code
2. How to work in git (branching)
3. How the meta-configure stuff works
1. How to document the code
+++++++++++++++++++++++++++
Create documentation:
cd doc
make doc
make graphs # callgraphs
/*! This is a small comment on one line
*
* This is a detailed description
* spanning several lines.
*
* Example usage:
* @code
* fn(a, &b);
* @endcode
*
* @param[in] src This is a description of the first parameter
* @param[in,out] dest This is a description of the second parameter
* @retval TRUE This is a description of the return value
* @retval FALSE This is a description of another return value
* @see See also this function
*/
2. How to work in git (branching)
+++++++++++++++++++++++++++++++++
Baically follows: http://nvie.com/posts/a-successful-git-branching-model/
only somewhat simplified:
Do commits in develop branch. When done, merge with master.
($ git checkout -b develop master # create develop)
$ git checkout develop
Switch to branch develop
$ git add ..
$ git commit ..
$ git push origin develop
Add/commit stuff here (and push)
Ready for tagging
-----------------
(This is somewhat simplified - no release branch)
$ ./bump-version.sh 3.6.0
Files modified successfully, version bumped to 3.6.0
$ git checkout master
Switch to master
$ git merge --no-ff develop
Merge made by recursive.
(Summary of changes)
$ git tag -a 3.6.0
3. How the meta-configure stuff works
+++++++++++++++++++++++++++++++++++++
configure.ac --.
| .------> autoconf* -----> configure
[aclocal.m4] --+---+
| `-----> [autoheader*] --> [config.h.in]
[acsite.m4] ---'
.-------------> [config.cache]
configure* ------------+-------------> config.log
|
[config.h.in] -. v .-> [config.h] -.
+--> config.status* -+ +--> make*
Makefile.in ---' `-> Makefile ---'

44
apps/backend/Makefile.in
View file

@ -36,19 +36,19 @@ sysconfdir = @sysconfdir@
includedir = @includedir@ includedir = @includedir@
SH_SUFFIX = @SH_SUFFIX@ SH_SUFFIX = @SH_SUFFIX@
CLICON_MAJOR = @CLICON_VERSION_MAJOR@ CLIXON_MAJOR = @CLIXON_VERSION_MAJOR@
CLICON_MINOR = @CLICON_VERSION_MINOR@ CLIXON_MINOR = @CLIXON_VERSION_MINOR@
# Use this clicon lib for linking # Use this clixon lib for linking
CLICON_LIB = libclicon.so.$(CLICON_MAJOR).$(CLICON_MINOR) CLIXON_LIB = libclixon.so.$(CLIXON_MAJOR).$(CLIXON_MINOR)
# Location of system plugins # Location of system plugins
CLICON_BACKEND_SYSDIR = $(libdir)/clicon/plugins/backend CLIXON_BACKEND_SYSDIR = $(libdir)/clixon/plugins/backend
# For dependency. A little strange that we rely on it being built in the src dir # For dependency. A little strange that we rely on it being built in the src dir
# even though it may exist in $(libdir). But the new version may not have been installed yet. # even though it may exist in $(libdir). But the new version may not have been installed yet.
LIBDEPS = $(top_srcdir)/lib/src/$(CLICON_LIB) LIBDEPS = $(top_srcdir)/lib/src/$(CLIXON_LIB)
LIBS = -L$(top_srcdir)/lib/src @LIBS@ -l:$(CLICON_LIB) -lpthread LIBS = -L$(top_srcdir)/lib/src @LIBS@ -l:$(CLIXON_LIB) -lpthread
CPPFLAGS = @CPPFLAGS@ -fPIC CPPFLAGS = @CPPFLAGS@ -fPIC
INCLUDES = -I. -I$(top_srcdir)/lib/src -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@ INCLUDES = -I. -I$(top_srcdir)/lib/src -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@
@ -57,16 +57,16 @@ APPSRC = backend_main.c backend_socket.c backend_client.c \
backend_lock.c backend_commit.c backend_plugin.c backend_lock.c backend_commit.c backend_plugin.c
APPOBJ = $(APPSRC:.c=.o) APPOBJ = $(APPSRC:.c=.o)
APPL = clicon_backend APPL = clixon_backend
#SHLIB = clicon_backend #SHLIB = clixon_backend
MYNAME = clicon_backend MYNAME = clixon_backend
MYLIBLINK = lib$(MYNAME)$(SH_SUFFIX) MYLIBLINK = lib$(MYNAME)$(SH_SUFFIX)
MYLIB = $(MYLIBLINK).$(CLICON_MAJOR).$(CLICON_MINOR) MYLIB = $(MYLIBLINK).$(CLIXON_MAJOR).$(CLIXON_MINOR)
MYLIBSO = $(MYLIBLINK).$(CLICON_MAJOR) MYLIBSO = $(MYLIBLINK).$(CLIXON_MAJOR)
# Accessible from plugin # Accessible from plugin
LIBSRC = clicon_backend_transaction.c clicon_backend_handle.c LIBSRC = clixon_backend_transaction.c clixon_backend_handle.c
LIBOBJ = $(LIBSRC:.c=.o) LIBOBJ = $(LIBSRC:.c=.o)
all: $(MYLIB) $(APPL) test all: $(MYLIB) $(APPL) test
@ -88,24 +88,24 @@ install: install-lib $(APPL)
install-lib: $(MYLIB) install-lib: $(MYLIB)
install -d $(DESTDIR)$(libdir) install -d $(DESTDIR)$(libdir)
install $(MYLIB) $(DESTDIR)$(libdir) install $(MYLIB) $(DESTDIR)$(libdir)
ln -sf $(MYLIB) $(DESTDIR)$(libdir)/$(MYLIBSO) # -l:libclicon_config.so.2 ln -sf $(MYLIB) $(DESTDIR)$(libdir)/$(MYLIBSO) # -l:libclixon_config.so.2
ln -sf $(MYLIBSO) $(DESTDIR)$(libdir)/$(MYLIBLINK) # -l:libclicon_config.so ln -sf $(MYLIBSO) $(DESTDIR)$(libdir)/$(MYLIBLINK) # -l:libclixon_config.so
install -d $(DESTDIR)$(libdir)/clicon/plugins/backend install -d $(DESTDIR)$(libdir)/clixon/plugins/backend
uninstall: uninstall:
rm -f $(sbindir)/$(APPL) rm -f $(sbindir)/$(APPL)
rm -f $(libdir)/$(MYLIB) rm -f $(libdir)/$(MYLIB)
rm -f $(includedir)/clicon/* rm -f $(includedir)/clixon/*
install-include: clicon_backend.h clicon_backend_handle.h clicon_backend_transaction.h install-include: clixon_backend.h clixon_backend_handle.h clixon_backend_transaction.h
install -d $(DESTDIR)$(includedir)/clicon install -d $(DESTDIR)$(includedir)/clixon
install -m 644 $^ $(DESTDIR)$(includedir)/clicon install -m 644 $^ $(DESTDIR)$(includedir)/clixon
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .c .o .SUFFIXES: .c .o
.c.o: .c.o:
$(CC) $(INCLUDES) -D__PROGRAM__=\"$(APPL)\" -DCLICON_BACKEND_SYSDIR=\"$(CLICON_BACKEND_SYSDIR)\" $(CPPFLAGS) $(CFLAGS) -c $< $(CC) $(INCLUDES) -D__PROGRAM__=\"$(APPL)\" -DCLIXON_BACKEND_SYSDIR=\"$(CLIXON_BACKEND_SYSDIR)\" $(CPPFLAGS) $(CFLAGS) -c $<
# Just link test programs # Just link test programs
test.c : test.c :
@ -120,7 +120,7 @@ $(APPL) : $(APPOBJ) $(MYLIBLINK) $(LIBDEPS)
$(MYLIB): $(LIBOBJ) $(MYLIB): $(LIBOBJ)
$(CC) $(LDFLAGS) -shared -Wl,-soname,$(MYLIBSO) -o $@ -lc $(LIBOBJ) -Wl,-soname=$(MYLIBSO) $(CC) $(LDFLAGS) -shared -Wl,-soname,$(MYLIBSO) -o $@ -lc $(LIBOBJ) -Wl,-soname=$(MYLIBSO)
# link-name is needed for application linking, eg for clicon_cli and clicon_backend # link-name is needed for application linking, eg for clixon_cli and clixon_backend
$(MYLIBLINK) : $(MYLIB) $(MYLIBLINK) : $(MYLIB)
# ln -sf $(MYLIB) $(MYLIBSO) # ln -sf $(MYLIB) $(MYLIBSO)
# ln -sf $(MYLIB) $@ # ln -sf $(MYLIB) $@

12
apps/backend/backend_client.c
View file

@ -2,26 +2,26 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */ #include "clixon_config.h" /* generated by config & autoconf */
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -48,7 +48,7 @@
#include <cligen/cligen.h> #include <cligen/cligen.h>
/* clicon */ /* clicon */
#include <clicon/clicon.h> #include <clixon/clixon.h>
#include "backend_commit.h" #include "backend_commit.h"
#include "backend_lock.h" #include "backend_lock.h"

8
apps/backend/backend_client.h
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */

14
apps/backend/backend_commit.c
View file

@ -2,26 +2,26 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */ #include "clixon_config.h" /* generated by config & autoconf */
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -49,9 +49,9 @@
#include <cligen/cligen.h> #include <cligen/cligen.h>
/* clicon */ /* clicon */
#include <clicon/clicon.h> #include <clixon/clixon.h>
#include "clicon_backend_transaction.h" #include "clixon_backend_transaction.h"
#include "backend_plugin.h" #include "backend_plugin.h"
#include "backend_handle.h" #include "backend_handle.h"
#include "backend_commit.h" #include "backend_commit.h"

8
apps/backend/backend_commit.h
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */

8
apps/backend/backend_handle.h
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *

12
apps/backend/backend_lock.c
View file

@ -2,26 +2,26 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */ #include "clixon_config.h" /* generated by config & autoconf */
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -48,7 +48,7 @@
#include <cligen/cligen.h> #include <cligen/cligen.h>
/* clicon */ /* clicon */
#include <clicon/clicon.h> #include <clixon/clixon.h>
#include "backend_lock.h" #include "backend_lock.h"

8
apps/backend/backend_lock.h
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *

14
apps/backend/backend_main.c
View file

@ -2,26 +2,26 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */ #include "clixon_config.h" /* generated by config & autoconf */
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -49,9 +49,9 @@
#include <cligen/cligen.h> #include <cligen/cligen.h>
/* clicon */ /* clicon */
#include <clicon/clicon.h> #include <clixon/clixon.h>
#include "clicon_backend_handle.h" #include "clixon_backend_handle.h"
#include "backend_socket.h" #include "backend_socket.h"
#include "backend_client.h" #include "backend_client.h"
#include "backend_commit.h" #include "backend_commit.h"

16
apps/backend/backend_plugin.c
View file

@ -2,27 +2,27 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */ #include "clixon_config.h" /* generated by config & autoconf */
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -45,9 +45,9 @@
#include <cligen/cligen.h> #include <cligen/cligen.h>
/* clicon */ /* clicon */
#include <clicon/clicon.h> #include <clixon/clixon.h>
#include "clicon_backend_transaction.h" #include "clixon_backend_transaction.h"
#include "backend_plugin.h" #include "backend_plugin.h"
#include "backend_commit.h" #include "backend_commit.h"
@ -422,7 +422,7 @@ plugin_initiate(clicon_handle h)
char *dir; char *dir;
/* First load CLICON system plugins */ /* First load CLICON system plugins */
if (config_plugin_load_dir(h, CLICON_BACKEND_SYSDIR) < 0) if (config_plugin_load_dir(h, CLIXON_BACKEND_SYSDIR) < 0)
return -1; return -1;
/* Then load application plugins */ /* Then load application plugins */

8
apps/backend/backend_plugin.h
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */

12
apps/backend/backend_socket.c
View file

@ -2,26 +2,26 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */ #include "clixon_config.h" /* generated by config & autoconf */
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -54,7 +54,7 @@
#include <cligen/cligen.h> #include <cligen/cligen.h>
/* clicon */ /* clicon */
#include <clicon/clicon.h> #include <clixon/clixon.h>
#include "backend_socket.h" #include "backend_socket.h"
#include "backend_client.h" #include "backend_client.h"

8
apps/backend/backend_socket.h
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */

BIN
apps/backend/clicon_transaction_api.o
View file

Binary file not shown.

18
apps/backend/clicon_backend.h → apps/backend/clixon_backend.h
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
@ -24,8 +24,8 @@
* Internal code should not include this file * Internal code should not include this file
*/ */
#ifndef _CLICON_BACKEND_H_ #ifndef _CLIXON_BACKEND_H_
#define _CLICON_BACKEND_H_ #define _CLIXON_BACKEND_H_
/* /*
* Use this constant to disable some prototypes that should not be visible outside the lib. * Use this constant to disable some prototypes that should not be visible outside the lib.
@ -33,8 +33,8 @@
*/ */
/* Common code (API and Backend daemon) */ /* Common code (API and Backend daemon) */
#include <clicon/clicon_backend_handle.h> #include <clixon/clixon_backend_handle.h>
#include <clicon/clicon_backend_transaction.h> #include <clixon/clixon_backend_transaction.h>
/*! Clicon Backend plugin callbacks: use these in your backend plugin code /*! Clicon Backend plugin callbacks: use these in your backend plugin code
*/ */
@ -89,4 +89,4 @@ int transaction_end(clicon_handle h, transaction_data td);
*/ */
int transaction_abort(clicon_handle h, transaction_data td); int transaction_abort(clicon_handle h, transaction_data td);
#endif /* _CLICON_BACKEND_H_ */ #endif /* _CLIXON_BACKEND_H_ */

14
apps/backend/clicon_backend_handle.c → apps/backend/clixon_backend_handle.c
View file

@ -2,26 +2,26 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */ #include "clixon_config.h" /* generated by config & autoconf */
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -43,9 +43,9 @@
#include <cligen/cligen.h> #include <cligen/cligen.h>
/* clicon */ /* clicon */
#include <clicon/clicon.h> #include <clixon/clixon.h>
#include "clicon_backend_handle.h" #include "clixon_backend_handle.h"
#include "backend_client.h" #include "backend_client.h"
#include "backend_handle.h" #include "backend_handle.h"

14
apps/backend/clicon_backend_handle.h → apps/backend/clixon_backend_handle.h
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
@ -24,8 +24,8 @@
* Internal code should include this * Internal code should include this
*/ */
#ifndef _CLICON_BACKEND_HANDLE_H_ #ifndef _CLIXON_BACKEND_HANDLE_H_
#define _CLICON_BACKEND_HANDLE_H_ #define _CLIXON_BACKEND_HANDLE_H_
/* /*
* Types * Types
@ -68,4 +68,4 @@ int subscription_delete(clicon_handle h, char *stream,
struct handle_subscription *subscription_each(clicon_handle h, struct handle_subscription *subscription_each(clicon_handle h,
struct handle_subscription *hprev); struct handle_subscription *hprev);
#endif /* _CLICON_BACKEND_HANDLE_H_ */ #endif /* _CLIXON_BACKEND_HANDLE_H_ */

14
apps/backend/clicon_backend_transaction.c → apps/backend/clixon_backend_transaction.c
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */
@ -23,7 +23,7 @@
* Note that the functions in this file are accessible from the plugins * Note that the functions in this file are accessible from the plugins
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */ #include "clixon_config.h" /* generated by config & autoconf */
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -42,9 +42,9 @@
#include <cligen/cligen.h> #include <cligen/cligen.h>
/* clicon */ /* clicon */
#include <clicon/clicon.h> #include <clixon/clixon.h>
#include "clicon_backend_transaction.h" #include "clixon_backend_transaction.h"
#include "backend_plugin.h" #include "backend_plugin.h"
/* Access functions for transaction-data handle in callbacks /* Access functions for transaction-data handle in callbacks

14
apps/backend/clicon_backend_transaction.h → apps/backend/clixon_backend_transaction.h
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
@ -24,8 +24,8 @@
* Internal code should include this * Internal code should include this
*/ */
#ifndef _CLICON_BACKEND_TRANSACTION_H_ #ifndef _CLIXON_BACKEND_TRANSACTION_H_
#define _CLICON_BACKEND_TRANSACTION_H_ #define _CLIXON_BACKEND_TRANSACTION_H_
/* /*
* Types * Types
@ -57,4 +57,4 @@ size_t transaction_clen(transaction_data td);
int transaction_print(FILE *f, transaction_data th); int transaction_print(FILE *f, transaction_data th);
#endif /* _CLICON_BACKEND_TRANSACTION_H_ */ #endif /* _CLIXON_BACKEND_TRANSACTION_H_ */

40
apps/cli/Makefile.in
View file

@ -37,30 +37,30 @@ sysconfdir = @sysconfdir@
includedir = @includedir@ includedir = @includedir@
SH_SUFFIX = @SH_SUFFIX@ SH_SUFFIX = @SH_SUFFIX@
CLICON_MAJOR = @CLICON_VERSION_MAJOR@ CLIXON_MAJOR = @CLIXON_VERSION_MAJOR@
CLICON_MINOR = @CLICON_VERSION_MINOR@ CLIXON_MINOR = @CLIXON_VERSION_MINOR@
# Use this clicon lib for linking # Use this clixon lib for linking
CLICON_LIB = libclicon.so.$(CLICON_MAJOR).$(CLICON_MINOR) CLIXON_LIB = libclixon.so.$(CLIXON_MAJOR).$(CLIXON_MINOR)
# Location of system plugins # Location of system plugins
CLICON_CLI_SYSDIR = $(libdir)/clicon/plugins/cli CLIXON_CLI_SYSDIR = $(libdir)/clixon/plugins/cli
# For dependency. A little strange that we rely on it being built in the src dir # For dependency. A little strange that we rely on it being built in the src dir
# even though it may exist in $(libdir). But the new version may not have been installed yet. # even though it may exist in $(libdir). But the new version may not have been installed yet.
LIBDEPS = $(top_srcdir)/lib/src/$(CLICON_LIB) LIBDEPS = $(top_srcdir)/lib/src/$(CLIXON_LIB)
LIBS = -L$(top_srcdir)/lib/src @LIBS@ -l:$(CLICON_LIB) -lpthread LIBS = -L$(top_srcdir)/lib/src @LIBS@ -l:$(CLIXON_LIB) -lpthread
CPPFLAGS = @CPPFLAGS@ -fPIC CPPFLAGS = @CPPFLAGS@ -fPIC
INCLUDES = -I. -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@ INCLUDES = -I. -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@
APPL = clicon_cli APPL = clixon_cli
SRC = cli_main.c SRC = cli_main.c
OBJS = $(SRC:.c=.o) OBJS = $(SRC:.c=.o)
MYNAME = clicon_cli MYNAME = clixon_cli
MYLIBLINK = lib$(MYNAME)$(SH_SUFFIX) MYLIBLINK = lib$(MYNAME)$(SH_SUFFIX)
MYLIB = $(MYLIBLINK).$(CLICON_MAJOR).$(CLICON_MINOR) MYLIB = $(MYLIBLINK).$(CLIXON_MAJOR).$(CLIXON_MINOR)
MYLIBSO = $(MYLIBLINK).$(CLICON_MAJOR) MYLIBSO = $(MYLIBLINK).$(CLIXON_MAJOR)
LIBSRC = cli_plugin.c cli_common.c cli_handle.c cli_generate.c LIBSRC = cli_plugin.c cli_common.c cli_handle.c cli_generate.c
LIBOBJS = $(LIBSRC:.c=.o) LIBOBJS = $(LIBSRC:.c=.o)
@ -84,24 +84,24 @@ install: install-lib $(APPL)
install-lib: $(MYLIB) install-lib: $(MYLIB)
install -d $(DESTDIR)$(libdir) install -d $(DESTDIR)$(libdir)
install $(MYLIB) $(DESTDIR)$(libdir) install $(MYLIB) $(DESTDIR)$(libdir)
ln -sf $(MYLIB) $(DESTDIR)$(libdir)/$(MYLIBSO) # -l:libclicon_cli.so.2 ln -sf $(MYLIB) $(DESTDIR)$(libdir)/$(MYLIBSO) # -l:libclixon_cli.so.2
ln -sf $(MYLIBSO) $(DESTDIR)$(libdir)/$(MYLIBLINK) # -l:libclicon_cli.so ln -sf $(MYLIBSO) $(DESTDIR)$(libdir)/$(MYLIBLINK) # -l:libclixon_cli.so
install -d $(DESTDIR)$(libdir)/clicon/plugins/cli install -d $(DESTDIR)$(libdir)/clixon/plugins/cli
install-include: clicon_cli.h clicon_cli_api.h install-include: clixon_cli.h clixon_cli_api.h
install -d $(DESTDIR)$(includedir)/clicon install -d $(DESTDIR)$(includedir)/clixon
install -m 644 $^ $(DESTDIR)$(includedir)/clicon install -m 644 $^ $(DESTDIR)$(includedir)/clixon
uninstall: uninstall:
rm -f $(bindir)/$(APPL) rm -f $(bindir)/$(APPL)
rm -f $(libdir)/$(MYLIB) rm -f $(libdir)/$(MYLIB)
rm -f $(includedir)/clicon/* rm -f $(includedir)/clixon/*
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .c .o .SUFFIXES: .c .o
.c.o: .c.o:
$(CC) $(INCLUDES) $(CPPFLAGS) -D__PROGRAM__=\"$(APPL)\" -DCLICON_CLI_SYSDIR=\"$(CLICON_CLI_SYSDIR)\" $(CFLAGS) -c $< $(CC) $(INCLUDES) $(CPPFLAGS) -D__PROGRAM__=\"$(APPL)\" -DCLIXON_CLI_SYSDIR=\"$(CLIXON_CLI_SYSDIR)\" $(CFLAGS) -c $<
# Just link test programs # Just link test programs
test.c : test.c :
@ -116,7 +116,7 @@ $(APPL): $(OBJS) $(MYLIBLINK) $(LIBDEPS)
$(MYLIB) : $(LIBOBJS) $(MYLIB) : $(LIBOBJS)
$(CC) -shared -Wl,-soname,$(MYLIBSO) -o $@ $(LIBOBJS) $(LIBS) -Wl,-soname=$(MYLIBSO) $(CC) -shared -Wl,-soname,$(MYLIBSO) -o $@ $(LIBOBJS) $(LIBS) -Wl,-soname=$(MYLIBSO)
# link-name is needed for application linking, eg for clicon_cli and clicon_config # link-name is needed for application linking, eg for clixon_cli and clixon_config
$(MYLIBLINK) : $(MYLIB) $(MYLIBLINK) : $(MYLIB)
# ln -sf $(MYLIB) $(MYLIBSO) # ln -sf $(MYLIB) $(MYLIBSO)
# ln -sf $(MYLIB) $@ # ln -sf $(MYLIB) $@

14
apps/cli/cli_common.c
View file

@ -2,27 +2,27 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */ #include "clixon_config.h" /* generated by config & autoconf */
#endif #endif
#include <stdlib.h> #include <stdlib.h>
@ -55,9 +55,9 @@
#include <cligen/cligen.h> #include <cligen/cligen.h>
/* clicon */ /* clicon */
#include <clicon/clicon.h> #include <clixon/clixon.h>
#include "clicon_cli_api.h" #include "clixon_cli_api.h"
#include "cli_common.h" #include "cli_common.h"

8
apps/cli/cli_common.h
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *

14
apps/cli/cli_generate.c
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
@ -27,7 +27,7 @@
* +-------------+ <------------ +-------------+ +-------------+ * +-------------+ <------------ +-------------+ +-------------+
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */ #include "clixon_config.h" /* generated by config & autoconf */
#endif #endif
@ -44,9 +44,9 @@
#include <cligen/cligen.h> #include <cligen/cligen.h>
/* clicon */ /* clicon */
#include <clicon/clicon.h> #include <clixon/clixon.h>
#include "clicon_cli_api.h" #include "clixon_cli_api.h"
#include "cli_plugin.h" #include "cli_plugin.h"
#include "cli_generate.h" #include "cli_generate.h"

8
apps/cli/cli_generate.h
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */

14
apps/cli/cli_handle.c
View file

@ -2,27 +2,27 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */ #include "clixon_config.h" /* generated by config & autoconf */
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -45,9 +45,9 @@
#include <cligen/cligen.h> #include <cligen/cligen.h>
/* clicon */ /* clicon */
#include <clicon/clicon.h> #include <clixon/clixon.h>
#include "clicon_cli_api.h" #include "clixon_cli_api.h"
#include "cli_plugin.h" #include "cli_plugin.h"
#include "cli_handle.h" #include "cli_handle.h"

8
apps/cli/cli_handle.h
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *

14
apps/cli/cli_main.c
View file

@ -2,27 +2,27 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */ #include "clixon_config.h" /* generated by config & autoconf */
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -46,9 +46,9 @@
#include <cligen/cligen.h> #include <cligen/cligen.h>
/* clicon */ /* clicon */
#include <clicon/clicon.h> #include <clixon/clixon.h>
#include "clicon_cli_api.h" #include "clixon_cli_api.h"
#include "cli_plugin.h" #include "cli_plugin.h"
#include "cli_generate.h" #include "cli_generate.h"

18
apps/cli/cli_plugin.c
View file

@ -2,27 +2,27 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */ #include "clixon_config.h" /* generated by config & autoconf */
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -46,10 +46,10 @@
#include <cligen/cligen.h> #include <cligen/cligen.h>
/* clicon */ /* clicon */
#include <clicon/clicon.h> #include <clixon/clixon.h>
/* clicon_cli */ /* clicon_cli */
#include "clicon_cli_api.h" #include "clixon_cli_api.h"
#include "cli_plugin.h" #include "cli_plugin.h"
#include "cli_handle.h" #include "cli_handle.h"
@ -557,9 +557,9 @@ cli_syntax_load (clicon_handle h)
cli_syntax_set(h, stx); cli_syntax_set(h, stx);
/* First load CLICON system plugins. CLICON_CLI_SYSDIR is defined /* First load CLICON system plugins. CLIXON_CLI_SYSDIR is defined
in Makefile*/ in Makefile*/
if (cli_plugin_load_dir(h, CLICON_CLI_SYSDIR, stx) < 0) if (cli_plugin_load_dir(h, CLIXON_CLI_SYSDIR, stx) < 0)
goto quit; goto quit;
/* Then load application plugins */ /* Then load application plugins */

8
apps/cli/cli_plugin.h
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */

16
apps/cli/clicon_cli.h → apps/cli/clixon_cli.h
View file

@ -2,31 +2,31 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */
#ifndef _CLICON_CLI_H_ #ifndef _CLIXON_CLI_H_
#define _CLICON_CLI_H_ #define _CLIXON_CLI_H_
#include <sys/types.h> #include <sys/types.h>
/* Common code (API and clicon_cli) */ /* Common code (API and clicon_cli) */
#include <clicon/clicon_cli_api.h> #include <clixon/clixon_cli_api.h>
/*! Clicon Cli plugin callbacks: use these in your cli plugin code /*! Clicon Cli plugin callbacks: use these in your cli plugin code
*/ */
@ -56,4 +56,4 @@ char *plugin_parse_hook(clicon_handle h, char *cmd, char *name);
/* Called if ^Z entered. Can modify cli command buffer and position */ /* Called if ^Z entered. Can modify cli command buffer and position */
int plugin_susp_hook(clicon_handle h, char *buf, int prompt_width, int *cursor_loc); int plugin_susp_hook(clicon_handle h, char *buf, int prompt_width, int *cursor_loc);
#endif /* _CLICON_CLI_H_ */ #endif /* _CLIXON_CLI_H_ */

14
apps/cli/clicon_cli_api.h → apps/cli/clixon_cli_api.h
View file

@ -2,27 +2,27 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* Note, this is a CLICON API file, only exprorted function prototypes should appear here * Note, this is a CLICON API file, only exprorted function prototypes should appear here
*/ */
#ifndef _CLICON_CLI_API_H_ #ifndef _CLIXON_CLI_API_H_
#define _CLICON_CLI_API_H_ #define _CLIXON_CLI_API_H_
/* /*
* Constants * Constants
@ -110,4 +110,4 @@ int cli_notification_register(clicon_handle h, char *stream, enum format_enum fo
char *filter, int status, char *filter, int status,
int (*fn)(int, void*), void *arg); int (*fn)(int, void*), void *arg);
#endif /* _CLICON_CLI_API_H_ */ #endif /* _CLIXON_CLI_API_H_ */

14
apps/dbctrl/Makefile.in
View file

@ -32,16 +32,16 @@ localstatedir = @localstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
SH_SUFFIX = @SH_SUFFIX@ SH_SUFFIX = @SH_SUFFIX@
CLICON_MAJOR = @CLICON_VERSION_MAJOR@ CLIXON_MAJOR = @CLIXON_VERSION_MAJOR@
CLICON_MINOR = @CLICON_VERSION_MINOR@ CLIXON_MINOR = @CLIXON_VERSION_MINOR@
# Use this clicon lib for linking # Use this clixon lib for linking
CLICON_LIB = libclicon.so.$(CLICON_MAJOR).$(CLICON_MINOR) CLIXON_LIB = libclixon.so.$(CLIXON_MAJOR).$(CLIXON_MINOR)
# For dependency # For dependency
LIBDEPS = $(top_srcdir)/lib/src/$(CLICON_LIB) LIBDEPS = $(top_srcdir)/lib/src/$(CLIXON_LIB)
LIBS = -L$(top_srcdir)/lib/src @LIBS@ -l:$(CLICON_LIB) LIBS = -L$(top_srcdir)/lib/src @LIBS@ -l:$(CLIXON_LIB)
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
@ -53,7 +53,7 @@ OBJS = $(SRC:.c=.o)
APPSRC = dbctrl_main.c APPSRC = dbctrl_main.c
APPOBJ = $(APPSRC:.c=.o) APPOBJ = $(APPSRC:.c=.o)
APPL = clicon_dbctrl APPL = clixon_dbctrl
all: $(APPL) all: $(APPL)

12
apps/dbctrl/dbctrl_main.c
View file

@ -2,26 +2,26 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */ #include "clixon_config.h" /* generated by config & autoconf */
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -47,7 +47,7 @@
#include <cligen/cligen.h> #include <cligen/cligen.h>
/* clicon */ /* clicon */
#include <clicon/clicon.h> #include <clixon/clixon.h>
/* Command line options to be passed to getopt(3) */ /* Command line options to be passed to getopt(3) */
#define DBCTRL_OPTS "hDd:pbn:r:m:Zi" #define DBCTRL_OPTS "hDd:pbn:r:m:Zi"

34
apps/netconf/Makefile.in
View file

@ -36,27 +36,27 @@ sysconfdir = @sysconfdir@
includedir = @includedir@ includedir = @includedir@
SH_SUFFIX = @SH_SUFFIX@ SH_SUFFIX = @SH_SUFFIX@
CLICON_MAJOR = @CLICON_VERSION_MAJOR@ CLIXON_MAJOR = @CLIXON_VERSION_MAJOR@
CLICON_MINOR = @CLICON_VERSION_MINOR@ CLIXON_MINOR = @CLIXON_VERSION_MINOR@
# Use this clicon lib for linking # Use this clixon lib for linking
CLICON_LIB = libclicon.so.$(CLICON_MAJOR).$(CLICON_MINOR) CLIXON_LIB = libclixon.so.$(CLIXON_MAJOR).$(CLIXON_MINOR)
# For dependency # For dependency
LIBDEPS = $(top_srcdir)/lib/src/$(CLICON_LIB) LIBDEPS = $(top_srcdir)/lib/src/$(CLIXON_LIB)
LIBS = -L$(top_srcdir)/lib/src @LIBS@ -l:$(CLICON_LIB) LIBS = -L$(top_srcdir)/lib/src @LIBS@ -l:$(CLIXON_LIB)
CPPFLAGS = @CPPFLAGS@ -fPIC CPPFLAGS = @CPPFLAGS@ -fPIC
INCLUDES = -I. -I$(top_srcdir)/lib/src -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@ INCLUDES = -I. -I$(top_srcdir)/lib/src -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@
APPL = clicon_netconf APPL = clixon_netconf
SRC = netconf_main.c SRC = netconf_main.c
OBJS = $(SRC:.c=.o) OBJS = $(SRC:.c=.o)
MYNAME = clicon_netconf MYNAME = clixon_netconf
MYLIBLINK = lib$(MYNAME)$(SH_SUFFIX) MYLIBLINK = lib$(MYNAME)$(SH_SUFFIX)
MYLIB = $(MYLIBLINK).$(CLICON_MAJOR).$(CLICON_MINOR) MYLIB = $(MYLIBLINK).$(CLIXON_MAJOR).$(CLIXON_MINOR)
MYLIBSO = $(MYLIBLINK).$(CLICON_MAJOR) MYLIBSO = $(MYLIBLINK).$(CLIXON_MAJOR)
LIBSRC = netconf_hello.c netconf_rpc.c netconf_filter.c netconf_lib.c netconf_plugin.c LIBSRC = netconf_hello.c netconf_rpc.c netconf_filter.c netconf_lib.c netconf_plugin.c
LIBOBJS = $(LIBSRC:.c=.o) LIBOBJS = $(LIBSRC:.c=.o)
@ -80,17 +80,17 @@ install: install-lib $(APPL)
install-lib: $(MYLIB) install-lib: $(MYLIB)
install -d $(DESTDIR)$(libdir) install -d $(DESTDIR)$(libdir)
install $(MYLIB) $(DESTDIR)$(libdir) install $(MYLIB) $(DESTDIR)$(libdir)
ln -sf $(MYLIB) $(DESTDIR)$(libdir)/$(MYLIBSO) # -l:libclicon_netconf.so.2 ln -sf $(MYLIB) $(DESTDIR)$(libdir)/$(MYLIBSO) # -l:libclixon_netconf.so.2
ln -sf $(MYLIBSO) $(DESTDIR)$(libdir)/$(MYLIBLINK) # -l:libclicon_netconf.so ln -sf $(MYLIBSO) $(DESTDIR)$(libdir)/$(MYLIBLINK) # -l:libclixon_netconf.so
install-include: clicon_netconf.h install-include: clixon_netconf.h
install -d $(DESTDIR)$(includedir)/clicon install -d $(DESTDIR)$(includedir)/clixon
install -m 644 $^ $(DESTDIR)$(includedir)/clicon install -m 644 $^ $(DESTDIR)$(includedir)/clixon
uninstall: uninstall:
rm -f $(bindir)/$(APPL) rm -f $(bindir)/$(APPL)
rm -f $(libdir)/$(MYLIB) rm -f $(libdir)/$(MYLIB)
rm -f $(includedir)/clicon/* rm -f $(includedir)/clixon/*
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .c .o .SUFFIXES: .c .o
@ -104,7 +104,7 @@ $(APPL) : $(OBJS) $(MYLIBLINK) $(LIBDEPS)
$(MYLIB) : $(LIBOBJS) $(MYLIB) : $(LIBOBJS)
$(CC) -shared -Wl,-soname,$(MYLIBSO) -o $@ $(LIBOBJS) $(LIBS) -Wl,-soname=$(MYLIBSO) $(CC) -shared -Wl,-soname,$(MYLIBSO) -o $@ $(LIBOBJS) $(LIBS) -Wl,-soname=$(MYLIBSO)
# link-name is needed for application linking, eg for clicon_cli and clicon_config # link-name is needed for application linking, eg for clixon_cli and clixon_config
$(MYLIBLINK) : $(MYLIB) $(MYLIBLINK) : $(MYLIB)
# ln -sf $(MYLIB) $(MYLIBSO) # ln -sf $(MYLIB) $(MYLIBSO)
# ln -sf $(MYLIB) $@ # ln -sf $(MYLIB) $@

14
apps/netconf/clicon_netconf.h → apps/netconf/clixon_netconf.h
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
@ -23,8 +23,8 @@
* should only include this file (not the netconf_*.h) * should only include this file (not the netconf_*.h)
*/ */
#ifndef _CLICON_NETCONF_H_ #ifndef _CLIXON_NETCONF_H_
#define _CLICON_NETCONF_H_ #define _CLIXON_NETCONF_H_
/* /*
* Types * Types
@ -70,4 +70,4 @@ int netconf_xpath(cxobj *xsearch,
cxobj *xt); cxobj *xt);
#endif /* _CLICON_NETCONF_H_ */ #endif /* _CLIXON_NETCONF_H_ */

12
apps/netconf/netconf_filter.c
View file

@ -2,27 +2,27 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
* netconf match & selection: get and edit operations * netconf match & selection: get and edit operations
*****************************************************************************/ *****************************************************************************/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */ #include "clixon_config.h" /* generated by config & autoconf */
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -46,7 +46,7 @@
#include <cligen/cligen.h> #include <cligen/cligen.h>
/* clicon */ /* clicon */
#include <clicon/clicon.h> #include <clixon/clixon.h>
#include "netconf_rpc.h" #include "netconf_rpc.h"
#include "netconf_lib.h" #include "netconf_lib.h"

8
apps/netconf/netconf_filter.h
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *

12
apps/netconf/netconf_hello.c
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
@ -37,7 +37,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */ #include "clixon_config.h" /* generated by config & autoconf */
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -61,7 +61,7 @@
#include <cligen/cligen.h> #include <cligen/cligen.h>
/* clicon */ /* clicon */
#include <clicon/clicon.h> #include <clixon/clixon.h>
#include "netconf_lib.h" #include "netconf_lib.h"
#include "netconf_hello.h" #include "netconf_hello.h"

8
apps/netconf/netconf_hello.h
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *

12
apps/netconf/netconf_lib.c
View file

@ -2,27 +2,27 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
* netconf lib * netconf lib
*****************************************************************************/ *****************************************************************************/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */ #include "clixon_config.h" /* generated by config & autoconf */
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -47,7 +47,7 @@
#include <cligen/cligen.h> #include <cligen/cligen.h>
/* clicon */ /* clicon */
#include <clicon/clicon.h> #include <clixon/clixon.h>
#include "netconf_rpc.h" #include "netconf_rpc.h"
#include "netconf_lib.h" #include "netconf_lib.h"

8
apps/netconf/netconf_lib.h
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *

14
apps/netconf/netconf_main.c
View file

@ -2,26 +2,26 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */ #include "clixon_config.h" /* generated by config & autoconf */
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -48,9 +48,9 @@
#include <cligen/cligen.h> #include <cligen/cligen.h>
/* clicon */ /* clicon */
#include <clicon/clicon.h> #include <clixon/clixon.h>
#include "clicon_netconf.h" #include "clixon_netconf.h"
#include "netconf_lib.h" #include "netconf_lib.h"
#include "netconf_hello.h" #include "netconf_hello.h"
#include "netconf_plugin.h" #include "netconf_plugin.h"

14
apps/netconf/netconf_plugin.c
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
@ -23,7 +23,7 @@
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */ #include "clixon_config.h" /* generated by config & autoconf */
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -46,10 +46,10 @@
#include <cligen/cligen.h> #include <cligen/cligen.h>
/* clicon */ /* clicon */
#include <clicon/clicon.h> #include <clixon/clixon.h>
/* clicon netconf*/ /* clicon netconf*/
#include "clicon_netconf.h" #include "clixon_netconf.h"
#include "netconf_lib.h" #include "netconf_lib.h"
#include "netconf_plugin.h" #include "netconf_plugin.h"

8
apps/netconf/netconf_plugin.h
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *

14
apps/netconf/netconf_rpc.c
View file

@ -2,27 +2,27 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
* Code for handling netconf rpc messages * Code for handling netconf rpc messages
*****************************************************************************/ *****************************************************************************/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */ #include "clixon_config.h" /* generated by config & autoconf */
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -47,9 +47,9 @@
#include <cligen/cligen.h> #include <cligen/cligen.h>
/* clicon */ /* clicon */
#include <clicon/clicon.h> #include <clixon/clixon.h>
#include "clicon_netconf.h" #include "clixon_netconf.h"
#include "netconf_lib.h" #include "netconf_lib.h"
#include "netconf_filter.h" #include "netconf_filter.h"
#include "netconf_plugin.h" #include "netconf_plugin.h"

8
apps/netconf/netconf_rpc.h
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *

20
clicon.conf.cpp.cpp → clixon.conf.cpp.cpp
View file

@ -19,12 +19,12 @@
# #
# #
# CLICON options - Default values # CLIXON options - Default values
# The origin of this file is run a _first_ time through a pre-processor at # The origin of this file is run a _first_ time through a pre-processor at
# clicon make install time causing autoconf constants (such as "prefix" and # clixon make install time causing autoconf constants (such as "prefix" and
# "localstatedir") to be replaced with their installed values. # "localstatedir") to be replaced with their installed values.
# It should be run a _second_ time as a part of installation of the application, # It should be run a _second_ time as a part of installation of the application,
# in case clicon.mk is included in the application include file, and # in case clixon.mk is included in the application include file, and
# "$(APPNAME).conf" rule is accessed. # "$(APPNAME).conf" rule is accessed.
# #
# See clicon_tutorial for more documentation # See clicon_tutorial for more documentation
@ -70,31 +70,25 @@ CLICON_ARCHIVE_DIR localstatedir/APPNAME/archive
# XXX Name of startup configuration file (in XML) # XXX Name of startup configuration file (in XML)
CLICON_STARTUP_CONFIG localstatedir/APPNAME/startup-config CLICON_STARTUP_CONFIG localstatedir/APPNAME/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 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 # If family above is AF_INET: IPv4 address
CLICON_SOCK localstatedir/APPNAME/APPNAME.sock CLICON_SOCK localstatedir/APPNAME/APPNAME.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 CLICON_SOCK_PORT 4535
# Process-id file # Process-id file
CLICON_BACKEND_PIDFILE localstatedir/APPNAME/APPNAME.pidfile CLICON_BACKEND_PIDFILE localstatedir/APPNAME/APPNAME.pidfile
# Group membership to access clicon_config unix socket # Group membership to access clixon_backend unix socket
# CLICON_SOCK_GROUP clicon # CLICON_SOCK_GROUP clicon
# Set if all configuration changes are committed directly, commit command unnecessary # Set if all configuration changes are committed directly, commit command unnecessary
# CLICON_AUTOCOMMIT 0 # CLICON_AUTOCOMMIT 0
# Clicon backend callback order. There are two dimensions: operation (del/add/change)
# and priority
# 0: all callbacks in (rising) priority order
# 1: first delete operations in declining prio order; then add/change in prio order
# 2: like (1) but CHANGE is replaced by (DEL;ADD)
# XXX OBSOLETE?
# CLICON_COMMIT_ORDER 0 # CLICON_COMMIT_ORDER 0
# Name of master plugin (both frontend and backend). Master plugin has special # Name of master plugin (both frontend and backend). Master plugin has special

18
clicon.mk.cpp → clixon.mk.cpp
View file

@ -20,28 +20,28 @@
# #
# Include this file in your application Makefile using eg: # Include this file in your application Makefile using eg:
# -include $(datarootdir)/clicon/clicon.mk # -include $(datarootdir)/clixon/clixon.mk
# then you can use the DIRS below in your install rules. # then you can use the DIRS below in your install rules.
# You also get rules for the application configure file. # You also get rules for the application configure file.
# NOTE: APPNAME must be defined in the local Makefile # NOTE: APPNAME must be defined in the local Makefile
clicon_DBSPECDIR=prefix/share/$(APPNAME) clixon_DBSPECDIR=prefix/share/$(APPNAME)
clicon_SYSCONFDIR=sysconfdir clixon_SYSCONFDIR=sysconfdir
clicon_LOCALSTATEDIR=localstatedir/$(APPNAME) clixon_LOCALSTATEDIR=localstatedir/$(APPNAME)
clicon_LIBDIR=libdir/$(APPNAME) clixon_LIBDIR=libdir/$(APPNAME)
clicon_DATADIR=datadir/clicon clixon_DATADIR=datadir/clicon
# Rules for the clicon application configuration file. # Rules for the clicon application configuration file.
# The clicon applications should be started with this fileas its -f argument. # The clicon applications should be started with this fileas its -f argument.
# Typically installed in sysconfdir # Typically installed in sysconfdir
# Example: APPNAME=myapp --> clicon_cli -f /usr/local/etc/myapp.conf # Example: APPNAME=myapp --> clixon_cli -f /usr/local/etc/myapp.conf
# The two variants are if there is a .conf.local file or not # The two variants are if there is a .conf.local file or not
.PHONY: $(APPNAME).conf .PHONY: $(APPNAME).conf
ifneq (,$(wildcard ${APPNAME}.conf.local)) ifneq (,$(wildcard ${APPNAME}.conf.local))
${APPNAME}.conf: ${clicon_DATADIR}/clicon.conf.cpp ${APPNAME}.conf.local ${APPNAME}.conf: ${clixon_DATADIR}/clicon.conf.cpp ${APPNAME}.conf.local
$(CPP) -P -x assembler-with-cpp -DAPPNAME=$(APPNAME) $< > $@ $(CPP) -P -x assembler-with-cpp -DAPPNAME=$(APPNAME) $< > $@
cat ${APPNAME}.conf.local >> $@ cat ${APPNAME}.conf.local >> $@
else else
${APPNAME}.conf: ${clicon_DATADIR}/clicon.conf.cpp ${APPNAME}.conf: ${clixon_DATADIR}/clicon.conf.cpp
$(CPP) -P -x assembler-with-cpp -DAPPNAME=$(APPNAME) $< > $@ $(CPP) -P -x assembler-with-cpp -DAPPNAME=$(APPNAME) $< > $@
endif endif

54
configure vendored
View file

@ -582,7 +582,7 @@ PACKAGE_STRING=
PACKAGE_BUGREPORT= PACKAGE_BUGREPORT=
PACKAGE_URL= PACKAGE_URL=
ac_unique_file="lib/clicon/clicon.h.in" ac_unique_file="lib/clixon/clixon.h.in"
# Factoring default headers for most tests. # Factoring default headers for most tests.
ac_includes_default="\ ac_includes_default="\
#include <stdio.h> #include <stdio.h>
@ -632,7 +632,6 @@ CPP
OBJEXT OBJEXT
EXEEXT EXEEXT
ac_ct_CC ac_ct_CC
CLICON__LIBDIR
RANLIB RANLIB
AR AR
EXE_SUFFIX EXE_SUFFIX
@ -657,10 +656,10 @@ build_vendor
build_cpu build_cpu
build build
CLIGEN_VERSION CLIGEN_VERSION
CLICON_VERSION_MINOR CLIXON_VERSION_MINOR
CLICON_VERSION_MAJOR CLIXON_VERSION_MAJOR
CLICON_VERSION_STRING CLIXON_VERSION_STRING
CLICON_VERSION CLIXON_VERSION
target_alias target_alias
host_alias host_alias
build_alias build_alias
@ -2128,34 +2127,38 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Default CFLAGS unless set by environment. # Default CFLAGS unless set by environment.
: ${CFLAGS="-O2"} : ${CFLAGS="-O2"}
CLICON_VERSION_MAJOR="3" CLIXON_VERSION_MAJOR="3"
CLICON_VERSION_MINOR="2" CLIXON_VERSION_MINOR="2"
CLICON_VERSION_PATCH="0" CLIXON_VERSION_PATCH="0"
CLICON_VERSION="\"${CLICON_VERSION_MAJOR}.${CLICON_VERSION_MINOR}.${CLICON_VERSION_PATCH}\"" CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\""
# Fix to specific version (eg 3.5) or head (3) # Fix to specific version (eg 3.5) or head (3)
CLIGEN_VERSION="3" CLIGEN_VERSION="3"
ac_config_headers="$ac_config_headers include/clicon_config.h lib/clicon/clicon.h" ac_config_headers="$ac_config_headers include/clixon_config.h lib/clixon/clixon.h"
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define CLICON_VERSION_STRING $CLICON_VERSION #define CLIXON_VERSION_STRING $CLIXON_VERSION
_ACEOF _ACEOF
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define CLICON_VERSION_MAJOR $CLICON_VERSION_MAJOR #define CLIXON_VERSION_MAJOR $CLIXON_VERSION_MAJOR
_ACEOF _ACEOF
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define CLICON_VERSION_MINOR $CLICON_VERSION_MINOR #define CLIXON_VERSION_MINOR $CLIXON_VERSION_MINOR
_ACEOF _ACEOF
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define CLICON_VERSION_PATCH $CLICON_VERSION_PATCH #define CLIXON_VERSION_PATCH $CLIXON_VERSION_PATCH
_ACEOF _ACEOF
# clicon versions spread to Makefile's (.so files) and variable in build.c # clixon versions spread to Makefile's (.so files) and variable in build.c
@ -2163,8 +2166,8 @@ _ACEOF
# Bind to specific CLIgen version # Bind to specific CLIgen version
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: CLICON version is ${CLICON_VERSION}_PRE1" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: CLIXON version is ${CLIXON_VERSION}_PRE1" >&5
$as_echo "CLICON version is ${CLICON_VERSION}_PRE1" >&6; } $as_echo "CLIXON version is ${CLIXON_VERSION}_PRE1" >&6; }
ac_aux_dir= ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@ -2317,7 +2320,6 @@ test -n "$target_alias" &&
# Clicon application director. Eg /hello.
# Some stuff installed in /usr/local/. Such as qdbm # Some stuff installed in /usr/local/. Such as qdbm
LIBS="-L /usr/local/lib" LIBS="-L /usr/local/lib"
@ -3466,10 +3468,10 @@ rm -f conftest.l $LEX_OUTPUT_ROOT.c
fi fi
if test "$LEX" = ":"; then if test "$LEX" = ":"; then
as_fn_error $? "CLICON does not find lex or flex." "$LINENO" 5 as_fn_error $? "CLIXON does not find lex or flex." "$LINENO" 5
fi fi
if test "$YACC" != "bison -y"; then if test "$YACC" != "bison -y"; then
as_fn_error $? "CLICON does not find bison. There are several problems with yacc and byacc. Please install bison." "$LINENO" 5 as_fn_error $? "CLIXON does not find bison. There are several problems with yacc and byacc. Please install bison." "$LINENO" 5
fi fi
if test "$prefix" = "NONE"; then if test "$prefix" = "NONE"; then
@ -4191,7 +4193,7 @@ fi
ac_config_files="$ac_config_files Makefile lib/Makefile lib/src/Makefile lib/clicon/Makefile apps/Makefile apps/cli/Makefile apps/backend/Makefile apps/netconf/Makefile apps/dbctrl/Makefile include/Makefile etc/Makefile etc/cliconrc example/Makefile example/docker/Makefile docker/Makefile docker/cli/Makefile docker/cli/Dockerfile docker/backend/Makefile docker/backend/Dockerfile docker/netconf/Makefile docker/netconf/Dockerfile doc/Makefile" ac_config_files="$ac_config_files Makefile lib/Makefile lib/src/Makefile lib/clixon/Makefile apps/Makefile apps/cli/Makefile apps/backend/Makefile apps/netconf/Makefile apps/dbctrl/Makefile include/Makefile etc/Makefile etc/clixonrc example/Makefile example/docker/Makefile docker/Makefile docker/cli/Makefile docker/cli/Dockerfile docker/backend/Makefile docker/backend/Dockerfile docker/netconf/Makefile docker/netconf/Dockerfile doc/Makefile"
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure # This file is a shell script that caches the results of configure
@ -4882,12 +4884,12 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
for ac_config_target in $ac_config_targets for ac_config_target in $ac_config_targets
do do
case $ac_config_target in case $ac_config_target in
"include/clicon_config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/clicon_config.h" ;; "include/clixon_config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/clixon_config.h" ;;
"lib/clicon/clicon.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/clicon/clicon.h" ;; "lib/clixon/clixon.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/clixon/clixon.h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
"lib/src/Makefile") CONFIG_FILES="$CONFIG_FILES lib/src/Makefile" ;; "lib/src/Makefile") CONFIG_FILES="$CONFIG_FILES lib/src/Makefile" ;;
"lib/clicon/Makefile") CONFIG_FILES="$CONFIG_FILES lib/clicon/Makefile" ;; "lib/clixon/Makefile") CONFIG_FILES="$CONFIG_FILES lib/clixon/Makefile" ;;
"apps/Makefile") CONFIG_FILES="$CONFIG_FILES apps/Makefile" ;; "apps/Makefile") CONFIG_FILES="$CONFIG_FILES apps/Makefile" ;;
"apps/cli/Makefile") CONFIG_FILES="$CONFIG_FILES apps/cli/Makefile" ;; "apps/cli/Makefile") CONFIG_FILES="$CONFIG_FILES apps/cli/Makefile" ;;
"apps/backend/Makefile") CONFIG_FILES="$CONFIG_FILES apps/backend/Makefile" ;; "apps/backend/Makefile") CONFIG_FILES="$CONFIG_FILES apps/backend/Makefile" ;;
@ -4895,7 +4897,7 @@ do
"apps/dbctrl/Makefile") CONFIG_FILES="$CONFIG_FILES apps/dbctrl/Makefile" ;; "apps/dbctrl/Makefile") CONFIG_FILES="$CONFIG_FILES apps/dbctrl/Makefile" ;;
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;; "etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;;
"etc/cliconrc") CONFIG_FILES="$CONFIG_FILES etc/cliconrc" ;; "etc/clixonrc") CONFIG_FILES="$CONFIG_FILES etc/clixonrc" ;;
"example/Makefile") CONFIG_FILES="$CONFIG_FILES example/Makefile" ;; "example/Makefile") CONFIG_FILES="$CONFIG_FILES example/Makefile" ;;
"example/docker/Makefile") CONFIG_FILES="$CONFIG_FILES example/docker/Makefile" ;; "example/docker/Makefile") CONFIG_FILES="$CONFIG_FILES example/docker/Makefile" ;;
"docker/Makefile") CONFIG_FILES="$CONFIG_FILES docker/Makefile" ;; "docker/Makefile") CONFIG_FILES="$CONFIG_FILES docker/Makefile" ;;

43
configure.ac
View file

@ -23,34 +23,34 @@
# in the directory containing this script. # in the directory containing this script.
# #
AC_INIT(lib/clicon/clicon.h.in) AC_INIT(lib/clixon/clixon.h.in)
# Default CFLAGS unless set by environment. # Default CFLAGS unless set by environment.
: ${CFLAGS="-O2"} : ${CFLAGS="-O2"}
CLICON_VERSION_MAJOR="3" CLIXON_VERSION_MAJOR="3"
CLICON_VERSION_MINOR="2" CLIXON_VERSION_MINOR="2"
CLICON_VERSION_PATCH="0" CLIXON_VERSION_PATCH="0"
CLICON_VERSION="\"${CLICON_VERSION_MAJOR}.${CLICON_VERSION_MINOR}.${CLICON_VERSION_PATCH}\"" CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\""
# Fix to specific version (eg 3.5) or head (3) # Fix to specific version (eg 3.5) or head (3)
CLIGEN_VERSION="3" CLIGEN_VERSION="3"
AC_CONFIG_HEADERS([include/clicon_config.h lib/clicon/clicon.h]) AC_CONFIG_HEADERS([include/clixon_config.h lib/clixon/clixon.h])
AC_DEFINE_UNQUOTED(CLICON_VERSION_STRING, $CLICON_VERSION) AC_DEFINE_UNQUOTED(CLIXON_VERSION_STRING, $CLIXON_VERSION, [Clixon version string])
AC_DEFINE_UNQUOTED(CLICON_VERSION_MAJOR, $CLICON_VERSION_MAJOR) AC_DEFINE_UNQUOTED(CLIXON_VERSION_MAJOR, $CLIXON_VERSION_MAJOR, [Clixon major release])
AC_DEFINE_UNQUOTED(CLICON_VERSION_MINOR, $CLICON_VERSION_MINOR) AC_DEFINE_UNQUOTED(CLIXON_VERSION_MINOR, $CLIXON_VERSION_MINOR, [Clixon minor release])
AC_DEFINE_UNQUOTED(CLICON_VERSION_PATCH, $CLICON_VERSION_PATCH) AC_DEFINE_UNQUOTED(CLIXON_VERSION_PATCH, $CLIXON_VERSION_PATCH, [Clixon path version])
# clicon versions spread to Makefile's (.so files) and variable in build.c # clixon versions spread to Makefile's (.so files) and variable in build.c
AC_SUBST(CLICON_VERSION) AC_SUBST(CLIXON_VERSION)
AC_SUBST(CLICON_VERSION_STRING) AC_SUBST(CLIXON_VERSION_STRING)
AC_SUBST(CLICON_VERSION_MAJOR) AC_SUBST(CLIXON_VERSION_MAJOR)
AC_SUBST(CLICON_VERSION_MINOR) AC_SUBST(CLIXON_VERSION_MINOR)
AC_SUBST(CLIGEN_VERSION) # Bind to specific CLIgen version AC_SUBST(CLIGEN_VERSION) # Bind to specific CLIgen version
AC_MSG_RESULT(CLICON version is ${CLICON_VERSION}_PRE1) AC_MSG_RESULT(CLIXON version is ${CLIXON_VERSION}_PRE1)
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
AC_SUBST(CC) AC_SUBST(CC)
@ -65,7 +65,6 @@ AC_SUBST(SH_SUFFIX)
AC_SUBST(EXE_SUFFIX) AC_SUBST(EXE_SUFFIX)
AC_SUBST(AR) AC_SUBST(AR)
AC_SUBST(RANLIB) AC_SUBST(RANLIB)
AC_SUBST(CLICON__LIBDIR) # Clicon application director. Eg /hello.
# Some stuff installed in /usr/local/. Such as qdbm # Some stuff installed in /usr/local/. Such as qdbm
LIBS="-L /usr/local/lib" LIBS="-L /usr/local/lib"
@ -86,10 +85,10 @@ AC_MSG_RESULT(CFLAGS is $CFLAGS)
AC_PROG_YACC AC_PROG_YACC
AC_PROG_LEX AC_PROG_LEX
if test "$LEX" = ":"; then if test "$LEX" = ":"; then
AC_MSG_ERROR(CLICON does not find lex or flex.) AC_MSG_ERROR(CLIXON does not find lex or flex.)
fi fi
if test "$YACC" != "bison -y"; then if test "$YACC" != "bison -y"; then
AC_MSG_ERROR(CLICON does not find bison. There are several problems with yacc and byacc. Please install bison.) AC_MSG_ERROR(CLIXON does not find bison. There are several problems with yacc and byacc. Please install bison.)
fi fi
if test "$prefix" = "NONE"; then if test "$prefix" = "NONE"; then
@ -153,12 +152,12 @@ if test "$ac_enable_keycontent" = "yes"; then
AC_DEFINE(DB_KEYCONTENT) AC_DEFINE(DB_KEYCONTENT)
fi fi
AH_BOTTOM([#include <clicon_custom.h>]) AH_BOTTOM([#include <clixon_custom.h>])
AC_OUTPUT(Makefile AC_OUTPUT(Makefile
lib/Makefile lib/Makefile
lib/src/Makefile lib/src/Makefile
lib/clicon/Makefile lib/clixon/Makefile
apps/Makefile apps/Makefile
apps/cli/Makefile apps/cli/Makefile
apps/backend/Makefile apps/backend/Makefile
@ -166,7 +165,7 @@ AC_OUTPUT(Makefile
apps/dbctrl/Makefile apps/dbctrl/Makefile
include/Makefile include/Makefile
etc/Makefile etc/Makefile
etc/cliconrc etc/clixonrc
example/Makefile example/Makefile
example/docker/Makefile example/docker/Makefile
docker/Makefile docker/Makefile

30
docker/backend/Dockerfile.in
View file

@ -1,15 +1,35 @@
#
# Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
#
# This file is part of CLIXON.
#
# 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.
#
# 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 CLIXON; see the file LICENSE. If not, see
# <http://www.gnu.org/licenses/>.
#
FROM ubuntu:14.04 FROM ubuntu:14.04
# 12.04 # 12.04
MAINTAINER Olof Hagsand <olof@hagsand.se> MAINTAINER Olof Hagsand <olof@hagsand.se>
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install -y libqdbm-dev RUN apt-get update && apt-get install -y libqdbm-dev
COPY libcligen.so.@CLIGEN_VERSION@ /usr/lib/ COPY libcligen.so.@CLIGEN_VERSION@ /usr/lib/
COPY libclicon.so.@CLICON_VERSION_MAJOR@ /usr/lib/ COPY libclixon.so.@CLIXON_VERSION_MAJOR@ /usr/lib/
COPY libclicon_backend.so.@CLICON_VERSION_MAJOR@ /usr/lib/ COPY libclixon_backend.so.@CLIXON_VERSION_MAJOR@ /usr/lib/
COPY clicon_backend /usr/sbin/ COPY clixon_backend /usr/sbin/
RUN ldconfig RUN ldconfig
RUN sudo groupadd clicon RUN sudo groupadd clixon
CMD ["/usr/sbin/clicon_backend", "-D", "1", "-F", "-f", "/data/clicon.conf"] CMD ["/usr/sbin/clixon_backend", "-D", "1", "-F", "-f", "/data/clixon.conf"]

10
docker/backend/Makefile.in
View file

@ -29,22 +29,22 @@ libdir = @libdir@
includedir = @includedir@ includedir = @includedir@
datarootdir = @datarootdir@ datarootdir = @datarootdir@
# You may consider changing this # You may consider changing this
image = olofhagsand/clicon_backend image = olofhagsand/clixon_backend
all: all:
@echo "Run make docker to build docker image" @echo "Run make docker to build docker image"
clean: clean:
distclean: clean distclean: clean
rm -f Makefile *~ .depend libcligen* libclicon* clicon_backend Dockerfile rm -f Makefile *~ .depend libcligen* libclixon* clixon_backend Dockerfile
# Kind of reverse install, could have copied from src dir,... # Kind of reverse install, could have copied from src dir,...
.PHONY: docker push .PHONY: docker push
docker: docker:
cp $(DESTDIR)$(libdir)/libcligen.so.@CLIGEN_VERSION@ . cp $(DESTDIR)$(libdir)/libcligen.so.@CLIGEN_VERSION@ .
cp $(DESTDIR)$(libdir)/libclicon.so.@CLICON_VERSION_MAJOR@ . cp $(DESTDIR)$(libdir)/libclixon.so.@CLIXON_VERSION_MAJOR@ .
cp $(DESTDIR)$(libdir)/libclicon_backend.so.@CLICON_VERSION_MAJOR@ . cp $(DESTDIR)$(libdir)/libclixon_backend.so.@CLIXON_VERSION_MAJOR@ .
cp $(DESTDIR)$(sbindir)/clicon_backend . cp $(DESTDIR)$(sbindir)/clixon_backend .
sudo docker build -t $(image) . sudo docker build -t $(image) .
push: push:

2
docker/backend/README
View file

@ -1,4 +1,4 @@
Ensure that cligen and clicon has been built and installed. Ensure that cligen and clixon has been built and installed.
sudo make docker sudo make docker
make push make push

28
docker/cli/Dockerfile.in
View file

@ -1,14 +1,34 @@
#
# Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
#
# This file is part of CLIXON.
#
# 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.
#
# 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 CLIXON; see the file LICENSE. If not, see
# <http://www.gnu.org/licenses/>.
#
FROM ubuntu:14.04 FROM ubuntu:14.04
# 12.04 # 12.04
MAINTAINER Olof Hagsand <olof@hagsand.se> MAINTAINER Olof Hagsand <olof@hagsand.se>
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install -y libqdbm-dev RUN apt-get update && apt-get install -y libqdbm-dev
COPY libcligen.so.@CLIGEN_VERSION@ /usr/lib/ COPY libcligen.so.@CLIGEN_VERSION@ /usr/lib/
COPY libclicon.so.@CLICON_VERSION_MAJOR@ /usr/lib/ COPY libclixon.so.@CLIXON_VERSION_MAJOR@ /usr/lib/
COPY libclicon_cli.so.@CLIGEN_VERSION@ /usr/lib/ COPY libclixon_cli.so.@CLIXON_VERSION_MAJOR@ /usr/lib/
COPY clicon_cli /usr/bin/ COPY clixon_cli /usr/bin/
RUN ldconfig RUN ldconfig
CMD ["/usr/bin/clicon_cli", "-f", "/data/clicon.conf"] CMD ["/usr/bin/clixon_cli", "-f", "/data/clixon.conf"]

10
docker/cli/Makefile.in
View file

@ -29,22 +29,22 @@ libdir = @libdir@
includedir = @includedir@ includedir = @includedir@
datarootdir = @datarootdir@ datarootdir = @datarootdir@
# You may consider changing this # You may consider changing this
image = olofhagsand/clicon_cli image = olofhagsand/clixon_cli
all: all:
@echo "Run make docker to build docker image" @echo "Run make docker to build docker image"
clean: clean:
distclean: clean distclean: clean
rm -f Makefile *~ .depend libcligen* libclicon* clicon_cli Dockerfile rm -f Makefile *~ .depend libcligen* libclixon* clixon_cli Dockerfile
# Kind of reverse install, could have copied from src dir,... # Kind of reverse install, could have copied from src dir,...
.PHONY: docker push .PHONY: docker push
docker: docker:
cp $(DESTDIR)$(libdir)/libcligen.so.@CLIGEN_VERSION@ . cp $(DESTDIR)$(libdir)/libcligen.so.@CLIGEN_VERSION@ .
cp $(DESTDIR)$(libdir)/libclicon.so.@CLICON_VERSION_MAJOR@ . cp $(DESTDIR)$(libdir)/libclixon.so.@CLIXON_VERSION_MAJOR@ .
cp $(DESTDIR)$(libdir)/libclicon_cli.so.@CLICON_VERSION_MAJOR@ . cp $(DESTDIR)$(libdir)/libclixon_cli.so.@CLIXON_VERSION_MAJOR@ .
cp $(DESTDIR)$(bindir)/clicon_cli . cp $(DESTDIR)$(bindir)/clixon_cli .
sudo docker build -t $(image) . sudo docker build -t $(image) .
push: push:

2
docker/cli/README
View file

@ -1,4 +1,4 @@
Ensure that cligen and clicon has been built and installed. Ensure that cligen and clixon has been built and installed.
sudo make docker sudo make docker
make push make push

28
docker/netconf/Dockerfile.in
View file

@ -1,14 +1,34 @@
#
# Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
#
# This file is part of CLIXON.
#
# 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.
#
# 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 CLIXON; see the file LICENSE. If not, see
# <http://www.gnu.org/licenses/>.
#
FROM ubuntu:14.04 FROM ubuntu:14.04
# 12.04 # 12.04
MAINTAINER Olof Hagsand <olof@hagsand.se> MAINTAINER Olof Hagsand <olof@hagsand.se>
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install -y libqdbm-dev RUN apt-get update && apt-get install -y libqdbm-dev
COPY libcligen.so.@CLIGEN_VERSION@ /usr/lib/ COPY libcligen.so.@CLIGEN_VERSION@ /usr/lib/
COPY libclicon.so.@CLICON_VERSION_MAJOR@ /usr/lib/ COPY libclixon.so.@CLIXON_VERSION_MAJOR@ /usr/lib/
COPY libclicon_netconf.so.@CLIGEN_VERSION@ /usr/lib/ COPY libclixon_netconf.so.@CLIXON_VERSION_MAJOR@ /usr/lib/
COPY clicon_netconf /usr/bin/ COPY clixon_netconf /usr/bin/
RUN ldconfig RUN ldconfig
CMD ["/usr/bin/clicon_netconf", "-f", "/data/clicon.conf"] CMD ["/usr/bin/clixon_netconf", "-f", "/data/clixon.conf"]

10
docker/netconf/Makefile.in
View file

@ -29,22 +29,22 @@ libdir = @libdir@
includedir = @includedir@ includedir = @includedir@
datarootdir = @datarootdir@ datarootdir = @datarootdir@
# You may consider changing this # You may consider changing this
image = olofhagsand/clicon_netconf image = olofhagsand/clixon_netconf
all: all:
@echo "Run make docker to build docker image" @echo "Run make docker to build docker image"
clean: clean:
distclean: clean distclean: clean
rm -f Makefile *~ .depend libcligen* libclicon* clicon_netconf Dockerfile rm -f Makefile *~ .depend libcligen* libclixon* clixon_netconf Dockerfile
# Kind of reverse install, could have copied from src dir,... # Kind of reverse install, could have copied from src dir,...
.PHONY: docker push .PHONY: docker push
docker: docker:
cp $(DESTDIR)$(libdir)/libcligen.so.@CLIGEN_VERSION@ . cp $(DESTDIR)$(libdir)/libcligen.so.@CLIGEN_VERSION@ .
cp $(DESTDIR)$(libdir)/libclicon.so.@CLICON_VERSION_MAJOR@ . cp $(DESTDIR)$(libdir)/libclixon.so.@CLIXON_VERSION_MAJOR@ .
cp $(DESTDIR)$(libdir)/libclicon_netconf.so.@CLICON_VERSION_MAJOR@ . cp $(DESTDIR)$(libdir)/libclixon_netconf.so.@CLIXON_VERSION_MAJOR@ .
cp $(DESTDIR)$(bindir)/clicon_netconf . cp $(DESTDIR)$(bindir)/clixon_netconf .
sudo docker build -t $(image) . sudo docker build -t $(image) .
push: push:

2
docker/netconf/README
View file

@ -1,4 +1,4 @@
Ensure that cligen and clicon has been built and installed. Ensure that cligen and clixon has been built and installed.
sudo make docker sudo make docker
make push make push

6
etc/Makefile.in
View file

@ -32,11 +32,11 @@ all:
clean: clean:
distclean: clean distclean: clean
rm -f Makefile *~ .depend cliconrc rm -f Makefile *~ .depend clixonrc
install: cliconrc install: clixonrc
install -m 755 -d $(DESTDIR)$(sysconfdir) install -m 755 -d $(DESTDIR)$(sysconfdir)
install -m 755 cliconrc $(DESTDIR)$(sysconfdir) install -m 755 clixonrc $(DESTDIR)$(sysconfdir)
install-include: install-include:

0
etc/cliconrc.in → etc/clixonrc.in
View file

38
example/Makefile.in
View file

@ -39,9 +39,9 @@ PLUGINS = $(BE_PLUGIN) $(CLI_PLUGIN) $(NETCONF_PLUGIN)
all: $(PLUGINS) $(APPNAME).conf all: $(PLUGINS) $(APPNAME).conf
# Note: clicon.mk has a rule for: # Note: clixon.mk has a rule for:
# $(APPNAME.conf) # $(APPNAME.conf)
-include $(DESTDIR)$(datarootdir)/clicon/clicon.mk -include $(DESTDIR)$(datarootdir)/clixon/clixon.mk
CLISPECS = routing_cli.cli CLISPECS = routing_cli.cli
@ -82,25 +82,25 @@ distclean: clean
rm -f Makefile *~ .depend rm -f Makefile *~ .depend
install: $(YANGSPECS) $(CLISPECS) $(BE_PLUGIN) $(CLI_PLUGIN) $(NETCONF_PLUGIN) $(APPNAME).conf install: $(YANGSPECS) $(CLISPECS) $(BE_PLUGIN) $(CLI_PLUGIN) $(NETCONF_PLUGIN) $(APPNAME).conf
install -d $(DESTDIR)$(clicon_SYSCONFDIR) install -d $(DESTDIR)$(clixon_SYSCONFDIR)
install $(APPNAME).conf $(DESTDIR)$(clicon_SYSCONFDIR) install $(APPNAME).conf $(DESTDIR)$(clixon_SYSCONFDIR)
install -d $(DESTDIR)$(clicon_DBSPECDIR)/yang install -d $(DESTDIR)$(clixon_DBSPECDIR)/yang
install $(YANGSPECS) $(DESTDIR)$(clicon_DBSPECDIR)/yang install $(YANGSPECS) $(DESTDIR)$(clixon_DBSPECDIR)/yang
install -d $(DESTDIR)$(clicon_LIBDIR)/cli install -d $(DESTDIR)$(clixon_LIBDIR)/cli
install $(CLI_PLUGIN) $(DESTDIR)$(clicon_LIBDIR)/cli; install $(CLI_PLUGIN) $(DESTDIR)$(clixon_LIBDIR)/cli;
install -d $(DESTDIR)$(clicon_LIBDIR)/backend install -d $(DESTDIR)$(clixon_LIBDIR)/backend
install $(BE_PLUGIN) $(DESTDIR)$(clicon_LIBDIR)/backend; install $(BE_PLUGIN) $(DESTDIR)$(clixon_LIBDIR)/backend;
install -d $(DESTDIR)$(clicon_LIBDIR)/netconf install -d $(DESTDIR)$(clixon_LIBDIR)/netconf
install $(NETCONF_PLUGIN) $(DESTDIR)$(clicon_LIBDIR)/netconf; install $(NETCONF_PLUGIN) $(DESTDIR)$(clixon_LIBDIR)/netconf;
install -d $(DESTDIR)$(clicon_LIBDIR)/clispec install -d $(DESTDIR)$(clixon_LIBDIR)/clispec
install $(CLISPECS) $(DESTDIR)$(clicon_LIBDIR)/clispec; install $(CLISPECS) $(DESTDIR)$(clixon_LIBDIR)/clispec;
install -d $(DESTDIR)$(clicon_LOCALSTATEDIR) install -d $(DESTDIR)$(clixon_LOCALSTATEDIR)
uninstall: uninstall:
rm -rf $(DESTDIR)$(clicon_SYSCONFDIR)/$(APPNAME).conf rm -rf $(DESTDIR)$(clixon_SYSCONFDIR)/$(APPNAME).conf
rm -rf $(DESTDIR)$(clicon_DBSPECDIR) rm -rf $(DESTDIR)$(clixon_DBSPECDIR)
rm -rf $(DESTDIR)$(clicon_LOCALSTATEDIR) rm -rf $(DESTDIR)$(clixon_LOCALSTATEDIR)
rm -rf $(DESTDIR)$(clicon_LIBDIR) rm -rf $(DESTDIR)$(clixon_LIBDIR)
install-include: install-include:

1
example/docker/Makefile.in
View file

@ -48,6 +48,7 @@ docker: $(APPNAME).conf
install ../*.cli data/clispec install ../*.cli data/clispec
clean: clean:
rm -f $(APPNAME).conf
distclean: clean distclean: clean
rm -f Makefile *~ .depend rm -f Makefile *~ .depend

9
example/docker/routing.conf.local
View file

@ -1,7 +1,7 @@
# Main YANG module first parsed by parser (in CLICON_YANG_DIR). eg clicon.yang. # Main YANG module first parsed by parser (in CLICON_YANG_DIR). eg clicon.yang.
# Location of configuration-file for default values (this file) # 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 # Location of YANG module and submodule files. Only if CLICON_DBSPEC_TYPE is YANG
CLICON_YANG_DIR /data/yang CLICON_YANG_DIR /data/yang
# Option used to construct initial yang file: # Option used to construct initial yang file:
@ -29,17 +29,16 @@ CLICON_CLISPEC_DIR /data/clispec
CLICON_ARCHIVE_DIR /data CLICON_ARCHIVE_DIR /data
# XXX Name of startup configuration file (in XML) # XXX Name of startup configuration file (in XML)
CLICON_STARTUP_CONFIG /data/startup-config 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 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 # If family above is AF_INET: IPv4 address
CLICON_SOCK /data/routing.sock 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 CLICON_SOCK_PORT 4535
# Process-id file # Process-id file
CLICON_BACKEND_PIDFILE /data/routing.pidfile CLICON_BACKEND_PIDFILE /data/routing.pidfile
# Save values as XML in database instead of lvec:s. # Save values as XML in database instead of lvec:s.
# This is optimized for yang specified applications # This is optimized for yang specified applications
# But not compatible with key-based application (eg Rost) # But not compatible with key-based application (eg Rost)

4
example/routing_backend.c
View file

@ -35,10 +35,10 @@
#include <cligen/cligen.h> #include <cligen/cligen.h>
/* Clicon library functions. */ /* Clicon library functions. */
#include <clicon/clicon.h> #include <clixon/clixon.h>
/* These include signatures for plugin and transaction callbacks. */ /* 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 /*! This is called on validate (and commit). Check validity of candidate
*/ */

12
example/routing_cli.c
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2013 Olof Hagsand and Benny Holmgren 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
@ -38,8 +38,8 @@
/* clicon */ /* clicon */
#include <cligen/cligen.h> #include <cligen/cligen.h>
#include <clicon/clicon.h> #include <clixon/clixon.h>
#include <clicon/clicon_cli.h> #include <clixon/clixon_cli.h>
/* /*
* Plugin initialization * Plugin initialization

4
example/routing_netconf.c
View file

@ -30,8 +30,8 @@
#include <sys/param.h> #include <sys/param.h>
#include <cligen/cligen.h> #include <cligen/cligen.h>
#include <clicon/clicon.h> #include <clixon/clixon.h>
#include <clicon/clicon_netconf.h> #include <clixon/clixon_netconf.h>
/* /*

2
include/Makefile.in
View file

@ -34,7 +34,7 @@ all:
clean: clean:
distclean: clean distclean: clean
rm -f clicon_config.h Makefile *~ .depend rm -f clixon_config.h Makefile *~ .depend
install: install:

16
include/clicon_config.h.in → include/clixon_config.h.in
View file

@ -1,4 +1,16 @@
/* include/clicon_config.h.in. Generated from configure.ac by autoheader. */ /* include/clixon_config.h.in. Generated from configure.ac by autoheader. */
/* Clixon major release */
#undef CLIXON_VERSION_MAJOR
/* Clixon minor release */
#undef CLIXON_VERSION_MINOR
/* Clixon path version */
#undef CLIXON_VERSION_PATCH
/* Clixon version string */
#undef CLIXON_VERSION_STRING
/* Check if extra keys inserted for database lists containing content. Eg /* Check if extra keys inserted for database lists containing content. Eg
A.n.foo = 3 means A.3 $!a=foo exists */ A.n.foo = 3 means A.3 $!a=foo exists */
@ -119,4 +131,4 @@
`char[]'. */ `char[]'. */
#undef YYTEXT_POINTER #undef YYTEXT_POINTER
#include <clicon_custom.h> #include <clixon_custom.h>

10
include/clicon_custom.h → include/clixon_custom.h
View file

@ -2,23 +2,23 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
Custom file as boilerplate appended by clicon_config.h Custom file as boilerplate appended by clixon_config.h
*/ */
#ifndef HAVE_STRNDUP #ifndef HAVE_STRNDUP

6
lib/Makefile.in
View file

@ -28,7 +28,7 @@ LIBS = @LIBS@
SHELL = /bin/sh SHELL = /bin/sh
SUBDIRS = src clicon SUBDIRS = src clixon
.PHONY: all clean depend $(SUBDIRS) install .PHONY: all clean depend $(SUBDIRS) install
@ -48,7 +48,7 @@ install:
install-include: install-include:
for i in $(SUBDIRS); \ for i in $(SUBDIRS); \
do (cd $$i; $(MAKE) $(MFLAGS) $@); done; \ do (cd $$i; $(MAKE) $(MFLAGS) $@); done; \
(cd clicon; $(MAKE) $(MFLAGS) $@) (cd clixon; $(MAKE) $(MFLAGS) $@)
uninstall: uninstall:
for i in $(SUBDIRS); \ for i in $(SUBDIRS); \
@ -65,7 +65,7 @@ distclean: clean
rm -f Makefile *~ .depend rm -f Makefile *~ .depend
for i in $(SUBDIRS); \ for i in $(SUBDIRS); \
do (cd $$i; $(MAKE) $(MFLAGS) distclean); done; \ do (cd $$i; $(MAKE) $(MFLAGS) distclean); done; \
(cd clicon; $(MAKE) $(MFLAGS) $@) (cd clixon; $(MAKE) $(MFLAGS) $@)
tags: tags:
find $(srcdir) -name '*.[chyl]' -print | etags - find $(srcdir) -name '*.[chyl]' -print | etags -

79
lib/clicon/clicon.h.in
View file

@ -1,79 +0,0 @@
/*
*
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
This file is part of CLICON.
CLICON 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,
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
<http://www.gnu.org/licenses/>.
* Meta-include file that includes all sub-files in control-lib
* Note: this include files is for external purposes. Do not include this
* file in clicon lib-routines.
*/
/* This include file requires the following include file dependencies */
#include <stdio.h>
#include <stdint.h>
#include <dirent.h>
#include <sys/socket.h>
#include <net/if.h>
#include <netinet/in.h>
/*
* CLICON version macros
*/
#undef CLICON_VERSION_STRING
#undef CLICON_VERSION_MAJOR
#undef CLICON_VERSION_MINOR
#undef CLICON_VERSION_PATCH
/*
* Use this constant to disable some prototypes that should not be visible outside the lib.
* This is an alternative to use separate internal include files.
*/
#define LIBCLICON_API 1
#include <clicon/clicon_sig.h>
#include <clicon/clicon_log.h>
#include <clicon/clicon_err.h>
#include <clicon/clicon_queue.h>
#include <clicon/clicon_hash.h>
#include <clicon/clicon_handle.h>
#include <clicon/clicon_qdb.h>
#include <clicon/clicon_yang.h>
#include <clicon/clicon_yang_type.h>
#include <clicon/clicon_chunk.h>
#include <clicon/clicon_event.h>
#include <clicon/clicon_string.h>
#include <clicon/clicon_file.h>
#include <clicon/clicon_xml.h>
#include <clicon/clicon_proto.h>
#include <clicon/clicon_proto_encode.h>
#include <clicon/clicon_proto_client.h>
#include <clicon/clicon_proc.h>
#include <clicon/clicon_options.h>
#include <clicon/clicon_xml_map.h>
#include <clicon/clicon_xml_db.h>
#include <clicon/clicon_xsl.h>
#include <clicon/clicon_plugin.h>
#include <clicon/clicon_plugin.h>
/*
* Global variables generated by Makefile
*/
extern const char CLICON_BUILDSTR[];
extern const char CLICON_VERSION[];

8
lib/clicon/Makefile.in → lib/clixon/Makefile.in
View file

@ -31,14 +31,14 @@ depend:
install: install:
install-include: install-include:
install -m 755 -d $(DESTDIR)$(includedir)/clicon install -m 755 -d $(DESTDIR)$(includedir)/clixon
install -m 644 *.h $(DESTDIR)$(includedir)/clicon install -m 644 *.h $(DESTDIR)$(includedir)/clixon
uninstall: uninstall:
rm -f $(includedir)/clicon rm -f $(includedir)/clixon
clean: clean:
distclean: distclean:
rm -f Makefile clicon.h rm -f Makefile clixon.h

79
lib/clixon/clixon.h.in Normal file
View file

@ -0,0 +1,79 @@
/*
*
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
This file is part of CLIXON.
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.
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 CLIXON; see the file LICENSE. If not, see
<http://www.gnu.org/licenses/>.
* Meta-include file that includes all sub-files in control-lib
* Note: this include files is for external purposes. Do not include this
* file in clicon lib-routines.
*/
/* This include file requires the following include file dependencies */
#include <stdio.h>
#include <stdint.h>
#include <dirent.h>
#include <sys/socket.h>
#include <net/if.h>
#include <netinet/in.h>
/*
* CLIXON version macros
*/
#undef CLIXON_VERSION_STRING
#undef CLIXON_VERSION_MAJOR
#undef CLIXON_VERSION_MINOR
#undef CLIXON_VERSION_PATCH
/*
* Use this constant to disable some prototypes that should not be visible outside the lib.
* This is an alternative to use separate internal include files.
*/
#define LIBCLIXON_API 1
#include <clixon/clixon_sig.h>
#include <clixon/clixon_log.h>
#include <clixon/clixon_err.h>
#include <clixon/clixon_queue.h>
#include <clixon/clixon_hash.h>
#include <clixon/clixon_handle.h>
#include <clixon/clixon_qdb.h>
#include <clixon/clixon_yang.h>
#include <clixon/clixon_yang_type.h>
#include <clixon/clixon_chunk.h>
#include <clixon/clixon_event.h>
#include <clixon/clixon_string.h>
#include <clixon/clixon_file.h>
#include <clixon/clixon_xml.h>
#include <clixon/clixon_proto.h>
#include <clixon/clixon_proto_encode.h>
#include <clixon/clixon_proto_client.h>
#include <clixon/clixon_proc.h>
#include <clixon/clixon_options.h>
#include <clixon/clixon_xml_map.h>
#include <clixon/clixon_xml_db.h>
#include <clixon/clixon_xsl.h>
#include <clixon/clixon_plugin.h>
#include <clixon/clixon_plugin.h>
/*
* Global variables generated by Makefile
*/
extern const char CLIXON_BUILDSTR[];
extern const char CLIXON_VERSION[];

14
lib/clicon/clicon_chunk.h → lib/clixon/clixon_chunk.h
View file

@ -2,28 +2,28 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
* Copyright (C) 2002 Benny Holmgren, All rights reserved * Copyright (C) 2002 Benny Holmgren, All rights reserved
*/ */
#ifndef _CLICON_CHUNK_H_ #ifndef _CLIXON_CHUNK_H_
#define _CLICON_CHUNK_H_ #define _CLIXON_CHUNK_H_
/* /*
@ -163,4 +163,4 @@ void chunk_check (FILE *, const char *);
size_t chunksize (void *); size_t chunksize (void *);
#endif /* _CLICON_CHUNK_H_ */ #endif /* _CLIXON_CHUNK_H_ */

14
lib/clicon/clicon_err.h → lib/clixon/clixon_err.h
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
@ -25,8 +25,8 @@
* clicon_errno, clicon_suberrno, clicon_err_reason. * clicon_errno, clicon_suberrno, clicon_err_reason.
*/ */
#ifndef _CLICON_ERR_H_ #ifndef _CLIXON_ERR_H_
#define _CLICON_ERR_H_ #define _CLIXON_ERR_H_
/* /*
* Constants * Constants
@ -77,4 +77,4 @@ char *clicon_strerror(int err);
void *clicon_err_save(void); void *clicon_err_save(void);
int clicon_err_restore(void *handle); int clicon_err_restore(void *handle);
#endif /* _CLICON_ERR_H_ */ #endif /* _CLIXON_ERR_H_ */

14
lib/clicon/clicon_event.h → lib/clixon/clixon_event.h
View file

@ -2,28 +2,28 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
* Event handling and loop * Event handling and loop
*/ */
#ifndef _CLICON_EVENT_H_ #ifndef _CLIXON_EVENT_H_
#define _CLICON_EVENT_H_ #define _CLIXON_EVENT_H_
/* /*
* Prototypes * Prototypes
@ -43,4 +43,4 @@ int event_unreg_timeout(int (*fn)(int, void*), void *arg);
int event_loop(void); int event_loop(void);
#endif /* _CLICON_EVENT_H_ */ #endif /* _CLIXON_EVENT_H_ */

14
lib/clicon/clicon_file.h → lib/clixon/clixon_file.h
View file

@ -2,26 +2,26 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */
#ifndef _CLICON_FILE_H_ #ifndef _CLIXON_FILE_H_
#define _CLICON_FILE_H_ #define _CLIXON_FILE_H_
char **clicon_realpath(const char *cwd, char *path, const char *label); char **clicon_realpath(const char *cwd, char *path, const char *label);
@ -33,4 +33,4 @@ char *clicon_tmpfile(const char *label);
int file_cp(char *src, char *target); int file_cp(char *src, char *target);
#endif /* _CLICON_FILE_H_ */ #endif /* _CLIXON_FILE_H_ */

14
lib/clicon/clicon_handle.h → lib/clixon/clixon_handle.h
View file

@ -2,27 +2,27 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */
#ifndef _CLICON_HANDLE_H_ #ifndef _CLIXON_HANDLE_H_
#define _CLICON_HANDLE_H_ #define _CLIXON_HANDLE_H_
/* /*
* Types * Types
@ -58,4 +58,4 @@ clicon_hash_t *clicon_options(clicon_handle h);
/* Return internal clicon data (hash-array) given a handle.*/ /* Return internal clicon data (hash-array) given a handle.*/
clicon_hash_t *clicon_data(clicon_handle h); clicon_hash_t *clicon_data(clicon_handle h);
#endif /* _CLICON_HANDLE_H_ */ #endif /* _CLIXON_HANDLE_H_ */

14
lib/clicon/clicon_hash.h → lib/clixon/clixon_hash.h
View file

@ -2,26 +2,26 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */
#ifndef _CLICON_HASH_H_ #ifndef _CLIXON_HASH_H_
#define _CLICON_HASH_H_ #define _CLIXON_HASH_H_
struct clicon_hash { struct clicon_hash {
qelem_t h_qelem; qelem_t h_qelem;
@ -67,4 +67,4 @@ char **hash_keys(clicon_hash_t *hash, size_t *nkeys);
#define hash_each_end(__hash__) if (__k__) free(__k__); } } #define hash_each_end(__hash__) if (__k__) free(__k__); } }
#endif /* _CLICON_HASH_H_ */ #endif /* _CLIXON_HASH_H_ */

14
lib/clicon/clicon_log.h → lib/clixon/clixon_log.h
View file

@ -2,28 +2,28 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
* Regular logging and debugging. Syslog using levels. * Regular logging and debugging. Syslog using levels.
*/ */
#ifndef _CLICON_LOG_H_ #ifndef _CLIXON_LOG_H_
#define _CLICON_LOG_H_ #define _CLIXON_LOG_H_
/* /*
* Constants * Constants
@ -54,4 +54,4 @@ int clicon_debug_init(int dbglevel, FILE *f);
int clicon_debug(int dbglevel, char *format, ...); int clicon_debug(int dbglevel, char *format, ...);
char *mon2name(int md); char *mon2name(int md);
#endif /* _CLICON_LOG_H_ */ #endif /* _CLIXON_LOG_H_ */

16
lib/clicon/clicon_options.h → lib/clixon/clixon_options.h
View file

@ -2,28 +2,28 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
* Configuration file and Options. * Configuration file and Options.
*/ */
#ifndef _CLICON_OPTIONS_H_ #ifndef _CLIXON_OPTIONS_H_
#define _CLICON_OPTIONS_H_ #define _CLIXON_OPTIONS_H_
/* /*
* Constants * Constants
@ -103,12 +103,10 @@ enum genmodel_type clicon_cli_genmodel_type(clicon_handle h);
int clicon_autocommit(clicon_handle h); int clicon_autocommit(clicon_handle h);
int clicon_autocommit_set(clicon_handle h, int val); int clicon_autocommit_set(clicon_handle h, int val);
int clicon_commit_order(clicon_handle h);
yang_spec * clicon_dbspec_yang(clicon_handle h); yang_spec * clicon_dbspec_yang(clicon_handle h);
int clicon_dbspec_yang_set(clicon_handle h, struct yang_spec *ys); int clicon_dbspec_yang_set(clicon_handle h, struct yang_spec *ys);
char *clicon_dbspec_name(clicon_handle h); char *clicon_dbspec_name(clicon_handle h);
int clicon_dbspec_name_set(clicon_handle h, char *name); int clicon_dbspec_name_set(clicon_handle h, char *name);
#endif /* _CLICON_OPTIONS_H_ */ #endif /* _CLIXON_OPTIONS_H_ */

14
lib/clicon/clicon_plugin.h → lib/clixon/clixon_plugin.h
View file

@ -2,28 +2,28 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */
/* /*
* Internal prototypes, not accessed by plugin client code * Internal prototypes, not accessed by plugin client code
*/ */
#ifndef _CLICON_PLUGIN_H_ #ifndef _CLIXON_PLUGIN_H_
#define _CLICON_PLUGIN_H_ #define _CLIXON_PLUGIN_H_
/* /*
* Types * Types
@ -64,4 +64,4 @@ typedef int (plgexit_t)(clicon_handle); /* Plugin exit */
/* Find a function in global namespace or a plugin. XXX clicon internal */ /* Find a function in global namespace or a plugin. XXX clicon internal */
void *clicon_find_func(clicon_handle h, char *plugin, char *func); void *clicon_find_func(clicon_handle h, char *plugin, char *func);
#endif /* _CLICON_PLUGIN_H_ */ #endif /* _CLIXON_PLUGIN_H_ */

14
lib/clicon/clicon_proc.h → lib/clixon/clixon_proc.h
View file

@ -2,26 +2,26 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */
#ifndef _CLICON_PROC_H_ #ifndef _CLIXON_PROC_H_
#define _CLICON_PROC_H_ #define _CLIXON_PROC_H_
/* /*
* Prototypes * Prototypes
@ -30,4 +30,4 @@ int clicon_proc_run (char *, void (outcb)(char *), int doerr);
int clicon_proc_daemon (char *); int clicon_proc_daemon (char *);
int group_name2gid(char *name, gid_t *gid); int group_name2gid(char *name, gid_t *gid);
#endif /* _CLICON_PROC_H_ */ #endif /* _CLIXON_PROC_H_ */

14
lib/clicon/clicon_proto.h → lib/clixon/clixon_proto.h
View file

@ -2,28 +2,28 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
* Protocol to communicate with CLICON config daemon * Protocol to communicate with CLICON config daemon
*/ */
#ifndef _CLICON_PROTO_H_ #ifndef _CLIXON_PROTO_H_
#define _CLICON_PROTO_H_ #define _CLIXON_PROTO_H_
/* /*
* Types * Types
@ -180,4 +180,4 @@ int send_msg_err(int s, int err, int suberr, char *format, ...);
#endif /* _CLICON_PROTO_H_ */ #endif /* _CLIXON_PROTO_H_ */

14
lib/clicon/clicon_proto_client.h → lib/clixon/clixon_proto_client.h
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
@ -24,8 +24,8 @@
* it should (is?) be general enough to be used by other applications. * it should (is?) be general enough to be used by other applications.
*/ */
#ifndef _CLICON_PROTO_CLIENT_H_ #ifndef _CLIXON_PROTO_CLIENT_H_
#define _CLICON_PROTO_CLIENT_H_ #define _CLIXON_PROTO_CLIENT_H_
int clicon_rpc_commit(clicon_handle h, char *running_db, char *db, int clicon_rpc_commit(clicon_handle h, char *running_db, char *db,
int snapshot, int startup); int snapshot, int startup);
@ -54,4 +54,4 @@ int clicon_rpc_subscription(clicon_handle h, int status, char *stream,
enum format_enum format, char *filter, int *s); enum format_enum format, char *filter, int *s);
#endif /* _CLICON_PROTO_CLIENT_H_ */ #endif /* _CLIXON_PROTO_CLIENT_H_ */

14
lib/clicon/clicon_proto_encode.h → lib/clixon/clixon_proto_encode.h
View file

@ -2,20 +2,20 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
@ -23,8 +23,8 @@
* and server (clicon_backend) * and server (clicon_backend)
*/ */
#ifndef _CLICON_PROTO_ENCODE_H_ #ifndef _CLIXON_PROTO_ENCODE_H_
#define _CLICON_PROTO_ENCODE_H_ #define _CLIXON_PROTO_ENCODE_H_
/* /*
* Prototypes * Prototypes
@ -186,4 +186,4 @@ struct clicon_msg *clicon_msg_err_encode(uint32_t err, uint32_t suberr,
int clicon_msg_err_decode(struct clicon_msg *msg, uint32_t *err, uint32_t *suberr, int clicon_msg_err_decode(struct clicon_msg *msg, uint32_t *err, uint32_t *suberr,
char **reason, const char *label); char **reason, const char *label);
#endif /* _CLICON_PROTO_ENCODE_H_ */ #endif /* _CLIXON_PROTO_ENCODE_H_ */

14
lib/clicon/clicon_qdb.h → lib/clixon/clixon_qdb.h
View file

@ -2,26 +2,26 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */
#ifndef _CLICON_QDB_H_ #ifndef _CLIXON_QDB_H_
#define _CLICON_QDB_H_ #define _CLIXON_QDB_H_
/* /*
@ -55,4 +55,4 @@ int db_regexp(char *file, char *regexp, const char *label,
char *db_sanitize(char *rx, const char *label); char *db_sanitize(char *rx, const char *label);
#endif /* _CLICON_QDB_H_ */ #endif /* _CLIXON_QDB_H_ */

14
lib/clicon/clicon_queue.h → lib/clixon/clixon_queue.h
View file

@ -2,28 +2,28 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
* Copyright (C) 2002 Benny Holmgren, All rights reserved * Copyright (C) 2002 Benny Holmgren, All rights reserved
*/ */
#ifndef _CLICON_QUEUE_H_ #ifndef _CLIXON_QUEUE_H_
#define _CLICON_QUEUE_H_ #define _CLIXON_QUEUE_H_
/* /*
* Circular queue structure for use as first entry in a parent structure. * Circular queue structure for use as first entry in a parent structure.
@ -86,4 +86,4 @@ typedef struct _qelem_t {
#define NEXTQ(type, elem) ((type)((elem)?((qelem_t *)(elem))->q_next:NULL)) #define NEXTQ(type, elem) ((type)((elem)?((qelem_t *)(elem))->q_next:NULL))
#endif /* _CLICON_QUEUE_H_ */ #endif /* _CLIXON_QUEUE_H_ */

14
lib/clicon/clicon_sha1.h → lib/clixon/clixon_sha1.h
View file

@ -2,29 +2,29 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */
#ifndef _CLICON_SHA1_H_ #ifndef _CLIXON_SHA1_H_
#define _CLICON_SHA1_H_ #define _CLIXON_SHA1_H_
/* /*
* Function Prototypes * Function Prototypes
*/ */
char *clicon_sha1hex(const char *str); char *clicon_sha1hex(const char *str);
#endif /* _CLICON_SHA1_H_ */ #endif /* _CLIXON_SHA1_H_ */

14
lib/clicon/clicon_sig.h → lib/clixon/clixon_sig.h
View file

@ -2,26 +2,26 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */
#ifndef _CLICON_SIG_H_ #ifndef _CLIXON_SIG_H_
#define _CLICON_SIG_H_ #define _CLIXON_SIG_H_
/* /*
* Types * Types
@ -39,4 +39,4 @@ int pidfile_get(char *pidfile, pid_t *pid0);
int pidfile_write(char *pidfile); int pidfile_write(char *pidfile);
int pidfile_zapold(pid_t pid); int pidfile_zapold(pid_t pid);
#endif /* _CLICON_SIG_H_ */ #endif /* _CLIXON_SIG_H_ */

14
lib/clicon/clicon_string.h → lib/clixon/clixon_string.h
View file

@ -2,26 +2,26 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */
#ifndef _CLICON_STRING_H_ #ifndef _CLIXON_STRING_H_
#define _CLICON_STRING_H_ #define _CLIXON_STRING_H_
/*! A malloc version that aligns on 4 bytes. To avoid warning from valgrind */ /*! A malloc version that aligns on 4 bytes. To avoid warning from valgrind */
#define align4(s) (((s)/4)*4 + 4) #define align4(s) (((s)/4)*4 + 4)
@ -53,4 +53,4 @@ int clicon_strmatch(const char *str, const char *regexp, char **match);
char *clicon_strsub(char *str, char *from, char *to); char *clicon_strsub(char *str, char *from, char *to);
#endif /* _CLICON_STRING_H_ */ #endif /* _CLIXON_STRING_H_ */

14
lib/clicon/clicon_xml.h → lib/clixon/clixon_xml.h
View file

@ -2,26 +2,26 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* XML support functions. * XML support functions.
*/ */
#ifndef _CLICON_XML_H #ifndef _CLIXON_XML_H
#define _CLICON_XML_H #define _CLIXON_XML_H
/* /*
* Types * Types
@ -108,4 +108,4 @@ int cxvec_append(cxobj *x, cxobj ***vec, size_t *len);
int xml_apply(cxobj *xn, enum cxobj_type type, xml_applyfn_t fn, void *arg); int xml_apply(cxobj *xn, enum cxobj_type type, xml_applyfn_t fn, void *arg);
int xml_apply_ancestor(cxobj *xn, xml_applyfn_t fn, void *arg); int xml_apply_ancestor(cxobj *xn, xml_applyfn_t fn, void *arg);
#endif /* _CLICON_XML_H */ #endif /* _CLIXON_XML_H */

14
lib/clicon/clicon_xml_db.h → lib/clixon/clixon_xml_db.h
View file

@ -2,26 +2,26 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* XML support functions. * XML support functions.
*/ */
#ifndef _CLICON_XML_DB_H #ifndef _CLIXON_XML_DB_H
#define _CLICON_XML_DB_H #define _CLIXON_XML_DB_H
/* /*
* Prototypes * Prototypes
@ -39,4 +39,4 @@ int xmldb_put( char *dbname, cxobj *xt,
int xmldb_put_xkey(char *dbname, char *xkey, char *val, yang_spec *yspec, int xmldb_put_xkey(char *dbname, char *xkey, char *val, yang_spec *yspec,
enum operation_type op); enum operation_type op);
#endif /* _CLICON_XML_DB_H */ #endif /* _CLIXON_XML_DB_H */

14
lib/clicon/clicon_xml_map.h → lib/clixon/clixon_xml_map.h
View file

@ -2,28 +2,28 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* *
* XML code * XML code
*/ */
#ifndef _CLICON_XML_MAP_H_ #ifndef _CLIXON_XML_MAP_H_
#define _CLICON_XML_MAP_H_ #define _CLIXON_XML_MAP_H_
/* /*
* lvmap_xml op codes * lvmap_xml op codes
@ -50,4 +50,4 @@ int xml_diff(yang_spec *yspec, cxobj *xt1, cxobj *xt2,
cxobj ***second, size_t *secondlen, cxobj ***second, size_t *secondlen,
cxobj ***changed1, cxobj ***changed2, size_t *changedlen); cxobj ***changed1, cxobj ***changed2, size_t *changedlen);
#endif /* _CLICON_XML_MAP_H_ */ #endif /* _CLIXON_XML_MAP_H_ */

14
lib/clicon/clicon_xsl.h → lib/clixon/clixon_xsl.h
View file

@ -2,26 +2,26 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
* XML XPATH and XSLT functions. * XML XPATH and XSLT functions.
*/ */
#ifndef _CLICON_XSL_H #ifndef _CLIXON_XSL_H
#define _CLICON_XSL_H #define _CLIXON_XSL_H
/* /*
* Prototypes * Prototypes
@ -31,4 +31,4 @@ cxobj *xpath_each(cxobj *xn_top, char *xpath, cxobj *prev);
cxobj **xpath_vec(cxobj *xn_top, char *xpath, size_t *xv_len); cxobj **xpath_vec(cxobj *xn_top, char *xpath, size_t *xv_len);
cxobj **xpath_vec_flag(cxobj *cxtop, char *xpath, uint16_t flags, size_t *veclen); cxobj **xpath_vec_flag(cxobj *cxtop, char *xpath, uint16_t flags, size_t *veclen);
#endif /* _CLICON_XSL_H */ #endif /* _CLIXON_XSL_H */

14
lib/clicon/clicon_yang.h → lib/clixon/clixon_yang.h
View file

@ -2,26 +2,26 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */
#ifndef _CLICON_YANG_H_ #ifndef _CLIXON_YANG_H_
#define _CLICON_YANG_H_ #define _CLIXON_YANG_H_
/* /*
@ -203,4 +203,4 @@ int yang_spec_main(clicon_handle h, FILE *f, int printspec);
cvec *yang_arg2cvec(yang_stmt *ys, char *delimi); cvec *yang_arg2cvec(yang_stmt *ys, char *delimi);
int yang_key_match(yang_node *yn, char *name); int yang_key_match(yang_node *yn, char *name);
#endif /* _CLICON_YANG_H_ */ #endif /* _CLIXON_YANG_H_ */

14
lib/clicon/clicon_yang_type.h → lib/clixon/clixon_yang_type.h
View file

@ -2,26 +2,26 @@
* *
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2009-2016 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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/>. <http://www.gnu.org/licenses/>.
*/ */
#ifndef _CLICON_YANG_TYPE_H_ #ifndef _CLIXON_YANG_TYPE_H_
#define _CLICON_YANG_TYPE_H_ #define _CLIXON_YANG_TYPE_H_
/* /*
* Constants * Constants
@ -65,4 +65,4 @@ int yang_type_resolve(yang_stmt *ys, yang_stmt *ytype,
char **pattern, uint8_t *fraction); char **pattern, uint8_t *fraction);
#endif /* _CLICON_YANG_TYPE_H_ */ #endif /* _CLIXON_YANG_TYPE_H_ */

Some files were not shown because too many files have changed in this diff Show more