projects
/
tinc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3a6200c
)
- More fixes.
author
Guus Sliepen
<guus@tinc-vpn.org>
Mon, 20 Nov 2000 23:29:47 +0000
(23:29 +0000)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Mon, 20 Nov 2000 23:29:47 +0000
(23:29 +0000)
src/net.c
patch
|
blob
|
history
src/process.c
patch
|
blob
|
history
diff --git
a/src/net.c
b/src/net.c
index
f1593b6
..
c16a261
100644
(file)
--- a/
src/net.c
+++ b/
src/net.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: net.c,v 1.35.4.
79 2000/11/20 22:13:03
guus Exp $
+ $Id: net.c,v 1.35.4.
80 2000/11/20 23:29:46
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-1115,7
+1115,6
@@
void terminate_connection(connection_t *cl)
connection_t *p;
subnet_t *subnet;
rbl_t *rbl;
connection_t *p;
subnet_t *subnet;
rbl_t *rbl;
-
cp
if(cl->status.remove)
return;
cp
if(cl->status.remove)
return;
@@
-1131,7
+1130,6
@@
cp
if(cl->status.meta)
close(cl->meta_socket);
if(cl->status.meta)
close(cl->meta_socket);
-cp
/* Find all connections that were lost because they were behind cl
(the connection that was dropped). */
/* Find all connections that were lost because they were behind cl
(the connection that was dropped). */
diff --git
a/src/process.c
b/src/process.c
index
ca992dc
..
eb066ab
100644
(file)
--- a/
src/process.c
+++ b/
src/process.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: process.c,v 1.1.2.
6 2000/11/20 22:13:12
guus Exp $
+ $Id: process.c,v 1.1.2.
7 2000/11/20 23:29:47
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-252,12
+252,10
@@
cp
"fork");
return -1;
}
"fork");
return -1;
}
-cp
+
if(pid)
{
if(pid)
{
- syslog(LOG_DEBUG, "%p, %d (%p)", child_pids, pid, &pid);
list_append(child_pids, &pid);
list_append(child_pids, &pid);
-cp
return 0;
}
cp
return 0;
}
cp