From f30ff24ed49e8456b51599a1da8f5bd4472a2400 Mon Sep 17 00:00:00 2001 From: billz Date: Sun, 27 Apr 2025 09:08:51 -0700 Subject: [PATCH] Update _enable_network_activity_monitor() compile raspap-network-monitor.c --- installers/common.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/installers/common.sh b/installers/common.sh index 59642605..ccb7e245 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -75,7 +75,7 @@ function _update_raspap() { _download_latest_files _change_file_ownership _patch_system_files - _symlink_net_activity + _enable_network_activity_monitor _create_plugin_scripts _install_complete } @@ -829,20 +829,21 @@ function _configure_networking() { # Install and enable RaspAP network activity monitor function _enable_network_activity_monitor() { _install_log "Enabling RaspAP network activity monitor" - sudo cp $webroot_dir/installers/network-activity.sh "$raspap_dir/hostapd" || _install_status 1 "Unable to copy network-activity.sh" + echo "Compiling raspap-network-monitor.c to /usr/local/bin/" + sudo gcc -O2 -o /usr/local/bin/raspap-network-monitor $webroot_dir/installers/raspap-network-monitor.c || _install_status 1 "Failed to compile raspap-network-monitor.c" + echo "Copying raspap-network-activity@.service to /lib/systemd/system/" sudo cp $webroot_dir/installers/raspap-network-activity@.service /lib/systemd/system/ || _install_status 1 "Unable to move raspap-network-activity.service file" sudo systemctl daemon-reload + echo "Enabling raspap-network-activity@wlan0.service" sudo systemctl enable raspap-network-activity@wlan0.service || _install_status 1 "Failed to enable raspap-network-activity.service" + echo "Starting raspap-network-activity@wlan0.service" sudo systemctl start raspap-network-activity@wlan0.service || _install_status 1 "Failed to start raspap-network-activity.service" sleep 0.5 - _symlink_net_activity - echo "Network activity monitor enabled" -} - -function _symlink_net_activity() { echo "Symlinking /dev/shm/net_activity to $webroot_dir/app/net_activity" sudo ln -sf /dev/shm/net_activity $webroot_dir/app/net_activity || _install_status 1 "Failed to link net_activity to ${webroot_dir}/app" + echo "Setting ownership for ${raspap_user} on ${webroot_dir}/app/net_activity" sudo chown -R $raspap_user:$raspap_user $webroot_dir/app/net_activity || _install_status 1 "Unable to set ownership of ${webroot_dir}/app/net_activity" + echo "Network activity monitor enabled" } # Prompt to configure TCP BBR option