/[smeserver]/rpms/ipsvd/sme8/tcpsvd_keepalive.patch
ViewVC logotype

Diff of /rpms/ipsvd/sme8/tcpsvd_keepalive.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.1 by charliebrady, Wed Dec 25 21:15:46 2013 UTC Revision 1.2 by charliebrady, Thu Dec 26 20:52:39 2013 UTC
# Line 1  Line 1 
1  diff -U4 -r net/ipsvd-0.12.1/src/socket_bind.c net.new/ipsvd-0.12.1/src/socket_bind.c  diff -ru -I '\$Id:' net.old/ipsvd-0.12.1/src/socket_bind.c net/ipsvd-0.12.1/src/socket_bind.c
2  --- net/ipsvd-0.12.1/src/socket_bind.c  2006-02-05 06:16:48.000000000 +1100  --- net.old/ipsvd-0.12.1/src/socket_bind.c      2006-02-04 14:16:48.000000000 -0500
3  +++ net.new/ipsvd-0.12.1/src/socket_bind.c      2013-12-19 16:11:13.000000000 +1100  +++ net/ipsvd-0.12.1/src/socket_bind.c  2013-12-26 15:47:25.166952124 -0500
4  @@ -30,4 +30,10 @@  @@ -31,3 +31,9 @@
      if (setsockopt(s,SOL_SOCKET,SO_RCVBUF,&size,sizeof size) == 0) return;  
5       size -= (size >> 5);       size -= (size >> 5);
6     }     }
7   }   }
# Line 12  diff -U4 -r net/ipsvd-0.12.1/src/socket_ Line 11  diff -U4 -r net/ipsvd-0.12.1/src/socket_
11  +  int opt = 1;  +  int opt = 1;
12  +  return setsockopt(s,SOL_SOCKET,SO_KEEPALIVE,&opt,sizeof opt);  +  return setsockopt(s,SOL_SOCKET,SO_KEEPALIVE,&opt,sizeof opt);
13  +}  +}
14  diff -U4 -r net/ipsvd-0.12.1/src/socket.h net.new/ipsvd-0.12.1/src/socket.h  diff -ru -I '\$Id:' net.old/ipsvd-0.12.1/src/socket.h net/ipsvd-0.12.1/src/socket.h
15  --- net/ipsvd-0.12.1/src/socket.h       2006-02-05 06:16:48.000000000 +1100  --- net.old/ipsvd-0.12.1/src/socket.h   2006-02-04 14:16:48.000000000 -0500
16  +++ net.new/ipsvd-0.12.1/src/socket.h   2013-12-19 16:11:42.000000000 +1100  +++ net/ipsvd-0.12.1/src/socket.h       2013-12-26 15:47:25.167952137 -0500
17  @@ -17,6 +17,7 @@  @@ -18,5 +18,6 @@
  extern int socket_local4(int,char *,uint16 *);  
18   extern int socket_remote4(int,char *,uint16 *);   extern int socket_remote4(int,char *,uint16 *);
19    
20   extern void socket_tryreservein(int,int);   extern void socket_tryreservein(int,int);
21  +extern int socket_keepalive(int);  +extern int socket_keepalive(int);
22    
23   #endif   #endif
24  diff -U4 -r net/ipsvd-0.12.1/src/tcpsvd.c net.new/ipsvd-0.12.1/src/tcpsvd.c  diff -ru -I '\$Id:' net.old/ipsvd-0.12.1/src/tcpsvd.c net/ipsvd-0.12.1/src/tcpsvd.c
25  --- net/ipsvd-0.12.1/src/tcpsvd.c       2006-02-05 06:16:47.000000000 +1100  --- net.old/ipsvd-0.12.1/src/tcpsvd.c   2006-02-04 14:16:47.000000000 -0500
26  +++ net.new/ipsvd-0.12.1/src/tcpsvd.c   2013-12-19 16:24:28.000000000 +1100  +++ net/ipsvd-0.12.1/src/tcpsvd.c       2013-12-26 15:48:10.644538719 -0500
27  @@ -31,11 +31,11 @@  @@ -32,9 +32,9 @@
  #include "ssl_io.h"  
