Commit b8724f78 authored by Thomas Markwalder's avatar Thomas Markwalder

[#80] Corrected unresolved symbol, dhcpv4o6() 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
parent 18d088f2
......@@ -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 */
......@@ -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);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment