Differential D4472
resolver: preserve binary compatibility; reduce header pollution Authored by vangyzen on Dec 9 2015, 4:59 PM. Tags None Referenced Files
Subscribers
Details In r289315, I added new fields to res_state. This broke binary Fix these problems by moving the new fields into __res_state_ext. Suggested by: ume
Diff Detail
Event TimelineComment Actions Could you move reload_period as well? We should not touch struct __res_state as much as possible to ease merging further upstream changes.
Comment Actions There are some codes in res_setoptions() which touch statp->_u._ext.ext but we disabled them. I think it is better to do something like following in res_setoptions(): @@ -599,9 +595,7 @@
{
const char *cp = options;
int i;
-#ifndef _LIBC
struct __res_state_ext *ext = statp->_u._ext.ext;
-#endif
#ifdef DEBUG
if (statp->options & RES_DEBUG)
@@ -686,8 +680,10 @@
statp->options |= RES_NOCHECKNAME;
} else if (!strncmp(cp, "reload-period:",
sizeof("reload-period:") - 1)) {
- statp->reload_period = (u_short)
- atoi(cp + sizeof("reload-period:") - 1);
+ if (ext != NULL) {
+ ext->reload_period = (u_short)
+ atoi(cp + sizeof("reload-period:") - 1);
+ }
}
#ifdef RES_USE_EDNS0
else if (!strncmp(cp, "edns0", sizeof("edns0") - 1)) {It seems you forgot to include the diff for resolv.h in you. Comment Actions Oops, I have submitted it accidentally at the middle. X-( | ||||||||||||||||||||||||||||||||||||||||||||