mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-22 09:57:20 +00:00
Code Issues Releases Wiki Activity

[#223] Minor edits

Browse Source 
Renamed boolean fake_gw -> use_fake_gw
Added missing blank line
This commit is contained in:
Thomas Markwalder 2022-02-07 11:59:51 -05:00 committed by Tomek Mrugalski
parent b5fafe1288
commit 2b08209f97
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
relay/dhcrelay.c
View File

@ -105,7 +105,7 @@ struct server_list {
} *servers; } *servers;
struct interface_info *uplink = NULL; struct interface_info *uplink = NULL;
isc_boolean_t fake_gw = ISC_FALSE; isc_boolean_t use_fake_gw = ISC_FALSE;
struct in_addr gw = {0}; struct in_addr gw = {0};
#ifdef DHCPv6 #ifdef DHCPv6
@ -562,7 +562,7 @@ main(int argc, char **argv) {
if (inet_pton(AF_INET, argv[i], &gw) <= 0) { if (inet_pton(AF_INET, argv[i], &gw) <= 0) {
usage("Invalid gateway address '%s'", argv[i]); usage("Invalid gateway address '%s'", argv[i]);
} else { } else {
fake_gw = ISC_TRUE; use_fake_gw = ISC_TRUE;
} }
} else if (!strcmp(argv[i], "-D")) { } else if (!strcmp(argv[i], "-D")) {
#ifdef DHCPv6 #ifdef DHCPv6
@ -934,9 +934,10 @@ do_relay4(struct interface_info *ip, struct dhcp_packet *packet,
return; return;
} }
if (fake_gw) { if (use_fake_gw) {
packet->giaddr = gw; packet->giaddr = gw;
} }
if (send_packet(out, NULL, packet, length, out->addresses[0], if (send_packet(out, NULL, packet, length, out->addresses[0],
&to, htop) < 0) { &to, htop) < 0) {
++server_packet_errors; ++server_packet_errors;

4
relay/tests/relay_unittests.c
View File

@ -406,13 +406,13 @@ ATF_TC_HEAD(gwaddr_override_test, tc) {
atf_tc_set_md_var(tc, "descr", "tests that gateway addr (giaddr) field can be overridden"); atf_tc_set_md_var(tc, "descr", "tests that gateway addr (giaddr) field can be overridden");
} }
extern isc_boolean_t fake_gw; extern isc_boolean_t use_fake_gw;
extern struct in_addr gw; extern struct in_addr gw;
/* This basic test checks if the new gwaddr override (-g) option is disabled by default */ /* This basic test checks if the new gwaddr override (-g) option is disabled by default */
ATF_TC_BODY(gwaddr_override_test, tc) { ATF_TC_BODY(gwaddr_override_test, tc) {
if (fake_gw == ISC_TRUE) { if (use_fake_gw == ISC_TRUE) {
atf_tc_fail("the gwaddr override should be disabled by default"); atf_tc_fail("the gwaddr override should be disabled by default");
} }
char txt[48] = {0}; char txt[48] = {0};