← Back to branch summary

~ubuntu-branches/ubuntu/wily/maradns/wily-proposed

« back to all changes in this revision

Viewing changes to deadwood-3.2.07/update/2.9.07/deadwood-2.9.06-speedup1.patch

  • Committer: Package Import Robot
  • Author(s): Dariusz Dwornikowski, Tomasz Buchert, Dariusz Dwornikowski
  • Date: 2015-03-27 18:34:08 UTC
  • mfrom: (1.2.12)
  • Revision ID: package-import@ubuntu.com-20150327183408-wnfachdkdjt96yu6
Tags: 2.0.11-1
http://bugs.debian.org/785536
http://bugs.debian.org/785535
[ Tomasz Buchert ]
* Imported Upstream version 2.0.11

[ Dariusz Dwornikowski ]
* d/patches: 
  - refreshed all patches for new deadwood version
  - removed generating of random prime on build (Closes: #785536) 
* d/rules: date taken from changelog (Closes: #785535)

Show diffs side-by-side

added added

removed removed

Lines of Context:
deadwood-3.2.07/update/2.9.07/deadwood-2.9.06-speedup1.patch
 
1
--- deadwood-H-20100906-1/src/DwUdpSocket.c.orig        2010-09-06 20:01:26.000000000 -0700
 
2
+++ deadwood-H-20100906-1/src/DwUdpSocket.c     2010-09-06 20:03:49.000000000 -0700
 
3
@@ -179,8 +179,9 @@
 
4
      dw_str *query, SOCKET x_socket_num) {
 
5
         sockaddr_all_T server;
 
6
         SOCKET s = 0;
 
7
-        int32_t rnum = -1;
 
8
+        int_fast32_t rnum = -1;
 
9
         ip_addr_T addr = {0,{0,0},0,0};
 
10
+       int counter = 0;
 
11
         socklen_t inet_len = sizeof(struct sockaddr_in);
 
12
 
 
13
         if(rem[n].socket != x_socket_num || /* Already used (sanity check) */
 
14
@@ -195,7 +196,12 @@
 
15
         }
 
16
 
 
17
         /* Get IP of remote server and open a socket to them */
 
18
-        addr = get_upstream_ip(query,n);
 
19
+       for(counter = 0; counter < 7; counter++) { /* Don't stop on bad IP */
 
20
+               addr = get_upstream_ip(query,n);
 
21
+               if(addr.len > 0) {
 
22
+                       break;
 
23
+               }
 
24
+       }
 
25
         dw_log_ip("Making connection to IP",&addr,128);
 
26
         if(addr.len == 0) { /* Failed to get upstream IP */
 
27
                 return;