[#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 67e1aa000635c5813241af6e3001747f58fa6cc4..b55d90c29177d25acc3d33eb3c20976a46dc1ef7 100644 (file)
--- 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 90bf6c48ed3a058990e4a532415389e7f1d46364..191d354ae87da3d0831ab5a4aa301a6fcc97ac20 100644 (file)
--- 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};