Add set nameservers

.clang-tidy

@@ -7,7 +7,8 @@ Checks:
   modernize-*,
   performance-*,
   portability-*,
-  readability-*
+  readability-*,
+  -readability-function-cognitive-complexity
 
 HeaderFilterRegex: 'src'
 FormatStyle: file
@@ -52,9 +53,9 @@ CheckOptions:
   - key: readability-identifier-naming.PrivateMethodCase
     value: lower_case
   - key: readability-identifier-naming.PublicMethodCase
-    value: camelCase
+    value: camelBack
   - key: readability-identifier-naming.ProtectedMethodCase
-    value: camelCase
+    value: camelBack
 
   - key: readability-identifier-naming.ConstexprVariableCase
     value: UPPER_CASE

.github/workflows/code-format.yml

@@ -18,26 +18,31 @@ jobs:
         uses: actions/checkout@v4
 
       # --- C/C++ ---
-      - name: Format C/C++ with clang-format
+      - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y clang-format
+          sudo apt-get install -y clang-format pipx jq
+
+      - name: Format C/C++ with clang-format
+        run: |
           find . -regex '.*\.\(cpp\|hpp\|cu\|cuh\|c\|h\)' -exec clang-format -style=file -i {} \;
 
       # --- CMake ---
       - name: Format CMake files
         run: |
-          sudo apt-get update
-          sudo apt-get install -y pipx
           pipx install cmakelang
           find . -regex '.*\.\(cmake\)' -exec cmake-format -i {} \;
           find . -name 'CMakeLists.txt' -exec cmake-format -i {} \;
 
+      # --- Markdown ---
+      - name: Format CMake files
+        run: |
+          pipx install mdformat
+          find . -type f -name "*.md" -exec mdformat {} +
+
       # --- JSON ---
       - name: Format JSON files
         run: |
-          sudo apt-get update
-          sudo apt-get install -y jq
           find . -regex '.*\.\(json\)' -exec bash -c "jq . {} > {}.tmp && mv {}.tmp {}" \;
 
       # --- Create Pull Request ---

.github/workflows/conf-build-test.yml

