diff options
| author |   Dave Barach <dave@barachs.net> | 2019-08-15 15:14:14 -0400 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-08-19 09:23:20 +0000 |
| commit | 28c6e5cfdb3bda0c1869b5a976210fa633590652 (patch) | |
| tree | 3c19bd3499a3f15fd11b3a6600ab5785a648962c /src | |
| parent | 6bde1f4cd1ec703e04e880118d440a1c8d49b8f4 (diff) | |
dhcp: resolver process node index in main_t
Remove the (unused) node_registration_t, don't try to use it to signal
resolution events.
Type: fix
Ticket: VPP-1746
Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: Ice975e32152892ac4100b9e758412d48a43f09f1
(cherry picked from commit 018c14b7dbc5a910693f150045bfa803c4ae4eec)
Diffstat (limited to 'src')
| -rw-r--r-- | src/vnet/dns/dns.c | 3 | ||||
| -rw-r--r-- | src/vnet/dns/dns.h | 1 | ||||
| -rw-r--r-- | src/vnet/dns/reply_node.c | 2 | ||||
| -rw-r--r-- | src/vnet/dns/resolver_process.c | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/src/vnet/dns/dns.c b/src/vnet/dns/dns.c index 471728b8bb7..3285bedc903 100644 --- a/src/vnet/dns/dns.c +++ b/src/vnet/dns/dns.c @@ -650,7 +650,8 @@ vnet_send_dns_request (dns_main_t * dm, dns_cache_entry_t * ep) out: - vlib_process_signal_event_mt (dm->vlib_main, dns_resolver_node.index, + vlib_process_signal_event_mt (dm->vlib_main, + dm->resolver_process_node_index, DNS_RESOLVER_EVENT_PENDING, 0); } diff --git a/src/vnet/dns/dns.h b/src/vnet/dns/dns.h index 494ac672096..e6944de0ca9 100644 --- a/src/vnet/dns/dns.h +++ b/src/vnet/dns/dns.h @@ -127,7 +127,6 @@ extern dns_main_t dns_main; extern vlib_node_registration_t dns46_reply_node; extern vlib_node_registration_t dns4_request_node; extern vlib_node_registration_t dns6_request_node; -extern vlib_node_registration_t dns_resolver_node; #define foreach_dns46_request_error \ _(NONE, "No error") \ diff --git a/src/vnet/dns/reply_node.c b/src/vnet/dns/reply_node.c index 81ce8f480d0..77d54c84019 100644 --- a/src/vnet/dns/reply_node.c +++ b/src/vnet/dns/reply_node.c @@ -171,7 +171,7 @@ dns46_reply_node_fn (vlib_main_t * vm, /* * Deal with everything in process ctx on the main thread */ - vlib_process_signal_event_mt (vm, dns_resolver_node.index, + vlib_process_signal_event_mt (vm, dm->resolver_process_node_index, DNS_RESOLVER_EVENT_RESOLVED, (uword) resp0); error0 = DNS46_REPLY_ERROR_PROCESSED; diff --git a/src/vnet/dns/resolver_process.c b/src/vnet/dns/resolver_process.c index cba659266c9..220a4907963 100644 --- a/src/vnet/dns/resolver_process.c +++ b/src/vnet/dns/resolver_process.c @@ -38,8 +38,6 @@ #include <vlibapi/api_helper_macros.h> -vlib_node_registration_t dns_resolver_node; - extern int vnet_dns_response_to_reply (u8 * response, vl_api_dns_resolve_name_reply_t * rmp, |