espressif/esp-protocols
1
0
Fork 1
mirror of https://github.com/espressif/esp-protocols.git synced 2025-06-25 17:31:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(mdns): Console test: set instance for service

Browse Source
This commit is contained in:
David Cermak
2024-07-22 17:12:14 +02:00
parent ee00e97b2b
commit f107dcd118
2 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
components/mdns/mdns_console.c
View File

@ -818,6 +818,8 @@ static struct {
struct arg_str *service; struct arg_str *service;
struct arg_str *proto; struct arg_str *proto;
struct arg_str *instance; struct arg_str *instance;
struct arg_str *host;
struct arg_str *old_instance;
struct arg_end *end; struct arg_end *end;
} mdns_service_instance_set_args; } mdns_service_instance_set_args;
@ -833,8 +835,20 @@ static int cmd_mdns_service_instance_set(int argc, char **argv)
printf("ERROR: Bad arguments!\n"); printf("ERROR: Bad arguments!\n");
return 1; return 1;
} }
const char *host = NULL;
if (mdns_service_instance_set_args.host->count && mdns_service_instance_set_args.host->sval[0]) {
host = mdns_service_instance_set_args.host->sval[0];
}
const char *old_instance = NULL;
if (mdns_service_instance_set_args.old_instance->count && mdns_service_instance_set_args.old_instance->sval[0]) {
old_instance = mdns_service_instance_set_args.old_instance->sval[0];
}
esp_err_t err = mdns_service_instance_name_set_for_host(old_instance, mdns_service_instance_set_args.service->sval[0], mdns_service_instance_set_args.proto->sval[0], host, mdns_service_instance_set_args.instance->sval[0]);
if (err != ESP_OK) {
printf("mdns_service_instance_name_set_for_host() failed with %s\n", esp_err_to_name(err));
return 1;
}
ESP_ERROR_CHECK( mdns_service_instance_name_set(mdns_service_instance_set_args.service->sval[0], mdns_service_instance_set_args.proto->sval[0], mdns_service_instance_set_args.instance->sval[0]) );
return 0; return 0;
} }
@ -843,7 +857,9 @@ static void register_mdns_service_instance_set(void)
mdns_service_instance_set_args.service = arg_str1(NULL, NULL, "<service>", "MDNS Service"); mdns_service_instance_set_args.service = arg_str1(NULL, NULL, "<service>", "MDNS Service");
mdns_service_instance_set_args.proto = arg_str1(NULL, NULL, "<proto>", "IP Protocol"); mdns_service_instance_set_args.proto = arg_str1(NULL, NULL, "<proto>", "IP Protocol");
mdns_service_instance_set_args.instance = arg_str1(NULL, NULL, "<instance>", "Instance name"); mdns_service_instance_set_args.instance = arg_str1(NULL, NULL, "<instance>", "Instance name");
mdns_service_instance_set_args.end = arg_end(2); mdns_service_instance_set_args.host = arg_str0("h", "host", "<hostname>", "Service for this (delegated) host");
mdns_service_instance_set_args.old_instance = arg_str0("i", "old_instance", "<old_instance>", "Instance name before update");
mdns_service_instance_set_args.end = arg_end(4);
const esp_console_cmd_t cmd_add = { const esp_console_cmd_t cmd_add = {
.command = "mdns_service_instance_set", .command = "mdns_service_instance_set",

21
components/mdns/tests/host_test/pytest_mdns.py
View File

@ -155,5 +155,26 @@ def test_service_subtype(mdns_console, dig_app):
dig_app.check_record('_subtest2._sub._test2._tcp.local', query_type='PTR', expected=True) dig_app.check_record('_subtest2._sub._test2._tcp.local', query_type='PTR', expected=True)
def test_service_set_instance(mdns_console, dig_app):
dig_app.check_record('local._test._tcp.local', query_type='SRV', expected=True)
mdns_console.send_input('mdns_service_instance_set _test _tcp local2')
dig_app.check_record('local2._test._tcp.local', query_type='SRV', expected=True)
mdns_console.send_input('mdns_service_instance_set _test2 _tcp extern2 -h delegated')
mdns_console.send_input('mdns_service_lookup _test2 _tcp -d')
mdns_console.get_output('PTR : extern2')
dig_app.check_record('extern2._test2._tcp.local', query_type='SRV', expected=True)
mdns_console.send_input('mdns_service_instance_set _test2 _tcp extern3 -h delegated -i extern')
mdns_console.get_output('ESP_ERR_NOT_FOUND')
def test_service_remove_all(mdns_console, dig_app):
mdns_console.send_input('mdns_service_remove_all')
mdns_console.send_input('mdns_service_lookup _test2 _tcp -d')
mdns_console.get_output('No results found!')
mdns_console.send_input('mdns_service_lookup _test _tcp')
mdns_console.get_output('No results found!')
dig_app.check_record('_test._tcp.local', query_type='PTR', expected=False)
if __name__ == '__main__': if __name__ == '__main__':
pytest.main(['-s', 'test_mdns.py']) pytest.main(['-s', 'test_mdns.py'])