From 27082746ad05fbc7f4ee2e5271346c2c7334a021 Mon Sep 17 00:00:00 2001 From: Abhinavpv28 <162570454+Abhinavpv28@users.noreply.github.com> Date: Sat, 17 May 2025 21:44:42 +0530 Subject: [PATCH 01/16] Update configure.ac --- configure.ac | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/configure.ac b/configure.ac index 6a87226c..c4e922ff 100644 --- a/configure.ac +++ b/configure.ac @@ -61,6 +61,18 @@ AC_TYPE_SIZE_T AC_CONFIG_FILES([Makefile src/Makefile]) +AC_ARG_ENABLE([L2support], + AS_HELP_STRING([--enable-L2support],[enable L2support (default is no)]), + [ + case "${enableval}" in + yes) L2_SUPPORT_ENABLE=true + L2_SUPPORT_FLAG="-DUSE_L2_SUPPORT" + m4_if(m4_sysval,[0],[SUBDIRS_L2_SUPPORT="src"]) ;; + no) L2_SUPPORT_ENABLE=false AC_MSG_ERROR([L2_SUPPORT is disabled]) ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-L2support]) ;; + esac + ], + [echo "L2support is disabled"]) # IARMBus Support AC_ARG_ENABLE([iarmbusSupport], From 0718ee8c230fa2f9808f46479f2c2572b3563319 Mon Sep 17 00:00:00 2001 From: Abhinavpv28 <162570454+Abhinavpv28@users.noreply.github.com> Date: Sat, 17 May 2025 21:46:18 +0530 Subject: [PATCH 02/16] Update cov_build.sh --- cov_build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cov_build.sh b/cov_build.sh index 2c2e17d2..ec7c0f57 100644 --- a/cov_build.sh +++ b/cov_build.sh @@ -78,6 +78,6 @@ cp libIARM.h /usr/local/include cd $WORKDIR autoreconf -i autoupdate -./configure --prefix=${INSTALL_DIR} --enable-iarmbusSupport=yes -make remotedebugger_CFLAGS="-I/usr/include/cjson -I/usr/local/include/wdmp-c -I/usr/local/include/rbus -I/usr/local/include -I/usr/local/include/trower-base64 -DIARMBUS_SUPPORT -DUSECOV" remotedebugger_LDFLAGS="-L/usr/local/lib -lrdkloggers -lcjson -lrfcapi -lrbus -lmsgpackc -lsecure_wrapper -lwebconfig_framework -lIARMBus -ltr181api -L/usr/local/lib/x86_64-linux-gnu -ltrower-base64 -L/usr/lib/x86_64-linux-gnu" +./configure --prefix=${INSTALL_DIR} --enable-iarmbusSupport=yes --enable-L2support=yes +make remotedebugger_CFLAGS="-I/usr/include/cjson -I/usr/local/include/wdmp-c -I/usr/local/include/rbus -I/usr/local/include -I/usr/local/include/trower-base64 -DIARMBUS_SUPPORT -DUSECOV -DUSE_L2_SUPPORT" remotedebugger_LDFLAGS="-L/usr/local/lib -lrdkloggers -lcjson -lrfcapi -lrbus -lmsgpackc -lsecure_wrapper -lwebconfig_framework -lIARMBus -ltr181api -L/usr/local/lib/x86_64-linux-gnu -ltrower-base64 -L/usr/lib/x86_64-linux-gnu" make install From c144a56461c51a167df8f8932b83bd0aafc83f56 Mon Sep 17 00:00:00 2001 From: Abhinavpv28 <162570454+Abhinavpv28@users.noreply.github.com> Date: Sat, 17 May 2025 21:48:03 +0530 Subject: [PATCH 03/16] Update rrdInterface.c --- src/rrdInterface.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/rrdInterface.c b/src/rrdInterface.c index 279d64f4..c32acb42 100644 --- a/src/rrdInterface.c +++ b/src/rrdInterface.c @@ -74,16 +74,24 @@ int RRD_subscribe() subscriptions[1].handler = _remoteDebuggerWebCfgDataEventHandler; subscriptions[1].userData = NULL; -#ifndef IARMBUS_SUPPORT - subscriptions[2].eventName = RDM_DOWNLOAD_EVENT; - subscriptions[2].filter = NULL; - subscriptions[2].duration = 0; - subscriptions[2].handler = _rdmDownloadEventHandler; - subscriptions[2].userData = NULL; - - ret = rbusEvent_SubscribeEx(rrdRbusHandle, subscriptions, 3, 60); +#ifdef IARMBUS_SUPPORT +#ifdef USE_L2_SUPPORT + subscriptions[2].eventName = RDM_DOWNLOAD_EVENT; + subscriptions[2].filter = NULL; + subscriptions[2].duration = 0; + subscriptions[2].handler = _rdmDownloadEventHandler; + subscriptions[2].userData = NULL; + ret = rbusEvent_SubscribeEx(rrdRbusHandle, subscriptions, 3, 60); +#else + ret = rbusEvent_SubscribeEx(rrdRbusHandle, subscriptions, 2, 60); +#endif #else - ret = rbusEvent_SubscribeEx(rrdRbusHandle, subscriptions, 2, 60); + subscriptions[2].eventName = RDM_DOWNLOAD_EVENT; + subscriptions[2].filter = NULL; + subscriptions[2].duration = 0; + subscriptions[2].handler = _rdmDownloadEventHandler; + subscriptions[2].userData = NULL; + ret = rbusEvent_SubscribeEx(rrdRbusHandle, subscriptions, 3, 60); #endif #endif if(ret != 0) From 899a3b9fa4446db3bc0b52e109df229b2e6e202e Mon Sep 17 00:00:00 2001 From: Abhinavpv28 <162570454+Abhinavpv28@users.noreply.github.com> Date: Wed, 21 May 2025 15:42:56 +0530 Subject: [PATCH 04/16] Update cov_build.sh --- cov_build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/cov_build.sh b/cov_build.sh index ec7c0f57..1d44364c 100644 --- a/cov_build.sh +++ b/cov_build.sh @@ -76,6 +76,7 @@ cp libIBus.h /usr/local/include cp libIARM.h /usr/local/include cd $WORKDIR +git checkout feature/l2test autoreconf -i autoupdate ./configure --prefix=${INSTALL_DIR} --enable-iarmbusSupport=yes --enable-L2support=yes From 7726bd79c970b4b64e7dfee6676a9aec2876c262 Mon Sep 17 00:00:00 2001 From: Abhinavpv28 <162570454+Abhinavpv28@users.noreply.github.com> Date: Wed, 21 May 2025 17:45:46 +0530 Subject: [PATCH 05/16] Update native_full_build.yml --- .github/workflows/native_full_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/native_full_build.yml b/.github/workflows/native_full_build.yml index 6d39d4f7..54794544 100644 --- a/.github/workflows/native_full_build.yml +++ b/.github/workflows/native_full_build.yml @@ -17,6 +17,7 @@ jobs: uses: actions/checkout@v3 with: path: remote_debugger + ref: feature/l2test - name: Checkout code rfc code uses: actions/checkout@v4 From 054ce237e6ccb6d89747071977fe07fe00e5130b Mon Sep 17 00:00:00 2001 From: Abhinavpv28 <162570454+Abhinavpv28@users.noreply.github.com> Date: Wed, 21 May 2025 17:47:22 +0530 Subject: [PATCH 06/16] Update cov_build.sh --- cov_build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/cov_build.sh b/cov_build.sh index 1d44364c..ec7c0f57 100644 --- a/cov_build.sh +++ b/cov_build.sh @@ -76,7 +76,6 @@ cp libIBus.h /usr/local/include cp libIARM.h /usr/local/include cd $WORKDIR -git checkout feature/l2test autoreconf -i autoupdate ./configure --prefix=${INSTALL_DIR} --enable-iarmbusSupport=yes --enable-L2support=yes From 1a1d96ff7efbcb6af6203f693c3e3b97dd400723 Mon Sep 17 00:00:00 2001 From: Abhinavpv28 <162570454+Abhinavpv28@users.noreply.github.com> Date: Wed, 21 May 2025 17:55:55 +0530 Subject: [PATCH 07/16] Update L2-tests.yml --- .github/workflows/L2-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index a06430a8..b954b8d5 100644 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -18,6 +18,7 @@ jobs: uses: actions/checkout@v4 with: path: remote_debugger + ref: feature/l2test - name: Check out dependent repostiories uses: actions/checkout@v4 From da9ba4b74aacd2a60cbe9cd16effa6a7c5b7632b Mon Sep 17 00:00:00 2001 From: Abhinavpv28 <162570454+Abhinavpv28@users.noreply.github.com> Date: Thu, 22 May 2025 10:21:01 +0530 Subject: [PATCH 08/16] Update run_l2.sh --- run_l2.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/run_l2.sh b/run_l2.sh index 2da98029..ba7ad887 100644 --- a/run_l2.sh +++ b/run_l2.sh @@ -18,6 +18,12 @@ # limitations under the License. #################################################################################### +WORKDIR=`pwd` +cd WORKDIR +cd tr69hostif +sh cov_build.sh +sh run_l2.sh + RESULT_DIR="/tmp/l2_test_report" STATIC_PROFILE_DIR="/etc/rrd" OUTPUT_DIR="/tmp/rrd" From fb91505edb4726402bad68e3ef41a8b7c16722d3 Mon Sep 17 00:00:00 2001 From: Abhinavpv28 <162570454+Abhinavpv28@users.noreply.github.com> Date: Thu, 22 May 2025 12:03:07 +0530 Subject: [PATCH 09/16] Update run_l2.sh --- run_l2.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/run_l2.sh b/run_l2.sh index ba7ad887..2da98029 100644 --- a/run_l2.sh +++ b/run_l2.sh @@ -18,12 +18,6 @@ # limitations under the License. #################################################################################### -WORKDIR=`pwd` -cd WORKDIR -cd tr69hostif -sh cov_build.sh -sh run_l2.sh - RESULT_DIR="/tmp/l2_test_report" STATIC_PROFILE_DIR="/etc/rrd" OUTPUT_DIR="/tmp/rrd" From c192951a86e0a8393d350f079af71bad18325921 Mon Sep 17 00:00:00 2001 From: Abhinavpv28 <162570454+Abhinavpv28@users.noreply.github.com> Date: Thu, 22 May 2025 12:05:25 +0530 Subject: [PATCH 10/16] Update cov_build.sh --- cov_build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cov_build.sh b/cov_build.sh index ec7c0f57..b8c57bed 100644 --- a/cov_build.sh +++ b/cov_build.sh @@ -69,6 +69,8 @@ cp /usr/iarmmgrs/hal/include/pwrMgr.h /usr/local/include/ # Build and install stubs from tr69hostif cd tr69hostif +sh cov_build.sh +sh run_l2.sh cd ./src/unittest/stubs g++ -fPIC -shared -o libIARMBus.so iarm_stubs.cpp -I/usr/tr69hostif/src/hostif/parodusClient/pal -I/usr/tr69hostif/src/unittest/stubs -I/usr/tr69hostif/src/hostif/parodusClient/waldb -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/tr69hostif/src/hostif/include -I/usr/tr69hostif/src/hostif/profiles/DeviceInfo -I/usr/tr69hostif/src/hostif/parodusClient/pal -fpermissive cp libIARMBus.so /usr/local/lib From 5cd04f976f9e60b7890dcf7d27fa9497b34101f5 Mon Sep 17 00:00:00 2001 From: Abhinavpv28 <162570454+Abhinavpv28@users.noreply.github.com> Date: Thu, 22 May 2025 12:23:08 +0530 Subject: [PATCH 11/16] Update cov_build.sh --- cov_build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cov_build.sh b/cov_build.sh index b8c57bed..2464127b 100644 --- a/cov_build.sh +++ b/cov_build.sh @@ -69,8 +69,7 @@ cp /usr/iarmmgrs/hal/include/pwrMgr.h /usr/local/include/ # Build and install stubs from tr69hostif cd tr69hostif -sh cov_build.sh -sh run_l2.sh +cp ./hostif/parodusClient/waldb/data-model/data-model-generic.xml /etc cd ./src/unittest/stubs g++ -fPIC -shared -o libIARMBus.so iarm_stubs.cpp -I/usr/tr69hostif/src/hostif/parodusClient/pal -I/usr/tr69hostif/src/unittest/stubs -I/usr/tr69hostif/src/hostif/parodusClient/waldb -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/tr69hostif/src/hostif/include -I/usr/tr69hostif/src/hostif/profiles/DeviceInfo -I/usr/tr69hostif/src/hostif/parodusClient/pal -fpermissive cp libIARMBus.so /usr/local/lib From d702732cec1b6076bbbd43da9f6cff024843c166 Mon Sep 17 00:00:00 2001 From: Abhinavpv28 <162570454+Abhinavpv28@users.noreply.github.com> Date: Thu, 22 May 2025 12:34:10 +0530 Subject: [PATCH 12/16] Update cov_build.sh --- cov_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cov_build.sh b/cov_build.sh index 2464127b..c20bc151 100644 --- a/cov_build.sh +++ b/cov_build.sh @@ -69,7 +69,7 @@ cp /usr/iarmmgrs/hal/include/pwrMgr.h /usr/local/include/ # Build and install stubs from tr69hostif cd tr69hostif -cp ./hostif/parodusClient/waldb/data-model/data-model-generic.xml /etc +cp .src/hostif/parodusClient/waldb/data-model/data-model-generic.xml /etc cd ./src/unittest/stubs g++ -fPIC -shared -o libIARMBus.so iarm_stubs.cpp -I/usr/tr69hostif/src/hostif/parodusClient/pal -I/usr/tr69hostif/src/unittest/stubs -I/usr/tr69hostif/src/hostif/parodusClient/waldb -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/tr69hostif/src/hostif/include -I/usr/tr69hostif/src/hostif/profiles/DeviceInfo -I/usr/tr69hostif/src/hostif/parodusClient/pal -fpermissive cp libIARMBus.so /usr/local/lib From 2a963b22978f11589dbef6fe7b865f3e7d1bcd11 Mon Sep 17 00:00:00 2001 From: Abhinavpv28 <162570454+Abhinavpv28@users.noreply.github.com> Date: Thu, 22 May 2025 12:34:42 +0530 Subject: [PATCH 13/16] Update cov_build.sh --- cov_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cov_build.sh b/cov_build.sh index c20bc151..dd857cd0 100644 --- a/cov_build.sh +++ b/cov_build.sh @@ -69,7 +69,7 @@ cp /usr/iarmmgrs/hal/include/pwrMgr.h /usr/local/include/ # Build and install stubs from tr69hostif cd tr69hostif -cp .src/hostif/parodusClient/waldb/data-model/data-model-generic.xml /etc +cp ./src/hostif/parodusClient/waldb/data-model/data-model-generic.xml /etc cd ./src/unittest/stubs g++ -fPIC -shared -o libIARMBus.so iarm_stubs.cpp -I/usr/tr69hostif/src/hostif/parodusClient/pal -I/usr/tr69hostif/src/unittest/stubs -I/usr/tr69hostif/src/hostif/parodusClient/waldb -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/tr69hostif/src/hostif/include -I/usr/tr69hostif/src/hostif/profiles/DeviceInfo -I/usr/tr69hostif/src/hostif/parodusClient/pal -fpermissive cp libIARMBus.so /usr/local/lib From 594f8b1f43cef8926df3ba6343cff8264ff12f9f Mon Sep 17 00:00:00 2001 From: Abhinavpv28 <162570454+Abhinavpv28@users.noreply.github.com> Date: Thu, 22 May 2025 12:46:26 +0530 Subject: [PATCH 14/16] Update cov_build.sh --- cov_build.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cov_build.sh b/cov_build.sh index dd857cd0..caf7a0d6 100644 --- a/cov_build.sh +++ b/cov_build.sh @@ -70,6 +70,12 @@ cp /usr/iarmmgrs/hal/include/pwrMgr.h /usr/local/include/ cd tr69hostif cp ./src/hostif/parodusClient/waldb/data-model/data-model-generic.xml /etc +pid=`pidof tr69hostif` +if [ ! -z "$pid" ]; then + kill -9 `pidof tr69hostif` +fi +sh cov_build.sh +sh run_l2.sh cd ./src/unittest/stubs g++ -fPIC -shared -o libIARMBus.so iarm_stubs.cpp -I/usr/tr69hostif/src/hostif/parodusClient/pal -I/usr/tr69hostif/src/unittest/stubs -I/usr/tr69hostif/src/hostif/parodusClient/waldb -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/tr69hostif/src/hostif/include -I/usr/tr69hostif/src/hostif/profiles/DeviceInfo -I/usr/tr69hostif/src/hostif/parodusClient/pal -fpermissive cp libIARMBus.so /usr/local/lib From ec83cffe13fa70bab0b2616b3a1cff122e80a522 Mon Sep 17 00:00:00 2001 From: Abhinavpv28 <162570454+Abhinavpv28@users.noreply.github.com> Date: Thu, 22 May 2025 17:45:03 +0530 Subject: [PATCH 15/16] Update native_full_build.yml --- .github/workflows/native_full_build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/native_full_build.yml b/.github/workflows/native_full_build.yml index 54794544..6d39d4f7 100644 --- a/.github/workflows/native_full_build.yml +++ b/.github/workflows/native_full_build.yml @@ -17,7 +17,6 @@ jobs: uses: actions/checkout@v3 with: path: remote_debugger - ref: feature/l2test - name: Checkout code rfc code uses: actions/checkout@v4 From 2b8b589962cc8bcaba2cc13ea09a3591e65f3bb7 Mon Sep 17 00:00:00 2001 From: Abhinavpv28 <162570454+Abhinavpv28@users.noreply.github.com> Date: Thu, 22 May 2025 18:16:42 +0530 Subject: [PATCH 16/16] Update L2-tests.yml --- .github/workflows/L2-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index b954b8d5..a06430a8 100644 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -18,7 +18,6 @@ jobs: uses: actions/checkout@v4 with: path: remote_debugger - ref: feature/l2test - name: Check out dependent repostiories uses: actions/checkout@v4