[hipl-commit] [trunk] Rev 4099: Remove all Android-related infrastructure and hacks.

  • From: Diego Biurrun <diego@xxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Tue, 30 Mar 2010 15:42:47 +0300

Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 30/03/2010 at 15:42:47
Revision: 4099
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  Remove all Android-related infrastructure and hacks.
  
  The Android port is broken and non-functional.  It was never updated
  for the slew of changes in the past few months.  Should interest in an
  Android port reappear it should be redone in a less intrusive fashion.

Modified:
  D  Android.mk
  D  lib/android/
  D  lib/android/icmp6.h
  D  lib/android/libhipandroid.c
  D  lib/android/libhipandroid.h
  D  lib/android/libipq.c
  D  lib/android/regex.c
  D  lib/android/regex.h
  M  COPYING
  M  Makefile.am
  M  check_header_verbosity.sh
  M  configure.ac
  M  doc/HOWTO.xml
  M  doc/verbose-header-files.txt
  M  doc/verbose-headers.txt
  M  firewall/firewall.c
  M  firewall/user_ipsec_esp.c
  M  firewall/user_ipsec_sadb.c
  M  firewall/user_ipsec_sadb.h
  M  hipd/init.c
  M  lib/core/crypto.c
  M  lib/core/filemanip.h

=== modified file 'COPYING'
--- COPYING     2010-03-25 17:36:15 +0000
+++ COPYING     2010-03-30 12:41:08 +0000
@@ -34,7 +34,6 @@
 
   * firewall/user_ipsec_esp.c
   * tools/DNS
-  * lib/android
   * lib/tool
   * lib/ipsec
   * i3

=== modified file 'Makefile.am'
--- Makefile.am 2010-03-29 22:07:01 +0000
+++ Makefile.am 2010-03-30 12:41:08 +0000
@@ -7,10 +7,10 @@
 # XX FIX: use dist_doc_DATA for all documentation (if you change this,
 # make sure the check the "make bin" still works)
 #
-EXTRA_DIST =  .vimrc debian doc hipext hipfwmi lib/android patches
+EXTRA_DIST =  .vimrc debian doc hipext hipfwmi patches
 EXTRA_DIST += test/configs test/demo test/maintainer test/openwrt
 EXTRA_DIST += test/packaging test/packets test/performance
-EXTRA_DIST += Android.mk autogen.sh check_header_verbosity.sh i3-cfg-PL.xml
+EXTRA_DIST += autogen.sh check_header_verbosity.sh i3-cfg-PL.xml
 EXTRA_DIST += release.version tcp verbose-headers.txt
 EXTRA_DIST += $(wildcard $(addprefix $(srcdir)/test/,*.cgi *.pl *.py *.sh))
 EXTRA_DIST += $(wildcard $(addprefix $(srcdir)/tools/,*.cfg *.pl *.py *.sh))
