From 238f0d833ea28dea044084cba3851b3ae916c02c Mon Sep 17 00:00:00 2001
From: Jaehyun Kim <jeik01.kim@samsung.com>
Date: Fri, 31 Dec 2021 17:57:40 +0900
Subject: [PATCH] Use libbpf package for online monitoring

Change-Id: Ie792e397f7518f98ff5fdd2e6b415e63f57d7248
Signed-off-by: Jaehyun Kim <jeik01.kim@samsung.com>
---
 packaging/net-config.spec              |   7 ++++---
 plugin/online-monitor/CMakeLists.txt   |   3 ++-
 plugin/online-monitor/bpf_code         | Bin 0 -> 2496 bytes
 plugin/online-monitor/online-monitor.c |   5 ++---
 4 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 plugin/online-monitor/bpf_code

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index c29df82..e4ccca1 100755
--- a/packaging/net-config.spec
+++ b/packaging/net-config.spec
@@ -100,9 +100,8 @@ TIZEN Network Configuration service extension for HAL test.
 %ifarch arm armv7l aarch64
 %package plugin-online-monitor
 Summary:        net-config extension for advanced online monitoring
-BuildRequires:  connman-extension-bpf-devel
-Requires:       libelf0
-Requires:       connman-extension-bpf
+BuildRequires:  pkgconfig(libbpf)
+Requires:       libbpf
 Requires:       %{name} = %{version}-%{release}
 %description plugin-online-monitor
 TIZEN Network Configuration service extension for advanced online monitoring.
@@ -207,6 +206,7 @@ mv %{_builddir}/%{name}-%{version}/net-config.wearable %{buildroot}%{_bindir}
 cp plugin/online-monitor/online_monitor.conf %{buildroot}/%{_localstatedir}/lib/net-config
 cp plugin/online-monitor/common_info_dump.sh %{buildroot}/opt/var/lib/net-config/
 cp plugin/online-monitor/supp_log_dump.sh %{buildroot}/opt/var/lib/net-config/
+cp plugin/online-monitor/bpf_code %{buildroot}/opt/var/lib/net-config/
 %endif
 
 %post
@@ -307,6 +307,7 @@ mv %{_sysconfdir}/dbus-1/system.d/net-config-robot.conf %{_sysconfdir}/dbus-1/sy
 %attr(644,root,root) %{_localstatedir}/lib/net-config/online_monitor.conf
 %attr(750,network_fw,network_fw) /opt/var/lib/net-config/common_info_dump.sh
 %attr(750,network_fw,network_fw) /opt/var/lib/net-config/supp_log_dump.sh
+%attr(640,network_fw,network_fw) /opt/var/lib/net-config/bpf_code
 
 %post plugin-online-monitor
 /usr/bin/mkdir -p /opt/usr/data/network/online_mon
diff --git a/plugin/online-monitor/CMakeLists.txt b/plugin/online-monitor/CMakeLists.txt
index 0b1f0f5..6d951b1 100755
--- a/plugin/online-monitor/CMakeLists.txt
+++ b/plugin/online-monitor/CMakeLists.txt
@@ -12,6 +12,7 @@ INCLUDE(FindPkgConfig)
 PKG_CHECK_MODULES(pkgs_online_mon REQUIRED
 	dlog
 	glib-2.0
+	libbpf
 	libcurl
 	)
 
@@ -37,7 +38,7 @@ SET(SRCS_ONLINE_MON
 
 # library build
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS_ONLINE_MON})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_online_mon_LDFLAGS} "-lbpf")
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_online_mon_LDFLAGS})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "" OUTPUT_NAME ${PROJECT_NAME})
 
 # install
