Add PcapPlusPlus library for packet parsing
Bump version to 2.1.0
Change-Id: Ic1d083ccff515f3b74a25dcf5b2f2ee39e1ad650
diff --git a/Makefile b/Makefile
index 2d2cd67..7404b8e 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,7 @@
CMOCK_VER ?= 0207b30
GMOCK_GLOBAL_VER ?= 1.0.2
GRPC_VER ?= v1.31.1
+PCAPPLUSPLUS_VER ?= v20.08
# Docker related
DOCKER_LABEL_VCS_DIRTY = false
@@ -46,7 +47,8 @@
--build-arg GTEST_VER=${GTEST_VER} \
--build-arg CMOCK_VER=${CMOCK_VER} \
--build-arg GMOCK_GLOBAL_VER=${GMOCK_GLOBAL_VER} \
- --build-arg GRPC_VER=${GRPC_VER}
+ --build-arg GRPC_VER=${GRPC_VER} \
+ --build-arg PCAPPLUSPLUS_VER=${PCAPPLUSPLUS_VER}
.DEFAULT_GOAL := build
diff --git a/VERSION b/VERSION
index 38f77a6..7ec1d6d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.1
+2.1.0
diff --git a/docker/Dockerfile.openolt-test b/docker/Dockerfile.openolt-test
index f4d5ed8..d05a2ec 100644
--- a/docker/Dockerfile.openolt-test
+++ b/docker/Dockerfile.openolt-test
@@ -33,9 +33,10 @@
ccache=3.2.4-1 \
g++-4.9=4.9.3-13ubuntu2 \
wget=1.17.1-1ubuntu1.5 \
- ca-certificates=20190110~16.04.1 \
+ ca-certificates=20201027ubuntu0.16.04.1 \
lcov=1.12-2 \
- libgoogle-glog-dev=0.3.4-0.1 && \
+ libgoogle-glog-dev=0.3.4-0.1 \
+ libpcap-dev=1.7.4-2ubuntu0.1 && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
@@ -50,6 +51,13 @@
make && make install && cd /tmp && \
rm -rf /tmp/grpc
+ARG PCAPPLUSPLUS_VER
+# Download, compile and install PcapPlusPlus. Remove the source and build artificats after install.
+RUN cd /tmp && git clone -b $PCAPPLUSPLUS_VER https://github.com/seladb/PcapPlusPlus.git && \
+ cd /tmp/PcapPlusPlus && ./configure-linux.sh —default && \
+ make all && make install && cd /tmp && \
+ rm -rf /tmp/PcapPlusPlus
+
ARG GTEST_VER
# Download compile and install gtest library. Remove the source and build artificats after install.
RUN cd /tmp && git clone https://github.com/google/googletest.git && \