@@ -639,7 +639,7 @@
        rm -f ltmain.sh m4/*.m4 Makefile.in missing py-compile
 
 # Do not check headers that have issues we cannot fix.
-NOCHECK_HEADER_LIST = $(wildcard $(srcdir)/lib/gui/*.h 
$(srcdir)/lib/android/*.h)
+NOCHECK_HEADER_LIST = $(wildcard $(srcdir)/lib/gui/*.h)
 HIPL_HEADER_FILTERED = $(filter-out $(NOCHECK_HEADER_LIST),$(HIPL_HEADER_LIST))
 HIPL_HEADER_OBJS = $(subst 
$(srcdir),$(builddir),$(HIPL_HEADER_FILTERED:.h=.ho))
 CLEANFILES += $(HIPL_HEADER_OBJS)

=== modified file 'check_header_verbosity.sh'
--- check_header_verbosity.sh   2010-03-26 01:26:05 +0000
+++ check_header_verbosity.sh   2010-03-30 12:41:08 +0000
@@ -45,4 +45,4 @@
 TEMPFILE=$(mktemp)
 find_verbous_decls searchtags_local_headers $TEMPFILE
 
-grep -vE "android|i3|_H$" $TEMPFILE | sort -u >| verbose-headers.txt
+grep -vE "i3|_H$" $TEMPFILE | sort -u >| verbose-headers.txt

=== modified file 'configure.ac'
--- configure.ac        2010-03-29 19:52:05 +0000
+++ configure.ac        2010-03-30 12:41:08 +0000
@@ -34,11 +34,6 @@
 # We need the math lib in the registration extension.
 AC_CHECK_LIB(m, pow,, AC_MSG_ERROR(Math lib not found))
 
-# Checks for header files.
-# libintl.h and alloca.h are only used in libhipandroid/regex.c
-# REMOVE IF POSSIBLE
-AC_CHECK_HEADERS([alloca.h libintl.h])
-
 case "$host" in
   alpha*)
     TARGET=ALPHA;

=== modified file 'doc/HOWTO.xml'
--- doc/HOWTO.xml       2010-03-26 01:26:05 +0000
+++ doc/HOWTO.xml       2010-03-30 12:41:08 +0000
@@ -1589,318 +1589,6 @@
       </section>
 
   </section>
-
-  <section id="android"> <!-- android -->
-    <title>HIPL on Android</title>
-    <para>
-        This section explains how to install HIP on Android (emulator or a 
real device). See <ulink url="http://infrahip.hiit.fi/hipl/contrib/android/"; /> 
for binary images.
-    </para>
-
-    <section> <!-- Prerequisites -->
-      <title>Prerequisites</title>
-      <orderedlist>
-        <listitem>
-          <para>
-            The kernel needs to be updated to support the various
-            features required by HIPL that aren't present in the
-            standard distribution. These include ipv6 support and
-            various IPSec- and packet filtering related options
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            iptables and ip6tables tool. Android ships with iptables,
-            so we would also need ip6tables
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Any ipv6 ready tool for testing connectivity. Like ping6 or wget
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            There is no DNS proxy support. The one in HIPL is written in 
python, which
-            cannot be run in Android due to lack of python support. So the 
mappings will
-            have to be added in "/etc/hosts" or "/data/hip/hosts" file
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            There is no LD_PRELOAD support. The reasons being: Android'd 
linker doesn't have support
-            for LD_PRELOAD environment variable, and also most of the Android 
applications are java
-            based, they are launched in a different way, not much use for 
LD_PRELOAD.
-          </para>
-        </listitem>
-      </orderedlist>
-    </section> <!-- Prerequisites -->
-
-    <section> <!-- Precompiled binaries -->
-      <title>Installing/Running from pre-compiled binaries</title>
-
-      <para>
-        We are providing precompiled images for emulator and Android "HTC 
Dream" G1, though
-        they may not be always uptodate, so compiling from source is 
recommended.
-      </para>
-      <orderedlist>
-        <listitem>
-          <para>Emulator</para>
-          <orderedlist>
-            <listitem>
-              <para>
-                Download and unzip the SDK (android-sdk-hipl*.zip) from the
-                <ulink 
url="http://infrahip.hiit.fi/index.php?index=download";>infrahip page</ulink>
-              </para>
-            </listitem>
-            <listitem>
-              <para>Run the emulator</para>
-              <para>
-                <programlisting>
-$ cd android-sdk
-$ tools/emulator -data platforms/android-1.5/images/userdata.img &amp;
-                </programlisting>
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                Test the connection
-                <programlisting>
-$ tools/adb shell # Log into emulator shell
-# hipd -k 2>/dev/null &amp;
-# hipfw -klpF 2>/dev/null &amp;
-# hipconf add map 2001:1b:a9be:c6a6:34e5:8361:c07f:a990 193.167.187.134 # We 
don't have dns proxy
-# wget http://[2001:001b:a9be:c6a6:34e5:8361:c07f:a990] -O- #LSI also can be 
used here</programlisting>
-            If you need to see the output, run each binary in its own "adb 
shell".
-              </para>
-            </listitem>
-          </orderedlist>
-        </listitem>
-
-        <listitem>
-          <para>Device - Android "HTC Dream" G1</para>
-          <para>
-            Please see
-            <ulink 
url="http://source.android.com/documentation/building-for-dream";>here</ulink>
-            for more generic details
-          </para>
-          <orderedlist>
-            <listitem>
-              <para>Download the pre-compiled flashable 
images(android-dream-hipl*.zip) from the
-                <ulink 
url="http://infrahip.hiit.fi/index.php?index=download";>infrahip page</ulink>
-                and unzip them
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                Flash the downloaded images(boot.img and system.img)
-                into device by following the instructions at
-                <ulink 
url="http://www.htc.com/www/support/android/adp.html";>HTC page</ulink>.
-                We don't need to update all the images, just the boot and 
system images.
-                <programlisting>
-$ ./fastboot boot boot.img
-$ ./fastboot system system.img</programlisting>
-              </para>
-              <para>
-                <emphasis role="bold">WARNING: The system and boot partitions 
will be
-                  overwritten, though the data partition would remain 
same</emphasis>
-              </para>
-            </listitem>
-            <listitem>
-              <para>Test the connection</para>
-              <para>Remember to connect the device into USB port
-                <programlisting>
-$ tools/adb shell # Log into device shell
-# hipd -k 2>/dev/null &amp;
-# hipfw -klpF 2>/dev/null &amp;
-# hipconf add map 2001:1b:a9be:c6a6:34e5:8361:c07f:a990 193.167.187.134 # We 
don't have dns proxy
-# wget http://[2001:001b:a9be:c6a6:34e5:8361:c07f:a990] -O- #LSI also can be 
used here</programlisting>
-            If you need to see the output, run each binary in its own "adb 
shell".
-              </para>
-            </listitem>
-          </orderedlist>
-        </listitem>
-
-      </orderedlist>
-    </section> <!-- Precompiled binaries -->
-
-    <section> <!-- Compiling from source -->
-      <title>Compiling from source</title>
-      <para>This section explains how to compile HIP either for emulator or a 
device</para>
-      <orderedlist>
-
-        <listitem> <!-- Compiling for emulator -->
-          <para>Compiling for emulator</para>
-          <orderedlist>
-            <listitem>
-              <para>
-                Get source by following the guidelines specified at
-                <ulink 
url="http://source.android.com/download";>android.com</ulink>. Use "cupcake" 
branch
-              </para>
-            </listitem>
-            <listitem>
-              <para>Inside .repo directory(within android source directory), 
create a file called
-                "local_manifest.xml". This file contains description of extra 
packages required for
-                HIP support
-                <programlisting><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <remote  name="surki-github" fetch="git://github.com/surki/" />
-
-  <remove-project name="platform/external/iptables" />
-
-  <project path="kernel" name="kernel/common" 
revision="refs/heads/android-goldfish-2.6.29" />
-  <project path="external/iptables" name="iptables" 
revision="refs/heads/android-hipl" remote="surki-github" />
-  <project path="external/wget" name="wget" revision="refs/heads/android-hipl" 
remote="surki-github" />
-  <project path="external/hipl" name="hipl" revision="refs/heads/android-hipl" 
remote="surki-github" />
-</manifest>]]></programlisting>and do a <programlisting>repo 
sync</programlisting>
-                which will bring all the HIPL specific changes into local 
repository
-              </para>
-            </listitem>
-            <listitem>
-              <para>Compile the source</para>
-              <para>
-                <programlisting>
-$ cd ~/src/mydroid #Android source directory
-$ source build/envsetup.sh
-$ lunch generic-eng #Chooses a generic build for emulator and sets up the 
required env. variables
-$ make TARGET_PRODUCT:=generic</programlisting>
-              </para>
-            </listitem>
-            <listitem>
-              <para>Compile the kernel
-              <programlisting>
-$ cd ~/src/mydroid #Android source directory
-$ source build/envsetup.sh
-$ lunch generic-eng #Chooses a generic build and sets up the required env. 
variables
-$ cd kernel # Kernel source
-$ export CROSS_COMPILE=arm-eabi- ARCH=arm
-$ make goldfish_defconfig
-$ make menuconfig #To select HIPL specific kernel options</programlisting>
-              Select the HIP specific kernel options as mentioned in HIP
-              <link linkend="ch_kernel">"Compiling the Kernel"</link> page.
-              <programlisting>$ make</programlisting>
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                Test the connection
-                <programlisting>
-$ export PATH=$PATH:~/src/mydroid/out/host/linux-x86/bin
-$ emulator -kernel kernel/arch/arm/boot/zImage -system 
out/target/product/generic/system.img -data 
out/target/product/generic/userdata.img &amp;
-$ adb shell # Log into emulator shell
-# hipd -k 2>/dev/null &amp;
-# hipfw -klpF 2>/dev/null &amp;
-# hipconf add map 2001:1b:a9be:c6a6:34e5:8361:c07f:a990 193.167.187.134 # We 
don't have dns proxy
-# wget http://[2001:001b:a9be:c6a6:34e5:8361:c07f:a990] -O- #LSI also can be 
used here</programlisting>
-                If you need to debug, run each binary in its own "adb shell".
-              </para>
-            </listitem>
-
-          </orderedlist>
-        </listitem> <!-- Compiling for emulator -->
-
-        <listitem> <!-- Compiling for device -->
-          <para>Compiling for device Android "HTC Dream" G1</para>
-          <para>Please refer to
-            <ulink 
url="http://source.android.com/documentation/building-for-dream";>Android 
site</ulink>
-            for more generic details
-          </para>
-          <orderedlist>
-            <listitem><para>Get the source(follow it up from Android site). 
Cupcake</para></listitem>
-            <listitem>
-              <para>Apply this local manifest
-                <programlisting>
-                  <![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <remote  name="surki-github" fetch="git://github.com/surki/" />
-
-  <remove-project name="platform/external/iptables" />
-
-  <project path="kernel" name="kernel/common" 
revision="refs/heads/android-msm-2.6.29" />
-  <project path="external/iptables" name="iptables" 
revision="refs/heads/android-hipl" remote="surki-github" />
-  <project path="external/wget" name="wget" revision="refs/heads/android-hipl" 
remote="surki-github" />
-  <project path="external/hipl" name="hipl" revision="refs/heads/android-hipl" 
remote="surki-github" />
-</manifest>]]></programlisting>and do a <programlisting>repo 
sync</programlisting>
-              </para>
-            </listitem>
-            <listitem><para>Compile the kernel as specified in the above 
section</para></listitem>
-            <listitem>
-              <para>
-                <programlisting>make TARGET_PRODUCT:=dream 
TARGET_PREBUILT_KERNEL:=kernel/arch/arm/boot/zImage</programlisting>
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                Flash the built images(boot.img and system.img)
-                into device by following the instructions at
-                <ulink 
url="http://www.htc.com/www/support/android/adp.html";>HTC page</ulink>.
-                We don't need to update all the images,
-                just the boot and system images.
-                <programlisting>
-$ fastboot boot out/target/product/dream-open/boot.img
-$ fastboot system out/target/product/dream-open/system.img</programlisting>
-              </para>
-              <para>
-                <emphasis role="bold">WARNING: The system and boot partitions 
will be
-                  overwritten, though the data partition would remain 
same</emphasis>
-              </para>
-            </listitem>
-            <listitem>
-              <para>Test the connection</para>
-              <para>Remember to connect the device into USB port
-                <programlisting>
-$ tools/adb shell # Log into device shell
-# hipd -k 2>/dev/null &amp;
-# hipfw -klpF 2>/dev/null &amp;
-# hipconf add map 2001:1b:a9be:c6a6:34e5:8361:c07f:a990 193.167.187.134 # We 
don't have dns proxy
-# wget http://[2001:001b:a9be:c6a6:34e5:8361:c07f:a990] -O- #LSI also can be 
used here</programlisting>
-            If you need to see the output, run each binary in its own "adb 
shell".
-              </para>
-            </listitem>
-            <listitem>
-              <para>Flashing the device</para>
-            </listitem>
-          </orderedlist>
-        </listitem> <!-- Compiling for device -->
-      </orderedlist>
-    </section> <!-- Compile from source -->
-
-    <section> <!-- Notes -->
-      <title>Notes</title>
-      <orderedlist>
-        <listitem>
-          <para>
-            During development, to update hip binaries, you will have to use 
"adb".
-            So use something like
-            <programlisting>$ adb sync</programlisting>
-            from the android source directory
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            During development, to update hip binaries, you will have to 
remount
-            /system partition read/write(by default system directory is 
readonly).
-            So use something like
-            <programlisting># mount -oremount,rw /dev/block/mtdblock0 
/system</programlisting>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            HIP configuration files are located at "/data/hip/"
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            hipd crashes sometimes when run in simulator. Restarting will be
-            required if it crashes
-          </para>
-        </listitem>
-      </orderedlist>
-    </section> <!-- Notes -->
-  </section> <!-- android -->
   </chapter> <!-- inst -->
 
   <chapter id="ch_prebuilt">

=== modified file 'doc/verbose-header-files.txt'
--- doc/verbose-header-files.txt        2010-03-29 14:13:13 +0000
+++ doc/verbose-header-files.txt        2010-03-30 12:41:08 +0000
@@ -47,7 +47,6 @@
 libhipcore/state.h : ADDR_STATE_WAITING_ECHO_REQ
 libhiptool/xfrm.h : add_time
 firewall/user_ipsec_esp.h : add_udp_header
-libhipandroid/regex.h : allocated
 firewall/rule_management.h : alloc_empty_rule
 firewall/dlist.h : alloc_list
 firewall/hslist.h : alloc_slist
@@ -67,7 +66,6 @@
 libhipcore/hip_statistics.h : calc_avg
 libhipcore/hip_statistics.h : calc_std_dev
 libhiptool/xfrm.h : calgos
-libhipandroid/regex.h : can_be_null
 libhipgui/tools.h : check_apply_group
 libhipgui/tools.h : check_apply_hit
 libhipgui/tools.h : check_name_group
@@ -142,20 +140,16 @@
 hipd/esp_prot_hipd_msg.h : esp_prot_update_add_anchor
 firewall/rule_management.h : ESTABLISHED_STR
 libhipcore/esp_prot_common.h : EXT_ESP_PROT_COMMON_H_
-libhipandroid/regex.h : fastmap
-libhipandroid/regex.h : fastmap_accurate
 performance/performance.h : files_open
 firewall/firewall_control.h : FIREWALL_CONTROL_H_
 firewall/firewall_defines.h : FIREWALL_DEFINES_H_
 libhipcore/icomm.h : firewall_hl
 libhipcore/icomm.h : firewall_port_cache_hl
-libhipandroid/libhipandroid /usr/include/fcntl /usr/include/unistd.h : F_LOCK
 hipd/maintenance.h : FORCE_EXIT_COUNTER_START
 firewall/rule_management.h : FORWARD_STR
 libhipcore/linkedlist.h : free_elem_fn_t
 firewall/dlist.h : free_list_chain
 firewall/rule_management.h : free_rule
-libhipandroid/libhipandroid /usr/include/fcntl /usr/include/unistd.h : F_TEST
 libhiptool/nlink.h : get_ctl_fd
 libhipcore/ife.h : GOTO_OUT
 libhipgui/hipgui.h : gui_hit_local_add
@@ -584,147 +578,12 @@
 libhipcore/hashtree.h : htree_print_data
 libhipcore/hashtree.h : htree_print_nodes
 agent/str_var.h : HUGE_STRING
-libhipandroid/libhipandroid.h : icmp6_checksum
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : icmp6_data16
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : icmp6_data32
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : icmp6_data8
-libhipandroid/icmp6 /usr/include/linux/icmpv6 /usr/include/netinet/icmp6.h : 
icmp6_dataun
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ICMP6_DST_UNREACH
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ICMP6_DST_UNREACH_ADDR
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ICMP6_DST_UNREACH_ADMIN
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : 
ICMP6_DST_UNREACH_BEYONDSCOPE
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ICMP6_DST_UNREACH_NOPORT
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ICMP6_DST_UNREACH_NOROUTE
-libhipandroid/icmp6 : ICMP6_DST_UNREACH_NOTNEIGHBOR
-libhipandroid/icmp6.h : icmp6errstat
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : icmp6_filt
-hipd/init libhipandroid/icmp6 /usr/include/netinet/icmp6.h : 
ICMP6_FILTER_SETBLOCK
-hipd/init libhipandroid/icmp6 /usr/include/netinet/icmp6.h : 
ICMP6_FILTER_SETBLOCKALL
-hipd/init libhipandroid/icmp6 /usr/include/netinet/icmp6.h : 
ICMP6_FILTER_SETPASS
-hipd/init libhipandroid/icmp6 /usr/include/netinet/icmp6.h : 
ICMP6_FILTER_SETPASSALL
-hipd/init libhipandroid/icmp6 /usr/include/netinet/icmp6.h : 
ICMP6_FILTER_WILLBLOCK
-hipd/init libhipandroid/icmp6 /usr/include/netinet/icmp6.h : 
ICMP6_FILTER_WILLPASS
-libhipandroid/icmp6.h : ICMP6_FQDN_QUERY
-libhipandroid/icmp6.h : ICMP6_FQDN_REPLY
-libhipandroid/icmp6.h : icmp6_ifoutstat_inc
-libhipandroid/icmp6.h : icmp6_ifstat_inc
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ICMP6_INFOMSG_MASK
-libhipandroid/icmp6 /usr/include/linux/icmpv6 /usr/include/netinet/icmp6.h : 
icmp6_maxdelay
-libhipandroid/icmp6.h : ICMP6_MAXTYPE
-libhipandroid/icmp6 : ICMP6_MEMBERSHIP_QUERY
-libhipandroid/icmp6 : ICMP6_MEMBERSHIP_REDUCTION
-libhipandroid/icmp6 : ICMP6_MEMBERSHIP_REPORT
-libhipandroid/icmp6 /usr/include/linux/icmpv6 /usr/include/netinet/icmp6.h : 
icmp6_mtu
-libhipandroid/icmp6.h : icmp6_namelookup
-libhipandroid/icmp6 : icmp6_ni_hdr
-libhipandroid/icmp6 : icmp6_ni_nonce
-libhipandroid/icmp6 : ICMP6_NI_QUERY
-libhipandroid/icmp6 : ICMP6_NI_REFUSED
-libhipandroid/icmp6 : ICMP6_NI_REPLY
-libhipandroid/icmp6 : ICMP6_NI_SUBJ_FQDN
-libhipandroid/icmp6 : ICMP6_NI_SUBJ_IPV4
-libhipandroid/icmp6 : ICMP6_NI_SUBJ_IPV6
-libhipandroid/icmp6 : ICMP6_NI_SUCCESS
-libhipandroid/icmp6 : ICMP6_NI_UNKNOWN
-libhipandroid/icmp6.h : icmp6_nl_hdr
-libhipandroid/icmp6.h : icmp6_nl_nonce
-libhipandroid/icmp6.h : icmp6_nl_ttl
-libhipandroid/icmp6 : icmp6_nodeinfo
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ICMP6_PACKET_TOO_BIG
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ICMP6_PARAM_PROB
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ICMP6_PARAMPROB_HEADER
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ICMP6_PARAMPROB_NEXTHEADER
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ICMP6_PARAMPROB_OPTION
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : icmp6_pptr
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : icmp6_router_renum
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ICMP6_ROUTER_RENUMBERING
-libhipandroid/icmp6 : ICMP6_ROUTER_RENUMBERING_COMMAND
-libhipandroid/icmp6 : ICMP6_ROUTER_RENUMBERING_RESULT
-libhipandroid/icmp6 : ICMP6_ROUTER_RENUMBERING_SEQNUM_RESET
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ICMP6_RR_FLAGS_FORCEAPPLY
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ICMP6_RR_FLAGS_PREVDONE
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ICMP6_RR_FLAGS_REQRESULT
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ICMP6_RR_FLAGS_SPECSITE
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ICMP6_RR_FLAGS_TEST
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : 
ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : 
ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ICMP6_RR_PCOUSE_RAFLAGS_AUTO
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : 
ICMP6_RR_PCOUSE_RAFLAGS_ONLINK
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : 
ICMP6_RR_RESULT_FLAGS_FORBIDDEN
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ICMP6_RR_RESULT_FLAGS_OOB
-libhipandroid/icmp6.h : icmp6stat
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ICMP6_TIME_EXCEEDED
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ICMP6_TIME_EXCEED_REASSEMBLY
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ICMP6_TIME_EXCEED_TRANSIT
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : icmp6_un_data16
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : icmp6_un_data32
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : icmp6_un_data8
-libhipandroid/icmp6.h : ICMP6_WRUREPLY
-libhipandroid/icmp6.h : ICMP6_WRUREQUEST
-libhipandroid/icmp6.h : ICMPV6CTL_ERRPPSLIMIT
-libhipandroid/icmp6.h : ICMPV6CTL_MAXID
-libhipandroid/icmp6.h : ICMPV6CTL_MTUDISC_HIWAT
-libhipandroid/icmp6.h : ICMPV6CTL_MTUDISC_LOWAT
-libhipandroid/icmp6.h : ICMPV6CTL_NAMES
-libhipandroid/icmp6.h : ICMPV6CTL_ND6_DEBUG
-libhipandroid/icmp6.h : ICMPV6CTL_ND6_DELAY
-libhipandroid/icmp6.h : ICMPV6CTL_ND6_DRLIST
-libhipandroid/icmp6.h : ICMPV6CTL_ND6_MAXNUDHINT
-libhipandroid/icmp6.h : ICMPV6CTL_ND6_MMAXTRIES
-libhipandroid/icmp6.h : ICMPV6CTL_ND6_PRLIST
-libhipandroid/icmp6.h : ICMPV6CTL_ND6_PRUNE
-libhipandroid/icmp6.h : ICMPV6CTL_ND6_UMAXTRIES
-libhipandroid/icmp6.h : ICMPV6CTL_ND6_USELOOPBACK
-libhipandroid/icmp6.h : ICMPV6CTL_NODEINFO
-libhipandroid/icmp6.h : ICMPV6CTL_REDIRACCEPT
-libhipandroid/icmp6.h : ICMPV6CTL_REDIRTIMEOUT
-libhipandroid/icmp6.h : ICMPV6CTL_STATS
-libhipandroid/icmp6.h : ICMPV6_PLD_MAXLEN
-libhipandroid/icmp6.h : icp6errs_dst_unreach_addr
-libhipandroid/icmp6.h : icp6errs_dst_unreach_admin
-libhipandroid/icmp6.h : icp6errs_dst_unreach_beyondscope
-libhipandroid/icmp6.h : icp6errs_dst_unreach_noport
-libhipandroid/icmp6.h : icp6errs_dst_unreach_noroute
-libhipandroid/icmp6.h : icp6errs_packet_too_big
-libhipandroid/icmp6.h : icp6errs_paramprob_header
-libhipandroid/icmp6.h : icp6errs_paramprob_nextheader
-libhipandroid/icmp6.h : icp6errs_paramprob_option
-libhipandroid/icmp6.h : icp6errs_redirect
-libhipandroid/icmp6.h : icp6errs_time_exceed_reassembly
-libhipandroid/icmp6.h : icp6errs_time_exceed_transit
-libhipandroid/icmp6.h : icp6errs_unknown
-libhipandroid/icmp6.h : icp6s_badcode
-libhipandroid/icmp6.h : icp6s_badlen
-libhipandroid/icmp6.h : icp6s_badna
-libhipandroid/icmp6.h : icp6s_badns
-libhipandroid/icmp6.h : icp6s_badra
-libhipandroid/icmp6.h : icp6s_badredirect
-libhipandroid/icmp6.h : icp6s_badrs
-libhipandroid/icmp6.h : icp6s_canterror
-libhipandroid/icmp6.h : icp6s_checksum
-libhipandroid/icmp6.h : icp6s_error
-libhipandroid/icmp6.h : icp6s_inhist
-libhipandroid/icmp6.h : icp6s_nd_badopt
-libhipandroid/icmp6.h : icp6s_nd_toomanyopt
-libhipandroid/icmp6.h : icp6s_odst_unreach_addr
-libhipandroid/icmp6.h : icp6s_odst_unreach_admin
-libhipandroid/icmp6.h : icp6s_odst_unreach_beyondscope
-libhipandroid/icmp6.h : icp6s_odst_unreach_noport
-libhipandroid/icmp6.h : icp6s_odst_unreach_noroute
-libhipandroid/icmp6.h : icp6s_opacket_too_big
-libhipandroid/icmp6.h : icp6s_oparamprob_header
-libhipandroid/icmp6.h : icp6s_oparamprob_nextheader
-libhipandroid/icmp6.h : icp6s_oparamprob_option
-libhipandroid/icmp6.h : icp6s_oredirect
-libhipandroid/icmp6.h : icp6s_otime_exceed_reassembly
-libhipandroid/icmp6.h : icp6s_otime_exceed_transit
-libhipandroid/icmp6.h : icp6s_ounknown
-libhipandroid/icmp6.h : icp6s_outerrhist
-libhipandroid/icmp6.h : icp6s_outhist
-libhipandroid/icmp6.h : icp6s_pmtuchg
-libhipandroid/icmp6.h : icp6s_reflect
-libhipandroid/icmp6.h : icp6s_toofreq
-libhipandroid/icmp6.h : icp6s_tooshort
+hipd/init /usr/include/netinet/icmp6.h : ICMP6_FILTER_SETBLOCK
+hipd/init /usr/include/netinet/icmp6.h : ICMP6_FILTER_SETBLOCKALL
+hipd/init /usr/include/netinet/icmp6.h : ICMP6_FILTER_SETPASS
+hipd/init /usr/include/netinet/icmp6.h : ICMP6_FILTER_SETPASSALL
+hipd/init /usr/include/netinet/icmp6.h : ICMP6_FILTER_WILLBLOCK
+hipd/init /usr/include/netinet/icmp6.h : ICMP6_FILTER_WILLPASS
 libhipgui/widgets.h : ID_ABOUTDLG
 libhipgui/events.h : IDB_DBG_RESTART
 libhipgui/events.h : IDB_DBG_RSTALL
@@ -772,7 +631,6 @@
 libhiptool/xfrm.h : integrity_failed
 firewall/rule_management.h : int_option
 test/checksum.h : ip6_ahhdr
-libhipandroid/libhipandroid /usr/include/netinet/ip6.h : ip6_hops
 libhipcore/common_defines.h : IPV4_TO_IPV6
 test/checksum.h : ipv6_multiplex
 test/checksum.h : ipv6_parse_ah
@@ -824,149 +682,16 @@
 libhipcore/common_defines.h : MIN_HIP_MTU
 libhipcore/hashtable.h : MIN_NODES
 libhipcore/hip_statistics.h : min_value
-libhipandroid/icmp6.h : mld6_addr
-libhipandroid/icmp6.h : mld6_cksum
-libhipandroid/icmp6.h : mld6_code
-libhipandroid/icmp6.h : mld6_hdr
-libhipandroid/icmp6.h : MLD6_LISTENER_DONE
-libhipandroid/icmp6.h : MLD6_LISTENER_QUERY
-libhipandroid/icmp6.h : MLD6_LISTENER_REPORT
-libhipandroid/icmp6.h : mld6_maxdelay
-libhipandroid/icmp6.h : MLD6_MTRACE
-libhipandroid/icmp6.h : MLD6_MTRACE_RESP
-libhipandroid/icmp6.h : mld6_reserved
-libhipandroid/icmp6.h : mld6_type
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : mld_addr
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : mld_cksum
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : mld_code
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : mld_hdr
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : mld_icmp6_hdr
-libhipandroid/icmp6.h : MLD_LISTENER_DONE
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : MLD_LISTENER_QUERY
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : MLD_LISTENER_REPORT
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : mld_maxdelay
-libhipandroid/icmp6.h : MLD_MTRACE
-libhipandroid/icmp6.h : MLD_MTRACE_RESP
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : mld_reserved
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : mld_type
 libhipgui/tools.h : NAME_INVALID_CHARS
 performance/performance : names
 hipd/nat.h : __NAT_H__
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_na_cksum
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_na_code
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ND_NA_FLAG_OVERRIDE
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ND_NA_FLAG_ROUTER
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ND_NA_FLAG_SOLICITED
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_na_flags_reserved
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_na_hdr
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_na_target
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_na_type
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_neighbor_advert
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ND_NEIGHBOR_ADVERT
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_neighbor_solicit
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ND_NEIGHBOR_SOLICIT
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_ns_cksum
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_ns_code
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_ns_hdr
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_ns_reserved
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_ns_target
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_ns_type
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_opt_hdr
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_opt_len
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_opt_mtu
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ND_OPT_MTU
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_opt_mtu_len
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_opt_mtu_mtu
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_opt_mtu_reserved
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_opt_mtu_type
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ND_OPT_PI_FLAG_AUTO
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ND_OPT_PI_FLAG_ONLINK
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_opt_pi_flags_reserved
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_opt_pi_len
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_opt_pi_preferred_time
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_opt_pi_prefix
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_opt_pi_prefix_len
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_opt_pi_reserved2
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_opt_pi_type
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_opt_pi_valid_time
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_opt_prefix_info
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ND_OPT_PREFIX_INFORMATION
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_opt_rd_hdr
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ND_OPT_REDIRECTED_HEADER
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_opt_rh_len
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_opt_rh_reserved1
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_opt_rh_reserved2
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_opt_rh_type
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ND_OPT_SOURCE_LINKADDR
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ND_OPT_TARGET_LINKADDR
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_opt_type
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_ra_cksum
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_ra_code
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_ra_curhoplimit
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ND_RA_FLAG_MANAGED
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ND_RA_FLAG_OTHER
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_ra_flags_reserved
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_ra_hdr
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_ra_reachable
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_ra_retransmit
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_ra_router_lifetime
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_ra_type
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_rd_cksum
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_rd_code
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_rd_dst
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_rd_hdr
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_rd_reserved
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_rd_target
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_rd_type
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_redirect
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ND_REDIRECT
-libhipandroid/icmp6.h : ND_REDIRECT_ONLINK
-libhipandroid/icmp6.h : ND_REDIRECT_ROUTER
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_router_advert
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ND_ROUTER_ADVERT
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_router_solicit
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : ND_ROUTER_SOLICIT
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_rs_cksum
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_rs_code
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_rs_hdr
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_rs_reserved
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : nd_rs_type
 firewall/rule_management.h : NEGATE_STR
-libhipandroid/icmp6.h : _NETINET_ICMP6_H_
 libhiptool/nlink /usr/include/linux/netlink.h : NETLINK_ADD_MEMBERSHIP
 libhiptool/nlink /usr/include/linux/netlink.h : NETLINK_DROP_MEMBERSHIP
-libhipandroid/regex.h : newline_anchor
 firewall/rule_management.h : NEW_STR
 firewall/esp_prot_api firewall/user_ipsec_sadb.h : next_free
-libhipandroid/icmp6 : ni_cksum
-libhipandroid/icmp6 : ni_code
-libhipandroid/icmp6 : ni_flags
-libhipandroid/icmp6 : NI_FQDN_FLAG_VALIDTTL
-libhipandroid/icmp6.h : ni_fqdn_name
-libhipandroid/icmp6.h : ni_fqdn_namelen
-libhipandroid/icmp6.h : ni_fqdn_ttl
-libhipandroid/icmp6 : NI_NODEADDR_FLAG_ALL
-libhipandroid/icmp6.h : NI_NODEADDR_FLAG_ANYCAST
-libhipandroid/icmp6 : NI_NODEADDR_FLAG_COMPAT
-libhipandroid/icmp6 : NI_NODEADDR_FLAG_GLOBAL
-libhipandroid/icmp6 : NI_NODEADDR_FLAG_LINKLOCAL
-libhipandroid/icmp6 : NI_NODEADDR_FLAG_SITELOCAL
-libhipandroid/icmp6 : NI_NODEADDR_FLAG_TRUNCATE
-libhipandroid/icmp6 : ni_qtype
-libhipandroid/icmp6 : NI_QTYPE_DNSNAME
-libhipandroid/icmp6 : NI_QTYPE_FQDN
-libhipandroid/icmp6 : NI_QTYPE_IPV4ADDR
-libhipandroid/icmp6 : NI_QTYPE_NODEADDR
-libhipandroid/icmp6 : NI_QTYPE_NOOP
-libhipandroid/icmp6 : NI_QTYPE_SUPTYPES
-libhipandroid/icmp6.h : ni_reply_fqdn
-libhipandroid/icmp6 : NI_SUPTYPE_FLAG_COMPRESS
-libhipandroid/icmp6 : ni_type
 libhiptool/nlink.h : NLMSG_TAIL
 firewall/rule_management.h : NO_OPTION
-libhipandroid/regex.h : no_sub
-libhipandroid/regex.h : not_bol
-libhipandroid/regex.h : not_eol
 hipd/nsupdate.h : NSUPDATE_ARG0
 hipd/nsupdate.h : NSUPDATE_PL
 firewall/esp_prot_fw_msg hipd/esp_prot_anchordb.h : num_anchors
@@ -975,7 +700,6 @@
 libhipcore/hashchain_store.h : num_functions
 libhipcore/hashchain_store.h : num_hash_lengths
 libhipcore/hashchain_store.h : num_hchain_lengths
-libhipandroid/regex /usr/include/regex.h : num_regs
 hipd/output.h : ONE
 hipd/hipd.h : OPENDHT_REFRESH_INTERVAL
 libhipconf/hipconf.h : OPT_HI_FILE
@@ -1007,130 +731,12 @@
 hipd/maintenance.h : publish_addr
 hipd/maintenance.h : publish_hit
 hipd/hipd.h : QUEUE_CHECK_INTERVAL
-libhipandroid/regex.h : _RE_ARGS
-libhipandroid/regex /usr/include/regex.h : RE_BACKSLASH_ESCAPE_IN_LISTS
-libhipandroid/regex /usr/include/regex.h : RE_BK_PLUS_QM
-libhipandroid/regex /usr/include/regex.h : RE_CHAR_CLASSES
-libhipandroid/regex.h : re_comp
-libhipandroid/regex.h : re_compile_fastmap
-libhipandroid/regex.h : re_compile_pattern
-libhipandroid/regex /usr/include/regex.h : RE_CONTEXT_INDEP_ANCHORS
-libhipandroid/regex /usr/include/regex.h : RE_CONTEXT_INDEP_OPS
-libhipandroid/regex /usr/include/regex.h : RE_CONTEXT_INVALID_OPS
-libhipandroid/regex /usr/include/regex.h : RE_DOT_NEWLINE
-libhipandroid/regex /usr/include/regex.h : RE_DOT_NOT_NULL
-libhipandroid/regex /usr/include/bits/posix2_lim /usr/include/regex.h : 
RE_DUP_MAX
-libhipandroid/regex.h : re_exec
-libhipandroid/regex /usr/include/regex.h : REG_BADBR
-libhipandroid/regex /usr/include/regex.h : REG_BADPAT
-libhipandroid/regex /usr/include/regex.h : REG_BADRPT
-libhipandroid/regex /usr/include/regex.h : REG_EBRACE
-libhipandroid/regex /usr/include/regex.h : REG_EBRACK
-libhipandroid/regex /usr/include/regex.h : REG_ECOLLATE
-libhipandroid/regex /usr/include/regex.h : REG_ECTYPE
-libhipandroid/regex /usr/include/regex.h : REG_EEND
-libhipandroid/regex /usr/include/regex.h : REG_EESCAPE
-libhipandroid/regex /usr/include/regex.h : REG_EPAREN
-libhipandroid/regex /usr/include/regex.h : REG_ERANGE
-libhipandroid/regex /usr/include/regex.h : REG_ERPAREN
-libhipandroid/regex /usr/include/regex.h : reg_errcode_t
-libhipandroid/regex.h : regerror
-libhipandroid/regex /usr/include/regex.h : REG_ESIZE
-libhipandroid/regex /usr/include/regex.h : REG_ESPACE
-libhipandroid/regex /usr/include/regex.h : REG_ESUBREG
-libhipandroid/regex.h : __REGEXP_LIBRARY_H__
-libhipandroid/regex /usr/include/regex.h : REG_ICASE
-libhipandroid/regex /usr/include/regex.h : REG_NEWLINE
-libhipandroid/regex /usr/include/regex.h : REG_NOERROR
-libhipandroid/regex /usr/include/regex.h : REG_NOMATCH
-libhipandroid/regex /usr/include/regex.h : REG_NOSUB
-libhipandroid/regex /usr/include/regex.h : REG_NOTBOL
-libhipandroid/regex /usr/include/regex.h : REG_NOTEOL
-libhipandroid/regex /usr/include/regex.h : regoff_t
-libhipandroid/regex.h : regs_allocated
-libhipandroid/regex /usr/include/regex.h : REGS_FIXED
-libhipandroid/regex /usr/include/regex.h : REGS_REALLOCATE
-libhipandroid/regex /usr/include/regex.h : REGS_UNALLOCATED
-libhipandroid/regex /usr/include/regex.h : reg_syntax_t
-libhipandroid/regex /usr/include/regex.h : RE_HAT_LISTS_NOT_NEWLINE
-libhipandroid/regex /usr/include/regex.h : RE_INTERVALS
-libhipandroid/regex /usr/include/regex.h : RE_LIMITED_OPS
-libhipandroid/regex.h : re_match
-libhipandroid/regex.h : re_match_2
 firewall/conntrack.h : remove_esp_decryption_data
-libhipandroid/regex /usr/include/regex.h : RE_NEWLINE_ALT
-libhipandroid/regex /usr/include/regex.h : RE_NO_BK_BRACES
-libhipandroid/regex /usr/include/regex.h : RE_NO_BK_PARENS
-libhipandroid/regex /usr/include/regex.h : RE_NO_BK_REFS
-libhipandroid/regex /usr/include/regex.h : RE_NO_BK_VBAR
-libhipandroid/regex /usr/include/regex.h : RE_NO_EMPTY_RANGES
-libhipandroid/regex /usr/include/regex.h : RE_NO_POSIX_BACKTRACKING
-libhipandroid/regex /usr/include/regex.h : RE_NREGS
-libhipandroid/regex /usr/include/regex.h : re_nsub
-libhipandroid/regex /usr/include/regex.h : re_pattern_buffer
 libhiptool/xfrm.h : replay_window
 firewall/conntrack.h : REPLY_DIR
-libhipandroid/regex /usr/include/regex.h : re_registers
-libhipandroid/regex.h : re_search
-libhipandroid/regex.h : re_search_2
 test/checksum.h : reserved1
-libhipandroid/regex.h : re_set_registers
-libhipandroid/regex.h : re_set_syntax
-libhipandroid/regex /usr/include/regex.h : RE_SYNTAX_AWK
-libhipandroid/regex /usr/include/regex.h : RE_SYNTAX_ED
-libhipandroid/regex /usr/include/regex.h : RE_SYNTAX_EGREP
-libhipandroid/regex /usr/include/regex.h : RE_SYNTAX_EMACS
-libhipandroid/regex /usr/include/regex.h : RE_SYNTAX_GREP
-libhipandroid/regex /usr/include/regex.h : RE_SYNTAX_POSIX_AWK
-libhipandroid/regex /usr/include/regex.h : RE_SYNTAX_POSIX_BASIC
-libhipandroid/regex /usr/include/regex.h : _RE_SYNTAX_POSIX_COMMON
-libhipandroid/regex /usr/include/regex.h : RE_SYNTAX_POSIX_EGREP
-libhipandroid/regex /usr/include/regex.h : RE_SYNTAX_POSIX_EXTENDED
-libhipandroid/regex /usr/include/regex.h : RE_SYNTAX_POSIX_MINIMAL_BASIC
-libhipandroid/regex /usr/include/regex.h : RE_SYNTAX_POSIX_MINIMAL_EXTENDED
-libhipandroid/regex /usr/include/regex.h : RE_SYNTAX_SED
-libhipandroid/regex /usr/include/regex.h : RE_TRANSLATE_TYPE
-libhipandroid/regex /usr/include/regex.h : RE_UNMATCHED_RIGHT_PAREN_ORD
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rpm_code
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rpm_len
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rpm_matchlen
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rpm_maxlen
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rpm_minlen
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rpm_ordinal
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : RPM_PCO_ADD
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : RPM_PCO_CHANGE
-libhipandroid/icmp6 : RPM_PCO_MAX
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : RPM_PCO_SETGLOBAL
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rpm_prefix
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rpm_reserved
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rpu_flags
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rpu_keeplen
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rpu_pltime
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rpu_prefix
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rpu_raflags
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rpu_ramask
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rpu_uselen
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rpu_vltime
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rr_cksum
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rr_code
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rr_flags
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rr_hdr
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rr_maxdelay
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rr_pco_match
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rr_pco_use
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rr_reserved
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rr_result
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rrr_flags
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rrr_ifid
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rrr_matchedlen
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rrr_ordinal
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rrr_prefix
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rr_segnum
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rr_seqnum
-libhipandroid/icmp6 /usr/include/netinet/icmp6.h : rr_type
 firewall/rule_management.h : RSA_FILE
 libhiptool/xfrmapi.h : RTA_BUF_SIZE
-libhipandroid/icmp6.h : RTF_PROBEMTU
 libhiptool/nlink.h : rtnl_filter_t
 performance/performance.h : running
 hipd/nsupdate.h : run_nsupdate_for_hit
@@ -1174,7 +780,6 @@
 libhipcore/builder.h : STRONGER_KEY
 agent/str_var.h : str_var_empty
 agent/str_var.h : str_var_find
-libhipandroid/regex.h : syntax
 
 libipsec/libpfkey.h : __SYSDEP_SA_LEN__
 libhipcore/debug.h : SYSLOG_FACILITY
@@ -1190,7 +795,6 @@
 firewall/common_types.h : TimeVal
 firewall/common_types.h : _TimeVal
 libhipcore/hip_statistics.h : timeval_to_uint64
-libhipandroid/regex.h : translate
 hipd/output.h : TWO
 libhipcore/protodefs.h : type1
 libhipcore/protodefs.h : type2
@@ -1246,7 +850,6 @@
 libhipgui/tools.h : update_list_value
 firewall/conntrack.h : update_peer_opp_info
 test/first_test test/hipsetup.h : usage_f
-libhipandroid/regex : used
 firewall/user_ipsec_api.h : USER_IPSEC_API_H_
 firewall/user_ipsec_esp.h : USER_IPSEC_ESP_H_
 firewall/user_ipsec_fw_msg.h : USER_IPSEC_FW_MSG_H_

=== modified file 'doc/verbose-headers.txt'
--- doc/verbose-headers.txt     2010-03-29 19:15:04 +0000
+++ doc/verbose-headers.txt     2010-03-30 12:41:08 +0000
@@ -89,7 +89,6 @@
 libhipcore/protodefs.h : algorithm
 libhipcore/utils : alias
 libhipcore/utils.h : alias2
-libhipandroid/regex.h : allocated
 firewall/rule_management.h : alloc_empty_rule
 firewall/dlist.h : alloc_list
 firewall/hslist.h : alloc_slist
@@ -136,11 +135,10 @@
 hipd/init.h : BIT_TEST
 hipd/blind.h : BLIND_H
 libhiptool/crypto.h : bn2bin_safe
-firewall/rule_management libhipandroid/regex.h : boolean
+firewall/rule_management : boolean
 libhipcore/protodefs.h : branch_length
 libhipcore/protodefs.h : branch_nodes
 libipsec/policy_parse libipsec/policy_parse libipsec/test-policy 
libopphip/wrap test/telnet/ring test/ttcp usr/include/openssl/pem.h : buf
-libhipandroid/regex : buffer
 libhipgui/events.h : BUTTON_IDS
 libhipgui/events.h : BUTTON_IDS_N
 libhiptool/nlink.h : bytelen
@@ -151,7 +149,6 @@
 libhipcore/hip_statistics.h : calc_timeval_diff
 libhiptool/xfrm.h : calgos
 libhipcore/utils.h : caller
-libhipandroid/regex.h : can_be_null
 libhipcore/protodefs test/unittest.h : caseid
 libhipcore/certtools libhipcore/protodefs.h : cert
 libhipcore/protodefs.h : cert_count
@@ -356,7 +353,7 @@
 libhiptool/xfrm.h : encap_sport
 libhiptool/xfrm.h : encap_type
 firewall/user_ipsec_sadb i3/aeshash/aescpp.hh : enc_key
-hipd/hadb libhipandroid/regex /usr/include/regex.h : end
+hipd/hadb /usr/include/regex.h : end
 libhipcore/protodefs.h : endpoint
 libhipcore/protodefs.h : endpoint_hip
 firewall/esp_prot_api firewall/user_ipsec_sadb hipd/registration i3/i3/i3 
test/listtest.h : entry

=== modified file 'firewall/firewall.c'
--- firewall/firewall.c 2010-03-18 12:09:47 +0000
+++ firewall/firewall.c 2010-03-30 12:41:08 +0000
@@ -854,7 +854,7 @@
     system_print("echo 1048576 > /proc/sys/net/core/wmem_max");
 }
 
-#if !defined(CONFIG_HIP_OPENWRT) && !defined(ANDROID_CHANGES)
+#ifndef CONFIG_HIP_OPENWRT
 /**
  * Loads several modules that are needed by the firewall.
  */