diff --git a/plugin/online-monitor/bpf_code b/plugin/online-monitor/bpf_code
new file mode 100644
index 0000000000000000000000000000000000000000..265d2b4a19f72a2b9f2e1d0734cd75b1a6ce1a47
GIT binary patch
literal 2496
zcmcgu&uddb5S})Tc~$8zj4cHr9t00Iq>)PfMPo&c5G0pa4`N7PpP`yGX_7WABF2Nz
zi_nYcMG(cK;6-whCwS=};UD1DlRXsTH@mY<x^3)1aAEh``F3_@c4yuu&u*k{_V)CU
zX+89t+LB?38lm<)p{5Dyho*m0^G(_0j_<UXVVNm+d|Sz9F+Yx;p$#I3h~*RLbLg!Z
z=3ih&6hj|H_o2g$?F50wF0T)u`w~wc*b8|Mcm>G%Y<FV$2}Ytk>_mWd!LTz#!;r(y
zX*vSTIIAj7e+>d!2zrCSbc3aK93j|ezv;4~DG!LC*99|FqyXl&zcbDwW#8OKkgh@t
zc02qHK~6T9-S02i#a|fSrl4>8%Q*KH-)a9S^bR`DG4Me;h4Jus{B@;9p?-Z2$xSWW
z_s~7A+bS-;$8l^m_h|CyFN;0oFM?@Zu!-cRAy154QwnwLH~HRawPpriD|*j;^7=vN
z<@^}G_PvE2zD->}4dBFcI6~w4<a%hLSP&A0F>*b!%#HKPc1?W-m85x&!|+Dmf6u#6
zXIMo1tuZ#*(fBK1%KxCr5R7j_FHC)k$ccUk$Wxb#2hHao7!R@E)MnJz#_{EGjtH<W
z7(T*ZkB*;JP5g)1{oipnRg^@p1o<o+FL%xlx74k4O3%8F*Rj+`ztkJmsr5+-0gAEV
zj;8$uXj<}MmiYW!32!WZMflH_oiD;mxhRQ;kHU{hKFz{g;UgCRQuvs~KNWt{;)}v3
zr4E#c!4rPX;vWdVWu5C1_+j;eDuvxUA62}`fPRZvBZ5BCao7#<laTn>Jb!2JEP30K
z@5w%+KQuT%(VDkbqiDq|R7>t-uSUgOxk_$nWvPZ4X);@`l=2iU6jqDb+`>Yox|pYI
zVbS%LsvgakA7<Usf){luTCG)Txq0Avkufzp8_QnQ5H~oj<;e@ePl+rTKQFRiJT7{Z
z!VAV@IPt%=JJ@ceSQ-2-@6%Vyyp=}vhA=1UyV{A}+1`m&9>l*Pf7@^JY^=!7x)F(A
zS^T8zYYhn~AuGI(&uR9{vxl0}{_Q*1l0fxqCPn~u{Fl4z{~?O)O4c^)`#T3ZkZP3x
m4XvTaZxX+W%fxN(zYBHiX;21!ihuK-@IL<kVeE`4Euuf^KhTo^

literal 0
HcmV?d00001

diff --git a/plugin/online-monitor/online-monitor.c b/plugin/online-monitor/online-monitor.c
index 3c61e10..688217f 100755
--- a/plugin/online-monitor/online-monitor.c
+++ b/plugin/online-monitor/online-monitor.c
@@ -20,8 +20,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/types.h>
-#include <bpf/linux/asm-generic/socket.h>
-#include <bpf/linux/bpf.h>
+#include <bpf/linux/socket.h>
 #include <bpf/bpf.h>
 #include <bpf/libbpf.h>
 #include <linux/if_ether.h>
@@ -31,7 +30,7 @@
 
 #include "online-monitor.h"
 
-#define BPF_FILE_PATH        "/var/lib/connman/bpf_code"
+#define BPF_FILE_PATH        "/var/lib/net-config/bpf_code"
 #define BPF_MAP_INTERVAL     3
 #define DNS_NO_RESPONSE_MAX  4
 #define DETECTION_INTERVAL   4
-- 
2.7.4