updated fork from remote (fix for digest)

Dockerfile

@@ -10,11 +10,11 @@ RUN apt-get update && \
         pkg-config python3 python3-dev python3-pip python3-setuptools traceroute wget xcscope-el \
         zip unzip libthrift-dev thrift-compiler bison clang flex iptables libelf-dev libfl-dev libgc-dev \
         llvm net-tools zlib1g-dev lld pkg-config ccache sudo iputils-ping python-is-python3 tcpdump \
-        iperf3 protobuf-compiler protobuf-c-compiler tmux \
+        iperf3 protobuf-compiler protobuf-c-compiler tmux lsb-release\
         vim tmuxp && \
     pip install --upgrade \
         pip==21.3.1 scapy==2.5.0 ply pyroute2 \
-        cffi ipaddress ipdb ipython pypcap thrift \
+        cffi ipaddress ipdb ipython pypcap  \
         protobuf==3.20.3
 
 ARG P4_UTILS_COMMIT="83b118bbae530b31cc74e7fa32f9174f7c0a1184"

install-p4-dev.sh

@@ -8,11 +8,25 @@ function do_bmv2 {
     git checkout ${BMV2_COMMIT}
 
     # Install dependencies
+    THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+    source $THIS_DIR/common.sh
+
+    check_lib libthrift libthrift-0.13.0
+    git clone -b 0.13.0 https://github.com/apache/thrift.git thrift-0.13.0
+    cd thrift-0.13.0
+    ./bootstrap.sh
+    ./configure --with-cpp=yes --with-c_glib=no --with-java=no --with-ruby=no --with-erlang=no --with-go=no --with-nodejs=no
+    make -j2 && sudo make install
+    cd lib/py
+    sudo python3 setup.py install
+    cd ../../..
+    
     ./install_deps.sh
 
+
     # Build behavioral-model
     ./autogen.sh
-    ./configure --without-nanomsg --disable-elogger --disable-logging-macros 'CFLAGS=-g -O2' 'CXXFLAGS=-g -O2'
+    ./configure --with-thrift --with-nanomsg --enable-debugger --disable-elogger "CXXFLAGS=-O2 -g"    
     make -j8
     make install
     ldconfig