@@ -74,58 +74,3 @@ jobs:
           path: |
             ${{ runner.temp }}/common/*
 
-  release-deploy:
-    if: ${{ startsWith(github.ref, 'refs/tags/v') }}
-    needs: [build_test_package]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pages: write
-      id-token: write
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - uses: actions/download-artifact@v4
-        with:
-          path: artifacts
-
-      - name: Move docs to website dir
-        run: mv artifacts/common/html github-pages
-
-      - name: Clean packages
-        run: |
-          rm -rf artifacts/*/_CPack_Packages
-          mv artifacts/common . || true
-
-      - name: Create CHANGELOG
-        run: |
-          git log $(git rev-list --tags --skip=1 --max-count=1 | xargs git describe --tags --abbrev=0)..$(git describe --tags --abbrev=0) \
-            --pretty=format:"* %h - %s (%an, %ar)" > CHANGELOG.md
-
-      - name: Package GitHub Page content
-        working-directory: ${{ github.workspace }}/github-pages
-        run: |
-          cmake -E make_directory ${{ runner.temp }}/page-packages
-          cmake -E tar c ${{ runner.temp }}/page-packages/github-pages.tar -- .
-
-      - name: Release
-        uses: softprops/action-gh-release@v2
-        with:
-          files: ./artifacts/*/*
-          body_path: ./CHANGELOG.md
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: github-pages
-          path: ${{ runner.temp }}/page-packages/*
-
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4
-

.github/workflows/release-deploy.yml

@@ -0,0 +1,60 @@
+name: release-deploy
+
+on:
+  workflow_run:
+    workflows: ["push-build-test-lint-release"]
+    types:
+      - completed
+
+jobs:
+  release:
+    if: ${{ github.event.workflow_run.conclusion == 'success' && startsWith(github.ref, 'refs/tags/v') }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pages: write
+      id-token: write
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/download-artifact@v4
+        with:
+          path: artifacts
+
+      - name: Move docs to website dir
+        run: mv artifacts/common/html github-pages
+
+      - name: Clean packages
+        run: |
+          rm -rf artifacts/*/_CPack_Packages
+          mv artifacts/common . || true
+
+      - name: Create CHANGELOG
+        run: |
+          git log $(git rev-list --tags --skip=1 --max-count=1 | xargs git describe --tags --abbrev=0)..$(git describe --tags --abbrev=0) \
+            --pretty=format:"* %h - %s (%an, %ar)" > CHANGELOG.md
+
+      - name: Package GitHub Page content
+        working-directory: ${{ github.workspace }}/github-pages
+        run: |
+          cmake -E make_directory ${{ runner.temp }}/page-packages
+          cmake -E tar c ${{ runner.temp }}/page-packages/github-pages.tar -- .
+
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: ./artifacts/*/*
+          body_path: ./CHANGELOG.md
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: github-pages
+          path: ${{ runner.temp }}/page-packages/*
+
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
+

.gitignore

@@ -3,5 +3,3 @@ build*
 doc
 tags
 CMakeUserPresets.json
-dbus_xml/net.connman/*.h
-dbus_xml/net.connman/*.c

CMakeLists.txt

@@ -14,7 +14,7 @@ project(
   LANGUAGES C CXX)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 include(GNUInstallDirs)

examples/connmanctl.cpp

@@ -77,6 +77,24 @@ auto main() -> int {
                     props.print();
                 }
             }
+        }
+        if (cmd == "agent") {
+            auto on_register = [arg](const auto success) {
+                if (success) {
+                    std::cout << "Agent "
+                              << ((arg == "on") ? "registered" : "unregistered")
+                              << "\n";
+                }
+            };
+            if (arg == "on") {
+                manager->registerAgent(manager->internalAgentPath(),
+                                       on_register);
+            } else if (arg == "off") {
+                manager->unregisterAgent(manager->internalAgentPath(),
+                                         on_register);
+            } else {
+                std::cout << "Usage: agent on/off\n";
+            }
         } else if (cmd == "services") {
             const auto services = manager->services();
             if (services.empty()) {
@@ -222,7 +240,9 @@ auto main() -> int {
                         !connect) {
                     std::cout << (connect ? "Connecting" : "Disconnecting")
                               << " to service: " << name << "\n";
-                    const auto onConnect = [name, connect](bool success) {
+                    const auto on_connect = [name, connect, &connecting,
+                                             &cin_mutex,
+                                             &cin_cv](bool success) {
                         if (success) {
                             std::cout
                                 << "Service " << name
@@ -233,12 +253,17 @@ auto main() -> int {
                                       << (connect ? " connect" : " disconnect")
                                       << " to service " << name << "\n";
                         }
+                        {
+                            const std::unique_lock<std::mutex> lock(cin_mutex);
+                            connecting = false;
+                        }
+                        cin_cv.notify_one();
                     };
                     if (connect) {
-                        (*iterator)->connect(onConnect);
+                        (*iterator)->connect(on_connect);
                         connecting = true;
                     } else {
-                        (*iterator)->disconnect(onConnect);
+                        (*iterator)->disconnect(on_connect);
                     }
                 } else {
                     std::cout << "Service " << name << " is already "

include/amarula/dbus/connman/gagent.hpp

@@ -3,6 +3,7 @@
 #include <glib.h>
 
 #include <functional>
+#include <string>
 #include <utility>
 
 namespace Amarula::DBus::G::Connman {
@@ -11,10 +12,11 @@ class Connman;
 class Agent {
     GDBusNodeInfo *node_info_;
     guint registration_id_{0};
-    GDBusConnection *connection_{nullptr};
-    static constexpr const auto AGENT_PATH{"/net/amarula/gconnman/agent"};
+    GDBusConnection* connection_{nullptr};
+    std::string path_{"/net/amarula/gconnman/agent"};
 
-    explicit Agent(GDBusConnection *connection);
+    explicit Agent(GDBusConnection* connection,
+                   const std::string& path = std::string());
 
     using RequestInputCallback =
         std::function<GVariant *(const gchar *service, GVariant *fields)>;

include/amarula/dbus/connman/gmanager.hpp

@@ -123,6 +123,8 @@ class Manager : public DBusProxy<ManaProperties> {
     void onTechnologiesChanged(OnTechListChangedCallback callback);
     void onServicesChanged(OnServListChangedCallback callback);
 
+    auto internalAgentPath() const -> std::string { return agent_->path_; };
+
    private:
     enum class InputType : std::uint8_t {
         InputUnknown = 0,
@@ -152,8 +154,7 @@ class Manager : public DBusProxy<ManaProperties> {
     OnServicesChangedCallback services_changed_cb_{
         [](const Manager::ProxyList<Service>&) {}};
 
-    explicit Manager(DBus* dbus);
-    void init();
+    explicit Manager(DBus* dbus, const std::string& agent_path = std::string());
 
     using DBusProxy::DBusProxy;
 

include/amarula/dbus/connman/gservice.hpp

@@ -214,6 +214,7 @@ struct ServProperties {
     Type type_{};
     std::optional<std::vector<Security>> security_;
     std::optional<std::vector<std::string>> name_servers_;
+    std::optional<std::vector<std::string>> name_servers_conf_;
     std::optional<std::vector<std::string>> domains_;
     std::optional<std::vector<std::string>> time_servers_;
     bool autoconnect_{false};
@@ -246,6 +247,8 @@ class Service : public DBusProxy<ServProperties> {
     void remove(PropertiesSetCallback callback = nullptr);
     void setAutoconnect(bool autoconnect,
                         PropertiesSetCallback callback = nullptr);
+    void setNameServers(const std::vector<std::string>& name_servers,
+                        PropertiesSetCallback callback = nullptr);
     friend class Manager;
 };
 

include/amarula/dbus/connman/gtechnology.hpp

@@ -28,7 +28,7 @@ struct TechProperties {
     [[nodiscard]] auto isPowered() const { return powered_; }
     [[nodiscard]] auto isConnected() const { return connected_; }
     [[nodiscard]] auto isTethering() const { return tethering_; }
-    [[nodiscard]] auto getTetheringFreq() const { return tetheringFreq_; }
+    [[nodiscard]] auto getTetheringFreq() const { return tethering_freq_; }
     void print() const;
 
    private:
@@ -37,7 +37,7 @@ struct TechProperties {
     bool tethering_ = false;
     std::string name_;
     Type type_;
-    int tetheringFreq_{0};
+    int tethering_freq_{0};
 
     void update(const gchar* key, GVariant* value);
 

include/amarula/dbus/gdbus.hpp

@@ -31,8 +31,8 @@ class DBus {
     virtual ~DBus();
 
     void start();
-    void on_any_async_done();
-    void on_any_async_start();
+    void onAnyAsyncDone();
+    void onAnyAsyncStart();
 
     [[nodiscard]] auto connection() const { return connection_; }
 };