- (djm) [packet.c] Shuffle #ifdef to reduce conditionally compiled code

diff --git a/ChangeLog b/ChangeLog
index 4095ad3bad8ed991048efb7bcf3a277932bbf0ab..668294f4f1925b7027cd76efaa8e974ecf3a1be2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
    is enabled, rely on SIA to check for locked accounts if enabled.  ok djm@
  - (djm) [scp.c] Rename limitbw -> limit_rate to match upstreamed patch
  - (djm) [sftp-int.c] Remove duplicated code from bogus sync
+ - (djm) [packet.c] Shuffle #ifdef to reduce conditionally compiled code
 
 20031121
  - (djm) OpenBSD CVS Sync

diff --git a/packet.c b/packet.c
index 16d5f972c8c36d836a9f8c911751350b2889eb27..daae9ffaaa2ad06d2b27c1f2ac53849477e1545e 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -1403,10 +1403,10 @@ packet_not_very_much_data_to_write(void)
 }
 
 
-#if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN)
 static void
 packet_set_tos(int interactive)
 {
+#if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN)
        int tos = interactive ? IPTOS_LOWDELAY : IPTOS_THROUGHPUT;
 
        if (!packet_connection_is_on_socket() ||
@@ -1416,8 +1416,8 @@ packet_set_tos(int interactive)
            sizeof(tos)) < 0)
                error("setsockopt IP_TOS %d: %.100s:",
                    tos, strerror(errno));
-}
 #endif
+}
 
 /* Informs that the current session is interactive.  Sets IP flags for that. */
 
@@ -1438,10 +1438,7 @@ packet_set_interactive(int interactive)
                return;
        if (interactive)
                set_nodelay(connection_in);
-#if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN)
        packet_set_tos(interactive);
-#endif
-
 }
 
 /* Returns true if the current connection is interactive. */