resolver: preserve binary compatibility; reduce header pollution

[vangyzen]

Summary

In r289315, I added new fields to res_state. This broke binary
backward compatibility. It also broke some ports (and possibly
other code) by requiring the definition of time_t and struct timespec.

Fix these problems by moving the new fields into __res_state_ext.

Suggested by: ume
MFC after: 1 week
Sponsored by: Dell Inc.

[ume]

Could you move reload_period as well? We should not touch struct __res_state as much as possible to ease merging further upstream changes.

[vangyzen]

Move reload_period into __res_ext_state, too.

[vangyzen]

include/resolv.h has returned to its r269867 state.

[ume]

lib/libc/resolv/res_init.c

685 ↗

(On Diff #10994)

You need to check if statp->_u._ext.ext is not NULL before set a value to reload_period.

[vangyzen]

Check for NULL ext pointer in one case I missed.

[vangyzen]

lib/libc/resolv/res_init.c

684–685 ↗

(On Diff #11043)

Indeed. Thank you.

[ume]

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.

[ume]

Oops, I have submitted it accidentally at the middle. X-(
It seems you forgot to include the diff for resolv.h in your previous patch.
Other than that, it seems good to me.

[vangyzen]

Pull ext into a local variable.

Upload the diff for resolv.h. Oops.

[ume]

It seems good to me.