_cleanup_(dnssd_service_freep) DnssdService *service = NULL;
_cleanup_(sd_bus_track_unrefp) sd_bus_track *bus_track = NULL;
_cleanup_free_ char *path = NULL;
- _cleanup_free_ char *instance_name = NULL;
Manager *m = userdata;
DnssdService *s = NULL;
const char *name;
if (!service->type)
return log_oom();
- r = dnssd_render_instance_name(service, &instance_name);
+ r = dnssd_render_instance_name(m, service, NULL);
if (r < 0)
return r;
}
static int specifier_dnssd_hostname(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
- DnssdService *s = (DnssdService *) userdata;
+ const Manager *m = ASSERT_PTR(userdata);
char *n;
- assert(s);
- assert(s->manager);
- assert(s->manager->llmnr_hostname);
+ assert(m->llmnr_hostname);
- n = strdup(s->manager->llmnr_hostname);
+ n = strdup(m->llmnr_hostname);
if (!n)
return -ENOMEM;
return 0;
}
-int dnssd_render_instance_name(DnssdService *s, char **ret_name) {
+int dnssd_render_instance_name(Manager *m, DnssdService *s, char **ret) {
static const Specifier specifier_table[] = {
{ 'a', specifier_architecture, NULL },
{ 'b', specifier_boot_id, NULL },
_cleanup_free_ char *name = NULL;
int r;
+ assert(m);
assert(s);
assert(s->name_template);
- r = specifier_printf(s->name_template, DNS_LABEL_MAX, specifier_table, NULL, s, &name);
+ r = specifier_printf(s->name_template, DNS_LABEL_MAX, specifier_table, NULL, m, &name);
if (r < 0)
return log_debug_errno(r, "Failed to replace specifiers: %m");
"Service instance name '%s' is invalid.",
name);
- *ret_name = TAKE_PTR(name);
+ if (ret)
+ *ret = TAKE_PTR(name);
return 0;
}
LIST_FOREACH(items, txt_data, s->txt_data_items)
txt_data->rr = dns_resource_record_unref(txt_data->rr);
- r = dnssd_render_instance_name(s, &n);
+ r = dnssd_render_instance_name(s->manager, s, &n);
if (r < 0)
return r;
DEFINE_TRIVIAL_CLEANUP_FUNC(DnssdService*, dnssd_service_free);
DEFINE_TRIVIAL_CLEANUP_FUNC(DnssdTxtData*, dnssd_txtdata_free);
-int dnssd_render_instance_name(DnssdService *s, char **ret_name);
+int dnssd_render_instance_name(Manager *m, DnssdService *s, char **ret);
int dnssd_load(Manager *manager);
int dnssd_txt_item_new_from_string(const char *key, const char *value, DnsTxtItem **ret_item);
int dnssd_txt_item_new_from_data(const char *key, const void *value, const size_t size, DnsTxtItem **ret_item);