shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

Merge d77c35cfcebaa96edbd72ea6800eb492102fd686 into fdab24bf6acc62d3011f9b5abdf834b4886642b2

Browse Source
This commit is contained in:
Vishwanath Chandapur 2025-03-13 05:47:59 +01:00 committed by GitHub
commit 74b125d480
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/resolve/resolved-bus.c
View File

@ -1831,7 +1831,7 @@ static int bus_method_reset_server_features(sd_bus_message *message, void *userd
}
static int dnssd_service_on_bus_track(sd_bus_track *t, void *userdata) {
DnssdService *s = ASSERT_PTR(userdata);
DnssdRegisteredService *s = ASSERT_PTR(userdata);
assert(t);
@ -1843,11 +1843,11 @@ static int dnssd_service_on_bus_track(sd_bus_track *t, void *userdata) {
static int bus_method_register_service(sd_bus_message *message, void *userdata, sd_bus_error *error) {
_cleanup_(sd_bus_creds_unrefp) sd_bus_creds *creds = NULL;
_cleanup_(dnssd_service_freep) DnssdService *service = NULL;
_cleanup_(dnssd_service_freep) DnssdRegisteredService *service = NULL;
_cleanup_(sd_bus_track_unrefp) sd_bus_track *bus_track = NULL;
const char *id, *name_template, *type;
_cleanup_free_ char *path = NULL;
DnssdService *s = NULL;
DnssdRegisteredService *s = NULL;
Manager *m = ASSERT_PTR(userdata);
uid_t euid;
int r;
@ -1857,7 +1857,7 @@ static int bus_method_register_service(sd_bus_message *message, void *userdata,
if (m->mdns_support != RESOLVE_SUPPORT_YES)
return sd_bus_error_set(error, SD_BUS_ERROR_NOT_SUPPORTED, "Support for MulticastDNS is disabled");
service = new0(DnssdService, 1);
service = new0(DnssdRegisteredService, 1);
if (!service)
return log_oom();
@ -2019,7 +2019,7 @@ static int bus_method_register_service(sd_bus_message *message, void *userdata,
static int call_dnssd_method(Manager *m, sd_bus_message *message, sd_bus_message_handler_t handler, sd_bus_error *error) {
_cleanup_free_ char *name = NULL;
DnssdService *s = NULL;
DnssdRegisteredService *s = NULL;
const char *path;
int r;

4
src/resolve/resolved-dns-scope.c
View File

@ -1603,7 +1603,7 @@ int dns_scope_announce(DnsScope *scope, bool goodbye) {
}
int dns_scope_add_dnssd_services(DnsScope *scope) {
DnssdService *service;
DnssdRegisteredService *service;
int r;
assert(scope);
@ -1642,7 +1642,7 @@ int dns_scope_add_dnssd_services(DnsScope *scope) {
int dns_scope_remove_dnssd_services(DnsScope *scope) {
_cleanup_(dns_resource_key_unrefp) DnsResourceKey *key = NULL;
DnssdService *service;
DnssdRegisteredService *service;
int r;
assert(scope);

6
src/resolve/resolved-dnssd-bus.c
View File

@ -10,7 +10,7 @@
#include "user-util.h"
int bus_dnssd_method_unregister(sd_bus_message *message, void *userdata, sd_bus_error *error) {
DnssdService *s = ASSERT_PTR(userdata);
DnssdRegisteredService *s = ASSERT_PTR(userdata);
Manager *m;
Link *l;
int r;
@ -68,7 +68,7 @@ int bus_dnssd_method_unregister(sd_bus_message *message, void *userdata, sd_bus_
static int dnssd_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {
_cleanup_free_ char *name = NULL;
Manager *m = ASSERT_PTR(userdata);
DnssdService *service;
DnssdRegisteredService *service;
int r;
assert(bus);
@ -91,7 +91,7 @@ static int dnssd_object_find(sd_bus *bus, const char *path, const char *interfac
static int dnssd_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) {
_cleanup_strv_free_ char **l = NULL;
Manager *m = ASSERT_PTR(userdata);
DnssdService *service;
DnssdRegisteredService *service;
unsigned c = 0;
int r;

6
src/resolve/resolved-dnssd-gperf.gperf
View File

@ -21,8 +21,8 @@ struct ConfigPerfItem;
Service.Name, config_parse_dnssd_service_name, 0, 0
Service.Type, config_parse_dnssd_service_type, 0, 0
Service.SubType, config_parse_dnssd_service_subtype, 0, 0
Service.Port, config_parse_ip_port, 0, offsetof(DnssdService, port)
Service.Priority, config_parse_uint16, 0, offsetof(DnssdService, priority)
Service.Weight, config_parse_uint16, 0, offsetof(DnssdService, weight)
Service.Port, config_parse_ip_port, 0, offsetof(DnssdRegisteredService, port)
Service.Priority, config_parse_uint16, 0, offsetof(DnssdRegisteredService, priority)
Service.Weight, config_parse_uint16, 0, offsetof(DnssdRegisteredService, weight)
Service.TxtText, config_parse_dnssd_txt, DNS_TXT_ITEM_TEXT, 0
Service.TxtData, config_parse_dnssd_txt, DNS_TXT_ITEM_DATA, 0

22
src/resolve/resolved-dnssd.c
View File

@ -37,7 +37,7 @@ DnssdTxtData *dnssd_txtdata_free_all(DnssdTxtData *txt_data) {
return dnssd_txtdata_free_all(next);
}
DnssdService *dnssd_service_free(DnssdService *service) {
DnssdRegisteredService *dnssd_service_free(DnssdRegisteredService *service) {
if (!service)
return NULL;
@ -60,7 +60,7 @@ DnssdService *dnssd_service_free(DnssdService *service) {
}
void dnssd_service_clear_on_reload(Hashmap *services) {
DnssdService *service;
DnssdRegisteredService *service;
HASHMAP_FOREACH(service, services)
if (service->config_source == RESOLVE_CONFIG_SOURCE_FILE) {
@ -91,7 +91,7 @@ static int dnssd_id_from_path(const char *path, char **ret_id) {
}
static int dnssd_service_load(Manager *manager, const char *path) {
_cleanup_(dnssd_service_freep) DnssdService *service = NULL;
_cleanup_(dnssd_service_freep) DnssdRegisteredService *service = NULL;
_cleanup_(dnssd_txtdata_freep) DnssdTxtData *txt_data = NULL;
_cleanup_free_ char *dropin_dirname = NULL;
int r;
@ -99,7 +99,7 @@ static int dnssd_service_load(Manager *manager, const char *path) {
assert(manager);
assert(path);
service = new0(DnssdService, 1);
service = new0(DnssdRegisteredService, 1);
if (!service)
return log_oom();
@ -172,7 +172,7 @@ static int specifier_dnssd_hostname(char specifier, const void *data, const char
return strdup_to(ret, m->llmnr_hostname);
}
int dnssd_render_instance_name(Manager *m, DnssdService *s, char **ret) {
int dnssd_render_instance_name(Manager *m, DnssdRegisteredService *s, char **ret) {
static const Specifier specifier_table[] = {
{ 'a', specifier_architecture, NULL },
{ 'b', specifier_boot_id, NULL },
@ -229,7 +229,7 @@ int dnssd_load(Manager *manager) {
return 0;
}
int dnssd_update_rrs(DnssdService *s) {
int dnssd_update_rrs(DnssdRegisteredService *s) {
_cleanup_free_ char *n = NULL, *service_name = NULL, *full_name = NULL, *sub_name = NULL, *selective_name = NULL;
int r;
@ -370,7 +370,7 @@ int dnssd_txt_item_new_from_data(const char *key, const void *data, const size_t
}
int dnssd_signal_conflict(Manager *manager, const char *name) {
DnssdService *s;
DnssdRegisteredService *s;
int r;
if (sd_bus_is_ready(manager->bus) <= 0)
@ -428,7 +428,7 @@ int config_parse_dnssd_service_name(
{ 'W', specifier_os_variant_id, NULL },
{}
};
DnssdService *s = ASSERT_PTR(userdata);
DnssdRegisteredService *s = ASSERT_PTR(userdata);
_cleanup_free_ char *name = NULL;
int r;
@ -470,7 +470,7 @@ int config_parse_dnssd_service_type(
void *data,
void *userdata) {
DnssdService *s = ASSERT_PTR(userdata);
DnssdRegisteredService *s = ASSERT_PTR(userdata);
int r;
assert(filename);
@ -506,7 +506,7 @@ int config_parse_dnssd_service_subtype(
void *data,
void *userdata) {
DnssdService *s = ASSERT_PTR(userdata);
DnssdRegisteredService *s = ASSERT_PTR(userdata);
assert(filename);
assert(lvalue);
@ -538,7 +538,7 @@ int config_parse_dnssd_txt(
void *userdata) {
_cleanup_(dnssd_txtdata_freep) DnssdTxtData *txt_data = NULL;
DnssdService *s = ASSERT_PTR(userdata);
DnssdRegisteredService *s = ASSERT_PTR(userdata);
DnsTxtItem *last = NULL;
assert(filename);

12
src/resolve/resolved-dnssd.h
View File

@ -5,7 +5,7 @@
#include "list.h"
#include "resolved-conf.h"
typedef struct DnssdService DnssdService;
typedef struct DnssdRegisteredService DnssdRegisteredService;
typedef struct DnssdTxtData DnssdTxtData;
typedef struct Manager Manager;
@ -25,7 +25,7 @@ struct DnssdTxtData {
LIST_FIELDS(DnssdTxtData, items);
};
struct DnssdService {
struct DnssdRegisteredService {
char *path;
char *id;
char *name_template;
@ -52,19 +52,19 @@ struct DnssdService {
uid_t originator;
};
DnssdService *dnssd_service_free(DnssdService *service);
DnssdRegisteredService *dnssd_service_free(DnssdRegisteredService *service);
DnssdTxtData *dnssd_txtdata_free(DnssdTxtData *txt_data);
DnssdTxtData *dnssd_txtdata_free_all(DnssdTxtData *txt_data);
void dnssd_service_clear_on_reload(Hashmap *services);
DEFINE_TRIVIAL_CLEANUP_FUNC(DnssdService*, dnssd_service_free);
DEFINE_TRIVIAL_CLEANUP_FUNC(DnssdRegisteredService*, dnssd_service_free);
DEFINE_TRIVIAL_CLEANUP_FUNC(DnssdTxtData*, dnssd_txtdata_free);
int dnssd_render_instance_name(Manager *m, DnssdService *s, char **ret);
int dnssd_render_instance_name(Manager *m, DnssdRegisteredService *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);
int dnssd_update_rrs(DnssdService *s);
int dnssd_update_rrs(DnssdRegisteredService *s);
int dnssd_signal_conflict(Manager *manager, const char *name);
const struct ConfigPerfItem* resolved_dnssd_gperf_lookup(const char *key, GPERF_LEN_TYPE length);

6
src/resolve/resolved-manager.c
View File

@ -817,7 +817,7 @@ int manager_start(Manager *m) {
Manager *manager_free(Manager *m) {
Link *l;
DnssdService *s;
DnssdRegisteredService *s;
if (!m)
return NULL;
@ -1399,7 +1399,7 @@ int manager_find_ifindex(Manager *m, int family, const union in_addr_union *in_a
void manager_refresh_rrs(Manager *m) {
Link *l;
DnssdService *s;
DnssdRegisteredService *s;
assert(m);
@ -1823,7 +1823,7 @@ void manager_cleanup_saved_user(Manager *m) {
}
bool manager_next_dnssd_names(Manager *m) {
DnssdService *s;
DnssdRegisteredService *s;
bool tried = false;
int r;