test (91f4623d) · Commits · tuxist / syslite

CMakeLists.txt

+4 −0

Changes for CMakeLists.txt: 4 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ add_executable(syslite
		src/unitfile.cpp
		src/service.cpp
		src/tty.cpp
		src/network.cpp
		src/syslite.cpp
		)

		@@ -27,4 +28,7 @@ target_include_directories(syslite PRIVATE

		target_link_libraries(syslite PRIVATE)

		add_executable(netdev src/netdev.cpp)

		install(TARGETS syslite DESTINATION sbin)
		install(TARGETS netdev DESTINATION sbin)

src/main.cpp

+7 −0

Changes for src/main.cpp: 7 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -19,6 +19,10 @@ static void sigRebootHandler(int) {
		if (g_init) g_init->reboot();
		}

		static void sigHupHandler(int) {
		if (g_init) g_init->reloadNetwork();
		}

		int main(int argc, char **argv) {
		for (int i = 1; i < argc; ++i) {
		if (std::strcmp(argv[i], "-h") == 0 \|\| std::strcmp(argv[i], "--help") == 0) {
		@@ -45,6 +49,9 @@ int main(int argc, char **argv) {
		sa.sa_handler = sigRebootHandler;
		sigaction(SIGUSR1, &sa, nullptr);

		sa.sa_handler = sigHupHandler;
		sigaction(SIGHUP, &sa, nullptr);

		signal(SIGPIPE, SIG_IGN);

		init.loadConfig("");

src/netdev.cpp

0 → 100644

+92 −0

Changes for src/netdev.cpp: 92 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		#include <iostream>
		#include <cstring>
		#include <csignal>
		#include <unistd.h>

		static void usage() {
		std::cout << "netdev — syslite network control\n"
		<< " netdev reload Reload network configuration\n"
		<< " netdev status Show interface status\n";
		}

		static void showStatus() {
		// Read interface info from /sys/class/net
		const char *netPath = "/sys/class/net";
		char path[256];
		char buf[128];

		// Iterate /sys/class/net via readdir
		auto *dir = opendir(netPath);
		if (!dir) {
		std::cerr << "netdev: cannot read " << netPath << std::endl;
		return;
		}

		struct dirent *entry;
		while ((entry = readdir(dir)) != nullptr) {
		if (entry->d_name[0] == '.') continue;

		std::cout << entry->d_name << ": ";

		// operstate
		snprintf(path, sizeof(path), "%s/%s/operstate", netPath, entry->d_name);
		FILE *f = fopen(path, "r");
		if (f) {
		if (fgets(buf, sizeof(buf), f)) {
		buf[strcspn(buf, "\n")] = 0;
		std::cout << buf;
		}
		fclose(f);
		}

		// carrier
		snprintf(path, sizeof(path), "%s/%s/carrier", netPath, entry->d_name);
		f = fopen(path, "r");
		if (f) {
		if (fgets(buf, sizeof(buf), f)) {
		buf[strcspn(buf, "\n")] = 0;
		std::cout << " carrier=" << buf;
		}
		fclose(f);
		}

		// address (MAC)
		snprintf(path, sizeof(path), "%s/%s/address", netPath, entry->d_name);
		f = fopen(path, "r");
		if (f) {
		if (fgets(buf, sizeof(buf), f)) {
		buf[strcspn(buf, "\n")] = 0;
		std::cout << " " << buf;
		}
		fclose(f);
		}

		std::cout << "\n";
		}
		closedir(dir);
		}

		int main(int argc, char **argv) {
		if (argc < 2) {
		usage();
		return 1;
		}

		if (std::strcmp(argv[1], "reload") == 0) {
		if (kill(1, SIGHUP) == 0) {
		std::cout << "Network reload triggered." << std::endl;
		return 0;
		} else {
		std::cerr << "netdev: failed to signal init (are you root?)" << std::endl;
		return 1;
		}
		}
		else if (std::strcmp(argv[1], "status") == 0) {
		showStatus();
		return 0;
		}
		else {
		usage();
		return 1;
		}
		}

src/network.cpp

0 → 100644

+819 −0

File added.

Preview size limit exceeded, changes collapsed.

src/network.h

0 → 100644

+107 −0

Changes for src/network.h: 107 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		#pragma once

		#include <string>
		#include <vector>
		#include <map>
		#include <cstdint>

		namespace syslite {

		// Parsed from systemd-networkd .network files
		struct NetworkConfig {
		// [Match]
		std::string matchName; // Name=eth* or ens*
		std::string matchMacAddress; // MACAddress=xx:xx:xx:xx:xx:xx

		// [Network]
		bool dhcp = false; // DHCP=yes/ipv4
		std::string address; // Address=192.168.1.10/24
		std::string gateway; // Gateway=192.168.1.1
		std::vector<std::string> dns; // DNS=8.8.8.8

		// [Link]
		bool linkUp = true;

		// Metadata
		std::string filePath;
		std::string name;
		};

		// DHCP lease result
		struct DhcpLease {
		uint32_t clientIp = 0;
		uint32_t serverIp = 0;
		uint32_t gateway = 0;
		uint32_t subnetMask = 0;
		uint32_t dns1 = 0;
		uint32_t dns2 = 0;
		uint32_t leaseTime = 0;
		};

		class NetworkManager {
		public:
		NetworkManager();
		~NetworkManager();

		// Load .network files from a directory (systemd-networkd compatible)
		int loadDirectory(const std::string &path);

		// Apply all loaded network configurations
		void applyAll();

		// Flush current configs and re-apply (runtime reload)
		void reload();

		// Start listening for new network devices (netlink RTNLGRP_LINK)
		// Returns fd to poll in the main loop (-1 on failure)
		int startDeviceMonitor();

		// Check the monitor fd for new device events; returns true if reload needed
		bool checkDeviceEvents();

		// Stop the device monitor
		void stopDeviceMonitor();

		private:
		// Parse a single .network file
		bool parseNetworkFile(const std::string &path, NetworkConfig &cfg);

		// Match an interface name against a pattern (supports trailing *)
		bool matchInterface(const std::string &pattern, const std::string &ifname);

		// Enumerate network interfaces from /sys/class/net
		std::vector<std::string> enumInterfaces();

		// Netlink: set interface up/down
		bool setLinkUp(const std::string &ifname);
		bool setLinkDown(const std::string &ifname);

		// Netlink: add IP address to interface (CIDR notation)
		bool addAddress(const std::string &ifname, const std::string &addrCidr);

		// Netlink: add default route
		bool addRoute(const std::string &ifname, const std::string &gateway);

		// DHCP client (raw socket, minimal DHCPv4)
		bool doDhcp(const std::string &ifname);

		// Write /etc/resolv.conf
		void writeResolvConf(const std::vector<std::string> &servers);

		// Helper: get interface index
		int getIfIndex(const std::string &ifname);

		// Helper: parse "1.2.3.4" -> network-order uint32
		static uint32_t parseIpv4(const std::string &s);
		// Helper: uint32 (network order) -> "1.2.3.4"
		static std::string formatIpv4(uint32_t ip);

		std::vector<NetworkConfig> _configs;
		std::vector<std::string> _dnsServers;
		int _monitorFd = -1;
		};

		// Parse a .network file (standalone, for testing)
		bool parseNetworkFile(const std::string &path, NetworkConfig &cfg);

		}