[Pkg-privacy-commits] [onioncat] 94/340: git-svn-id: http://www.cypherpunk.at/svn/onioncat/trunk at 385 58e1ccc2-750e-0410-8d0d-f93ca75ab447
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 13:04:28 UTC 2015
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch debian
in repository onioncat.
commit 262587319207af7115cbdec55f4966a8ad35adf6
Author: eagle <eagle at 58e1ccc2-750e-0410-8d0d-f93ca75ab447>
Date: Wed Dec 10 11:57:51 2008 +0000
git-svn-id: http://www.cypherpunk.at/svn/onioncat/trunk@385 58e1ccc2-750e-0410-8d0d-f93ca75ab447
---
config.h.in | 3 +++
configure | 3 ++-
configure.ac | 2 +-
src/ocat.h | 3 ---
src/ocatipv6route.c | 5 ++++-
src/ocatroute.c | 6 +++---
src/ocattun.c | 3 ---
7 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/config.h.in b/config.h.in
index 0fda4b9..92c804e 100644
--- a/config.h.in
+++ b/config.h.in
@@ -21,6 +21,9 @@
/* Define to 1 if you have the <linux/sockios.h> header file. */
#undef HAVE_LINUX_SOCKIOS_H
+/* Define to 1 if you have the <netinet/icmp6.h> header file. */
+#undef HAVE_NETINET_ICMP6_H
+
/* Define to 1 if you have the <netinet/in6.h> header file. */
#undef HAVE_NETINET_IN6_H
diff --git a/configure b/configure
index 3e35072..02a2205 100755
--- a/configure
+++ b/configure
@@ -3407,7 +3407,8 @@ fi
-for ac_header in sys/types.h sys/socket.h netinet/in.h netinet/in_systm.h netinet/ip.h netinet/ip6.h netinet/in6.h net/if.h net/if_tun.h linux/if_tun.h linux/sockios.h endian.h sys/endian.h net/ethernet.h
+
+for ac_header in sys/types.h sys/socket.h netinet/in.h netinet/in_systm.h netinet/ip.h netinet/ip6.h netinet/in6.h net/if.h net/if_tun.h linux/if_tun.h linux/sockios.h endian.h sys/endian.h net/ethernet.h netinet/icmp6.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_header" >&5
diff --git a/configure.ac b/configure.ac
index 40caa18..ffac0a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ AC_CHECK_LIB([pthread], [pthread_create])
# Checks for header files.
#AC_HEADER_STDC
#AC_CHECK_HEADERS([arpa/inet.h fcntl.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h unistd.h])
-AC_CHECK_HEADERS([sys/types.h sys/socket.h netinet/in.h netinet/in_systm.h netinet/ip.h netinet/ip6.h netinet/in6.h net/if.h net/if_tun.h linux/if_tun.h linux/sockios.h endian.h sys/endian.h net/ethernet.h], [], [],
+AC_CHECK_HEADERS([sys/types.h sys/socket.h netinet/in.h netinet/in_systm.h netinet/ip.h netinet/ip6.h netinet/in6.h net/if.h net/if_tun.h linux/if_tun.h linux/sockios.h endian.h sys/endian.h net/ethernet.h netinet/icmp6.h], [], [],
[[
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
diff --git a/src/ocat.h b/src/ocat.h
index e30b443..59ca7ae 100644
--- a/src/ocat.h
+++ b/src/ocat.h
@@ -40,9 +40,6 @@
#ifdef HAVE_NET_ETHERNET_H
#include <net/ethernet.h>
#endif
-//#ifdef HAVE_NETINET_IF_ETHER_H
-//#include <netinet/if_ether.h>
-//#endif
#include <netinet/icmp6.h>
#include <syslog.h>
diff --git a/src/ocatipv6route.c b/src/ocatipv6route.c
index 6808742..49c204e 100644
--- a/src/ocatipv6route.c
+++ b/src/ocatipv6route.c
@@ -27,9 +27,12 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <arpa/inet.h>
-#include <netinet/in.h>
#include <errno.h>
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
#include "ocat.h"
diff --git a/src/ocatroute.c b/src/ocatroute.c
index 819864f..366df2d 100644
--- a/src/ocatroute.c
+++ b/src/ocatroute.c
@@ -42,15 +42,15 @@
#ifdef HAVE_LINUX_SOCKIOS_H
#include <linux/sockios.h>
#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
#ifdef HAVE_NETINET_IN_SYSTM_H
#include <netinet/in_systm.h>
#endif
#ifdef HAVE_NETINET_IP_H
#include <netinet/ip.h>
#endif
-/*#ifdef HAVE_NETINET_IF_ETHER_H
-#include <netinet/if_ether.h>
-#endif*/
#include "ocat.h"
diff --git a/src/ocattun.c b/src/ocattun.c
index 5e09543..b581473 100644
--- a/src/ocattun.c
+++ b/src/ocattun.c
@@ -46,9 +46,6 @@
#ifdef HAVE_NET_IF_TUN_H
#include <net/if_tun.h>
#endif
-/*#ifdef HAVE_NETINET_IF_ETHER_H
-#include <netinet/if_ether.h>
-#endif*/
#include "ocat.h"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onioncat.git
More information about the Pkg-privacy-commits
mailing list