From: Thomas Markwalder <tmark@isc.org>
Date: Mon, 7 Feb 2022 16:59:51 +0000 (-0500)
Subject: [#223] Minor edits
X-Git-Tag: v4_4_3~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b08209f9787949ff5ebdd5c7f0455ec95f53705;p=thirdparty%2Fdhcp.git

[#223] Minor edits

Renamed boolean fake_gw -> use_fake_gw
Added missing blank line
---

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};