@@ -891,7 +891,7 @@
     HIP_DEBUG("Probing completed\n");
 }
 
-#endif /*!defined(CONFIG_HIP_OPENWRT) && !defined(ANDROID_CHANGES) */
+#endif /* !CONFIG_HIP_OPENWRT */
 
 /*-------------PACKET FILTERING FUNCTIONS------------------*/
 
@@ -2345,7 +2345,7 @@
     print_rule_tables();
 
     firewall_increase_netlink_buffers();
-#if !defined(CONFIG_HIP_OPENWRT) && !defined(ANDROID_CHANGES)
+#ifndef CONFIG_HIP_OPENWRT
     firewall_probe_kernel_modules();
 #endif
 

=== modified file 'firewall/user_ipsec_esp.c'
--- firewall/user_ipsec_esp.c   2010-03-29 19:33:56 +0000
+++ firewall/user_ipsec_esp.c   2010-03-30 12:41:08 +0000
@@ -367,7 +367,6 @@
             goto out_err;
         }
         break;
-#ifndef ANDROID_CHANGES
     case HIP_ESP_BLOWFISH_SHA1:
         iv_len = 8;
         if (!entry->enc_key) {
@@ -377,7 +376,6 @@
             goto out_err;
         }
         break;
-#endif
     case HIP_ESP_NULL_SHA1:
     // same encryption chiper as next transform
     case HIP_ESP_NULL_MD5:
@@ -442,13 +440,11 @@
                              (des_cblock *) cbc_iv, DES_ENCRYPT);
 
         break;
-#ifndef ANDROID_CHANGES
     case HIP_ESP_BLOWFISH_SHA1:
         BF_cbc_encrypt(in, &out[esp_data_offset + iv_len], elen,
                        &entry->bf_key, cbc_iv, BF_ENCRYPT);
 
         break;
-#endif
     case HIP_ESP_NULL_SHA1:
     case HIP_ESP_NULL_MD5:
         // NOTE: in this case there is no IV
@@ -658,7 +654,6 @@
             goto out_err;
         }
         break;
-#ifndef ANDROID_CHANGES
     case HIP_ESP_BLOWFISH_SHA1:
         iv_len = 8;
         if (!entry->enc_key) {
@@ -668,7 +663,6 @@
             goto out_err;
         }
         break;
-#endif
     case HIP_ESP_NULL_SHA1:
     case HIP_ESP_NULL_MD5:
         iv_len = 0;
@@ -702,12 +696,10 @@
                              entry->ks[0], entry->ks[1], entry->ks[2],
                              (des_cblock *) cbc_iv, DES_DECRYPT);
         break;
-#ifndef ANDROID_CHANGES
     case HIP_ESP_BLOWFISH_SHA1:
         BF_cbc_encrypt(&in[esp_data_offset + iv_len], out, elen,
                        &entry->bf_key, cbc_iv, BF_DECRYPT);
         break;
