[Pkg-privacy-commits] [onioncat] 80/241: keepalive bugfix

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to branch upstream-master
in repository onioncat.

commit 2d8d9e612bf60ad76339cd4decc02830b08c27ac
Author: eagle <eagle at 58e1ccc2-750e-0410-8d0d-f93ca75ab447>
Date:   Fri Nov 28 09:56:21 2008 +0000

    keepalive bugfix
    
    git-svn-id: https://www.cypherpunk.at/svn/onioncat/trunk@369 58e1ccc2-750e-0410-8d0d-f93ca75ab447
---
 src/ocatctrl.c  | 34 +++++++++++++++++-----------------
 src/ocatroute.c |  4 +---
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/ocatctrl.c b/src/ocatctrl.c
index 56b2dab..174538f 100644
--- a/src/ocatctrl.c
+++ b/src/ocatctrl.c
@@ -28,27 +28,27 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <fcntl.h>
+//#include <fcntl.h>
 #include <pthread.h>
 #include <arpa/inet.h>
 #include <errno.h>
-#include <sys/time.h>
-#include <sys/select.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#ifdef HAVE_LINUX_SOCKIOS_H
-#include <linux/sockios.h>
-#endif
-#ifdef HAVE_NETINET_IN_SYSTM_H
-#include <netinet/in_systm.h>
-#endif
-#ifdef HAVE_NETINET_IP_H
-#include <netinet/ip.h>
-#endif
+//#include <sys/time.h>
+//#include <sys/select.h>
+//#include <sys/types.h>
+//#include <sys/stat.h>
+//#include <sys/socket.h>
+//#include <sys/ioctl.h>
+//#ifdef HAVE_LINUX_SOCKIOS_H
+//#include <linux/sockios.h>
+//#endif
+//#ifdef HAVE_NETINET_IN_SYSTM_H
+//#include <netinet/in_systm.h>
+//#endif
+//#ifdef HAVE_NETINET_IP_H
+//#include <netinet/ip.h>
+//#endif
 
-#include <net/ethernet.h>
+//#include <net/ethernet.h>
 
 #include "ocat.h"
 
diff --git a/src/ocatroute.c b/src/ocatroute.c
index 168c0c6..5c8dfaa 100644
--- a/src/ocatroute.c
+++ b/src/ocatroute.c
@@ -63,8 +63,6 @@
 
 // file descriptor of tcp listener
 int sockfd_[2];
-// file descriptors of control port
-//static int ctrlfd_[2];
 // file descriptors of socket_receiver pipe
 // used for internal communication
 static int lpfd_[2];
@@ -833,7 +831,7 @@ void packet_forwarder(void)
 }
 
 
-int send_keepalive(const OcatPeer_t *peer)
+int send_keepalive(OcatPeer_t *peer)
 {
    struct ip6_hdr hdr;
    int len;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onioncat.git