mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-28 13:08:06 +00:00
Code Issues Releases Wiki Activity

dig: setup IDN whenever printing a message

Browse Source 
because dig now uses the netmgr, printing of response messages
happens in a different thread than setup. the IDN output filtering
procedure, which set using dns_name_settotextfilter(), is stored as
thread-local data, and so if it's set during setup, it won't be
accessible when printing. we now set it immediately before printing,
in the same thread, and clear it immedately afterward.
This commit is contained in:
Evan Hunt 2020-09-12 13:23:52 -07:00 committed by Ondřej Surý
parent cde27d2d2b
commit e12dc1faa2
3 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/dig/dig.c
View File

@ -552,6 +552,8 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg,
UNUSED(msgbuf); UNUSED(msgbuf);
dig_idnsetup(query->lookup, true);
styleflags |= DNS_STYLEFLAG_REL_OWNER; styleflags |= DNS_STYLEFLAG_REL_OWNER;
if (yaml) { if (yaml) {
msg->indent.string = " "; msg->indent.string = " ";
@ -912,6 +914,9 @@ repopulate_buffer:
if (style != NULL) { if (style != NULL) {
dns_master_styledestroy(&style, mctx); dns_master_styledestroy(&style, mctx);
} }
dig_idnsetup(query->lookup, false);
return (result); return (result);
} }

27
bin/dig/dighost.c
View File

@ -2117,10 +2117,6 @@ setup_lookup(dig_lookup_t *lookup) {
#ifdef HAVE_LIBIDN2 #ifdef HAVE_LIBIDN2
char idn_origin[MXNAME], idn_textname[MXNAME]; char idn_origin[MXNAME], idn_textname[MXNAME];
result = dns_name_settotextfilter(lookup->idnout ? idn_output_filter
: NULL);
check_result(result, "dns_name_settotextfilter");
#endif /* HAVE_LIBIDN2 */ #endif /* HAVE_LIBIDN2 */
INSIST(!free_now); INSIST(!free_now);
@ -4234,10 +4230,6 @@ cancel_all(void) {
*/ */
void void
destroy_libs(void) { destroy_libs(void) {
#ifdef HAVE_LIBIDN2
isc_result_t result;
#endif /* HAVE_LIBIDN2 */
if (keep != NULL) { if (keep != NULL) {
isc_nmhandle_detach(&keep); isc_nmhandle_detach(&keep);
} }
@ -4275,11 +4267,6 @@ destroy_libs(void) {
clear_searchlist(); clear_searchlist();
#ifdef HAVE_LIBIDN2
result = dns_name_settotextfilter(NULL);
check_result(result, "dns_name_settotextfilter");
#endif /* HAVE_LIBIDN2 */
if (commctx != NULL) { if (commctx != NULL) {
debug("freeing commctx"); debug("freeing commctx");
isc_mempool_destroy(&commctx); isc_mempool_destroy(&commctx);
@ -4476,3 +4463,17 @@ idn_ace_to_locale(const char *src, char **dst) {
*dst = local_src; *dst = local_src;
} }
#endif /* HAVE_LIBIDN2 */ #endif /* HAVE_LIBIDN2 */
void
dig_idnsetup(dig_lookup_t *lookup, bool active) {
#ifdef HAVE_LIBIDN2
isc_result_t result;
result = dns_name_settotextfilter(
(active && lookup->idnout) ? idn_output_filter : NULL);
check_result(result, "dns_name_settotextfilter");
#else
UNUSED(lookup);
UNUSED(active);
return;
#endif /* HAVE_LIBIDN2 */
}

16
bin/dig/dighost.h
View File

@ -388,32 +388,38 @@ setup_text_key(void);
* Routines exported from dig.c for use by dig for iOS * Routines exported from dig.c for use by dig for iOS
*/ */
/*%< /*%
* Call once only to set up libraries, parse global * Call once only to set up libraries, parse global
* parameters and initial command line query parameters * parameters and initial command line query parameters
*/ */
void void
dig_setup(int argc, char **argv); dig_setup(int argc, char **argv);
/*%< /*%
* Call to supply new parameters for the next lookup * Call to supply new parameters for the next lookup
*/ */
void void
dig_query_setup(bool, bool, int argc, char **argv); dig_query_setup(bool, bool, int argc, char **argv);
/*%< /*%
* set the main application event cycle running * set the main application event cycle running
*/ */
void void
dig_startup(void); dig_startup(void);
/*%< /*%
* Initiates the next lookup cycle * Initiates the next lookup cycle
*/ */
void void
dig_query_start(void); dig_query_start(void);
/*%< /*%
* Activate/deactivate IDN filtering of output.
*/
void
dig_idnsetup(dig_lookup_t *lookup, bool active);
/*%
* Cleans up the application * Cleans up the application
*/ */
void void