Changeset 550

Timestamp:

01/03/11 21:17:38 (17 months ago)

Author:

eagle

Message:

OC now works on DragonFly? BSD.
Misleading config file error message removed.
DNS interception started (but not in use yet).

Location:

trunk

Files:

• config.h.in (modified) (3 diffs)
• configure (modified) (11 diffs)
• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/Makefile.in (modified) (3 diffs)
• src/ocat.c (modified) (2 diffs)
• src/ocat.h (modified) (4 diffs)
• src/ocateth.c (modified) (1 diff)
• src/ocatresolv.c (added)
• src/ocatsetup.c (modified) (2 diffs)
• src/ocattun.c (modified) (1 diff)

trunk/config.h.in

@@ -9 +9 @@
 /* enable handling of accidental HTTP requests */
 #undef HANDLE_HTTP
+
+/* Define to 1 if you have the <arpa/nameser.h> header file. */
+#undef HAVE_ARPA_NAMESER_H
 
 /* Define to 1 if you have the <endian.h> header file. */
@@ -58 +61 @@
 #undef HAVE_NETINET_IP_H
 
+/* Define to 1 if you have the <netinet/udp.h> header file. */
+#undef HAVE_NETINET_UDP_H
+
 /* Define to 1 if you have the <net/ethernet.h> header file. */
 #undef HAVE_NET_ETHERNET_H
@@ -66 +72 @@
 /* Define to 1 if you have the <net/if_tun.h> header file. */
 #undef HAVE_NET_IF_TUN_H
+
+/* Define to 1 if you have the <net/tun/if_tun.h> header file. */
+#undef HAVE_NET_TUN_IF_TUN_H
 
 /* Define if you have POSIX threads libraries and header files. */

trunk/configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for onioncat 0.2.2.r549.
+# Generated by GNU Autoconf 2.62 for onioncat 0.2.2.r550.
 #
 # Report bugs to <rahra@cypherpunk.at>.
@@ -597 +597 @@
 PACKAGE_NAME='onioncat'
 PACKAGE_TARNAME='onioncat'
-PACKAGE_VERSION='0.2.2.r549'
-PACKAGE_STRING='onioncat 0.2.2.r549'
+PACKAGE_VERSION='0.2.2.r550'
+PACKAGE_STRING='onioncat 0.2.2.r550'
 PACKAGE_BUGREPORT='rahra@cypherpunk.at'
 
