Skip to content

Add ipv4 6.configuration #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EddyTheCo merged 5 commits into from
Aug 28, 2026
Merged

Add ipv4 6.configuration #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6fc1baa
gconnman_serv_test.cpp: Run also if the manager has services
EddyTheCo Aug 27, 2026
287fa3b
connman_service: Parse and expose IPv4.Configuration
EddyTheCo Aug 27, 2026
d14585a
gconnman_serv_test.cpp: Add setIPv4Configuration test
EddyTheCo Aug 27, 2026
0e60cf0
connman_service: Parse and expose IPv6.Configuration
EddyTheCo Aug 27, 2026
e633b88
gconnman_serv_test.cpp: Add setIPv6Configuration test
EddyTheCo Aug 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions include/amarula/dbus/connman/gservice.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ namespace Amarula::DBus::G::Connman {
class Manager;
struct ServProperties;

using VariantPtr = std::unique_ptr<GVariant, decltype(&g_variant_unref)>;

class GVariantParser {
public:
GVariantParser() = default;
Expand All @@ -26,6 +28,9 @@ class GVariantParser {
void parse(GVariant* variant);

virtual void update(const gchar* /*key*/, GVariant* /*value*/) {};
[[nodiscard]] virtual auto getVariant() const -> VariantPtr {
return {nullptr, &g_variant_unref};
}
};

class IPv4 : public GVariantParser {
Expand All @@ -37,6 +42,9 @@ class IPv4 : public GVariantParser {
Auto,
};

explicit IPv4(IPv4::Method method, std::string address = "",
std::string netmask = "", std::string gateway = "");

friend auto operator<<(std::ostream& ostr,
const IPv4& object) -> std::ostream&;

Expand All @@ -52,8 +60,10 @@ class IPv4 : public GVariantParser {
std::string gateway_;
explicit IPv4(GVariant* variant) { parse(variant); };
void update(const gchar* key, GVariant* value) override;
[[nodiscard]] auto getVariant() const -> VariantPtr override;

friend class ServProperties;
friend class Service;
};

struct IPv6 : public GVariantParser {
Expand All @@ -66,6 +76,10 @@ struct IPv6 : public GVariantParser {
Auto,
};
enum class Privacy : uint8_t { Disabled = 0, Enabled, Preferred };

explicit IPv6(IPv6::Method method, std::string address = "",
uint8_t prefix_length = 0U, std::string gateway = "",
IPv6::Privacy privacy = IPv6::Privacy::Disabled);
friend auto operator<<(std::ostream& ostr,
const IPv6& object) -> std::ostream&;
[[nodiscard]] auto getMethod() const { return method_; }
Expand All @@ -82,8 +96,10 @@ struct IPv6 : public GVariantParser {
uint8_t prefix_length_{0U};
explicit IPv6(GVariant* variant) { parse(variant); };
void update(const gchar* key, GVariant* value) override;
[[nodiscard]] auto getVariant() const -> VariantPtr override;

friend class ServProperties;
friend class Service;
};

struct Ethernet : public GVariantParser {
Expand Down Expand Up @@ -204,7 +220,13 @@ struct ServProperties {
[[nodiscard]] auto isImmutable() const { return immutable_; }
[[nodiscard]] auto isRoaming() const { return roaming_; }
[[nodiscard]] auto getIPv4() const { return ipv4_; }
[[nodiscard]] auto getIPv4Configuration() const {
return ipv4_configuration_;
}
[[nodiscard]] auto getIPv6() const { return ipv6_; }
[[nodiscard]] auto getIPv6Configuration() const {
return ipv6_configuration_;
}
[[nodiscard]] auto getEthernet() const { return ethernet_; }
[[nodiscard]] auto getProvider() const { return provider_; }
[[nodiscard]] auto getProxy() const { return proxy_; }
Expand All @@ -230,7 +252,9 @@ struct ServProperties {
bool roaming_{false};
uint8_t strength_{0U};
std::optional<IPv4> ipv4_{std::nullopt};
std::optional<IPv4> ipv4_configuration_{std::nullopt};
std::optional<IPv6> ipv6_{std::nullopt};
std::optional<IPv6> ipv6_configuration_{std::nullopt};
std::optional<Ethernet> ethernet_{std::nullopt};
std::optional<Provider> provider_{std::nullopt};
std::optional<Proxy> proxy_{std::nullopt};
Expand All @@ -255,6 +279,10 @@ class Service : public DBusProxy<ServProperties> {
PropertiesSetCallback callback = nullptr);
void setNameServers(const std::vector<std::string>& name_servers,
PropertiesSetCallback callback = nullptr);
void setIPv4(const IPv4& ipv4_configuration,
PropertiesSetCallback callback = nullptr);
void setIPv6(const IPv6& ipv6_configuration,
PropertiesSetCallback callback = nullptr);
friend class Manager;
};

Expand Down
2 changes: 2 additions & 0 deletions src/dbus/gconnman_private.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ constexpr auto REMOVE_STR = "Remove";
constexpr auto INTERFACE_STR = "Interface";
constexpr auto MTU_STR = "MTU";
constexpr auto NAMESERVERS_CONFIGURATION_STR = "Nameservers.Configuration";
constexpr auto IPV4_CONFIGURATION_STR = "IPv4.Configuration";
constexpr auto IPV6_CONFIGURATION_STR = "IPv6.Configuration";

// Manager interface
constexpr auto MANAGER_INTERFACE = "net.connman.Manager";
Expand Down
104 changes: 102 additions & 2 deletions src/dbus/gconnman_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ static constexpr EnumStringMap<IPv6::Method, 5> IPV6_METHOD_MAP{
static constexpr EnumStringMap<IPv6::Privacy, 4> IPV6_PRIVACY_MAP{
{{{IPv6::Privacy::Disabled, "disabled"},
{IPv6::Privacy::Enabled, "enabled"},
{IPv6::Privacy::Preferred, "preferred"},
{IPv6::Privacy::Preferred, "prefered"}}}};
{IPv6::Privacy::Preferred, "prefered"},
{IPv6::Privacy::Preferred, "preferred"}}}};

Service::Service(DBus* dbus, const gchar* obj_path)
: DBusProxy(dbus, SERVICE, obj_path, SERVICE_INTERFACE) {}
Expand Down Expand Up @@ -121,6 +121,20 @@ void Service::setNameServers(const std::vector<std::string>& name_servers,
&Service::finishAsyncCall, data.release());
}

IPv4::IPv4(const IPv4::Method method, std::string address, std::string netmask,
std::string gateway)
: method_(method),
address_(std::move(address)),
netmask_(std::move(netmask)),
gateway_(std::move(gateway)) {}

void Service::setIPv4(const IPv4& ipv4_configuration,
PropertiesSetCallback callback) {
auto data = prepareCallback(std::move(callback));
setProperty(IPV4_CONFIGURATION_STR, ipv4_configuration.getVariant().get(),
nullptr, &Service::finishAsyncCall, data.release());
}

void IPv4::update(const gchar* key, GVariant* value) {
if (g_strcmp0(key, METHOD_STR) == 0U) {
method_ =
Expand All @@ -136,6 +150,46 @@ void IPv4::update(const gchar* key, GVariant* value) {
}
}

auto IPv4::getVariant() const -> VariantPtr {
GVariantBuilder builder;
g_variant_builder_init(&builder, G_VARIANT_TYPE("a{sv}"));
g_variant_builder_add(
&builder, "{sv}", METHOD_STR,
g_variant_new_string(
std::string(IPV4_METHOD_MAP.toString(method_)).c_str()));
if (!address_.empty()) {
g_variant_builder_add(&builder, "{sv}", ADDRESS_STR,
g_variant_new_string(address_.c_str()));
}
if (!netmask_.empty()) {
g_variant_builder_add(&builder, "{sv}", NETMASK_STR,
g_variant_new_string(netmask_.c_str()));
}
if (!gateway_.empty()) {
g_variant_builder_add(&builder, "{sv}", GATEWAY_STR,
g_variant_new_string(gateway_.c_str()));
}

return VariantPtr{g_variant_ref_sink(g_variant_builder_end(&builder)),
&g_variant_unref};
}

IPv6::IPv6(const IPv6::Method method, std::string address,
uint8_t prefix_length, std::string gateway,
const IPv6::Privacy privacy)
: method_(method),
address_(std::move(address)),
gateway_(std::move(gateway)),
privacy_(privacy),
prefix_length_(prefix_length) {}

void Service::setIPv6(const IPv6& ipv6_configuration,
PropertiesSetCallback callback) {
auto data = prepareCallback(std::move(callback));
setProperty(IPV6_CONFIGURATION_STR, ipv6_configuration.getVariant().get(),
nullptr, &Service::finishAsyncCall, data.release());
}

void IPv6::update(const gchar* key, GVariant* value) {
if (g_strcmp0(key, METHOD_STR) == 0U) {
method_ =
Expand All @@ -154,6 +208,34 @@ void IPv6::update(const gchar* key, GVariant* value) {
}
}

auto IPv6::getVariant() const -> VariantPtr {
GVariantBuilder builder;
g_variant_builder_init(&builder, G_VARIANT_TYPE("a{sv}"));
g_variant_builder_add(
&builder, "{sv}", METHOD_STR,
g_variant_new_string(
std::string(IPV6_METHOD_MAP.toString(method_)).c_str()));
if (!address_.empty()) {
g_variant_builder_add(&builder, "{sv}", ADDRESS_STR,
g_variant_new_string(address_.c_str()));
}
if (prefix_length_ != 0U) {
g_variant_builder_add(&builder, "{sv}", PREFIXLENGTH_STR,
g_variant_new_byte(prefix_length_));
}
if (!gateway_.empty()) {
g_variant_builder_add(&builder, "{sv}", GATEWAY_STR,
g_variant_new_string(gateway_.c_str()));
}
g_variant_builder_add(
&builder, "{sv}", PRIVACY_STR,
g_variant_new_string(
std::string(IPV6_PRIVACY_MAP.toString(privacy_)).c_str()));

return VariantPtr{g_variant_ref_sink(g_variant_builder_end(&builder)),
&g_variant_unref};
}

void GVariantParser::parse(GVariant* variant) {
GVariantIter* iter = g_variant_iter_new(variant);
GVariant* prop = nullptr;
Expand Down Expand Up @@ -241,10 +323,18 @@ void ServProperties::update(const gchar* key, GVariant* value) {
ipv4_ = (g_variant_n_children(value) != 0)
? std::optional<IPv4>(IPv4(value))
: std::nullopt;
} else if (g_strcmp0(key, IPV4_CONFIGURATION_STR) == 0U) {
ipv4_configuration_ = (g_variant_n_children(value) != 0)
? std::optional<IPv4>(IPv4(value))
: std::nullopt;
} else if (g_strcmp0(key, IPV6_STR) == 0U) {
ipv6_ = (g_variant_n_children(value) != 0)
? std::optional<IPv6>(IPv6(value))
: std::nullopt;
} else if (g_strcmp0(key, IPV6_CONFIGURATION_STR) == 0U) {
ipv6_configuration_ = (g_variant_n_children(value) != 0)
? std::optional<IPv6>(IPv6(value))
: std::nullopt;
} else if (g_strcmp0(key, ETHERNET_STR) == 0U) {
ethernet_ = (g_variant_n_children(value) != 0)
? std::optional<Ethernet>(Ethernet(value))
Expand Down Expand Up @@ -346,10 +436,20 @@ auto operator<<(std::ostream& ost, const ServProperties& obj) -> std::ostream& {
ost << obj.ipv4_.value();
}

if (obj.ipv4_configuration_) {
ost << "Configuration ";
ost << obj.ipv4_configuration_.value();
}

if (obj.ipv6_) {
ost << obj.ipv6_.value();
}

if (obj.ipv6_configuration_) {
ost << "Configuration ";
ost << obj.ipv6_configuration_.value();
}

if (obj.ethernet_) {
ost << obj.ethernet_.value();
}
Expand Down
Loading
Loading