diff options
| -rw-r--r-- | VNFs/vACL/Makefile | 2 | ||||
| -rw-r--r-- | VNFs/vACL/pipeline/pipeline_acl.h | 2 | ||||
| -rw-r--r-- | VNFs/vCGNAPT/Makefile | 2 | ||||
| -rw-r--r-- | VNFs/vCGNAPT/pipeline/pipeline_cgnapt.h | 2 | ||||
| -rw-r--r-- | VNFs/vFW/Makefile | 2 | ||||
| -rw-r--r-- | VNFs/vFW/pipeline/pipeline_vfw.h | 2 | ||||
| -rw-r--r-- | common/vnf_common/rest_api.c | 2 | ||||
| -rwxr-xr-x | tools/vnf_build.sh | 3 |
8 files changed, 8 insertions, 9 deletions
diff --git a/VNFs/vACL/Makefile b/VNFs/vACL/Makefile index 0995f905..bf1502a2 100644 --- a/VNFs/vACL/Makefile +++ b/VNFs/vACL/Makefile @@ -66,7 +66,7 @@ CFLAGS += -I$(VNF_CORE)/common/VIL/gateway TOP = $(RTE_SDK)/../civetweb CFLAGS += -I$(TOP)/include $(COPT) -DUSE_WEBSOCKET -DUSE_IPV6 -DUSE_SSL_DH=1 CFLAGS += -DREST_API_SUPPORT -LDFLAGS += -ljson -lcrypto -lssl +LDFLAGS += -ljson-c -lcrypto -lssl LDFLAGS += -L$(RTE_SDK)/../civetweb/ -lcivetweb # all source are stored in SRCS-y diff --git a/VNFs/vACL/pipeline/pipeline_acl.h b/VNFs/vACL/pipeline/pipeline_acl.h index 93b92c45..a0ff84da 100644 --- a/VNFs/vACL/pipeline/pipeline_acl.h +++ b/VNFs/vACL/pipeline/pipeline_acl.h @@ -29,7 +29,7 @@ #include "pipeline.h" #include "pipeline_acl_be.h" #include <civetweb.h> -#include <json/json.h> +#include <json-c/json.h> /* ACL IPV4 and IPV6 enable flags for debugging (Default both on) */ extern int acl_ipv4_enabled; diff --git a/VNFs/vCGNAPT/Makefile b/VNFs/vCGNAPT/Makefile index 41cacfb7..82efa769 100644 --- a/VNFs/vCGNAPT/Makefile +++ b/VNFs/vCGNAPT/Makefile @@ -68,7 +68,7 @@ CFLAGS += -I$(VNF_CORE)/common/VIL/gateway TOP = $(RTE_SDK)/../civetweb CFLAGS += -I$(TOP)/include $(COPT) -DUSE_WEBSOCKET -DUSE_IPV6 -DUSE_SSL_DH=1 CFLAGS += -DREST_API_SUPPORT -LDFLAGS += -ljson -lcrypto -lssl +LDFLAGS += -ljson-c -lcrypto -lssl LDFLAGS += -L$(RTE_SDK)/../civetweb/ -lcivetweb # all source are stored in SRCS-y diff --git a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt.h b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt.h index 6497de27..d61273f0 100644 --- a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt.h +++ b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt.h @@ -29,7 +29,7 @@ #include "pipeline.h" #include "pipeline_cgnapt_common.h" #include <civetweb.h> -#include <json/json.h> +#include <json-c/json.h> /** * Add NAPT rule to the NAPT rule table. diff --git a/VNFs/vFW/Makefile b/VNFs/vFW/Makefile index b011eca2..80dd91ad 100644 --- a/VNFs/vFW/Makefile +++ b/VNFs/vFW/Makefile @@ -68,7 +68,7 @@ CFLAGS += -I$(VNF_CORE)/common/VIL/gateway TOP = $(RTE_SDK)/../civetweb CFLAGS += -I$(TOP)/include $(COPT) -DUSE_WEBSOCKET -DUSE_IPV6 -DUSE_SSL_DH=1 -DREST_API_SUPPORT=1 -LDFLAGS += -ljson -lcrypto -lssl +LDFLAGS += -ljson-c -lcrypto -lssl LDFLAGS += -L$(RTE_SDK)/../civetweb/ -lcivetweb # all source are stored in SRCS-y diff --git a/VNFs/vFW/pipeline/pipeline_vfw.h b/VNFs/vFW/pipeline/pipeline_vfw.h index 96e7ad33..7cfc95c3 100644 --- a/VNFs/vFW/pipeline/pipeline_vfw.h +++ b/VNFs/vFW/pipeline/pipeline_vfw.h @@ -31,7 +31,7 @@ #include "pipeline_vfw_be.h" #include <civetweb.h> -#include <json/json.h> +#include <json-c/json.h> /* VFW IPV4 and IPV6 enable flags for debugging (Default both on) */ extern int vfw_ipv4_enabled; diff --git a/common/vnf_common/rest_api.c b/common/vnf_common/rest_api.c index 9cfbe88f..8efd7730 100644 --- a/common/vnf_common/rest_api.c +++ b/common/vnf_common/rest_api.c @@ -52,7 +52,7 @@ #include "pipeline_arpicmp.h" #include <civetweb.h> -#include <json/json.h> +#include <json-c/json.h> #include "app.h" #include "lib_arp.h" #include "interface.h" diff --git a/tools/vnf_build.sh b/tools/vnf_build.sh index 0a085a6a..d1bb898f 100755 --- a/tools/vnf_build.sh +++ b/tools/vnf_build.sh @@ -179,8 +179,7 @@ install_libs() sudo apt-get update sudo apt-get -y install build-essential linux-headers-$(uname -r) git unzip libpcap0.8-dev gcc \ make libc6 libc6-dev g++-multilib libzmq3-dev libcurl4-openssl-dev net-tools wget gcc unzip \ - libpcap-dev libncurses-dev libedit-dev pciutils liblua5.2-dev libncursesw5-dev libjson0 \ - libjson0-dev libssl-dev + libpcap-dev libncurses-dev libedit-dev pciutils liblua5.2-dev libncursesw5-dev libjson-c-dev libssl-dev touch .download } |