-#endif
     case HIP_ESP_NULL_SHA1:
     case HIP_ESP_NULL_MD5:
         memcpy(out, &in[esp_data_offset], elen);

=== modified file 'firewall/user_ipsec_sadb.c'
--- firewall/user_ipsec_sadb.c  2010-03-30 08:15:17 +0000
+++ firewall/user_ipsec_sadb.c  2010-03-30 12:41:08 +0000
@@ -489,12 +489,10 @@
             }
 
             break;
-#ifndef ANDROID_CHANGES
         case HIP_ESP_BLOWFISH_SHA1:
             BF_set_key(&entry->bf_key, hip_enc_key_length(ealg), enc_key->key);
 
             break;
-#endif
         case HIP_ESP_NULL_SHA1:
         // same encryption chiper as next transform
         case HIP_ESP_NULL_MD5:

=== modified file 'firewall/user_ipsec_sadb.h'
--- firewall/user_ipsec_sadb.h  2010-03-30 08:15:17 +0000
+++ firewall/user_ipsec_sadb.h  2010-03-30 12:41:08 +0000
@@ -17,9 +17,7 @@
 
 #include <openssl/des.h>                /* des_key_schedule */
 #include <openssl/aes.h>                /* aes_key */
-#ifndef ANDROID_CHANGES
 #include <openssl/blowfish.h>   /* bf_key */
