diff options
| author | Thomas Markwalder <tmark@isc.org> | 2022-02-07 11:59:51 -0500 |
|---|---|---|
| committer | Tomek Mrugalski <tomek@isc.org> | 2022-03-04 09:39:00 +0000 |
| commit | 2b08209f9787949ff5ebdd5c7f0455ec95f53705 (patch) | |
| tree | c457850f91ba4363e6777d7c6d33bc1094fd2454 | |
| parent | b5fafe12888a14a503d58f603d26682d3aa3f2e7 (diff) | |
| download | isc-dhcp-2b08209f9787949ff5ebdd5c7f0455ec95f53705.tar.gz | |
[#223] Minor edits
Renamed boolean fake_gw -> use_fake_gw
Added missing blank line
| -rw-r--r-- | relay/dhcrelay.c | 7 | ||||
| -rw-r--r-- | relay/tests/relay_unittests.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c index 67e1aa00..b55d90c2 100644 --- a/relay/dhcrelay.c +++ b/relay/dhcrelay.c @@ -105,7 +105,7 @@ struct server_list { } *servers; 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}; #ifdef DHCPv6 @@ -562,7 +562,7 @@ main(int argc, char **argv) { if (inet_pton(AF_INET, argv[i], &gw) <= 0) { usage("Invalid gateway address '%s'", argv[i]); } else { - fake_gw = ISC_TRUE; + use_fake_gw = ISC_TRUE; } } else if (!strcmp(argv[i], "-D")) { #ifdef DHCPv6 @@ -934,9 +934,10 @@ do_relay4(struct interface_info *ip, struct dhcp_packet *packet, return; } - if (fake_gw) { + if (use_fake_gw) { packet->giaddr = gw; } + if (send_packet(out, NULL, packet, length, out->addresses[0], &to, htop) < 0) { ++server_packet_errors; diff --git a/relay/tests/relay_unittests.c b/relay/tests/relay_unittests.c index 90bf6c48..191d354a 100644 --- a/relay/tests/relay_unittests.c +++ b/relay/tests/relay_unittests.c @@ -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"); } -extern isc_boolean_t fake_gw; +extern isc_boolean_t use_fake_gw; extern struct in_addr gw; /* This basic test checks if the new gwaddr override (-g) option is disabled by default */ 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"); } char txt[48] = {0}; |