------------------------------------------------------------
revno: 13506
revision-id: squidadm@squid-cache.org-20140722001436-cobl5qvliz3zo2pm
parent: chtsanti@users.sourceforge.net-20140721145527-0ijfbpi3j6s3okvx
committer: Automatic source maintenance <squidadm@squid-cache.org>
branch nick: trunk
timestamp: Mon 2014-07-21 18:14:36 -0600
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20140722001436-\
#   cobl5qvliz3zo2pm
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: a831ad38587058fcb74fd8623e403b0cab2de41b
# timestamp: 2014-07-22 00:53:49 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: chtsanti@users.sourceforge.net-20140721145527-\
#   0ijfbpi3j6s3okvx
# 
# Begin patch
=== modified file 'src/comm/ConnOpener.cc'
--- src/comm/ConnOpener.cc	2014-07-21 14:55:27 +0000
+++ src/comm/ConnOpener.cc	2014-07-22 00:14:36 +0000
@@ -12,9 +12,9 @@
 #include "fde.h"
 #include "globals.h"
 #include "icmp/net_db.h"
+#include "ip/QosConfig.h"
 #include "ip/tools.h"
 #include "ipcache.h"
-#include "ip/QosConfig.h"
 #include "SquidConfig.h"
 #include "SquidTime.h"
 
@@ -263,11 +263,11 @@
 
     // Set TOS if needed.
     if (conn_->tos &&
-        Ip::Qos::setSockTos(temporaryFd_, conn_->tos, conn_->remote.isIPv4() ? AF_INET : AF_INET6) < 0)
+            Ip::Qos::setSockTos(temporaryFd_, conn_->tos, conn_->remote.isIPv4() ? AF_INET : AF_INET6) < 0)
         conn_->tos = 0;
 #if SO_MARK
     if (conn_->nfmark &&
-        Ip::Qos::setSockNfmark(temporaryFd_, conn_->nfmark) < 0)
+            Ip::Qos::setSockNfmark(temporaryFd_, conn_->nfmark) < 0)
         conn_->nfmark = 0;
 #endif
 

=== modified file 'src/comm/TcpAcceptor.cc'
--- src/comm/TcpAcceptor.cc	2014-07-21 14:55:27 +0000
+++ src/comm/TcpAcceptor.cc	2014-07-22 00:14:36 +0000
@@ -206,11 +206,11 @@
     // To correctly implement TOS values on listening sockets, probably requires
     // more work to inherit TOS values to created connection objects.
     if (conn->tos &&
-        Ip::Qos::setSockTos(conn->fd, conn->tos, conn->remote.isIPv4() ? AF_INET : AF_INET6) < 0)
+            Ip::Qos::setSockTos(conn->fd, conn->tos, conn->remote.isIPv4() ? AF_INET : AF_INET6) < 0)
         conn->tos = 0;
 #if SO_MARK
     if (conn->nfmark &&
-        Ip::Qos::setSockNfmark(conn->fd, conn->nfmark) < 0)
+            Ip::Qos::setSockNfmark(conn->fd, conn->nfmark) < 0)
         conn->nfmark = 0;
 #endif
 #endif