diff options
author | Thomas Markwalder <tmark@isc.org> | 2020-01-21 12:40:28 -0500 |
---|---|---|
committer | Thomas Markwalder <tmark@isc.org> | 2020-01-21 12:40:28 -0500 |
commit | b8724f78a6904c4b6f02ad5d52faf64102e86e6a (patch) | |
tree | 8b83c624aa4f73dec92d5ddfc262f09450ce57d6 /relay | |
parent | 18d088f258acd9a327c928db77212fde5a38e0c1 (diff) | |
download | isc-dhcp-b8724f78a6904c4b6f02ad5d52faf64102e86e6a.tar.gz |
[#80] Corrected unresolved symbol, dhcpv4o6() in relay_unittests under libtoolv4_4_2_f180-dhcpv4o6-undefined-in-relay-unittests-under-libtool
Removed dummy func defs, reworked #defines to satisfy symbols.
Changes to be committed:
modified: relay/dhcrelay.c
modified: relay/tests/relay_unittests.c
Diffstat (limited to 'relay')
-rw-r--r-- | relay/dhcrelay.c | 9 | ||||
-rw-r--r-- | relay/tests/relay_unittests.c | 26 |
2 files changed, 5 insertions, 30 deletions
diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c index d4ce5f27..883d5058 100644 --- a/relay/dhcrelay.c +++ b/relay/dhcrelay.c @@ -1433,9 +1433,8 @@ add_relay_agent_options(struct interface_info *ip, struct dhcp_packet *packet, return (length); } -#ifndef UNIT_TEST - #ifdef DHCPv6 +#ifndef UNIT_TEST /* * Parse a downstream argument: [address%]interface[#index]. */ @@ -2020,12 +2019,14 @@ process_down6(struct packet *packet) { if (if_id.data != NULL) data_string_forget(&if_id, MDL); } +#endif /* UNIT_TEST */ /* * Called by the dispatch packet handler with a decoded packet. */ void dhcpv6(struct packet *packet) { +#ifndef UNIT_TEST struct stream_list *dp; /* Try all relay-replies downwards. */ @@ -2048,8 +2049,9 @@ dhcpv6(struct packet *packet) { log_info("Can't process packet from interface '%s'.", packet->interface->name); +#endif /* UNIT_TEST */ } -#endif +#endif /* DHCPv6 */ /* Stub routines needed for linking with DHCP libraries. */ void @@ -2147,4 +2149,3 @@ void request_v4_interface(const char* name, int flags) { interface_snorf(tmp, (INTERFACE_REQUESTED | flags)); interface_dereference(&tmp, MDL); } -#endif /* UNIT_TEST */ diff --git a/relay/tests/relay_unittests.c b/relay/tests/relay_unittests.c index cba14bd5..b308393f 100644 --- a/relay/tests/relay_unittests.c +++ b/relay/tests/relay_unittests.c @@ -406,29 +406,3 @@ ATF_TP_ADD_TCS(tp) { return (atf_no_error()); } - -/* Below are dummy function definitions to satisfy "required" symbols */ -isc_result_t find_class (struct class **c, const char *s, - const char *file, int line) { - return 0; -} - -int check_collection (struct packet *packet, struct lease *lease, - struct collection *collection) { - return 0; -} - -void classify (struct packet *packet, struct class *class){} -void bootp(struct packet *packet){} -void dhcp(struct packet *packet){} -void dhcpv6(struct packet *packet){} - -int parse_allow_deny (struct option_cache **oc, struct parse *cfile, - int flag) { - return 0; -} - -isc_result_t dhcp_set_control_state (control_object_state_t oldstate, - control_object_state_t newstate) { - return (ISC_R_SUCCESS); -} |