-#endif
 #include <sys/time.h>
 #include <inttypes.h>
 #include <netinet/in.h>
@@ -47,9 +45,7 @@
     struct hip_crypto_key *enc_key;        /* raw encryption key */
     des_key_schedule       ks[3];          /* 3-DES keys */
     AES_KEY                aes_key;        /* AES key */
-#ifndef ANDROID_CHANGES
     BF_KEY                 bf_key;         /* BLOWFISH key */
-#endif
     /******************** statistics *************************/
     uint64_t               lifetime;       /* seconds until expiration */
     uint64_t               bytes;          /* bytes transmitted */

=== modified file 'hipd/init.c'
--- hipd/init.c 2010-03-29 17:50:59 +0000
+++ hipd/init.c 2010-03-30 12:41:08 +0000
@@ -46,8 +46,6 @@
     "193.167.187.134 hipdht2.infrahip.net\n"
 
 
-#ifndef ANDROID_CHANGES
-
 /** ICMPV6_FILTER related stuff */
 #define BIT_CLEAR(nr, addr) do { ((uint32_t *) (addr))[(nr) >> 5] &= ~(1U << 
((nr) & 31)); } while (0)
 #define BIT_SET(nr, addr) do { ((uint32_t *) (addr))[(nr) >> 5] |= (1U << 
