netconfig: Add IPv4 domain name helper and installer
PATCH 1/2 netconfig: Add IPv4 domain name helper and installer
The provided domain name helper allows to override the DHCP lease option value with the static one from network configuration file.
--- src/netconfig.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-)
src/netconfig.c +33 -1
@@ -251,6 +251,28 @@ static char **netconfig_ipv4_get_dns(struct netconfig *netconfig, uint8_t proto)return NULL ; } +static char *netconfig_ipv4_get_domain_name (struct netconfig *netconfig, +uint8_t proto) +{ +const struct l_dhcp_lease *lease; +char *domain_name; + + domain_name =l_settings_get_string (netconfig->active_settings, +"IPv4" ,"domain_name" ); +if (domain_name) +/* Allow to override the DHCP domain name with setting entry. */ +return domain_name; + +if (proto !=RTPROT_DHCP ) +return NULL ; + + lease =l_dhcp_client_get_lease (netconfig->dhcp_client); +if (!lease) +return NULL ; + +return l_dhcp_lease_get_domain_name (lease); +} +static struct netconfig_ifaddr *netconfig_ipv6_get_ifaddr (struct netconfig *netconfig,uint8_t proto)
@@ -685,6 +707,7 @@ static void netconfig_ipv4_ifaddr_add_cmd_cb(int error, uint16_t type,struct netconfig *netconfig = user_data;struct netconfig_ifaddr *ifaddr;char **dns; +char *domain_name;if (error && error != -EEXIST ) { l_error("netconfig: Failed to add IP address. "
@@ -709,12 +732,21 @@ static void netconfig_ipv4_ifaddr_add_cmd_cb(int error, uint16_t type, dns =netconfig_ipv4_get_dns (netconfig, netconfig->rtm_protocol);if (!dns) {l_error ("netconfig: Failed to obtain DNS addresses." ); - goto done; + goto domain_name; }resolve_add_dns (netconfig->ifindex, ifaddr->family, dns);l_strv_free (dns); +domain_name: + domain_name =netconfig_ipv4_get_domain_name (netconfig, + netconfig->rtm_protocol); +if (!domain_name) + goto done; + +resolve_add_domain_name (netconfig->ifindex, domain_name); +l_free (domain_name); + done:netconfig_ifaddr_destroy (ifaddr); }
Signature · 1 line
2.13.6
Hi Tim,
Quoted 12 lines · Tim Kourt
The provided domain name helper allows to override the DHCP lease option value with the static one from network configuration file.
--- src/netconfig.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-)src/netconfig.c +0
-0@@ -251,6 +251,28 @@ static char **netconfig_ipv4_get_dns(struct netconfig *netconfig, uint8_t proto)return NULL ;
src/netconfig.c static char **netconfig_ipv4_get_dns(struct netconfig *netconfig, uint8_t proto) · line 261
Quoted 10 lines
src/netconfig.c +8
-0} +static char *netconfig_ipv4_get_domain_name (struct netconfig *netconfig, +uint8_t proto) +{ +const struct l_dhcp_lease *lease; +char *domain_name; + + domain_name =l_settings_get_string (netconfig->active_settings, +"IPv4" ,"domain_name" );
Lets use CamelCase here
Quoted 7 lines
src/netconfig.c +7
-0+if (domain_name) +/* Allow to override the DHCP domain name with setting entry. */ +return domain_name; + +if (proto !=RTPROT_DHCP ) +return NULL ; +
src/netconfig.c static char **netconfig_ipv4_get_dns(struct netconfig *netconfig, uint8_t proto) · line 278
Quoted 10 lines
src/netconfig.c +7
-0+ lease =l_dhcp_client_get_lease (netconfig->dhcp_client); +if (!lease) +return NULL ; + +return l_dhcp_lease_get_domain_name (lease); +} +static struct netconfig_ifaddr *netconfig_ipv6_get_ifaddr (struct netconfig *netconfig,uint8_t proto)
Otherwise looks fine to me
Regards,
-Denis
PATCH 2/2 resolve: Add systemd-resolved domain name installer
In reply to Tim Kourt--- src/resolve.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/resolve.h | 1 + 2 files changed, 83 insertions(+)
src/resolve.c +82 -0
@@ -42,6 +42,8 @@ struct resolve_method_ops {void (*exit)(void *data);void (*add_dns)(uint32_t ifindex,uint8_t type,char **dns_list,void *data); +void (*add_domain_name)(uint32_t ifindex,char *domain_name, +void *data);void (*remove)(uint32_t ifindex,void *data); };
@@ -177,6 +179,74 @@ static void resolve_systemd_add_dns(uint32_t ifindex, uint8_t type, state, NULL); } +static void systemd_link_add_domains_reply (struct l_dbus_message *message, +void *user_data) +{ +const char *name; +const char *text; + +if (!l_dbus_message_is_error (message)) +return ; + +l_dbus_message_get_error (message, &name, &text); + +l_error ("resolve-systemd: Failed to modify the domain entries. %s: %s" , + name, text); +} + +static void resolve_systemd_add_domain_name (uint32_t ifindex,char *domain_name, +void *data) +{ +struct systemd_state *state = data; +struct l_dbus_message_builder *builder; +struct l_dbus_message *message; +bool routing_domain; + +l_debug ("ifindex: %u" , ifindex); + +if (!state->is_ready) { +l_error ("resolve-systemd: Failed to add domain name. " +"Is 'systemd-resolved' service running?" ); + +return ; + } + + message = +l_dbus_message_new_method_call (dbus_get_bus (), +SYSTEMD_RESOLVED_SERVICE , +SYSTEMD_RESOLVED_MANAGER_PATH , +SYSTEMD_RESOLVED_MANAGER_INTERFACE , +"SetLinkDomains" ); + +if (!message) +return ; + + builder =l_dbus_message_builder_new (message); +if (!builder) { +l_dbus_message_unref (message); +return ; + } + + routing_domain = true; + +l_dbus_message_builder_append_basic (builder,'i' , &ifindex); + +l_dbus_message_builder_enter_array (builder,"(sb)" ); + +l_dbus_message_builder_enter_struct (builder,"sb" ); +l_dbus_message_builder_append_basic (builder,'s' , domain_name); +l_dbus_message_builder_append_basic (builder,'b' , &routing_domain); +l_dbus_message_builder_leave_struct (builder); + +l_dbus_message_builder_leave_array (builder); + +l_dbus_message_builder_finalize (builder); +l_dbus_message_builder_destroy (builder); + +l_dbus_send_with_reply (dbus_get_bus (), message, + systemd_link_add_domains_reply, state,NULL ); +} +static void resolve_systemd_remove (uint32_t ifindex,void *data) {struct systemd_state *state = data;
@@ -249,6 +319,7 @@ static const struct resolve_method_ops resolve_method_systemd = { .init = resolve_systemd_init, .exit = resolve_systemd_exit, .add_dns = resolve_systemd_add_dns, + .add_domain_name = resolve_systemd_add_domain_name, .remove = resolve_systemd_remove, };
@@ -376,6 +447,17 @@ void resolve_add_dns(uint32_t ifindex, uint8_t type, char **dns_list) method.ops->add_dns (ifindex, type, dns_list, method.data); } +void resolve_add_domain_name (uint32_t ifindex,char *domain_name) +{ +if (!domain_name) +return ; + +if (!method.ops || !method.ops->add_dns) +return ; + + method.ops->add_domain_name (ifindex, domain_name, method.data); +} +void resolve_remove (uint32_t ifindex) {if (!method.ops || !method.ops->remove)
src/resolve.h +1 -0
@@ -21,4 +21,5 @@*/ void resolve_add_dns (uint32_t ifindex,uint8_t type,char **dns_list); +void resolve_add_domain_name (uint32_t ifindex,char *domain_name);void resolve_remove (uint32_t ifindex);
Signature · 1 line
2.13.6