@@ -1263 +1263 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures onioncat 0.2.2.r549 to adapt to many kinds of systems.
+\`configure' configures onioncat 0.2.2.r550 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1333 +1333 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of onioncat 0.2.2.r549:";;
+     short | recursive ) echo "Configuration of onioncat 0.2.2.r550:";;
    esac
   cat <<\_ACEOF
@@ -1426 +1426 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-onioncat configure 0.2.2.r549
+onioncat configure 0.2.2.r550
 generated by GNU Autoconf 2.62
 
@@ -1440 +1440 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by onioncat $as_me 0.2.2.r549, which was
+It was created by onioncat $as_me 0.2.2.r550, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
@@ -2089 +2089 @@
 # Define the identity of the package.
  PACKAGE='onioncat'
- VERSION='0.2.2.r549'
+ VERSION='0.2.2.r550'
 
 
@@ -2240 +2240 @@
 
 cat >>confdefs.h <<\_ACEOF
-#define SVN_REVISION "549"
+#define SVN_REVISION "550"
 _ACEOF
 
@@ -4325 +4325 @@
 
 
-for ac_header in sys/types.h sys/wait.h sys/socket.h sys/stat.h netdb.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 netinet/icmp6.h net/ethernet.h netinet/if_ether.h netinet/ether.h sys/ethernet.h fcntl.h time.h
+
+
+
+for ac_header in sys/types.h sys/wait.h sys/socket.h sys/stat.h netdb.h arpa/nameser.h netinet/in.h netinet/in_systm.h netinet/ip.h netinet/ip6.h netinet/in6.h net/if.h net/if_tun.h net/tun/if_tun.h linux/if_tun.h linux/sockios.h endian.h sys/endian.h netinet/icmp6.h net/ethernet.h netinet/if_ether.h netinet/ether.h netinet/udp.h sys/ethernet.h fcntl.h time.h
 do
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -5945 +5948 @@
 # values after options handling.
 ac_log="
-This file was extended by onioncat $as_me 0.2.2.r549, which was
+This file was extended by onioncat $as_me 0.2.2.r550, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
@@ -5998 +6001 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-onioncat config.status 0.2.2.r549
+onioncat config.status 0.2.2.r550
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

trunk/configure.ac

@@ -61 +61 @@
 # Checks for header files.
 #AC_HEADER_STDC
-AC_CHECK_HEADERS([sys/types.h sys/wait.h sys/socket.h sys/stat.h netdb.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 netinet/icmp6.h net/ethernet.h netinet/if_ether.h netinet/ether.h sys/ethernet.h fcntl.h time.h], [], [],
+AC_CHECK_HEADERS([sys/types.h sys/wait.h sys/socket.h sys/stat.h netdb.h arpa/nameser.h netinet/in.h netinet/in_systm.h netinet/ip.h netinet/ip6.h netinet/in6.h net/if.h net/if_tun.h net/tun/if_tun.h linux/if_tun.h linux/sockios.h endian.h sys/endian.h netinet/icmp6.h net/ethernet.h netinet/if_ether.h netinet/ether.h netinet/udp.h sys/ethernet.h fcntl.h time.h], [], [],
 [[
 #ifdef HAVE_SYS_TYPES_H

trunk/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = ocat
-ocat_SOURCES = ocat.c ocatlog.c ocatroute.c ocatthread.c ocattun.c ocatv6conv.c ocatcompat.c ocatpeer.c ocatsetup.c ocatipv4route.c ocateth.c ocatsocks.c ocatlibe.c ocatctrl.c ocatipv6route.c ocaticmp.c ocat_wintuntap.c ocat_netdesc.c ocathosts.c
+ocat_SOURCES = ocat.c ocatlog.c ocatroute.c ocatthread.c ocattun.c ocatv6conv.c ocatcompat.c ocatpeer.c ocatsetup.c ocatipv4route.c ocateth.c ocatsocks.c ocatlibe.c ocatctrl.c ocatipv6route.c ocaticmp.c ocat_wintuntap.c ocat_netdesc.c ocathosts.c ocatresolv.c
 noinst_HEADERS = ocat.h ocat_netdesc.h strlcpy.c strlcat.c ocathosts.h
 AM_CFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\"

trunk/src/Makefile.in

@@ -59 +59 @@
         ocatlibe.$(OBJEXT) ocatctrl.$(OBJEXT) ocatipv6route.$(OBJEXT) \
         ocaticmp.$(OBJEXT) ocat_wintuntap.$(OBJEXT) \
-        ocat_netdesc.$(OBJEXT) ocathosts.$(OBJEXT)
+        ocat_netdesc.$(OBJEXT) ocathosts.$(OBJEXT) \
+        ocatresolv.$(OBJEXT)
 ocat_OBJECTS = $(am_ocat_OBJECTS)
 ocat_LDADD = $(LDADD)
@@ -164 +165 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-ocat_SOURCES = ocat.c ocatlog.c ocatroute.c ocatthread.c ocattun.c ocatv6conv.c ocatcompat.c ocatpeer.c ocatsetup.c ocatipv4route.c ocateth.c ocatsocks.c ocatlibe.c ocatctrl.c ocatipv6route.c ocaticmp.c ocat_wintuntap.c ocat_netdesc.c ocathosts.c
+ocat_SOURCES = ocat.c ocatlog.c ocatroute.c ocatthread.c ocattun.c ocatv6conv.c ocatcompat.c ocatpeer.c ocatsetup.c ocatipv4route.c ocateth.c ocatsocks.c ocatlibe.c ocatctrl.c ocatipv6route.c ocaticmp.c ocat_wintuntap.c ocat_netdesc.c ocathosts.c ocatresolv.c
 noinst_HEADERS = ocat.h ocat_netdesc.h strlcpy.c strlcat.c ocathosts.h
 AM_CFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\"
@@ -246 +247 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ocatlog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ocatpeer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ocatresolv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ocatroute.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ocatsetup.Po@am__quote@

trunk/src/ocat.c

@@ -472 +472 @@
       CNF(config_failed) = errno;
       CNF(config_read) = 1;
+      log_debug("opening config file \"%s\" failed: \"%s\"", CNF(config_file), strerror(CNF(config_failed)));
    }
    else
@@ -502 +503 @@
    detach_thread();
 
-   if (CNF(config_failed))
+   if (CNF(config_failed) && (CNF(config_failed != ENOENT)))
       log_msg(LOG_NOTICE, "could not open config file %s: %s", CNF(config_file), strerror(CNF(config_failed)));
 

trunk/src/ocat.h

@@ -85 +85 @@
 #include <netinet/ip6.h>
 #endif
+#ifdef HAVE_NETINET_UDP_H
+#include <netinet/udp.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
 #ifdef HAVE_NET_ETHERNET_H
 #include <net/ethernet.h>
@@ -96 +102 @@
 #ifdef HAVE_NET_IF_TUN_H
 #include <net/if_tun.h>
+#endif
+#ifdef HAVE_NET_TUN_IF_TUN_H
+#include <net/tun/if_tun.h>
 #endif
 
@@ -341 +350 @@
    int sig_usr1, clear_stats;
    int hosts_lookup;
+   struct in6_addr oc_vdns;
 };
 
@@ -658 +668 @@
 #endif
 
-
-#endif
-
+/* ocatresolv.c */
+int check_dns(const struct ip6_hdr *, int);
+
+#endif
+

trunk/src/ocateth.c

@@ -38 +38 @@
  * RFC2461 is obsoleted by RFC4861
  * RFC4862 IPv6 Stateless Address Autoconfiguration
+ * RFC4443 ICMP6 (updates 2780, obsoletes 2463) (20101230)
  */
 

trunk/src/ocatsetup.c

@@ -205 +205 @@
 #endif
    setup_.pid_file = NDESC(pid_file);
+   setup_.oc_vdns = NDESC(prefix);
+   setup_.oc_vdns.s6_addr[15] = 1;
 }
 
@@ -349 +351 @@
          log_msg(LOG_WARNING, "could not convert struct sockaddr: \"%s\"", strerror(errno));
    }
+
+   inet_ntop(AF_INET6, &setup_.oc_vdns, ip6, SBUF);
+   fprintf(f, "ocat_dir               = %s\n", ip6);
 }
 

trunk/src/ocattun.c

@@ -144 +144 @@
    */
 
-#ifdef __FreeBSD__
+#if defined __FreeBSD__ || defined __DragonFly__
 
    int prm = 1;