((nr) & 31)); } while (0)
@@ -74,8 +72,6 @@
 #endif
 /** end ICMPV6_FILTER related stuff */
 
-#endif /* ANDROID_CHANGES */
-
 static int hip_init_host_ids(void);
 static int init_random_seed(void);
 static int hip_init_certs(void);
@@ -90,12 +86,7 @@
  */
 static void hip_sig_chld(int signum)
 {
-#ifdef ANDROID_CHANGES
-    int status;
-#else
     union wait status;
-#endif
-
     int pid;
 
     signal(signum, hip_sig_chld);
@@ -414,7 +405,6 @@
 }
 
 #ifndef CONFIG_HIP_OPENWRT
-#ifndef ANDROID_CHANGES
 /**
  * probe for kernel modules (linux specific)
  */
@@ -457,8 +447,6 @@
 
     HIP_DEBUG("Probing completed\n");
 }
-
-#endif /* ANDROID_CHANGES */
 #endif /* CONFIG_HIP_OPENWRT */
 
 /**
@@ -501,10 +489,8 @@
 #ifdef CONFIG_HIP_DEBUG
     hip_print_sysinfo();
 #endif
-#ifndef ANDROID_CHANGES
     hip_probe_kernel_modules();
 #endif
-#endif
 
     /* Register signal handlers */
     signal(SIGINT, hip_close);

