From a150eec7bef7fc864c14b3dcd00e8c5ed3851527 Mon Sep 17 00:00:00 2001 From: Olof hagsand Date: Sun, 10 Dec 2017 15:38:42 +0100 Subject: [PATCH 1/4] Fixed bug that deletes running on startup if backup started with -m running. --- CHANGELOG.md | 6 ++++++ apps/backend/backend_main.c | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0abaae8..454eb645 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Clixon Changelog +* Fixed bug that deletes running on startup if backup started with -m running. + When clixon starts again, running is lost. + The error was that the running (or startup) configuration may fail when + clixon backend starts. + The fix now makes a copy of running and copies it back on failure + ## 3.3.3 (25 November 2017) Thanks to Matthew Smith, Joe Loeliger at Netgate; Fredrik Pettai at diff --git a/apps/backend/backend_main.c b/apps/backend/backend_main.c index f65bf6c5..0f80d0d1 100644 --- a/apps/backend/backend_main.c +++ b/apps/backend/backend_main.c @@ -536,8 +536,13 @@ startup_mode_running(clicon_handle h, if (load_extraxml(h, extraxml_file, "tmp") < 0) goto done; /* Commit original running */ - if (candidate_commit(h, "candidate") < 0) + if (candidate_commit(h, "candidate") < 0){ + clicon_log(LOG_NOTICE, "%s: Commit of saved running failed, exiting.", __FUNCTION__); + /* Reinstate original */ + if (xmldb_copy(h, "candidate", "running") < 0) + goto done; goto done; + } /* Merge user reset state and extra xml file (no commit) */ if (db_merge(h, "tmp", "running") < 0) goto done; From f10e2a89e84e5a6badd5d03b8d81321c77ac8fe7 Mon Sep 17 00:00:00 2001 From: Olof hagsand Date: Sun, 31 Dec 2017 20:18:41 +0100 Subject: [PATCH 2/4] global variables into handle --- datastore/text/clixon_xmldb_text.c | 72 ++++++++++++++---------------- 1 file changed, 34 insertions(+), 38 deletions(-) diff --git a/datastore/text/clixon_xmldb_text.c b/datastore/text/clixon_xmldb_text.c index da40df1d..92b87e63 100644 --- a/datastore/text/clixon_xmldb_text.c +++ b/datastore/text/clixon_xmldb_text.c @@ -82,6 +82,12 @@ struct text_handle { char *th_dbdir; /* Directory of database files */ yang_spec *th_yangspec; /* Yang spec if this datastore */ clicon_hash_t *th_dbs; /* Hash of db_elements. key is dbname */ + int th_cache; /* Keep datastore text in memory so that get + operation need only read memory. + Write to file on modification or file change. + Assumes single backend*/ + char *th_format; /* Datastroe format: xml / json */ + int th_pretty; /* Store xml/json pretty-printed. */ }; /* Struct per database in hash */ @@ -90,19 +96,6 @@ struct db_element{ cxobj *de_xml; }; -/* Keep datastore text in memory so that get operation need only read memory. - * Write to file on modification or file change. - * Assumes single backend - * XXX MOVE TO HANDLE all three below - */ -static int xmltree_cache = 1; - -/* Format */ -static char *xml_format = "xml"; - -/* Store xml/json pretty-printed. Or not. */ -static int xml_pretty = 1; - /*! Check struct magic number for sanity checks * return 0 if OK, -1 if fail. */ @@ -173,6 +166,9 @@ text_connect(void) } memset(th, 0, size); th->th_magic = TEXT_HANDLE_MAGIC; + th->th_format = "xml"; /* default */ + th->th_pretty = 1; /* default */ + th->th_cache = 1; /* default */ if ((th->th_dbs = hash_init()) == NULL) goto done; xh = (xmldb_handle)th; @@ -199,7 +195,7 @@ text_disconnect(xmldb_handle xh) if (th->th_dbdir) free(th->th_dbdir); if (th->th_dbs){ - if (xmltree_cache){ + if (th->th_cache){ if ((keys = hash_keys(th->th_dbs, &klen)) == NULL) return 0; for(i = 0; i < klen; i++) @@ -239,11 +235,11 @@ text_getopt(xmldb_handle xh, else if (strcmp(optname, "dbdir") == 0) *value = th->th_dbdir; else if (strcmp(optname, "xml_cache") == 0) - *value = &xmltree_cache; + *value = &th->th_cache; else if (strcmp(optname, "format") == 0) - *value = xml_format; + *value = th->th_format; else if (strcmp(optname, "pretty") == 0) - *value = &xml_pretty; + *value = &th->th_pretty; else{ clicon_err(OE_PLUGIN, 0, "Option %s not implemented by plugin", optname); goto done; @@ -277,20 +273,20 @@ text_setopt(xmldb_handle xh, } } else if (strcmp(optname, "xml_cache") == 0){ - xmltree_cache = (intptr_t)value; + th->th_cache = (intptr_t)value; } else if (strcmp(optname, "format") == 0){ if (strcmp(value,"xml")==0) - xml_format = "xml"; + th->th_format = "xml"; else if (strcmp(value,"json")==0) - xml_format = "json"; + th->th_format = "json"; else{ clicon_err(OE_PLUGIN, 0, "Option %s unrecognized format: %s", optname, value); goto done; } } else if (strcmp(optname, "pretty") == 0){ - xml_pretty = (intptr_t)value; + th->th_pretty = (intptr_t)value; } else{ clicon_err(OE_PLUGIN, 0, "Option %s not implemented by plugin", optname); @@ -439,7 +435,7 @@ text_get(xmldb_handle xh, clicon_err(OE_YANG, ENOENT, "No yang spec"); goto done; } - if (xmltree_cache){ + if (th->th_cache){ if ((de = hash_value(th->th_dbs, db, NULL)) != NULL) xt = de->de_xml; } @@ -455,7 +451,7 @@ text_get(xmldb_handle xh, goto done; } /* Parse file into XML tree */ - if (strcmp(xml_format,"json")==0){ + if (strcmp(th->th_format,"json")==0){ if ((json_parse_file(fd, yspec, &xt)) < 0) goto done; } @@ -487,11 +483,11 @@ text_get(xmldb_handle xh, if (xvec != NULL) for (i=0; ith_cache) xml_apply_ancestor(xvec[i], (xml_applyfn_t*)xml_flag_set, (void*)XML_FLAG_CHANGE); } - if (xmltree_cache){ + if (th->th_cache){ /* Copy the matching parts of the (relevant) XML tree. * If cache was NULL, also write to datastore cache */ @@ -866,7 +862,7 @@ text_put(xmldb_handle xh, xml_name(x1)); goto done; } - if (xmltree_cache){ + if (th->th_cache){ if ((de = hash_value(th->th_dbs, db, NULL)) != NULL) x0 = de->de_xml; } @@ -882,7 +878,7 @@ text_put(xmldb_handle xh, goto done; } /* Parse file into XML tree */ - if (strcmp(xml_format,"json")==0){ + if (strcmp(th->th_format,"json")==0){ if ((json_parse_file(fd, yspec, &x0)) < 0) goto done; } @@ -941,7 +937,7 @@ text_put(xmldb_handle xh, clicon_log(LOG_NOTICE, "%s: verify failed #3", __FUNCTION__); #endif /* Write back to datastore cache if first time */ - if (xmltree_cache){ + if (th->th_cache){ struct db_element de0 = {0,}; if (de != NULL) de0 = *de; @@ -966,11 +962,11 @@ text_put(xmldb_handle xh, clicon_err(OE_CFG, errno, "Creating file %s", dbfile); goto done; } - if (strcmp(xml_format,"json")==0){ - if (xml2json(f, x0, xml_pretty) < 0) + if (strcmp(th->th_format,"json")==0){ + if (xml2json(f, x0, th->th_pretty) < 0) goto done; } - else if (clicon_xml2file(f, x0, 0, xml_pretty) < 0) + else if (clicon_xml2file(f, x0, 0, th->th_pretty) < 0) goto done; retval = 0; done: @@ -982,7 +978,7 @@ text_put(xmldb_handle xh, close(fd); if (cb) cbuf_free(cb); - if (!xmltree_cache && x0) + if (!th->th_cache && x0) xml_free(x0); return retval; } @@ -1007,7 +1003,7 @@ text_copy(xmldb_handle xh, struct db_element *de2 = NULL; /* XXX lock */ - if (xmltree_cache){ + if (th->th_cache){ /* 1. Free xml tree in "to" */ if ((de = hash_value(th->th_dbs, to, NULL)) != NULL){ @@ -1190,7 +1186,7 @@ text_delete(xmldb_handle xh, cxobj *xt = NULL; struct stat sb; - if (xmltree_cache){ + if (th->th_cache){ if ((de = hash_value(th->th_dbs, db, NULL)) != NULL){ if ((xt = de->de_xml) != NULL){ xml_free(xt); @@ -1230,7 +1226,7 @@ text_create(xmldb_handle xh, struct db_element *de = NULL; cxobj *xt = NULL; - if (xmltree_cache){ /* XXX This should nt really happen? */ + if (th->th_cache){ /* XXX This should nt really happen? */ if ((de = hash_value(th->th_dbs, db, NULL)) != NULL){ if ((xt = de->de_xml) != NULL){ assert(xt==NULL); /* XXX */ @@ -1354,12 +1350,12 @@ main(int argc, xpath = argc>5?argv[5]:NULL; if (xmldb_get(h, db, xpath, &xt, NULL, 1, NULL) < 0) goto done; - if (strcmp(xml_format,"json")==0){ - if (xml2json(stdout, xt, xml_pretty) < 0) + if (strcmp(th->th_format,"json")==0){ + if (xml2json(stdout, xt, th->th_pretty) < 0) goto done; } else{ - if (clicon_xml2file(stdout, xt, 0, xml_pretty) < 0) + if (clicon_xml2file(stdout, xt, 0, th->th_pretty) < 0) goto done; } } From 38f0b446fa1b08683e092ca8560bf1c009ec819a Mon Sep 17 00:00:00 2001 From: Olof hagsand Date: Mon, 1 Jan 2018 12:25:33 +0100 Subject: [PATCH 3/4] 2017->2018 --- LICENSE.md | 2 +- Makefile.in | 2 +- apps/Makefile.in | 2 +- apps/backend/Makefile.in | 2 +- apps/backend/backend_client.c | 2 +- apps/backend/backend_client.h | 2 +- apps/backend/backend_commit.c | 2 +- apps/backend/backend_commit.h | 2 +- apps/backend/backend_handle.h | 2 +- apps/backend/backend_main.c | 2 +- apps/backend/backend_plugin.c | 2 +- apps/backend/backend_plugin.h | 2 +- apps/backend/backend_socket.c | 2 +- apps/backend/backend_socket.h | 2 +- apps/backend/clixon_backend.h | 2 +- apps/backend/clixon_backend_handle.c | 2 +- apps/backend/clixon_backend_handle.h | 2 +- apps/backend/clixon_backend_transaction.c | 2 +- apps/backend/clixon_backend_transaction.h | 2 +- apps/cli/Makefile.in | 2 +- apps/cli/cli_common.c | 2 +- apps/cli/cli_common.h | 2 +- apps/cli/cli_generate.c | 2 +- apps/cli/cli_generate.h | 2 +- apps/cli/cli_handle.c | 2 +- apps/cli/cli_handle.h | 2 +- apps/cli/cli_main.c | 2 +- apps/cli/cli_plugin.c | 2 +- apps/cli/cli_plugin.h | 2 +- apps/cli/cli_show.c | 2 +- apps/cli/clixon_cli.h | 2 +- apps/cli/clixon_cli_api.h | 2 +- apps/netconf/Makefile.in | 2 +- apps/netconf/clixon_netconf.h | 2 +- apps/netconf/netconf_filter.c | 2 +- apps/netconf/netconf_filter.h | 2 +- apps/netconf/netconf_hello.c | 2 +- apps/netconf/netconf_hello.h | 2 +- apps/netconf/netconf_lib.c | 2 +- apps/netconf/netconf_lib.h | 2 +- apps/netconf/netconf_main.c | 2 +- apps/netconf/netconf_plugin.c | 2 +- apps/netconf/netconf_plugin.h | 2 +- apps/netconf/netconf_rpc.c | 2 +- apps/netconf/netconf_rpc.h | 2 +- apps/restconf/Makefile.in | 2 +- apps/restconf/restconf_lib.c | 2 +- apps/restconf/restconf_lib.h | 2 +- apps/restconf/restconf_main.c | 2 +- apps/restconf/restconf_methods.c | 2 +- apps/restconf/restconf_methods.h | 2 +- clixon.conf.cpp.cpp | 2 +- clixon.mk.cpp | 2 +- configure | 4 +++- configure.ac | 2 +- datastore/Makefile.in | 2 +- datastore/datastore_client.c | 2 +- datastore/keyvalue/Makefile.in | 2 +- datastore/keyvalue/clixon_chunk.c | 2 +- datastore/keyvalue/clixon_chunk.h | 2 +- datastore/keyvalue/clixon_keyvalue.c | 2 +- datastore/keyvalue/clixon_keyvalue.h | 2 +- datastore/keyvalue/clixon_qdb.c | 2 +- datastore/keyvalue/clixon_qdb.h | 2 +- datastore/text/Makefile.in | 2 +- datastore/text/clixon_xmldb_text.c | 2 +- datastore/text/clixon_xmldb_text.h | 2 +- doc/Makefile.in | 2 +- docker/Makefile.in | 2 +- docker/README | 2 ++ docker/backend/Dockerfile.in | 2 +- docker/backend/Makefile.in | 2 +- docker/cli/Dockerfile.in | 2 +- docker/cli/Makefile.in | 2 +- docker/netconf/Dockerfile.in | 2 +- docker/netconf/Makefile.in | 2 +- etc/Makefile.in | 2 +- etc/clixonrc.in | 2 +- example/Makefile.in | 2 +- example/docker/Makefile.in | 2 +- example/routing_backend.c | 2 +- example/routing_cli.c | 2 +- example/routing_netconf.c | 2 +- include/Makefile.in | 2 +- include/clixon_custom.h | 2 +- lib/Makefile.in | 2 +- lib/clixon/Makefile.in | 2 +- lib/clixon/clixon.h.in | 2 +- lib/clixon/clixon_err.h | 2 +- lib/clixon/clixon_event.h | 2 +- lib/clixon/clixon_file.h | 2 +- lib/clixon/clixon_handle.h | 2 +- lib/clixon/clixon_hash.h | 2 +- lib/clixon/clixon_json.h | 2 +- lib/clixon/clixon_log.h | 2 +- lib/clixon/clixon_options.h | 2 +- lib/clixon/clixon_plugin.h | 2 +- lib/clixon/clixon_proto.h | 2 +- lib/clixon/clixon_proto_client.h | 2 +- lib/clixon/clixon_queue.h | 2 +- lib/clixon/clixon_sha1.h | 2 +- lib/clixon/clixon_sig.h | 2 +- lib/clixon/clixon_string.h | 2 +- lib/clixon/clixon_xml.h | 2 +- lib/clixon/clixon_xml_db.h | 2 +- lib/clixon/clixon_xml_map.h | 2 +- lib/clixon/clixon_xml_sort.h | 2 +- lib/clixon/clixon_xsl.h | 2 +- lib/clixon/clixon_yang.h | 2 +- lib/clixon/clixon_yang_type.h | 2 +- lib/src/Makefile.in | 2 +- lib/src/clixon_err.c | 2 +- lib/src/clixon_event.c | 2 +- lib/src/clixon_file.c | 2 +- lib/src/clixon_handle.c | 2 +- lib/src/clixon_hash.c | 2 +- lib/src/clixon_json.c | 2 +- lib/src/clixon_json_parse.h | 2 +- lib/src/clixon_json_parse.l | 2 +- lib/src/clixon_json_parse.y | 2 +- lib/src/clixon_log.c | 2 +- lib/src/clixon_options.c | 2 +- lib/src/clixon_plugin.c | 2 +- lib/src/clixon_proto.c | 2 +- lib/src/clixon_proto_client.c | 2 +- lib/src/clixon_sig.c | 2 +- lib/src/clixon_string.c | 2 +- lib/src/clixon_xml.c | 2 +- lib/src/clixon_xml_db.c | 2 +- lib/src/clixon_xml_map.c | 2 +- lib/src/clixon_xml_parse.h | 2 +- lib/src/clixon_xml_parse.l | 2 +- lib/src/clixon_xml_parse.y | 2 +- lib/src/clixon_xml_sort.c | 2 +- lib/src/clixon_xsl.c | 2 +- lib/src/clixon_yang.c | 2 +- lib/src/clixon_yang_parse.h | 2 +- lib/src/clixon_yang_parse.l | 2 +- lib/src/clixon_yang_parse.y | 2 +- lib/src/clixon_yang_type.c | 2 +- yang/Makefile.in | 2 +- 141 files changed, 144 insertions(+), 140 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 3a9651b5..84997252 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright 2009-2017 Olof Hagsand and Benny Holmgren +Copyright 2009-2018 Olof Hagsand and Benny Holmgren CLIXON is dual license. diff --git a/Makefile.in b/Makefile.in index 6b75f631..b9cdb616 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/apps/Makefile.in b/apps/Makefile.in index ae8b0a76..2f096de0 100644 --- a/apps/Makefile.in +++ b/apps/Makefile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/apps/backend/Makefile.in b/apps/backend/Makefile.in index cbc2f059..662b884b 100644 --- a/apps/backend/Makefile.in +++ b/apps/backend/Makefile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/apps/backend/backend_client.c b/apps/backend/backend_client.c index 939511b1..0fd9fad6 100644 --- a/apps/backend/backend_client.c +++ b/apps/backend/backend_client.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/backend/backend_client.h b/apps/backend/backend_client.h index 8536a01b..191a700a 100644 --- a/apps/backend/backend_client.h +++ b/apps/backend/backend_client.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/backend/backend_commit.c b/apps/backend/backend_commit.c index 289fa5c7..73753b63 100644 --- a/apps/backend/backend_commit.c +++ b/apps/backend/backend_commit.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/backend/backend_commit.h b/apps/backend/backend_commit.h index 98b76f74..6be05858 100644 --- a/apps/backend/backend_commit.h +++ b/apps/backend/backend_commit.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/backend/backend_handle.h b/apps/backend/backend_handle.h index 4a81af16..8eb3e073 100644 --- a/apps/backend/backend_handle.h +++ b/apps/backend/backend_handle.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/backend/backend_main.c b/apps/backend/backend_main.c index cf4e6422..1b52b629 100644 --- a/apps/backend/backend_main.c +++ b/apps/backend/backend_main.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/backend/backend_plugin.c b/apps/backend/backend_plugin.c index 75029f4e..fe3e5a6a 100644 --- a/apps/backend/backend_plugin.c +++ b/apps/backend/backend_plugin.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/backend/backend_plugin.h b/apps/backend/backend_plugin.h index b3b0d57b..253463e8 100644 --- a/apps/backend/backend_plugin.h +++ b/apps/backend/backend_plugin.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/backend/backend_socket.c b/apps/backend/backend_socket.c index 2324de82..7472fa06 100644 --- a/apps/backend/backend_socket.c +++ b/apps/backend/backend_socket.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/backend/backend_socket.h b/apps/backend/backend_socket.h index b88efb89..df6ac149 100644 --- a/apps/backend/backend_socket.h +++ b/apps/backend/backend_socket.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/backend/clixon_backend.h b/apps/backend/clixon_backend.h index f9b0d28f..7acbdb5b 100644 --- a/apps/backend/clixon_backend.h +++ b/apps/backend/clixon_backend.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/backend/clixon_backend_handle.c b/apps/backend/clixon_backend_handle.c index 142b63cd..aeba8a23 100644 --- a/apps/backend/clixon_backend_handle.c +++ b/apps/backend/clixon_backend_handle.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/backend/clixon_backend_handle.h b/apps/backend/clixon_backend_handle.h index 171d5dd0..2edb61b8 100644 --- a/apps/backend/clixon_backend_handle.h +++ b/apps/backend/clixon_backend_handle.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/backend/clixon_backend_transaction.c b/apps/backend/clixon_backend_transaction.c index 2c1a71d1..18b5c807 100644 --- a/apps/backend/clixon_backend_transaction.c +++ b/apps/backend/clixon_backend_transaction.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/backend/clixon_backend_transaction.h b/apps/backend/clixon_backend_transaction.h index 3eaee55f..2647a45c 100644 --- a/apps/backend/clixon_backend_transaction.h +++ b/apps/backend/clixon_backend_transaction.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/cli/Makefile.in b/apps/cli/Makefile.in index 42ffbcf2..359038b0 100644 --- a/apps/cli/Makefile.in +++ b/apps/cli/Makefile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/apps/cli/cli_common.c b/apps/cli/cli_common.c index 82c19c0b..c0266ab6 100644 --- a/apps/cli/cli_common.c +++ b/apps/cli/cli_common.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/cli/cli_common.h b/apps/cli/cli_common.h index 6e2d122b..8e177e5e 100644 --- a/apps/cli/cli_common.h +++ b/apps/cli/cli_common.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/cli/cli_generate.c b/apps/cli/cli_generate.c index 1fa391ea..3b8f2ce4 100644 --- a/apps/cli/cli_generate.c +++ b/apps/cli/cli_generate.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/cli/cli_generate.h b/apps/cli/cli_generate.h index f80628cf..371063ba 100644 --- a/apps/cli/cli_generate.h +++ b/apps/cli/cli_generate.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/cli/cli_handle.c b/apps/cli/cli_handle.c index 695efc8c..10762a41 100644 --- a/apps/cli/cli_handle.c +++ b/apps/cli/cli_handle.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/cli/cli_handle.h b/apps/cli/cli_handle.h index 9d67532a..273d40e8 100644 --- a/apps/cli/cli_handle.h +++ b/apps/cli/cli_handle.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/cli/cli_main.c b/apps/cli/cli_main.c index 25343e99..8f691256 100644 --- a/apps/cli/cli_main.c +++ b/apps/cli/cli_main.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/cli/cli_plugin.c b/apps/cli/cli_plugin.c index ef3dfcaa..f2da6b78 100644 --- a/apps/cli/cli_plugin.c +++ b/apps/cli/cli_plugin.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/cli/cli_plugin.h b/apps/cli/cli_plugin.h index 0a74e6a7..a81f057b 100644 --- a/apps/cli/cli_plugin.h +++ b/apps/cli/cli_plugin.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/cli/cli_show.c b/apps/cli/cli_show.c index 350966bd..10bfd062 100644 --- a/apps/cli/cli_show.c +++ b/apps/cli/cli_show.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/cli/clixon_cli.h b/apps/cli/clixon_cli.h index 1f539053..c41d7185 100644 --- a/apps/cli/clixon_cli.h +++ b/apps/cli/clixon_cli.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/cli/clixon_cli_api.h b/apps/cli/clixon_cli_api.h index e24e9053..9c0ececf 100644 --- a/apps/cli/clixon_cli_api.h +++ b/apps/cli/clixon_cli_api.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/netconf/Makefile.in b/apps/netconf/Makefile.in index 31009f97..523a51a2 100644 --- a/apps/netconf/Makefile.in +++ b/apps/netconf/Makefile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/apps/netconf/clixon_netconf.h b/apps/netconf/clixon_netconf.h index 616f511b..e3b1680e 100644 --- a/apps/netconf/clixon_netconf.h +++ b/apps/netconf/clixon_netconf.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/netconf/netconf_filter.c b/apps/netconf/netconf_filter.c index 00b3232d..89b698e9 100644 --- a/apps/netconf/netconf_filter.c +++ b/apps/netconf/netconf_filter.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/netconf/netconf_filter.h b/apps/netconf/netconf_filter.h index 25b0cd4d..ed5e3d98 100644 --- a/apps/netconf/netconf_filter.h +++ b/apps/netconf/netconf_filter.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/netconf/netconf_hello.c b/apps/netconf/netconf_hello.c index 128ef9cc..68b42805 100644 --- a/apps/netconf/netconf_hello.c +++ b/apps/netconf/netconf_hello.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/netconf/netconf_hello.h b/apps/netconf/netconf_hello.h index e5377014..82e235f7 100644 --- a/apps/netconf/netconf_hello.h +++ b/apps/netconf/netconf_hello.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/netconf/netconf_lib.c b/apps/netconf/netconf_lib.c index b3edcc73..debd0c3d 100644 --- a/apps/netconf/netconf_lib.c +++ b/apps/netconf/netconf_lib.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/netconf/netconf_lib.h b/apps/netconf/netconf_lib.h index d47f7d7b..f2dc73e1 100644 --- a/apps/netconf/netconf_lib.h +++ b/apps/netconf/netconf_lib.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c index 62584917..c70ae1c6 100644 --- a/apps/netconf/netconf_main.c +++ b/apps/netconf/netconf_main.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/netconf/netconf_plugin.c b/apps/netconf/netconf_plugin.c index 30473ad1..b601969f 100644 --- a/apps/netconf/netconf_plugin.c +++ b/apps/netconf/netconf_plugin.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/netconf/netconf_plugin.h b/apps/netconf/netconf_plugin.h index 4b1f71b1..96cf2921 100644 --- a/apps/netconf/netconf_plugin.h +++ b/apps/netconf/netconf_plugin.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/netconf/netconf_rpc.c b/apps/netconf/netconf_rpc.c index a912d0ed..a87a8bfb 100644 --- a/apps/netconf/netconf_rpc.c +++ b/apps/netconf/netconf_rpc.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/netconf/netconf_rpc.h b/apps/netconf/netconf_rpc.h index bfc992d9..3ce6a615 100644 --- a/apps/netconf/netconf_rpc.h +++ b/apps/netconf/netconf_rpc.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/restconf/Makefile.in b/apps/restconf/Makefile.in index ca089853..990529cc 100644 --- a/apps/restconf/Makefile.in +++ b/apps/restconf/Makefile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/apps/restconf/restconf_lib.c b/apps/restconf/restconf_lib.c index 7fc1d0ac..819ed211 100644 --- a/apps/restconf/restconf_lib.c +++ b/apps/restconf/restconf_lib.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/restconf/restconf_lib.h b/apps/restconf/restconf_lib.h index fa5459c8..2813295f 100644 --- a/apps/restconf/restconf_lib.h +++ b/apps/restconf/restconf_lib.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/restconf/restconf_main.c b/apps/restconf/restconf_main.c index 8d2e899a..f400edf0 100644 --- a/apps/restconf/restconf_main.c +++ b/apps/restconf/restconf_main.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/restconf/restconf_methods.c b/apps/restconf/restconf_methods.c index 67cbbad0..21331273 100644 --- a/apps/restconf/restconf_methods.c +++ b/apps/restconf/restconf_methods.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/apps/restconf/restconf_methods.h b/apps/restconf/restconf_methods.h index 661e01ba..89ece997 100644 --- a/apps/restconf/restconf_methods.h +++ b/apps/restconf/restconf_methods.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/clixon.conf.cpp.cpp b/clixon.conf.cpp.cpp index f8d9d8f7..feed22aa 100644 --- a/clixon.conf.cpp.cpp +++ b/clixon.conf.cpp.cpp @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/clixon.mk.cpp b/clixon.mk.cpp index bb1b3dce..966fae05 100644 --- a/clixon.mk.cpp +++ b/clixon.mk.cpp @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/configure b/configure index d6c316e5..78181e8e 100755 --- a/configure +++ b/configure @@ -2200,6 +2200,7 @@ _ACEOF # Bind to specific CLIgen version + { $as_echo "$as_me:${as_lineno-$LINENO}: result: CLIXON version is ${CLIXON_VERSION}" >&5 $as_echo "CLIXON version is ${CLIXON_VERSION}" >&6; } @@ -4096,7 +4097,8 @@ _ACEOF fi -# This is for backward compatibility of XML create and parse API in 3.4.0 +# Clixon 3.4.0 changes XML creation and parse API +# Set this for backward compat and migration. # Will be removed in 3.5.0 # Check whether --with-xml_compat was given. diff --git a/configure.ac b/configure.ac index bbdd9a43..efebf11b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/datastore/Makefile.in b/datastore/Makefile.in index 04591eb6..6e5ce1fe 100644 --- a/datastore/Makefile.in +++ b/datastore/Makefile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/datastore/datastore_client.c b/datastore/datastore_client.c index bd893f0b..89110ff5 100644 --- a/datastore/datastore_client.c +++ b/datastore/datastore_client.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/datastore/keyvalue/Makefile.in b/datastore/keyvalue/Makefile.in index f3fbc231..b18501b7 100644 --- a/datastore/keyvalue/Makefile.in +++ b/datastore/keyvalue/Makefile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/datastore/keyvalue/clixon_chunk.c b/datastore/keyvalue/clixon_chunk.c index bade74fa..cb197724 100644 --- a/datastore/keyvalue/clixon_chunk.c +++ b/datastore/keyvalue/clixon_chunk.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/datastore/keyvalue/clixon_chunk.h b/datastore/keyvalue/clixon_chunk.h index 06f7d418..81a8f18b 100644 --- a/datastore/keyvalue/clixon_chunk.h +++ b/datastore/keyvalue/clixon_chunk.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/datastore/keyvalue/clixon_keyvalue.c b/datastore/keyvalue/clixon_keyvalue.c index 00da273d..018c86fd 100644 --- a/datastore/keyvalue/clixon_keyvalue.c +++ b/datastore/keyvalue/clixon_keyvalue.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/datastore/keyvalue/clixon_keyvalue.h b/datastore/keyvalue/clixon_keyvalue.h index 33da4962..b11e15d5 100644 --- a/datastore/keyvalue/clixon_keyvalue.h +++ b/datastore/keyvalue/clixon_keyvalue.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/datastore/keyvalue/clixon_qdb.c b/datastore/keyvalue/clixon_qdb.c index 5bfa19a5..d0b72b63 100644 --- a/datastore/keyvalue/clixon_qdb.c +++ b/datastore/keyvalue/clixon_qdb.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/datastore/keyvalue/clixon_qdb.h b/datastore/keyvalue/clixon_qdb.h index 919a18aa..d2d38785 100644 --- a/datastore/keyvalue/clixon_qdb.h +++ b/datastore/keyvalue/clixon_qdb.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/datastore/text/Makefile.in b/datastore/text/Makefile.in index 6a5e69f9..ad24c6e9 100644 --- a/datastore/text/Makefile.in +++ b/datastore/text/Makefile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/datastore/text/clixon_xmldb_text.c b/datastore/text/clixon_xmldb_text.c index 92b87e63..9eae988e 100644 --- a/datastore/text/clixon_xmldb_text.c +++ b/datastore/text/clixon_xmldb_text.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/datastore/text/clixon_xmldb_text.h b/datastore/text/clixon_xmldb_text.h index 968af69a..12940f89 100644 --- a/datastore/text/clixon_xmldb_text.h +++ b/datastore/text/clixon_xmldb_text.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/doc/Makefile.in b/doc/Makefile.in index 4cf41576..7b1ce519 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/docker/Makefile.in b/docker/Makefile.in index b1c953a4..2a653879 100644 --- a/docker/Makefile.in +++ b/docker/Makefile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/docker/README b/docker/README index 0cad794f..5fcd6d49 100644 --- a/docker/README +++ b/docker/README @@ -1,3 +1,5 @@ +This dir is not updated + This dir contains docker code - how to build clixon as docker containers cli Build olofhagsand/clixon_cli container backend Build olofhagsand/clixon_backend container diff --git a/docker/backend/Dockerfile.in b/docker/backend/Dockerfile.in index 9b812f98..69929f80 100644 --- a/docker/backend/Dockerfile.in +++ b/docker/backend/Dockerfile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/docker/backend/Makefile.in b/docker/backend/Makefile.in index b943fb13..21c1287e 100644 --- a/docker/backend/Makefile.in +++ b/docker/backend/Makefile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/docker/cli/Dockerfile.in b/docker/cli/Dockerfile.in index 4ceb0134..6b316d58 100644 --- a/docker/cli/Dockerfile.in +++ b/docker/cli/Dockerfile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/docker/cli/Makefile.in b/docker/cli/Makefile.in index f616acba..349d4136 100644 --- a/docker/cli/Makefile.in +++ b/docker/cli/Makefile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/docker/netconf/Dockerfile.in b/docker/netconf/Dockerfile.in index e9676204..9a8bcc45 100644 --- a/docker/netconf/Dockerfile.in +++ b/docker/netconf/Dockerfile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/docker/netconf/Makefile.in b/docker/netconf/Makefile.in index 73c6b7c1..d099d3d2 100644 --- a/docker/netconf/Makefile.in +++ b/docker/netconf/Makefile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/etc/Makefile.in b/etc/Makefile.in index c6213afb..37e2e30d 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/etc/clixonrc.in b/etc/clixonrc.in index 0d6c1183..e06018c6 100644 --- a/etc/clixonrc.in +++ b/etc/clixonrc.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/example/Makefile.in b/example/Makefile.in index d7aedb34..f56f6bf0 100644 --- a/example/Makefile.in +++ b/example/Makefile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/example/docker/Makefile.in b/example/docker/Makefile.in index c2a79e9d..492c727f 100644 --- a/example/docker/Makefile.in +++ b/example/docker/Makefile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/example/routing_backend.c b/example/routing_backend.c index 1c672b02..449706c5 100644 --- a/example/routing_backend.c +++ b/example/routing_backend.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/example/routing_cli.c b/example/routing_cli.c index c1e794ca..b054d943 100644 --- a/example/routing_cli.c +++ b/example/routing_cli.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/example/routing_netconf.c b/example/routing_netconf.c index 9e6e5959..6ee613fe 100644 --- a/example/routing_netconf.c +++ b/example/routing_netconf.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/include/Makefile.in b/include/Makefile.in index 1403d6cc..75aa04a1 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/include/clixon_custom.h b/include/clixon_custom.h index c251d9a7..eaad25ac 100644 --- a/include/clixon_custom.h +++ b/include/clixon_custom.h @@ -1,7 +1,7 @@ /* ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/Makefile.in b/lib/Makefile.in index 2bc0f9ef..eba8991d 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/lib/clixon/Makefile.in b/lib/clixon/Makefile.in index a48f8c37..0cfe88e8 100644 --- a/lib/clixon/Makefile.in +++ b/lib/clixon/Makefile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/lib/clixon/clixon.h.in b/lib/clixon/clixon.h.in index 69bf4420..5b75e91c 100644 --- a/lib/clixon/clixon.h.in +++ b/lib/clixon/clixon.h.in @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/clixon/clixon_err.h b/lib/clixon/clixon_err.h index caf06116..8acc723c 100644 --- a/lib/clixon/clixon_err.h +++ b/lib/clixon/clixon_err.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/clixon/clixon_event.h b/lib/clixon/clixon_event.h index fd19e583..626a4b27 100644 --- a/lib/clixon/clixon_event.h +++ b/lib/clixon/clixon_event.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/clixon/clixon_file.h b/lib/clixon/clixon_file.h index 08cc1f57..3e34b6ce 100644 --- a/lib/clixon/clixon_file.h +++ b/lib/clixon/clixon_file.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/clixon/clixon_handle.h b/lib/clixon/clixon_handle.h index 207d076f..d56b31dd 100644 --- a/lib/clixon/clixon_handle.h +++ b/lib/clixon/clixon_handle.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/clixon/clixon_hash.h b/lib/clixon/clixon_hash.h index 59d22063..0adbb047 100644 --- a/lib/clixon/clixon_hash.h +++ b/lib/clixon/clixon_hash.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/clixon/clixon_json.h b/lib/clixon/clixon_json.h index e18279b5..68b19559 100644 --- a/lib/clixon/clixon_json.h +++ b/lib/clixon/clixon_json.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/clixon/clixon_log.h b/lib/clixon/clixon_log.h index 4e45e351..01c6eac4 100644 --- a/lib/clixon/clixon_log.h +++ b/lib/clixon/clixon_log.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/clixon/clixon_options.h b/lib/clixon/clixon_options.h index 7ce66a19..6727c157 100644 --- a/lib/clixon/clixon_options.h +++ b/lib/clixon/clixon_options.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/clixon/clixon_plugin.h b/lib/clixon/clixon_plugin.h index 61e14fb2..fbb8ffce 100644 --- a/lib/clixon/clixon_plugin.h +++ b/lib/clixon/clixon_plugin.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/clixon/clixon_proto.h b/lib/clixon/clixon_proto.h index 8012082c..ef79b6b4 100644 --- a/lib/clixon/clixon_proto.h +++ b/lib/clixon/clixon_proto.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/clixon/clixon_proto_client.h b/lib/clixon/clixon_proto_client.h index 1744eadc..ac917d77 100644 --- a/lib/clixon/clixon_proto_client.h +++ b/lib/clixon/clixon_proto_client.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/clixon/clixon_queue.h b/lib/clixon/clixon_queue.h index e7d45280..2997c655 100644 --- a/lib/clixon/clixon_queue.h +++ b/lib/clixon/clixon_queue.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/clixon/clixon_sha1.h b/lib/clixon/clixon_sha1.h index 9036ba18..6f788e14 100644 --- a/lib/clixon/clixon_sha1.h +++ b/lib/clixon/clixon_sha1.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/clixon/clixon_sig.h b/lib/clixon/clixon_sig.h index e4e1786d..ac03a908 100644 --- a/lib/clixon/clixon_sig.h +++ b/lib/clixon/clixon_sig.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/clixon/clixon_string.h b/lib/clixon/clixon_string.h index ba60e681..86088743 100644 --- a/lib/clixon/clixon_string.h +++ b/lib/clixon/clixon_string.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/clixon/clixon_xml.h b/lib/clixon/clixon_xml.h index f793ee11..5b3d8765 100644 --- a/lib/clixon/clixon_xml.h +++ b/lib/clixon/clixon_xml.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/clixon/clixon_xml_db.h b/lib/clixon/clixon_xml_db.h index 647dfe04..49b192f8 100644 --- a/lib/clixon/clixon_xml_db.h +++ b/lib/clixon/clixon_xml_db.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/clixon/clixon_xml_map.h b/lib/clixon/clixon_xml_map.h index 1cff0413..6d3befc3 100644 --- a/lib/clixon/clixon_xml_map.h +++ b/lib/clixon/clixon_xml_map.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/clixon/clixon_xml_sort.h b/lib/clixon/clixon_xml_sort.h index 04cce1ae..0a7ee662 100644 --- a/lib/clixon/clixon_xml_sort.h +++ b/lib/clixon/clixon_xml_sort.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/clixon/clixon_xsl.h b/lib/clixon/clixon_xsl.h index 65a04528..af1a4926 100644 --- a/lib/clixon/clixon_xsl.h +++ b/lib/clixon/clixon_xsl.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/clixon/clixon_yang.h b/lib/clixon/clixon_yang.h index 682c0a25..084fe3c5 100644 --- a/lib/clixon/clixon_yang.h +++ b/lib/clixon/clixon_yang.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/clixon/clixon_yang_type.h b/lib/clixon/clixon_yang_type.h index a7f6bec4..291766cf 100644 --- a/lib/clixon/clixon_yang_type.h +++ b/lib/clixon/clixon_yang_type.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/Makefile.in b/lib/src/Makefile.in index e6fdf2b2..77d08d90 100644 --- a/lib/src/Makefile.in +++ b/lib/src/Makefile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # diff --git a/lib/src/clixon_err.c b/lib/src/clixon_err.c index 9e900676..c50148e0 100644 --- a/lib/src/clixon_err.c +++ b/lib/src/clixon_err.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_event.c b/lib/src/clixon_event.c index 9569d44e..f23420ac 100644 --- a/lib/src/clixon_event.c +++ b/lib/src/clixon_event.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_file.c b/lib/src/clixon_file.c index 7282aece..a1a552bd 100644 --- a/lib/src/clixon_file.c +++ b/lib/src/clixon_file.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_handle.c b/lib/src/clixon_handle.c index f5debeff..beff1c41 100644 --- a/lib/src/clixon_handle.c +++ b/lib/src/clixon_handle.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_hash.c b/lib/src/clixon_hash.c index 2e50ca2d..4debe9c2 100644 --- a/lib/src/clixon_hash.c +++ b/lib/src/clixon_hash.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_json.c b/lib/src/clixon_json.c index e557ecb3..e261183c 100644 --- a/lib/src/clixon_json.c +++ b/lib/src/clixon_json.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_json_parse.h b/lib/src/clixon_json_parse.h index e1488d46..8196e942 100644 --- a/lib/src/clixon_json_parse.h +++ b/lib/src/clixon_json_parse.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_json_parse.l b/lib/src/clixon_json_parse.l index 7e0252ad..ea5eec30 100644 --- a/lib/src/clixon_json_parse.l +++ b/lib/src/clixon_json_parse.l @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_json_parse.y b/lib/src/clixon_json_parse.y index 64bfe2e2..55fb5f5a 100644 --- a/lib/src/clixon_json_parse.y +++ b/lib/src/clixon_json_parse.y @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_log.c b/lib/src/clixon_log.c index bca91b97..e55bcba0 100644 --- a/lib/src/clixon_log.c +++ b/lib/src/clixon_log.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_options.c b/lib/src/clixon_options.c index 43981877..769237c9 100644 --- a/lib/src/clixon_options.c +++ b/lib/src/clixon_options.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_plugin.c b/lib/src/clixon_plugin.c index 729ada7d..39e78e7f 100644 --- a/lib/src/clixon_plugin.c +++ b/lib/src/clixon_plugin.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_proto.c b/lib/src/clixon_proto.c index 93cbaa81..f9c9da9f 100644 --- a/lib/src/clixon_proto.c +++ b/lib/src/clixon_proto.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_proto_client.c b/lib/src/clixon_proto_client.c index 01bf82ad..83fc792a 100644 --- a/lib/src/clixon_proto_client.c +++ b/lib/src/clixon_proto_client.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_sig.c b/lib/src/clixon_sig.c index f633c046..c1374876 100644 --- a/lib/src/clixon_sig.c +++ b/lib/src/clixon_sig.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_string.c b/lib/src/clixon_string.c index 6ee4ee67..d02bf5ff 100644 --- a/lib/src/clixon_string.c +++ b/lib/src/clixon_string.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_xml.c b/lib/src/clixon_xml.c index eefad00f..a6021c4b 100644 --- a/lib/src/clixon_xml.c +++ b/lib/src/clixon_xml.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_xml_db.c b/lib/src/clixon_xml_db.c index b66a1d56..d3738f37 100644 --- a/lib/src/clixon_xml_db.c +++ b/lib/src/clixon_xml_db.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c index bb910066..b7ea80fc 100644 --- a/lib/src/clixon_xml_map.c +++ b/lib/src/clixon_xml_map.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_xml_parse.h b/lib/src/clixon_xml_parse.h index 11ae12ea..83950abb 100644 --- a/lib/src/clixon_xml_parse.h +++ b/lib/src/clixon_xml_parse.h @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_xml_parse.l b/lib/src/clixon_xml_parse.l index 340a4225..e16ffaae 100644 --- a/lib/src/clixon_xml_parse.l +++ b/lib/src/clixon_xml_parse.l @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_xml_parse.y b/lib/src/clixon_xml_parse.y index 5c7cdbd0..1e774e29 100644 --- a/lib/src/clixon_xml_parse.y +++ b/lib/src/clixon_xml_parse.y @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_xml_sort.c b/lib/src/clixon_xml_sort.c index 19580945..5d4c7eb9 100644 --- a/lib/src/clixon_xml_sort.c +++ b/lib/src/clixon_xml_sort.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_xsl.c b/lib/src/clixon_xsl.c index 1d140440..a44f28a1 100644 --- a/lib/src/clixon_xsl.c +++ b/lib/src/clixon_xsl.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_yang.c b/lib/src/clixon_yang.c index 7170b36a..7e435feb 100644 --- a/lib/src/clixon_yang.c +++ b/lib/src/clixon_yang.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_yang_parse.h b/lib/src/clixon_yang_parse.h index a63253c0..99ce0b5d 100644 --- a/lib/src/clixon_yang_parse.h +++ b/lib/src/clixon_yang_parse.h @@ -5,7 +5,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_yang_parse.l b/lib/src/clixon_yang_parse.l index 813bd2d0..eb235115 100644 --- a/lib/src/clixon_yang_parse.l +++ b/lib/src/clixon_yang_parse.l @@ -5,7 +5,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_yang_parse.y b/lib/src/clixon_yang_parse.y index 448b3d46..68748c8a 100644 --- a/lib/src/clixon_yang_parse.y +++ b/lib/src/clixon_yang_parse.y @@ -5,7 +5,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/lib/src/clixon_yang_type.c b/lib/src/clixon_yang_type.c index 37393909..335e0ed6 100644 --- a/lib/src/clixon_yang_type.c +++ b/lib/src/clixon_yang_type.c @@ -2,7 +2,7 @@ * ***** BEGIN LICENSE BLOCK ***** - Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren + Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren This file is part of CLIXON. diff --git a/yang/Makefile.in b/yang/Makefile.in index ba27919d..c52badc0 100644 --- a/yang/Makefile.in +++ b/yang/Makefile.in @@ -1,7 +1,7 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren +# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren # # This file is part of CLIXON # From b71e10e7017d6d268952693ccbc648b2b608924d Mon Sep 17 00:00:00 2001 From: Olof hagsand Date: Mon, 1 Jan 2018 12:28:58 +0100 Subject: [PATCH 4/4] 3.4.0 --- CHANGELOG.md | 7 +++---- configure | 2 +- configure.ac | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51b6d7d6..c2f19a40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,6 @@ # Clixon Changelog -## 3.4.0 (Upcoming) -### Known issues -* Please use text datastore, key-value datastore no up-to-date +## 3.4.0 (1 January 2018) ### Major changes: * Optimized search performance for large lists by sorting and binary search. @@ -41,7 +39,6 @@ formal specification instead of hardcoded C-code. ### Corrected Bugs - * Fixed bug that deletes running on startup if backup started with -m running. When clixon starts again, running is lost. The error was that the running (or startup) configuration may fail when @@ -50,6 +47,8 @@ * datastore/keyvalue/Makefile was left behind on make distclean. Fixed by conditional configure. Thanks renato@netgate.com. * Escape " in JSON names and strings and values +### Known issues +* Please use text datastore, key-value datastore no up-to-date ## 3.3.3 (25 November 2017) diff --git a/configure b/configure index 78181e8e..3d63adb5 100755 --- a/configure +++ b/configure @@ -2159,7 +2159,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CLIXON_VERSION_MAJOR="3" CLIXON_VERSION_MINOR="4" CLIXON_VERSION_PATCH="0" -CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}.PRE\"" +CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\"" # Fix to specific version (eg 3.5) or head (3) CLIGEN_VERSION="3" if test "$prefix" = "NONE"; then diff --git a/configure.ac b/configure.ac index efebf11b..294d269e 100644 --- a/configure.ac +++ b/configure.ac @@ -44,7 +44,7 @@ AC_INIT(lib/clixon/clixon.h.in) CLIXON_VERSION_MAJOR="3" CLIXON_VERSION_MINOR="4" CLIXON_VERSION_PATCH="0" -CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}.PRE\"" +CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\"" # Fix to specific version (eg 3.5) or head (3) CLIGEN_VERSION="3" if test "$prefix" = "NONE"; then