28   #endif   #endif
29    
30   #ifdef SSLSVD   #ifdef SSLSVD
# Line 39  diff -U4 -r net/ipsvd-0.12.1/src/tcpsvd. Line 36  diff -U4 -r net/ipsvd-0.12.1/src/tcpsvd.
36   #endif   #endif
37    
38   #define VERSION "$Id: tcpsvd.c,v 1.24 2006/02/03 19:30:24 pape Exp $"   #define VERSION "$Id: tcpsvd.c,v 1.24 2006/02/03 19:30:24 pape Exp $"
39    @@ -54,6 +54,7 @@
 @@ -53,8 +53,9 @@  
  const char **prog;  
40   unsigned long cnum =0;   unsigned long cnum =0;
41   unsigned long cmax =30;   unsigned long cmax =30;
42   unsigned long timeout =0;   unsigned long timeout =0;
# Line 49  diff -U4 -r net/ipsvd-0.12.1/src/tcpsvd. Line 44  diff -U4 -r net/ipsvd-0.12.1/src/tcpsvd.
44    
45   unsigned int ucspi =1;   unsigned int ucspi =1;
46   const char *instructs =0;   const char *instructs =0;
47   unsigned int iscdb =0;  @@ -241,6 +242,8 @@
 @@ -240,8 +241,10 @@  
    }  
48     else run =prog;     else run =prog;
49     if ((fd_move(0, c) == -1) || (fd_copy(1, 0) == -1))     if ((fd_move(0, c) == -1) || (fd_copy(1, 0) == -1))
50       drop("unable to set filedescriptor");       drop("unable to set filedescriptor");
# Line 60  diff -U4 -r net/ipsvd-0.12.1/src/tcpsvd. Line 53  diff -U4 -r net/ipsvd-0.12.1/src/tcpsvd.
53     sig_uncatch(sig_term);     sig_uncatch(sig_term);
54     sig_uncatch(sig_pipe);     sig_uncatch(sig_pipe);
55     sig_uncatch(sig_child);     sig_uncatch(sig_child);
56     sig_unblock(sig_child);  @@ -271,10 +274,10 @@
 @@ -270,12 +273,12 @@  
    phccmax =0;  
57    
58   #ifdef SSLSVD   #ifdef SSLSVD
59     while ((opt =getopt(argc, (const char **)argv,     while ((opt =getopt(argc, (const char **)argv,
# Line 75  diff -U4 -r net/ipsvd-0.12.1/src/tcpsvd. Line 66  diff -U4 -r net/ipsvd-0.12.1/src/tcpsvd.
66   #endif   #endif
67       switch(opt) {       switch(opt) {
68       case 'c': scan_ulong(optarg, &cmax); if (cmax < 1) usage(); break;       case 'c': scan_ulong(optarg, &cmax); if (cmax < 1) usage(); break;
69       case 'C':  @@ -297,6 +300,7 @@
 @@ -296,8 +299,9 @@  
        break;  
70       case 'E': ucspi =0; break;       case 'E': ucspi =0; break;
71       case 'b': scan_ulong(optarg, &backlog); break;       case 'b': scan_ulong(optarg, &backlog); break;
72       case 'h': lookuphost =1; break;       case 'h': lookuphost =1; break;
# Line 85  diff -U4 -r net/ipsvd-0.12.1/src/tcpsvd. Line 74  diff -U4 -r net/ipsvd-0.12.1/src/tcpsvd.
74       case 'p': lookuphost =1; paranoid =1; break;       case 'p': lookuphost =1; paranoid =1; break;
75       case 't': scan_ulong(optarg, &timeout); break;       case 't': scan_ulong(optarg, &timeout); break;
76       case 'v': ++verbose; break;       case 'v': ++verbose; break;
  #ifdef SSLSVD  

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed