Remove dnsmasq patches

[ipfire-2.x.git] / src / patches / dnsmasq / 0004-Set-conntrack-mark-before-connect-call.patch

diff --git a/src/patches/dnsmasq/0004-Set-conntrack-mark-before-connect-call.patch b/src/patches/dnsmasq/0004-Set-conntrack-mark-before-connect-call.patch
deleted file mode 100644 (file)
index f734fbc..0000000
--- a/src/patches/dnsmasq/0004-Set-conntrack-mark-before-connect-call.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From e9828b6f66b22ce8873f8d30a773137d1aef1b92 Mon Sep 17 00:00:00 2001
-From: Karl Vogel <karl.vogel@gmail.com>
-Date: Fri, 3 Oct 2014 21:45:15 +0100
-Subject: [PATCH 004/113] Set conntrack mark before connect() call.
-
-SO_MARK has to be done before issuing the connect() call on the
-TCP socket.
----
- src/forward.c | 36 ++++++++++++++++++------------------
- 1 file changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/src/forward.c b/src/forward.c
-index 4895efeba89a..2cf29eba6e26 100644
---- a/src/forward.c
-+++ b/src/forward.c
-@@ -1796,6 +1796,24 @@ unsigned char *tcp_request(int confd, time_t now,
-                         if ((last_server->tcpfd = socket(last_server->addr.sa.sa_family, SOCK_STREAM, 0)) == -1)
-                           continue;
-                         
-+#ifdef HAVE_CONNTRACK
-+                        /* Copy connection mark of incoming query to outgoing connection. */
-+                        if (option_bool(OPT_CONNTRACK))
-+                          {
-+                            unsigned int mark;
-+                            struct all_addr local;
-+#ifdef HAVE_IPV6                    
-+                            if (local_addr->sa.sa_family == AF_INET6)
-+                              local.addr.addr6 = local_addr->in6.sin6_addr;
-+                            else
-+#endif
-+                              local.addr.addr4 = local_addr->in.sin_addr;
-+                            
-+                            if (get_incoming_mark(&peer_addr, &local, 1, &mark))
-+                              setsockopt(last_server->tcpfd, SOL_SOCKET, SO_MARK, &mark, sizeof(unsigned int));
-+                          }
-+#endif        
-+                    
-                         if ((!local_bind(last_server->tcpfd,  &last_server->source_addr, last_server->interface, 1) ||
-                              connect(last_server->tcpfd, &last_server->addr.sa, sa_len(&last_server->addr)) == -1))
-                           {
-@@ -1820,24 +1838,6 @@ unsigned char *tcp_request(int confd, time_t now,
-                             size = new_size;
-                           }
- #endif
--                        
--#ifdef HAVE_CONNTRACK
--                        /* Copy connection mark of incoming query to outgoing connection. */
--                        if (option_bool(OPT_CONNTRACK))
--                          {
--                            unsigned int mark;
--                            struct all_addr local;
--#ifdef HAVE_IPV6                    
--                            if (local_addr->sa.sa_family == AF_INET6)
--                              local.addr.addr6 = local_addr->in6.sin6_addr;
--                            else
--#endif
--                              local.addr.addr4 = local_addr->in.sin_addr;
--                            
--                            if (get_incoming_mark(&peer_addr, &local, 1, &mark))
--                              setsockopt(last_server->tcpfd, SOL_SOCKET, SO_MARK, &mark, sizeof(unsigned int));
--                          }
--#endif        
-                       }
-                     
-                     *length = htons(size);
--- 
-2.1.0
-