=== removed directory 'lib/android'
=== modified file 'lib/core/crypto.c'
--- lib/core/crypto.c   2010-03-18 21:15:21 +0000
+++ lib/core/crypto.c   2010-03-30 12:41:08 +0000
@@ -696,23 +696,7 @@
     RSA *rsa = NULL;
 
     /* generate private and public keys */
-#ifdef ANDROID_CHANGES
-    BIGNUM *bn;
-    if (!(bn = BN_new())) {
-        goto err_out;
-    }
-    if (!BN_set_word(bn, RSA_F4)) {
-        goto err_out;
-    }
-    if (!(rsa = RSA_new())) {
-        goto err_out;
-    }
-    if (RSA_generate_key_ex(rsa, bits, bn, NULL) == -1) {
-        goto err_out;
-    }
-#else
     rsa = RSA_generate_key(bits, RSA_F4, NULL, NULL);
-#endif
     if (!rsa) {
         HIP_ERROR("create_rsa_key failed (RSA_generate_key): %s\n",
                   ERR_error_string(ERR_get_error(), NULL));

=== modified file 'lib/core/filemanip.h'
--- lib/core/filemanip.h        2010-03-19 09:00:54 +0000
+++ lib/core/filemanip.h        2010-03-30 12:41:08 +0000
@@ -16,8 +16,7 @@
 # define HIP_CREATE_FILE(x)     open((x), O_RDWR | O_CREAT, 0644)
 #endif
 
-/* system/bin for Android */
-#define HIP_DEFAULT_EXEC_PATH 
"/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/system/bin"
+#define HIP_DEFAULT_EXEC_PATH 
"/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin"
 
 int hip_create_lock_file(char *filename, int killold);
 int hip_remove_lock_file(char *filename);

Other related posts:

  • » [hipl-commit] [trunk] Rev 4099: Remove all Android-related infrastructure and hacks. - Diego Biurrun