Replace (unused,always 0) is_tcp argument to evdns_add_server_port*() with flags

Since we weren't using it for anything, and we always failed if it was
set, we're allowed to change the future semantics of setting it.

diff --git a/evdns.c b/evdns.c
index c9670fc52909b048900d6e805e600553d7e2b815..1f575c3cd6d58b9caf6cdd08fbcbca0f53331094 100644 (file)
--- a/evdns.c
+++ b/evdns.c
@@ -1597,11 +1597,11 @@ evdns_request_data_build(const char *const name, const int name_len,
 
 /* exported function */
 struct evdns_server_port *
-evdns_add_server_port_with_base(struct event_base *base, evutil_socket_t socket, int is_tcp, evdns_request_callback_fn_type cb, void *user_data)
+evdns_add_server_port_with_base(struct event_base *base, evutil_socket_t socket, int flags, evdns_request_callback_fn_type cb, void *user_data)
 {
        struct evdns_server_port *port;
-       if (is_tcp)
-               return NULL; /* TCP sockets not yet implemented */
+       if (flags)
+               return NULL; /* flags not yet implemented */
        if (!(port = mm_malloc(sizeof(struct evdns_server_port))))
                return NULL;
        memset(port, 0, sizeof(struct evdns_server_port));
@@ -1628,9 +1628,9 @@ evdns_add_server_port_with_base(struct event_base *base, evutil_socket_t socket,
 }
 
 struct evdns_server_port *
-evdns_add_server_port(evutil_socket_t socket, int is_tcp, evdns_request_callback_fn_type cb, void *user_data)
+evdns_add_server_port(evutil_socket_t socket, int flags, evdns_request_callback_fn_type cb, void *user_data)
 {
-       return evdns_add_server_port_with_base(NULL, socket, is_tcp, cb, user_data);
+       return evdns_add_server_port_with_base(NULL, socket, flags, cb, user_data);
 }
 
 /* exported function */

diff --git a/include/event2/dns.h b/include/event2/dns.h
index a954066f130472682ff6fe5bda48e4fe6b91127c..fa54381e8e3a2afe1c59e0b6de8d2d14266e5eaa 100644 (file)
--- a/include/event2/dns.h
+++ b/include/event2/dns.h
@@ -554,13 +554,13 @@ typedef void (*evdns_request_callback_fn_type)(struct evdns_server_request *, vo
 
     @param base The event base to handle events for the server port.
     @param socket A UDP socket to accept DNS requests.
-    @param is_tcp Always 0 for now.
+    @param flags Always 0 for now.
     @param callback A function to invoke whenever we get a DNS request
       on the socket.
     @param user_data Data to pass to the callback.
     @return an evdns_server_port structure for this server port.
  */
-struct evdns_server_port *evdns_add_server_port_with_base(struct event_base *base, evutil_socket_t socket, int is_tcp, evdns_request_callback_fn_type callback, void *user_data);
+struct evdns_server_port *evdns_add_server_port_with_base(struct event_base *base, evutil_socket_t socket, int flags, evdns_request_callback_fn_type callback, void *user_data);
 /** Close down a DNS server port, and free associated structures. */
 void evdns_close_server_port(struct evdns_server_port *port);
 

diff --git a/include/event2/dns_compat.h b/include/event2/dns_compat.h
index 3c207feb52aa913f80c3099c208135d2d333d540..cd7946cf7a541d8ea71b18b5a2ff0d268257fa43 100644 (file)
--- a/include/event2/dns_compat.h
+++ b/include/event2/dns_compat.h
@@ -321,7 +321,7 @@ void evdns_search_ndots_set(const int ndots);
     function is evdns_add_server_port_with_base().
 
 */
-struct evdns_server_port *evdns_add_server_port(evutil_socket_t socket, int is_tcp, evdns_request_callback_fn_type callback, void *user_data);
+struct evdns_server_port *evdns_add_server_port(evutil_socket_t socket, int flags, evdns_request_callback_fn_type callback, void *user_data);
 
 #ifdef WIN32
 int evdns_config_windows_nameservers(void);