fix ndk build

HMBSbige · Jun 8, 2014 · 3352504 · 3352504
1 parent 81a27c1
commit 3352504
Show file tree

Hide file tree

Showing 2,832 changed files with 126 additions and 260 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,4 @@ src/main/libs
 src/main/assets/armeabi
 src/main/assets/armeabi-v7a
 src/main/assets/x86
+src/main/jni
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "src/main/jni/shadowsocks"]
-	path = src/main/jni/shadowsocks
+[submodule "jni/shadowsocks"]
+	path = jni/shadowsocks
 	url = https://github.com/madeye/shadowsocks-libev.git
diff --git a/build-ndk.sh b/build-ndk.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
-cd src/main
 ndk-build clean
 ndk-build
 mkdir -p assets/armeabi
 mkdir -p assets/armeabi-v7a
 mkdir -p assets/x86
 for app in iptables pdnsd redsocks ss-local ss-tunnel tun2socks
 do
-    mv libs/armeabi/$app assets/armeabi/
-    mv libs/armeabi-v7a/$app assets/armeabi-v7a/
-    mv libs/x86/$app assets/x86/
+    mv libs/armeabi/$app src/main/assets/armeabi/
+    mv libs/armeabi-v7a/$app src/main/assets/armeabi-v7a/
+    mv libs/x86/$app src/main/assets/x86/
 done
+mv libs src/main/jni
diff --git a/src/main/jni/Android.mk → jni/Android.mk b/src/main/jni/Android.mk → jni/Android.mk
diff --git a/src/main/jni/Application.mk → jni/Application.mk b/src/main/jni/Application.mk → jni/Application.mk
diff --git a/src/main/jni/badvpn/CMakeLists.txt → jni/badvpn/CMakeLists.txt b/src/main/jni/badvpn/CMakeLists.txt → jni/badvpn/CMakeLists.txt
diff --git a/src/main/jni/badvpn/COPYING → jni/badvpn/COPYING b/src/main/jni/badvpn/COPYING → jni/badvpn/COPYING
diff --git a/src/main/jni/badvpn/ChangeLog → jni/badvpn/ChangeLog b/src/main/jni/badvpn/ChangeLog → jni/badvpn/ChangeLog
diff --git a/src/main/jni/badvpn/INSTALL → jni/badvpn/INSTALL b/src/main/jni/badvpn/INSTALL → jni/badvpn/INSTALL
diff --git a/src/main/jni/badvpn/INSTALL-WINDOWS → jni/badvpn/INSTALL-WINDOWS b/src/main/jni/badvpn/INSTALL-WINDOWS → jni/badvpn/INSTALL-WINDOWS
diff --git a/src/main/jni/badvpn/arpprobe/BArpProbe.c → jni/badvpn/arpprobe/BArpProbe.c b/src/main/jni/badvpn/arpprobe/BArpProbe.c → jni/badvpn/arpprobe/BArpProbe.c
diff --git a/src/main/jni/badvpn/arpprobe/BArpProbe.h → jni/badvpn/arpprobe/BArpProbe.h b/src/main/jni/badvpn/arpprobe/BArpProbe.h → jni/badvpn/arpprobe/BArpProbe.h
diff --git a/src/main/jni/badvpn/arpprobe/CMakeLists.txt → jni/badvpn/arpprobe/CMakeLists.txt b/src/main/jni/badvpn/arpprobe/CMakeLists.txt → jni/badvpn/arpprobe/CMakeLists.txt
diff --git a/src/main/jni/badvpn/badvpn.7 → jni/badvpn/badvpn.7 b/src/main/jni/badvpn/badvpn.7 → jni/badvpn/badvpn.7
diff --git a/src/main/jni/badvpn/base/BLog.c → jni/badvpn/base/BLog.c b/src/main/jni/badvpn/base/BLog.c → jni/badvpn/base/BLog.c
diff --git a/src/main/jni/badvpn/base/BLog.h → jni/badvpn/base/BLog.h b/src/main/jni/badvpn/base/BLog.h → jni/badvpn/base/BLog.h
diff --git a/src/main/jni/badvpn/base/BLog_syslog.c → jni/badvpn/base/BLog_syslog.c b/src/main/jni/badvpn/base/BLog_syslog.c → jni/badvpn/base/BLog_syslog.c
diff --git a/src/main/jni/badvpn/base/BLog_syslog.h → jni/badvpn/base/BLog_syslog.h b/src/main/jni/badvpn/base/BLog_syslog.h → jni/badvpn/base/BLog_syslog.h
diff --git a/src/main/jni/badvpn/base/BMutex.h → jni/badvpn/base/BMutex.h b/src/main/jni/badvpn/base/BMutex.h → jni/badvpn/base/BMutex.h
diff --git a/src/main/jni/badvpn/base/BPending.c → jni/badvpn/base/BPending.c b/src/main/jni/badvpn/base/BPending.c → jni/badvpn/base/BPending.c
diff --git a/src/main/jni/badvpn/base/BPending.h → jni/badvpn/base/BPending.h b/src/main/jni/badvpn/base/BPending.h → jni/badvpn/base/BPending.h
diff --git a/src/main/jni/badvpn/base/BPending_list.h → jni/badvpn/base/BPending_list.h b/src/main/jni/badvpn/base/BPending_list.h → jni/badvpn/base/BPending_list.h
diff --git a/src/main/jni/badvpn/base/CMakeLists.txt → jni/badvpn/base/CMakeLists.txt b/src/main/jni/badvpn/base/CMakeLists.txt → jni/badvpn/base/CMakeLists.txt
diff --git a/src/main/jni/badvpn/base/DebugObject.c → jni/badvpn/base/DebugObject.c b/src/main/jni/badvpn/base/DebugObject.c → jni/badvpn/base/DebugObject.c
diff --git a/src/main/jni/badvpn/base/DebugObject.h → jni/badvpn/base/DebugObject.h b/src/main/jni/badvpn/base/DebugObject.h → jni/badvpn/base/DebugObject.h
diff --git a/src/main/jni/badvpn/blog_channels.txt → jni/badvpn/blog_channels.txt b/src/main/jni/badvpn/blog_channels.txt → jni/badvpn/blog_channels.txt
diff --git a/src/main/jni/badvpn/blog_generator/blog.php → jni/badvpn/blog_generator/blog.php b/src/main/jni/badvpn/blog_generator/blog.php → jni/badvpn/blog_generator/blog.php
diff --git a/.../badvpn/blog_generator/blog_functions.php → jni/badvpn/blog_generator/blog_functions.php b/.../badvpn/blog_generator/blog_functions.php → jni/badvpn/blog_generator/blog_functions.php
diff --git a/src/main/jni/badvpn/bproto/BProto.h → jni/badvpn/bproto/BProto.h b/src/main/jni/badvpn/bproto/BProto.h → jni/badvpn/bproto/BProto.h
diff --git a/.../badvpn/bproto_generator/ProtoParser.lime → jni/badvpn/bproto_generator/ProtoParser.lime b/.../badvpn/bproto_generator/ProtoParser.lime → jni/badvpn/bproto_generator/ProtoParser.lime
diff --git a/...i/badvpn/bproto_generator/ProtoParser.php → jni/badvpn/bproto_generator/ProtoParser.php b/...i/badvpn/bproto_generator/ProtoParser.php → jni/badvpn/bproto_generator/ProtoParser.php
diff --git a/...in/jni/badvpn/bproto_generator/bproto.php → jni/badvpn/bproto_generator/bproto.php b/...in/jni/badvpn/bproto_generator/bproto.php → jni/badvpn/bproto_generator/bproto.php
diff --git a/...vpn/bproto_generator/bproto_functions.php → ...vpn/bproto_generator/bproto_functions.php b/...vpn/bproto_generator/bproto_functions.php → ...vpn/bproto_generator/bproto_functions.php
diff --git a/src/main/jni/badvpn/client/CMakeLists.txt → jni/badvpn/client/CMakeLists.txt b/src/main/jni/badvpn/client/CMakeLists.txt → jni/badvpn/client/CMakeLists.txt
diff --git a/src/main/jni/badvpn/client/DPReceive.c → jni/badvpn/client/DPReceive.c b/src/main/jni/badvpn/client/DPReceive.c → jni/badvpn/client/DPReceive.c
diff --git a/src/main/jni/badvpn/client/DPReceive.h → jni/badvpn/client/DPReceive.h b/src/main/jni/badvpn/client/DPReceive.h → jni/badvpn/client/DPReceive.h
diff --git a/src/main/jni/badvpn/client/DPRelay.c → jni/badvpn/client/DPRelay.c b/src/main/jni/badvpn/client/DPRelay.c → jni/badvpn/client/DPRelay.c
diff --git a/src/main/jni/badvpn/client/DPRelay.h → jni/badvpn/client/DPRelay.h b/src/main/jni/badvpn/client/DPRelay.h → jni/badvpn/client/DPRelay.h
diff --git a/src/main/jni/badvpn/client/DataProto.c → jni/badvpn/client/DataProto.c b/src/main/jni/badvpn/client/DataProto.c → jni/badvpn/client/DataProto.c
diff --git a/src/main/jni/badvpn/client/DataProto.h → jni/badvpn/client/DataProto.h b/src/main/jni/badvpn/client/DataProto.h → jni/badvpn/client/DataProto.h
diff --git a/.../badvpn/client/DataProtoKeepaliveSource.c → jni/badvpn/client/DataProtoKeepaliveSource.c b/.../badvpn/client/DataProtoKeepaliveSource.c → jni/badvpn/client/DataProtoKeepaliveSource.c
diff --git a/.../badvpn/client/DataProtoKeepaliveSource.h → jni/badvpn/client/DataProtoKeepaliveSource.h b/.../badvpn/client/DataProtoKeepaliveSource.h → jni/badvpn/client/DataProtoKeepaliveSource.h
diff --git a/src/main/jni/badvpn/client/DatagramPeerIO.c → jni/badvpn/client/DatagramPeerIO.c b/src/main/jni/badvpn/client/DatagramPeerIO.c → jni/badvpn/client/DatagramPeerIO.c
diff --git a/src/main/jni/badvpn/client/DatagramPeerIO.h → jni/badvpn/client/DatagramPeerIO.h b/src/main/jni/badvpn/client/DatagramPeerIO.h → jni/badvpn/client/DatagramPeerIO.h
diff --git a/...ni/badvpn/client/FragmentProtoAssembler.c → jni/badvpn/client/FragmentProtoAssembler.c b/...ni/badvpn/client/FragmentProtoAssembler.c → jni/badvpn/client/FragmentProtoAssembler.c
diff --git a/...ni/badvpn/client/FragmentProtoAssembler.h → jni/badvpn/client/FragmentProtoAssembler.h b/...ni/badvpn/client/FragmentProtoAssembler.h → jni/badvpn/client/FragmentProtoAssembler.h
diff --git a/...dvpn/client/FragmentProtoAssembler_tree.h → ...dvpn/client/FragmentProtoAssembler_tree.h b/...dvpn/client/FragmentProtoAssembler_tree.h → ...dvpn/client/FragmentProtoAssembler_tree.h
diff --git a/...badvpn/client/FragmentProtoDisassembler.c → ...badvpn/client/FragmentProtoDisassembler.c b/...badvpn/client/FragmentProtoDisassembler.c → ...badvpn/client/FragmentProtoDisassembler.c
diff --git a/...badvpn/client/FragmentProtoDisassembler.h → ...badvpn/client/FragmentProtoDisassembler.h b/...badvpn/client/FragmentProtoDisassembler.h → ...badvpn/client/FragmentProtoDisassembler.h
diff --git a/src/main/jni/badvpn/client/FrameDecider.c → jni/badvpn/client/FrameDecider.c b/src/main/jni/badvpn/client/FrameDecider.c → jni/badvpn/client/FrameDecider.c
diff --git a/src/main/jni/badvpn/client/FrameDecider.h → jni/badvpn/client/FrameDecider.h b/src/main/jni/badvpn/client/FrameDecider.h → jni/badvpn/client/FrameDecider.h
diff --git a/.../badvpn/client/FrameDecider_groups_tree.h → jni/badvpn/client/FrameDecider_groups_tree.h b/.../badvpn/client/FrameDecider_groups_tree.h → jni/badvpn/client/FrameDecider_groups_tree.h
diff --git a/...ni/badvpn/client/FrameDecider_macs_tree.h → jni/badvpn/client/FrameDecider_macs_tree.h b/...ni/badvpn/client/FrameDecider_macs_tree.h → jni/badvpn/client/FrameDecider_macs_tree.h
diff --git a/...dvpn/client/FrameDecider_multicast_tree.h → ...dvpn/client/FrameDecider_multicast_tree.h b/...dvpn/client/FrameDecider_multicast_tree.h → ...dvpn/client/FrameDecider_multicast_tree.h
diff --git a/...main/jni/badvpn/client/PasswordListener.c → jni/badvpn/client/PasswordListener.c b/...main/jni/badvpn/client/PasswordListener.c → jni/badvpn/client/PasswordListener.c
diff --git a/...main/jni/badvpn/client/PasswordListener.h → jni/badvpn/client/PasswordListener.h b/...main/jni/badvpn/client/PasswordListener.h → jni/badvpn/client/PasswordListener.h
diff --git a/src/main/jni/badvpn/client/PeerChat.c → jni/badvpn/client/PeerChat.c b/src/main/jni/badvpn/client/PeerChat.c → jni/badvpn/client/PeerChat.c
diff --git a/src/main/jni/badvpn/client/PeerChat.h → jni/badvpn/client/PeerChat.h b/src/main/jni/badvpn/client/PeerChat.h → jni/badvpn/client/PeerChat.h
diff --git a/src/main/jni/badvpn/client/SCOutmsgEncoder.c → jni/badvpn/client/SCOutmsgEncoder.c b/src/main/jni/badvpn/client/SCOutmsgEncoder.c → jni/badvpn/client/SCOutmsgEncoder.c
diff --git a/src/main/jni/badvpn/client/SCOutmsgEncoder.h → jni/badvpn/client/SCOutmsgEncoder.h b/src/main/jni/badvpn/client/SCOutmsgEncoder.h → jni/badvpn/client/SCOutmsgEncoder.h
diff --git a/src/main/jni/badvpn/client/SPProtoDecoder.c → jni/badvpn/client/SPProtoDecoder.c b/src/main/jni/badvpn/client/SPProtoDecoder.c → jni/badvpn/client/SPProtoDecoder.c
diff --git a/src/main/jni/badvpn/client/SPProtoDecoder.h → jni/badvpn/client/SPProtoDecoder.h b/src/main/jni/badvpn/client/SPProtoDecoder.h → jni/badvpn/client/SPProtoDecoder.h
diff --git a/src/main/jni/badvpn/client/SPProtoEncoder.c → jni/badvpn/client/SPProtoEncoder.c b/src/main/jni/badvpn/client/SPProtoEncoder.c → jni/badvpn/client/SPProtoEncoder.c
diff --git a/src/main/jni/badvpn/client/SPProtoEncoder.h → jni/badvpn/client/SPProtoEncoder.h b/src/main/jni/badvpn/client/SPProtoEncoder.h → jni/badvpn/client/SPProtoEncoder.h
diff --git a/...in/jni/badvpn/client/SimpleStreamBuffer.c → jni/badvpn/client/SimpleStreamBuffer.c b/...in/jni/badvpn/client/SimpleStreamBuffer.c → jni/badvpn/client/SimpleStreamBuffer.c
diff --git a/...in/jni/badvpn/client/SimpleStreamBuffer.h → jni/badvpn/client/SimpleStreamBuffer.h b/...in/jni/badvpn/client/SimpleStreamBuffer.h → jni/badvpn/client/SimpleStreamBuffer.h
diff --git a/...in/jni/badvpn/client/SinglePacketSource.c → jni/badvpn/client/SinglePacketSource.c b/...in/jni/badvpn/client/SinglePacketSource.c → jni/badvpn/client/SinglePacketSource.c
diff --git a/...in/jni/badvpn/client/SinglePacketSource.h → jni/badvpn/client/SinglePacketSource.h b/...in/jni/badvpn/client/SinglePacketSource.h → jni/badvpn/client/SinglePacketSource.h
diff --git a/src/main/jni/badvpn/client/StreamPeerIO.c → jni/badvpn/client/StreamPeerIO.c b/src/main/jni/badvpn/client/StreamPeerIO.c → jni/badvpn/client/StreamPeerIO.c
diff --git a/src/main/jni/badvpn/client/StreamPeerIO.h → jni/badvpn/client/StreamPeerIO.h b/src/main/jni/badvpn/client/StreamPeerIO.h → jni/badvpn/client/StreamPeerIO.h
diff --git a/src/main/jni/badvpn/client/badvpn-client.8 → jni/badvpn/client/badvpn-client.8 b/src/main/jni/badvpn/client/badvpn-client.8 → jni/badvpn/client/badvpn-client.8
diff --git a/src/main/jni/badvpn/client/client.c → jni/badvpn/client/client.c b/src/main/jni/badvpn/client/client.c → jni/badvpn/client/client.c
diff --git a/src/main/jni/badvpn/client/client.h → jni/badvpn/client/client.h b/src/main/jni/badvpn/client/client.h → jni/badvpn/client/client.h
diff --git a/...advpn/cmake/modules/COPYING-CMAKE-SCRIPTS → ...advpn/cmake/modules/COPYING-CMAKE-SCRIPTS b/...advpn/cmake/modules/COPYING-CMAKE-SCRIPTS → ...advpn/cmake/modules/COPYING-CMAKE-SCRIPTS
diff --git a/.../jni/badvpn/cmake/modules/FindGLIB2.cmake → jni/badvpn/cmake/modules/FindGLIB2.cmake b/.../jni/badvpn/cmake/modules/FindGLIB2.cmake → jni/badvpn/cmake/modules/FindGLIB2.cmake
diff --git a/.../cmake/modules/FindLibraryWithDebug.cmake → .../cmake/modules/FindLibraryWithDebug.cmake b/.../cmake/modules/FindLibraryWithDebug.cmake → .../cmake/modules/FindLibraryWithDebug.cmake
diff --git a/...n/jni/badvpn/cmake/modules/FindNSPR.cmake → jni/badvpn/cmake/modules/FindNSPR.cmake b/...n/jni/badvpn/cmake/modules/FindNSPR.cmake → jni/badvpn/cmake/modules/FindNSPR.cmake
diff --git a/...in/jni/badvpn/cmake/modules/FindNSS.cmake → jni/badvpn/cmake/modules/FindNSS.cmake b/...in/jni/badvpn/cmake/modules/FindNSS.cmake → jni/badvpn/cmake/modules/FindNSS.cmake
diff --git a/...ni/badvpn/cmake/modules/FindOpenSSL.cmake → jni/badvpn/cmake/modules/FindOpenSSL.cmake b/...ni/badvpn/cmake/modules/FindOpenSSL.cmake → jni/badvpn/cmake/modules/FindOpenSSL.cmake
diff --git a/src/main/jni/badvpn/compile-tun2sock.sh → jni/badvpn/compile-tun2sock.sh b/src/main/jni/badvpn/compile-tun2sock.sh → jni/badvpn/compile-tun2sock.sh
diff --git a/src/main/jni/badvpn/dhcpclient/BDHCPClient.c → jni/badvpn/dhcpclient/BDHCPClient.c b/src/main/jni/badvpn/dhcpclient/BDHCPClient.c → jni/badvpn/dhcpclient/BDHCPClient.c
diff --git a/src/main/jni/badvpn/dhcpclient/BDHCPClient.h → jni/badvpn/dhcpclient/BDHCPClient.h b/src/main/jni/badvpn/dhcpclient/BDHCPClient.h → jni/badvpn/dhcpclient/BDHCPClient.h
diff --git a/...n/jni/badvpn/dhcpclient/BDHCPClientCore.c → jni/badvpn/dhcpclient/BDHCPClientCore.c b/...n/jni/badvpn/dhcpclient/BDHCPClientCore.c → jni/badvpn/dhcpclient/BDHCPClientCore.c
diff --git a/...n/jni/badvpn/dhcpclient/BDHCPClientCore.h → jni/badvpn/dhcpclient/BDHCPClientCore.h b/...n/jni/badvpn/dhcpclient/BDHCPClientCore.h → jni/badvpn/dhcpclient/BDHCPClientCore.h
diff --git a/...main/jni/badvpn/dhcpclient/CMakeLists.txt → jni/badvpn/dhcpclient/CMakeLists.txt b/...main/jni/badvpn/dhcpclient/CMakeLists.txt → jni/badvpn/dhcpclient/CMakeLists.txt
diff --git a/.../jni/badvpn/dhcpclient/DHCPIpUdpDecoder.c → jni/badvpn/dhcpclient/DHCPIpUdpDecoder.c b/.../jni/badvpn/dhcpclient/DHCPIpUdpDecoder.c → jni/badvpn/dhcpclient/DHCPIpUdpDecoder.c
diff --git a/.../jni/badvpn/dhcpclient/DHCPIpUdpDecoder.h → jni/badvpn/dhcpclient/DHCPIpUdpDecoder.h b/.../jni/badvpn/dhcpclient/DHCPIpUdpDecoder.h → jni/badvpn/dhcpclient/DHCPIpUdpDecoder.h
diff --git a/.../jni/badvpn/dhcpclient/DHCPIpUdpEncoder.c → jni/badvpn/dhcpclient/DHCPIpUdpEncoder.c b/.../jni/badvpn/dhcpclient/DHCPIpUdpEncoder.c → jni/badvpn/dhcpclient/DHCPIpUdpEncoder.c
diff --git a/.../jni/badvpn/dhcpclient/DHCPIpUdpEncoder.h → jni/badvpn/dhcpclient/DHCPIpUdpEncoder.h b/.../jni/badvpn/dhcpclient/DHCPIpUdpEncoder.h → jni/badvpn/dhcpclient/DHCPIpUdpEncoder.h
diff --git a/src/main/jni/badvpn/dostest/CMakeLists.txt → jni/badvpn/dostest/CMakeLists.txt b/src/main/jni/badvpn/dostest/CMakeLists.txt → jni/badvpn/dostest/CMakeLists.txt
diff --git a/src/main/jni/badvpn/dostest/StreamBuffer.c → jni/badvpn/dostest/StreamBuffer.c b/src/main/jni/badvpn/dostest/StreamBuffer.c → jni/badvpn/dostest/StreamBuffer.c
diff --git a/src/main/jni/badvpn/dostest/StreamBuffer.h → jni/badvpn/dostest/StreamBuffer.h b/src/main/jni/badvpn/dostest/StreamBuffer.h → jni/badvpn/dostest/StreamBuffer.h
diff --git a/...ain/jni/badvpn/dostest/dostest-attacker.c → jni/badvpn/dostest/dostest-attacker.c b/...ain/jni/badvpn/dostest/dostest-attacker.c → jni/badvpn/dostest/dostest-attacker.c
diff --git a/src/main/jni/badvpn/dostest/dostest-server.c → jni/badvpn/dostest/dostest-server.c b/src/main/jni/badvpn/dostest/dostest-server.c → jni/badvpn/dostest/dostest-server.c
diff --git a/src/main/jni/badvpn/examples/CMakeLists.txt → jni/badvpn/examples/CMakeLists.txt b/src/main/jni/badvpn/examples/CMakeLists.txt → jni/badvpn/examples/CMakeLists.txt
diff --git a/...in/jni/badvpn/examples/FastPacketSource.h → jni/badvpn/examples/FastPacketSource.h b/...in/jni/badvpn/examples/FastPacketSource.h → jni/badvpn/examples/FastPacketSource.h
diff --git a/...in/jni/badvpn/examples/RandomPacketSink.h → jni/badvpn/examples/RandomPacketSink.h b/...in/jni/badvpn/examples/RandomPacketSink.h → jni/badvpn/examples/RandomPacketSink.h
diff --git a/...ain/jni/badvpn/examples/TimerPacketSink.h → jni/badvpn/examples/TimerPacketSink.h b/...ain/jni/badvpn/examples/TimerPacketSink.h → jni/badvpn/examples/TimerPacketSink.h
diff --git a/src/main/jni/badvpn/examples/arpprobe_test.c → jni/badvpn/examples/arpprobe_test.c b/src/main/jni/badvpn/examples/arpprobe_test.c → jni/badvpn/examples/arpprobe_test.c
diff --git a/src/main/jni/badvpn/examples/bavl_test.c → jni/badvpn/examples/bavl_test.c b/src/main/jni/badvpn/examples/bavl_test.c → jni/badvpn/examples/bavl_test.c
diff --git a/...n/jni/badvpn/examples/bencryption_bench.c → jni/badvpn/examples/bencryption_bench.c b/...n/jni/badvpn/examples/bencryption_bench.c → jni/badvpn/examples/bencryption_bench.c
diff --git a/...in/jni/badvpn/examples/bprocess_example.c → jni/badvpn/examples/bprocess_example.c b/...in/jni/badvpn/examples/bprocess_example.c → jni/badvpn/examples/bprocess_example.c
diff --git a/src/main/jni/badvpn/examples/brandom2_test.c → jni/badvpn/examples/brandom2_test.c b/src/main/jni/badvpn/examples/brandom2_test.c → jni/badvpn/examples/brandom2_test.c
diff --git a/...main/jni/badvpn/examples/btimer_example.c → jni/badvpn/examples/btimer_example.c b/...main/jni/badvpn/examples/btimer_example.c → jni/badvpn/examples/btimer_example.c
diff --git a/src/main/jni/badvpn/examples/cavl_test.c → jni/badvpn/examples/cavl_test.c b/src/main/jni/badvpn/examples/cavl_test.c → jni/badvpn/examples/cavl_test.c
diff --git a/...main/jni/badvpn/examples/cavl_test_tree.h → jni/badvpn/examples/cavl_test_tree.h b/...main/jni/badvpn/examples/cavl_test_tree.h → jni/badvpn/examples/cavl_test_tree.h
diff --git a/...ain/jni/badvpn/examples/dhcpclient_test.c → jni/badvpn/examples/dhcpclient_test.c b/...ain/jni/badvpn/examples/dhcpclient_test.c → jni/badvpn/examples/dhcpclient_test.c
diff --git a/...ain/jni/badvpn/examples/emscripten_test.c → jni/badvpn/examples/emscripten_test.c b/...ain/jni/badvpn/examples/emscripten_test.c → jni/badvpn/examples/emscripten_test.c
diff --git a/...main/jni/badvpn/examples/fairqueue_test.c → jni/badvpn/examples/fairqueue_test.c b/...main/jni/badvpn/examples/fairqueue_test.c → jni/badvpn/examples/fairqueue_test.c
diff --git a/...ain/jni/badvpn/examples/fairqueue_test2.c → jni/badvpn/examples/fairqueue_test2.c b/...ain/jni/badvpn/examples/fairqueue_test2.c → jni/badvpn/examples/fairqueue_test2.c
diff --git a/...in/jni/badvpn/examples/indexedlist_test.c → jni/badvpn/examples/indexedlist_test.c b/...in/jni/badvpn/examples/indexedlist_test.c → jni/badvpn/examples/indexedlist_test.c
diff --git a/src/main/jni/badvpn/examples/ipaddr6_test.c → jni/badvpn/examples/ipaddr6_test.c b/src/main/jni/badvpn/examples/ipaddr6_test.c → jni/badvpn/examples/ipaddr6_test.c
diff --git a/...ain/jni/badvpn/examples/ncd_parser_test.c → jni/badvpn/examples/ncd_parser_test.c b/...ain/jni/badvpn/examples/ncd_parser_test.c → jni/badvpn/examples/ncd_parser_test.c
diff --git a/.../jni/badvpn/examples/ncd_tokenizer_test.c → jni/badvpn/examples/ncd_tokenizer_test.c b/.../jni/badvpn/examples/ncd_tokenizer_test.c → jni/badvpn/examples/ncd_tokenizer_test.c
diff --git a/...i/badvpn/examples/ncd_value_parser_test.c → jni/badvpn/examples/ncd_value_parser_test.c b/...i/badvpn/examples/ncd_value_parser_test.c → jni/badvpn/examples/ncd_value_parser_test.c
diff --git a/...advpn/examples/ncdinterfacemonitor_test.c → ...advpn/examples/ncdinterfacemonitor_test.c b/...advpn/examples/ncdinterfacemonitor_test.c → ...advpn/examples/ncdinterfacemonitor_test.c
diff --git a/...jni/badvpn/examples/ncdudevmanager_test.c → jni/badvpn/examples/ncdudevmanager_test.c b/...jni/badvpn/examples/ncdudevmanager_test.c → jni/badvpn/examples/ncdudevmanager_test.c
diff --git a/...jni/badvpn/examples/ncdudevmonitor_test.c → jni/badvpn/examples/ncdudevmonitor_test.c b/...jni/badvpn/examples/ncdudevmonitor_test.c → jni/badvpn/examples/ncdudevmonitor_test.c
diff --git a/src/main/jni/badvpn/examples/ncdval_test.c → jni/badvpn/examples/ncdval_test.c b/src/main/jni/badvpn/examples/ncdval_test.c → jni/badvpn/examples/ncdval_test.c
diff --git a/...ain/jni/badvpn/examples/ncdvalcons_test.c → jni/badvpn/examples/ncdvalcons_test.c b/...ain/jni/badvpn/examples/ncdvalcons_test.c → jni/badvpn/examples/ncdvalcons_test.c
diff --git a/...n/jni/badvpn/examples/parse_number_test.c → jni/badvpn/examples/parse_number_test.c b/...n/jni/badvpn/examples/parse_number_test.c → jni/badvpn/examples/parse_number_test.c
diff --git a/...main/jni/badvpn/examples/predicate_test.c → jni/badvpn/examples/predicate_test.c b/...main/jni/badvpn/examples/predicate_test.c → jni/badvpn/examples/predicate_test.c
diff --git a/src/main/jni/badvpn/examples/savl_test.c → jni/badvpn/examples/savl_test.c b/src/main/jni/badvpn/examples/savl_test.c → jni/badvpn/examples/savl_test.c
diff --git a/...main/jni/badvpn/examples/savl_test_tree.h → jni/badvpn/examples/savl_test_tree.h b/...main/jni/badvpn/examples/savl_test_tree.h → jni/badvpn/examples/savl_test_tree.h
diff --git a/src/main/jni/badvpn/examples/stdin_input.c → jni/badvpn/examples/stdin_input.c b/src/main/jni/badvpn/examples/stdin_input.c → jni/badvpn/examples/stdin_input.c
diff --git a/...main/jni/badvpn/examples/substring_test.c → jni/badvpn/examples/substring_test.c b/...main/jni/badvpn/examples/substring_test.c → jni/badvpn/examples/substring_test.c
diff --git a/src/main/jni/badvpn/fix_flex.php → jni/badvpn/fix_flex.php b/src/main/jni/badvpn/fix_flex.php → jni/badvpn/fix_flex.php
diff --git a/src/main/jni/badvpn/flooder/CMakeLists.txt → jni/badvpn/flooder/CMakeLists.txt b/src/main/jni/badvpn/flooder/CMakeLists.txt → jni/badvpn/flooder/CMakeLists.txt
diff --git a/src/main/jni/badvpn/flooder/flooder.c → jni/badvpn/flooder/flooder.c b/src/main/jni/badvpn/flooder/flooder.c → jni/badvpn/flooder/flooder.c
diff --git a/src/main/jni/badvpn/flooder/flooder.h → jni/badvpn/flooder/flooder.h b/src/main/jni/badvpn/flooder/flooder.h → jni/badvpn/flooder/flooder.h
diff --git a/src/main/jni/badvpn/flow/BufferWriter.c → jni/badvpn/flow/BufferWriter.c b/src/main/jni/badvpn/flow/BufferWriter.c → jni/badvpn/flow/BufferWriter.c
diff --git a/src/main/jni/badvpn/flow/BufferWriter.h → jni/badvpn/flow/BufferWriter.h b/src/main/jni/badvpn/flow/BufferWriter.h → jni/badvpn/flow/BufferWriter.h
diff --git a/src/main/jni/badvpn/flow/CMakeLists.txt → jni/badvpn/flow/CMakeLists.txt b/src/main/jni/badvpn/flow/CMakeLists.txt → jni/badvpn/flow/CMakeLists.txt
diff --git a/src/main/jni/badvpn/flow/LineBuffer.c → jni/badvpn/flow/LineBuffer.c b/src/main/jni/badvpn/flow/LineBuffer.c → jni/badvpn/flow/LineBuffer.c
diff --git a/src/main/jni/badvpn/flow/LineBuffer.h → jni/badvpn/flow/LineBuffer.h b/src/main/jni/badvpn/flow/LineBuffer.h → jni/badvpn/flow/LineBuffer.h
diff --git a/src/main/jni/badvpn/flow/PacketBuffer.c → jni/badvpn/flow/PacketBuffer.c b/src/main/jni/badvpn/flow/PacketBuffer.c → jni/badvpn/flow/PacketBuffer.c
diff --git a/src/main/jni/badvpn/flow/PacketBuffer.h → jni/badvpn/flow/PacketBuffer.h b/src/main/jni/badvpn/flow/PacketBuffer.h → jni/badvpn/flow/PacketBuffer.h
diff --git a/src/main/jni/badvpn/flow/PacketCopier.c → jni/badvpn/flow/PacketCopier.c b/src/main/jni/badvpn/flow/PacketCopier.c → jni/badvpn/flow/PacketCopier.c
diff --git a/src/main/jni/badvpn/flow/PacketCopier.h → jni/badvpn/flow/PacketCopier.h b/src/main/jni/badvpn/flow/PacketCopier.h → jni/badvpn/flow/PacketCopier.h
diff --git a/...ain/jni/badvpn/flow/PacketPassConnector.c → jni/badvpn/flow/PacketPassConnector.c b/...ain/jni/badvpn/flow/PacketPassConnector.c → jni/badvpn/flow/PacketPassConnector.c
diff --git a/...ain/jni/badvpn/flow/PacketPassConnector.h → jni/badvpn/flow/PacketPassConnector.h b/...ain/jni/badvpn/flow/PacketPassConnector.h → jni/badvpn/flow/PacketPassConnector.h
diff --git a/...ain/jni/badvpn/flow/PacketPassFairQueue.c → jni/badvpn/flow/PacketPassFairQueue.c b/...ain/jni/badvpn/flow/PacketPassFairQueue.c → jni/badvpn/flow/PacketPassFairQueue.c
diff --git a/...ain/jni/badvpn/flow/PacketPassFairQueue.h → jni/badvpn/flow/PacketPassFairQueue.h b/...ain/jni/badvpn/flow/PacketPassFairQueue.h → jni/badvpn/flow/PacketPassFairQueue.h
diff --git a/...ni/badvpn/flow/PacketPassFairQueue_tree.h → jni/badvpn/flow/PacketPassFairQueue_tree.h b/...ni/badvpn/flow/PacketPassFairQueue_tree.h → jni/badvpn/flow/PacketPassFairQueue_tree.h
diff --git a/...ain/jni/badvpn/flow/PacketPassFifoQueue.c → jni/badvpn/flow/PacketPassFifoQueue.c b/...ain/jni/badvpn/flow/PacketPassFifoQueue.c → jni/badvpn/flow/PacketPassFifoQueue.c
diff --git a/...ain/jni/badvpn/flow/PacketPassFifoQueue.h → jni/badvpn/flow/PacketPassFifoQueue.h b/...ain/jni/badvpn/flow/PacketPassFifoQueue.h → jni/badvpn/flow/PacketPassFifoQueue.h
diff --git a/...ain/jni/badvpn/flow/PacketPassInterface.c → jni/badvpn/flow/PacketPassInterface.c b/...ain/jni/badvpn/flow/PacketPassInterface.c → jni/badvpn/flow/PacketPassInterface.c
diff --git a/...ain/jni/badvpn/flow/PacketPassInterface.h → jni/badvpn/flow/PacketPassInterface.h b/...ain/jni/badvpn/flow/PacketPassInterface.h → jni/badvpn/flow/PacketPassInterface.h
diff --git a/...main/jni/badvpn/flow/PacketPassNotifier.c → jni/badvpn/flow/PacketPassNotifier.c b/...main/jni/badvpn/flow/PacketPassNotifier.c → jni/badvpn/flow/PacketPassNotifier.c
diff --git a/...main/jni/badvpn/flow/PacketPassNotifier.h → jni/badvpn/flow/PacketPassNotifier.h b/...main/jni/badvpn/flow/PacketPassNotifier.h → jni/badvpn/flow/PacketPassNotifier.h
diff --git a/...jni/badvpn/flow/PacketPassPriorityQueue.c → jni/badvpn/flow/PacketPassPriorityQueue.c b/...jni/badvpn/flow/PacketPassPriorityQueue.c → jni/badvpn/flow/PacketPassPriorityQueue.c
diff --git a/...jni/badvpn/flow/PacketPassPriorityQueue.h → jni/badvpn/flow/PacketPassPriorityQueue.h b/...jni/badvpn/flow/PacketPassPriorityQueue.h → jni/badvpn/flow/PacketPassPriorityQueue.h
diff --git a/...advpn/flow/PacketPassPriorityQueue_tree.h → ...advpn/flow/PacketPassPriorityQueue_tree.h b/...advpn/flow/PacketPassPriorityQueue_tree.h → ...advpn/flow/PacketPassPriorityQueue_tree.h
diff --git a/...main/jni/badvpn/flow/PacketProtoDecoder.c → jni/badvpn/flow/PacketProtoDecoder.c b/...main/jni/badvpn/flow/PacketProtoDecoder.c → jni/badvpn/flow/PacketProtoDecoder.c
diff --git a/...main/jni/badvpn/flow/PacketProtoDecoder.h → jni/badvpn/flow/PacketProtoDecoder.h b/...main/jni/badvpn/flow/PacketProtoDecoder.h → jni/badvpn/flow/PacketProtoDecoder.h
diff --git a/...main/jni/badvpn/flow/PacketProtoEncoder.c → jni/badvpn/flow/PacketProtoEncoder.c b/...main/jni/badvpn/flow/PacketProtoEncoder.c → jni/badvpn/flow/PacketProtoEncoder.c
diff --git a/...main/jni/badvpn/flow/PacketProtoEncoder.h → jni/badvpn/flow/PacketProtoEncoder.h b/...main/jni/badvpn/flow/PacketProtoEncoder.h → jni/badvpn/flow/PacketProtoEncoder.h
diff --git a/src/main/jni/badvpn/flow/PacketProtoFlow.c → jni/badvpn/flow/PacketProtoFlow.c b/src/main/jni/badvpn/flow/PacketProtoFlow.c → jni/badvpn/flow/PacketProtoFlow.c
diff --git a/src/main/jni/badvpn/flow/PacketProtoFlow.h → jni/badvpn/flow/PacketProtoFlow.h b/src/main/jni/badvpn/flow/PacketProtoFlow.h → jni/badvpn/flow/PacketProtoFlow.h
diff --git a/src/main/jni/badvpn/flow/PacketRecvBlocker.c → jni/badvpn/flow/PacketRecvBlocker.c b/src/main/jni/badvpn/flow/PacketRecvBlocker.c → jni/badvpn/flow/PacketRecvBlocker.c
diff --git a/src/main/jni/badvpn/flow/PacketRecvBlocker.h → jni/badvpn/flow/PacketRecvBlocker.h b/src/main/jni/badvpn/flow/PacketRecvBlocker.h → jni/badvpn/flow/PacketRecvBlocker.h
diff --git a/...ain/jni/badvpn/flow/PacketRecvConnector.c → jni/badvpn/flow/PacketRecvConnector.c b/...ain/jni/badvpn/flow/PacketRecvConnector.c → jni/badvpn/flow/PacketRecvConnector.c
diff --git a/...ain/jni/badvpn/flow/PacketRecvConnector.h → jni/badvpn/flow/PacketRecvConnector.h b/...ain/jni/badvpn/flow/PacketRecvConnector.h → jni/badvpn/flow/PacketRecvConnector.h
diff --git a/...ain/jni/badvpn/flow/PacketRecvInterface.c → jni/badvpn/flow/PacketRecvInterface.c b/...ain/jni/badvpn/flow/PacketRecvInterface.c → jni/badvpn/flow/PacketRecvInterface.c
diff --git a/...ain/jni/badvpn/flow/PacketRecvInterface.h → jni/badvpn/flow/PacketRecvInterface.h b/...ain/jni/badvpn/flow/PacketRecvInterface.h → jni/badvpn/flow/PacketRecvInterface.h
diff --git a/src/main/jni/badvpn/flow/PacketRouter.c → jni/badvpn/flow/PacketRouter.c b/src/main/jni/badvpn/flow/PacketRouter.c → jni/badvpn/flow/PacketRouter.c
diff --git a/src/main/jni/badvpn/flow/PacketRouter.h → jni/badvpn/flow/PacketRouter.h b/src/main/jni/badvpn/flow/PacketRouter.h → jni/badvpn/flow/PacketRouter.h
diff --git a/...main/jni/badvpn/flow/PacketStreamSender.c → jni/badvpn/flow/PacketStreamSender.c b/...main/jni/badvpn/flow/PacketStreamSender.c → jni/badvpn/flow/PacketStreamSender.c
diff --git a/...main/jni/badvpn/flow/PacketStreamSender.h → jni/badvpn/flow/PacketStreamSender.h b/...main/jni/badvpn/flow/PacketStreamSender.h → jni/badvpn/flow/PacketStreamSender.h
diff --git a/src/main/jni/badvpn/flow/RouteBuffer.c → jni/badvpn/flow/RouteBuffer.c b/src/main/jni/badvpn/flow/RouteBuffer.c → jni/badvpn/flow/RouteBuffer.c
diff --git a/src/main/jni/badvpn/flow/RouteBuffer.h → jni/badvpn/flow/RouteBuffer.h b/src/main/jni/badvpn/flow/RouteBuffer.h → jni/badvpn/flow/RouteBuffer.h
diff --git a/...main/jni/badvpn/flow/SinglePacketBuffer.c → jni/badvpn/flow/SinglePacketBuffer.c b/...main/jni/badvpn/flow/SinglePacketBuffer.c → jni/badvpn/flow/SinglePacketBuffer.c
diff --git a/...main/jni/badvpn/flow/SinglePacketBuffer.h → jni/badvpn/flow/SinglePacketBuffer.h b/...main/jni/badvpn/flow/SinglePacketBuffer.h → jni/badvpn/flow/SinglePacketBuffer.h
diff --git a/...main/jni/badvpn/flow/SinglePacketSender.c → jni/badvpn/flow/SinglePacketSender.c b/...main/jni/badvpn/flow/SinglePacketSender.c → jni/badvpn/flow/SinglePacketSender.c
diff --git a/...main/jni/badvpn/flow/SinglePacketSender.h → jni/badvpn/flow/SinglePacketSender.h b/...main/jni/badvpn/flow/SinglePacketSender.h → jni/badvpn/flow/SinglePacketSender.h
diff --git a/...in/jni/badvpn/flow/SingleStreamReceiver.c → jni/badvpn/flow/SingleStreamReceiver.c b/...in/jni/badvpn/flow/SingleStreamReceiver.c → jni/badvpn/flow/SingleStreamReceiver.c
diff --git a/...in/jni/badvpn/flow/SingleStreamReceiver.h → jni/badvpn/flow/SingleStreamReceiver.h b/...in/jni/badvpn/flow/SingleStreamReceiver.h → jni/badvpn/flow/SingleStreamReceiver.h
diff --git a/...main/jni/badvpn/flow/SingleStreamSender.c → jni/badvpn/flow/SingleStreamSender.c b/...main/jni/badvpn/flow/SingleStreamSender.c → jni/badvpn/flow/SingleStreamSender.c
diff --git a/...main/jni/badvpn/flow/SingleStreamSender.h → jni/badvpn/flow/SingleStreamSender.h b/...main/jni/badvpn/flow/SingleStreamSender.h → jni/badvpn/flow/SingleStreamSender.h
diff --git a/...main/jni/badvpn/flow/StreamPacketSender.c → jni/badvpn/flow/StreamPacketSender.c b/...main/jni/badvpn/flow/StreamPacketSender.c → jni/badvpn/flow/StreamPacketSender.c
diff --git a/...main/jni/badvpn/flow/StreamPacketSender.h → jni/badvpn/flow/StreamPacketSender.h b/...main/jni/badvpn/flow/StreamPacketSender.h → jni/badvpn/flow/StreamPacketSender.h
diff --git a/...ain/jni/badvpn/flow/StreamPassConnector.c → jni/badvpn/flow/StreamPassConnector.c b/...ain/jni/badvpn/flow/StreamPassConnector.c → jni/badvpn/flow/StreamPassConnector.c
diff --git a/...ain/jni/badvpn/flow/StreamPassConnector.h → jni/badvpn/flow/StreamPassConnector.h b/...ain/jni/badvpn/flow/StreamPassConnector.h → jni/badvpn/flow/StreamPassConnector.h
diff --git a/...ain/jni/badvpn/flow/StreamPassInterface.c → jni/badvpn/flow/StreamPassInterface.c b/...ain/jni/badvpn/flow/StreamPassInterface.c → jni/badvpn/flow/StreamPassInterface.c
diff --git a/...ain/jni/badvpn/flow/StreamPassInterface.h → jni/badvpn/flow/StreamPassInterface.h b/...ain/jni/badvpn/flow/StreamPassInterface.h → jni/badvpn/flow/StreamPassInterface.h
diff --git a/...ain/jni/badvpn/flow/StreamRecvConnector.c → jni/badvpn/flow/StreamRecvConnector.c b/...ain/jni/badvpn/flow/StreamRecvConnector.c → jni/badvpn/flow/StreamRecvConnector.c
diff --git a/...ain/jni/badvpn/flow/StreamRecvConnector.h → jni/badvpn/flow/StreamRecvConnector.h b/...ain/jni/badvpn/flow/StreamRecvConnector.h → jni/badvpn/flow/StreamRecvConnector.h
diff --git a/...ain/jni/badvpn/flow/StreamRecvInterface.c → jni/badvpn/flow/StreamRecvInterface.c b/...ain/jni/badvpn/flow/StreamRecvInterface.c → jni/badvpn/flow/StreamRecvInterface.c
diff --git a/...ain/jni/badvpn/flow/StreamRecvInterface.h → jni/badvpn/flow/StreamRecvInterface.h b/...ain/jni/badvpn/flow/StreamRecvInterface.h → jni/badvpn/flow/StreamRecvInterface.h
diff --git a/src/main/jni/badvpn/flowextra/CMakeLists.txt → jni/badvpn/flowextra/CMakeLists.txt b/src/main/jni/badvpn/flowextra/CMakeLists.txt → jni/badvpn/flowextra/CMakeLists.txt
diff --git a/src/main/jni/badvpn/flowextra/KeepaliveIO.c → jni/badvpn/flowextra/KeepaliveIO.c b/src/main/jni/badvpn/flowextra/KeepaliveIO.c → jni/badvpn/flowextra/KeepaliveIO.c
diff --git a/src/main/jni/badvpn/flowextra/KeepaliveIO.h → jni/badvpn/flowextra/KeepaliveIO.h b/src/main/jni/badvpn/flowextra/KeepaliveIO.h → jni/badvpn/flowextra/KeepaliveIO.h
diff --git a/...n/flowextra/PacketPassInactivityMonitor.c → ...n/flowextra/PacketPassInactivityMonitor.c b/...n/flowextra/PacketPassInactivityMonitor.c → ...n/flowextra/PacketPassInactivityMonitor.c
diff --git a/...n/flowextra/PacketPassInactivityMonitor.h → ...n/flowextra/PacketPassInactivityMonitor.h b/...n/flowextra/PacketPassInactivityMonitor.h → ...n/flowextra/PacketPassInactivityMonitor.h
diff --git a/src/main/jni/badvpn/generate_files → jni/badvpn/generate_files b/src/main/jni/badvpn/generate_files → jni/badvpn/generate_files
diff --git a/.../badvpn/generated/NCDConfigParser_parse.c → jni/badvpn/generated/NCDConfigParser_parse.c b/.../badvpn/generated/NCDConfigParser_parse.c → jni/badvpn/generated/NCDConfigParser_parse.c
diff --git a/.../badvpn/generated/NCDConfigParser_parse.h → jni/badvpn/generated/NCDConfigParser_parse.h b/.../badvpn/generated/NCDConfigParser_parse.h → jni/badvpn/generated/NCDConfigParser_parse.h
diff --git a/...advpn/generated/NCDConfigParser_parse.out → ...advpn/generated/NCDConfigParser_parse.out b/...advpn/generated/NCDConfigParser_parse.out → ...advpn/generated/NCDConfigParser_parse.out
diff --git a/.../badvpn/generated/NCDConfigParser_parse.y → jni/badvpn/generated/NCDConfigParser_parse.y b/.../badvpn/generated/NCDConfigParser_parse.y → jni/badvpn/generated/NCDConfigParser_parse.y
diff --git a/...jni/badvpn/generated/NCDValParser_parse.c → jni/badvpn/generated/NCDValParser_parse.c b/...jni/badvpn/generated/NCDValParser_parse.c → jni/badvpn/generated/NCDValParser_parse.c
diff --git a/...jni/badvpn/generated/NCDValParser_parse.h → jni/badvpn/generated/NCDValParser_parse.h b/...jni/badvpn/generated/NCDValParser_parse.h → jni/badvpn/generated/NCDValParser_parse.h
diff --git a/...i/badvpn/generated/NCDValParser_parse.out → jni/badvpn/generated/NCDValParser_parse.out b/...i/badvpn/generated/NCDValParser_parse.out → jni/badvpn/generated/NCDValParser_parse.out
diff --git a/...jni/badvpn/generated/NCDValParser_parse.y → jni/badvpn/generated/NCDValParser_parse.y b/...jni/badvpn/generated/NCDValParser_parse.y → jni/badvpn/generated/NCDValParser_parse.y
diff --git a/...n/jni/badvpn/generated/bison_BPredicate.c → jni/badvpn/generated/bison_BPredicate.c b/...n/jni/badvpn/generated/bison_BPredicate.c → jni/badvpn/generated/bison_BPredicate.c
diff --git a/...n/jni/badvpn/generated/bison_BPredicate.h → jni/badvpn/generated/bison_BPredicate.h b/...n/jni/badvpn/generated/bison_BPredicate.h → jni/badvpn/generated/bison_BPredicate.h
diff --git a/...badvpn/generated/blog_channel_BArpProbe.h → ...badvpn/generated/blog_channel_BArpProbe.h b/...badvpn/generated/blog_channel_BArpProbe.h → ...badvpn/generated/blog_channel_BArpProbe.h
diff --git a/...dvpn/generated/blog_channel_BConnection.h → ...dvpn/generated/blog_channel_BConnection.h b/...dvpn/generated/blog_channel_BConnection.h → ...dvpn/generated/blog_channel_BConnection.h
diff --git a/...dvpn/generated/blog_channel_BDHCPClient.h → ...dvpn/generated/blog_channel_BDHCPClient.h b/...dvpn/generated/blog_channel_BDHCPClient.h → ...dvpn/generated/blog_channel_BDHCPClient.h
diff --git a/.../generated/blog_channel_BDHCPClientCore.h → .../generated/blog_channel_BDHCPClientCore.h b/.../generated/blog_channel_BDHCPClientCore.h → .../generated/blog_channel_BDHCPClientCore.h
diff --git a/...badvpn/generated/blog_channel_BDatagram.h → ...badvpn/generated/blog_channel_BDatagram.h b/...badvpn/generated/blog_channel_BDatagram.h → ...badvpn/generated/blog_channel_BDatagram.h
diff --git a/...dvpn/generated/blog_channel_BEncryption.h → ...dvpn/generated/blog_channel_BEncryption.h b/...dvpn/generated/blog_channel_BEncryption.h → ...dvpn/generated/blog_channel_BEncryption.h
diff --git a/...pn/generated/blog_channel_BInputProcess.h → ...pn/generated/blog_channel_BInputProcess.h b/...pn/generated/blog_channel_BInputProcess.h → ...pn/generated/blog_channel_BInputProcess.h
diff --git a/...vpn/generated/blog_channel_BLockReactor.h → ...vpn/generated/blog_channel_BLockReactor.h b/...vpn/generated/blog_channel_BLockReactor.h → ...vpn/generated/blog_channel_BLockReactor.h
diff --git a/.../badvpn/generated/blog_channel_BNetwork.h → jni/badvpn/generated/blog_channel_BNetwork.h b/.../badvpn/generated/blog_channel_BNetwork.h → jni/badvpn/generated/blog_channel_BNetwork.h
diff --git a/...advpn/generated/blog_channel_BPredicate.h → ...advpn/generated/blog_channel_BPredicate.h b/...advpn/generated/blog_channel_BPredicate.h → ...advpn/generated/blog_channel_BPredicate.h
diff --git a/.../badvpn/generated/blog_channel_BProcess.h → jni/badvpn/generated/blog_channel_BProcess.h b/.../badvpn/generated/blog_channel_BProcess.h → jni/badvpn/generated/blog_channel_BProcess.h
diff --git a/.../badvpn/generated/blog_channel_BReactor.h → jni/badvpn/generated/blog_channel_BReactor.h b/.../badvpn/generated/blog_channel_BReactor.h → jni/badvpn/generated/blog_channel_BReactor.h
diff --git a/...n/generated/blog_channel_BSSLConnection.h → ...n/generated/blog_channel_BSSLConnection.h b/...n/generated/blog_channel_BSSLConnection.h → ...n/generated/blog_channel_BSSLConnection.h
diff --git a/...i/badvpn/generated/blog_channel_BSignal.h → jni/badvpn/generated/blog_channel_BSignal.h b/...i/badvpn/generated/blog_channel_BSignal.h → jni/badvpn/generated/blog_channel_BSignal.h
diff --git a/...vpn/generated/blog_channel_BSocksClient.h → ...vpn/generated/blog_channel_BSocksClient.h b/...vpn/generated/blog_channel_BSocksClient.h → ...vpn/generated/blog_channel_BSocksClient.h
diff --git a/.../jni/badvpn/generated/blog_channel_BTap.h → jni/badvpn/generated/blog_channel_BTap.h b/.../jni/badvpn/generated/blog_channel_BTap.h → jni/badvpn/generated/blog_channel_BTap.h
diff --git a/...pn/generated/blog_channel_BThreadSignal.h → ...pn/generated/blog_channel_BThreadSignal.h b/...pn/generated/blog_channel_BThreadSignal.h → ...pn/generated/blog_channel_BThreadSignal.h
diff --git a/...dvpn/generated/blog_channel_BThreadWork.h → ...dvpn/generated/blog_channel_BThreadWork.h b/...dvpn/generated/blog_channel_BThreadWork.h → ...dvpn/generated/blog_channel_BThreadWork.h
diff --git a/...jni/badvpn/generated/blog_channel_BTime.h → jni/badvpn/generated/blog_channel_BTime.h b/...jni/badvpn/generated/blog_channel_BTime.h → jni/badvpn/generated/blog_channel_BTime.h
diff --git a/...dvpn/generated/blog_channel_BUnixSignal.h → ...dvpn/generated/blog_channel_BUnixSignal.h b/...dvpn/generated/blog_channel_BUnixSignal.h → ...dvpn/generated/blog_channel_BUnixSignal.h
diff --git a/...badvpn/generated/blog_channel_DPReceive.h → ...badvpn/generated/blog_channel_DPReceive.h b/...badvpn/generated/blog_channel_DPReceive.h → ...badvpn/generated/blog_channel_DPReceive.h
diff --git a/...i/badvpn/generated/blog_channel_DPRelay.h → jni/badvpn/generated/blog_channel_DPRelay.h b/...i/badvpn/generated/blog_channel_DPRelay.h → jni/badvpn/generated/blog_channel_DPRelay.h
diff --git a/...badvpn/generated/blog_channel_DataProto.h → ...badvpn/generated/blog_channel_DataProto.h b/...badvpn/generated/blog_channel_DataProto.h → ...badvpn/generated/blog_channel_DataProto.h
diff --git a/...n/generated/blog_channel_DatagramPeerIO.h → ...n/generated/blog_channel_DatagramPeerIO.h b/...n/generated/blog_channel_DatagramPeerIO.h → ...n/generated/blog_channel_DatagramPeerIO.h
diff --git a/...ted/blog_channel_FragmentProtoAssembler.h → ...ted/blog_channel_FragmentProtoAssembler.h b/...ted/blog_channel_FragmentProtoAssembler.h → ...ted/blog_channel_FragmentProtoAssembler.h
diff --git a/...vpn/generated/blog_channel_FrameDecider.h → ...vpn/generated/blog_channel_FrameDecider.h b/...vpn/generated/blog_channel_FrameDecider.h → ...vpn/generated/blog_channel_FrameDecider.h
diff --git a/...advpn/generated/blog_channel_LineBuffer.h → ...advpn/generated/blog_channel_LineBuffer.h b/...advpn/generated/blog_channel_LineBuffer.h → ...advpn/generated/blog_channel_LineBuffer.h
diff --git a/.../badvpn/generated/blog_channel_Listener.h → jni/badvpn/generated/blog_channel_Listener.h b/.../badvpn/generated/blog_channel_Listener.h → jni/badvpn/generated/blog_channel_Listener.h
diff --git a/.../generated/blog_channel_NCDBuildProgram.h → .../generated/blog_channel_NCDBuildProgram.h b/.../generated/blog_channel_NCDBuildProgram.h → .../generated/blog_channel_NCDBuildProgram.h
diff --git a/.../generated/blog_channel_NCDConfigParser.h → .../generated/blog_channel_NCDConfigParser.h b/.../generated/blog_channel_NCDConfigParser.h → .../generated/blog_channel_NCDConfigParser.h
diff --git a/...nerated/blog_channel_NCDConfigTokenizer.h → ...nerated/blog_channel_NCDConfigTokenizer.h b/...nerated/blog_channel_NCDConfigTokenizer.h → ...nerated/blog_channel_NCDConfigTokenizer.h
diff --git a/...dvpn/generated/blog_channel_NCDIfConfig.h → ...dvpn/generated/blog_channel_NCDIfConfig.h b/...dvpn/generated/blog_channel_NCDIfConfig.h → ...dvpn/generated/blog_channel_NCDIfConfig.h
diff --git a/...erated/blog_channel_NCDInterfaceMonitor.h → ...erated/blog_channel_NCDInterfaceMonitor.h b/...erated/blog_channel_NCDInterfaceMonitor.h → ...erated/blog_channel_NCDInterfaceMonitor.h
diff --git a/...n/generated/blog_channel_NCDModuleIndex.h → ...n/generated/blog_channel_NCDModuleIndex.h b/...n/generated/blog_channel_NCDModuleIndex.h → ...n/generated/blog_channel_NCDModuleIndex.h
diff --git a/...generated/blog_channel_NCDModuleProcess.h → ...generated/blog_channel_NCDModuleProcess.h b/...generated/blog_channel_NCDModuleProcess.h → ...generated/blog_channel_NCDModuleProcess.h
diff --git a/...generated/blog_channel_NCDPlaceholderDb.h → ...generated/blog_channel_NCDPlaceholderDb.h b/...generated/blog_channel_NCDPlaceholderDb.h → ...generated/blog_channel_NCDPlaceholderDb.h
diff --git a/...advpn/generated/blog_channel_NCDRequest.h → ...advpn/generated/blog_channel_NCDRequest.h b/...advpn/generated/blog_channel_NCDRequest.h → ...advpn/generated/blog_channel_NCDRequest.h
diff --git a/...generated/blog_channel_NCDRequestClient.h → ...generated/blog_channel_NCDRequestClient.h b/...generated/blog_channel_NCDRequestClient.h → ...generated/blog_channel_NCDRequestClient.h
diff --git a/...generated/blog_channel_NCDRfkillMonitor.h → ...generated/blog_channel_NCDRfkillMonitor.h b/...generated/blog_channel_NCDRfkillMonitor.h → ...generated/blog_channel_NCDRfkillMonitor.h
diff --git a/...vpn/generated/blog_channel_NCDUdevCache.h → ...vpn/generated/blog_channel_NCDUdevCache.h b/...vpn/generated/blog_channel_NCDUdevCache.h → ...vpn/generated/blog_channel_NCDUdevCache.h
diff --git a/...n/generated/blog_channel_NCDUdevManager.h → ...n/generated/blog_channel_NCDUdevManager.h b/...n/generated/blog_channel_NCDUdevManager.h → ...n/generated/blog_channel_NCDUdevManager.h
diff --git a/...n/generated/blog_channel_NCDUdevMonitor.h → ...n/generated/blog_channel_NCDUdevMonitor.h b/...n/generated/blog_channel_NCDUdevMonitor.h → ...n/generated/blog_channel_NCDUdevMonitor.h
diff --git a/...rated/blog_channel_NCDUdevMonitorParser.h → ...rated/blog_channel_NCDUdevMonitorParser.h b/...rated/blog_channel_NCDUdevMonitorParser.h → ...rated/blog_channel_NCDUdevMonitorParser.h
diff --git a/...ni/badvpn/generated/blog_channel_NCDVal.h → jni/badvpn/generated/blog_channel_NCDVal.h b/...ni/badvpn/generated/blog_channel_NCDVal.h → jni/badvpn/generated/blog_channel_NCDVal.h
diff --git a/.../generated/blog_channel_NCDValGenerator.h → .../generated/blog_channel_NCDValGenerator.h b/.../generated/blog_channel_NCDValGenerator.h → .../generated/blog_channel_NCDValGenerator.h
diff --git a/...vpn/generated/blog_channel_NCDValParser.h → ...vpn/generated/blog_channel_NCDValParser.h b/...vpn/generated/blog_channel_NCDValParser.h → ...vpn/generated/blog_channel_NCDValParser.h
diff --git a/...vpn/generated/blog_channel_PRStreamSink.h → ...vpn/generated/blog_channel_PRStreamSink.h b/...vpn/generated/blog_channel_PRStreamSink.h → ...vpn/generated/blog_channel_PRStreamSink.h
diff --git a/...n/generated/blog_channel_PRStreamSource.h → ...n/generated/blog_channel_PRStreamSource.h b/...n/generated/blog_channel_PRStreamSource.h → ...n/generated/blog_channel_PRStreamSource.h
diff --git a/...nerated/blog_channel_PacketProtoDecoder.h → ...nerated/blog_channel_PacketProtoDecoder.h b/...nerated/blog_channel_PacketProtoDecoder.h → ...nerated/blog_channel_PacketProtoDecoder.h
diff --git a/...generated/blog_channel_PasswordListener.h → ...generated/blog_channel_PasswordListener.h b/...generated/blog_channel_PasswordListener.h → ...generated/blog_channel_PasswordListener.h
diff --git a/.../badvpn/generated/blog_channel_PeerChat.h → jni/badvpn/generated/blog_channel_PeerChat.h b/.../badvpn/generated/blog_channel_PeerChat.h → jni/badvpn/generated/blog_channel_PeerChat.h
diff --git a/...n/generated/blog_channel_SPProtoDecoder.h → ...n/generated/blog_channel_SPProtoDecoder.h b/...n/generated/blog_channel_SPProtoDecoder.h → ...n/generated/blog_channel_SPProtoDecoder.h
diff --git a/...generated/blog_channel_ServerConnection.h → ...generated/blog_channel_ServerConnection.h b/...generated/blog_channel_ServerConnection.h → ...generated/blog_channel_ServerConnection.h
diff --git a/...generated/blog_channel_SocksUdpGwClient.h → ...generated/blog_channel_SocksUdpGwClient.h b/...generated/blog_channel_SocksUdpGwClient.h → ...generated/blog_channel_SocksUdpGwClient.h
diff --git a/...vpn/generated/blog_channel_StreamPeerIO.h → ...vpn/generated/blog_channel_StreamPeerIO.h b/...vpn/generated/blog_channel_StreamPeerIO.h → ...vpn/generated/blog_channel_StreamPeerIO.h
diff --git a/...dvpn/generated/blog_channel_UdpGwClient.h → ...dvpn/generated/blog_channel_UdpGwClient.h b/...dvpn/generated/blog_channel_UdpGwClient.h → ...dvpn/generated/blog_channel_UdpGwClient.h
diff --git a/.../jni/badvpn/generated/blog_channel_addr.h → jni/badvpn/generated/blog_channel_addr.h b/.../jni/badvpn/generated/blog_channel_addr.h → jni/badvpn/generated/blog_channel_addr.h
diff --git a/...ni/badvpn/generated/blog_channel_client.h → jni/badvpn/generated/blog_channel_client.h b/...ni/badvpn/generated/blog_channel_client.h → jni/badvpn/generated/blog_channel_client.h
diff --git a/...generated/blog_channel_dostest_attacker.h → ...generated/blog_channel_dostest_attacker.h b/...generated/blog_channel_dostest_attacker.h → ...generated/blog_channel_dostest_attacker.h
diff --git a/...n/generated/blog_channel_dostest_server.h → ...n/generated/blog_channel_dostest_server.h b/...n/generated/blog_channel_dostest_server.h → ...n/generated/blog_channel_dostest_server.h
diff --git a/...i/badvpn/generated/blog_channel_flooder.h → jni/badvpn/generated/blog_channel_flooder.h b/...i/badvpn/generated/blog_channel_flooder.h → jni/badvpn/generated/blog_channel_flooder.h
diff --git a/.../jni/badvpn/generated/blog_channel_lwip.h → jni/badvpn/generated/blog_channel_lwip.h b/.../jni/badvpn/generated/blog_channel_lwip.h → jni/badvpn/generated/blog_channel_lwip.h
diff --git a/...n/jni/badvpn/generated/blog_channel_ncd.h → jni/badvpn/generated/blog_channel_ncd.h b/...n/jni/badvpn/generated/blog_channel_ncd.h → jni/badvpn/generated/blog_channel_ncd.h
diff --git a/...badvpn/generated/blog_channel_ncd_alias.h → ...badvpn/generated/blog_channel_ncd_alias.h b/...badvpn/generated/blog_channel_ncd_alias.h → ...badvpn/generated/blog_channel_ncd_alias.h
diff --git a/...n/generated/blog_channel_ncd_arithmetic.h → ...n/generated/blog_channel_ncd_arithmetic.h b/...n/generated/blog_channel_ncd_arithmetic.h → ...n/generated/blog_channel_ncd_arithmetic.h
diff --git a/...advpn/generated/blog_channel_ncd_assert.h → ...advpn/generated/blog_channel_ncd_assert.h b/...advpn/generated/blog_channel_ncd_assert.h → ...advpn/generated/blog_channel_ncd_assert.h
diff --git a/...pn/generated/blog_channel_ncd_backtrack.h → ...pn/generated/blog_channel_ncd_backtrack.h b/...pn/generated/blog_channel_ncd_backtrack.h → ...pn/generated/blog_channel_ncd_backtrack.h
diff --git a/...dvpn/generated/blog_channel_ncd_blocker.h → ...dvpn/generated/blog_channel_ncd_blocker.h b/...dvpn/generated/blog_channel_ncd_blocker.h → ...dvpn/generated/blog_channel_ncd_blocker.h
diff --git a/...advpn/generated/blog_channel_ncd_buffer.h → ...advpn/generated/blog_channel_ncd_buffer.h b/...advpn/generated/blog_channel_ncd_buffer.h → ...advpn/generated/blog_channel_ncd_buffer.h
diff --git a/...badvpn/generated/blog_channel_ncd_call2.h → ...badvpn/generated/blog_channel_ncd_call2.h b/...badvpn/generated/blog_channel_ncd_call2.h → ...badvpn/generated/blog_channel_ncd_call2.h
diff --git a/...advpn/generated/blog_channel_ncd_choose.h → ...advpn/generated/blog_channel_ncd_choose.h b/...advpn/generated/blog_channel_ncd_choose.h → ...advpn/generated/blog_channel_ncd_choose.h
diff --git a/...advpn/generated/blog_channel_ncd_concat.h → ...advpn/generated/blog_channel_ncd_concat.h b/...advpn/generated/blog_channel_ncd_concat.h → ...advpn/generated/blog_channel_ncd_concat.h
diff --git a/...advpn/generated/blog_channel_ncd_daemon.h → ...advpn/generated/blog_channel_ncd_daemon.h b/...advpn/generated/blog_channel_ncd_daemon.h → ...advpn/generated/blog_channel_ncd_daemon.h
diff --git a/...advpn/generated/blog_channel_ncd_depend.h → ...advpn/generated/blog_channel_ncd_depend.h b/...advpn/generated/blog_channel_ncd_depend.h → ...advpn/generated/blog_channel_ncd_depend.h
diff --git a/...generated/blog_channel_ncd_depend_scope.h → ...generated/blog_channel_ncd_depend_scope.h b/...generated/blog_channel_ncd_depend_scope.h → ...generated/blog_channel_ncd_depend_scope.h
diff --git a/...nerated/blog_channel_ncd_dynamic_depend.h → ...nerated/blog_channel_ncd_dynamic_depend.h b/...nerated/blog_channel_ncd_dynamic_depend.h → ...nerated/blog_channel_ncd_dynamic_depend.h
diff --git a/.../badvpn/generated/blog_channel_ncd_exit.h → jni/badvpn/generated/blog_channel_ncd_exit.h b/.../badvpn/generated/blog_channel_ncd_exit.h → jni/badvpn/generated/blog_channel_ncd_exit.h
diff --git a/...dvpn/generated/blog_channel_ncd_explode.h → ...dvpn/generated/blog_channel_ncd_explode.h b/...dvpn/generated/blog_channel_ncd_explode.h → ...dvpn/generated/blog_channel_ncd_explode.h
diff --git a/.../badvpn/generated/blog_channel_ncd_file.h → jni/badvpn/generated/blog_channel_ncd_file.h b/.../badvpn/generated/blog_channel_ncd_file.h → jni/badvpn/generated/blog_channel_ncd_file.h
diff --git a/...pn/generated/blog_channel_ncd_file_open.h → ...pn/generated/blog_channel_ncd_file_open.h b/...pn/generated/blog_channel_ncd_file_open.h → ...pn/generated/blog_channel_ncd_file_open.h
diff --git a/...dvpn/generated/blog_channel_ncd_foreach.h → ...dvpn/generated/blog_channel_ncd_foreach.h b/...dvpn/generated/blog_channel_ncd_foreach.h → ...dvpn/generated/blog_channel_ncd_foreach.h
diff --git a/.../generated/blog_channel_ncd_from_string.h → .../generated/blog_channel_ncd_from_string.h b/.../generated/blog_channel_ncd_from_string.h → .../generated/blog_channel_ncd_from_string.h
diff --git a/...dvpn/generated/blog_channel_ncd_getargs.h → ...dvpn/generated/blog_channel_ncd_getargs.h b/...dvpn/generated/blog_channel_ncd_getargs.h → ...dvpn/generated/blog_channel_ncd_getargs.h
diff --git a/...advpn/generated/blog_channel_ncd_getenv.h → ...advpn/generated/blog_channel_ncd_getenv.h b/...advpn/generated/blog_channel_ncd_getenv.h → ...advpn/generated/blog_channel_ncd_getenv.h
diff --git a/...ni/badvpn/generated/blog_channel_ncd_if.h → jni/badvpn/generated/blog_channel_ncd_if.h b/...ni/badvpn/generated/blog_channel_ncd_if.h → jni/badvpn/generated/blog_channel_ncd_if.h
diff --git a/...n/generated/blog_channel_ncd_imperative.h → ...n/generated/blog_channel_ncd_imperative.h b/...n/generated/blog_channel_ncd_imperative.h → ...n/generated/blog_channel_ncd_imperative.h
diff --git a/...dvpn/generated/blog_channel_ncd_implode.h → ...dvpn/generated/blog_channel_ncd_implode.h b/...dvpn/generated/blog_channel_ncd_implode.h → ...dvpn/generated/blog_channel_ncd_implode.h
diff --git a/...badvpn/generated/blog_channel_ncd_index.h → ...badvpn/generated/blog_channel_ncd_index.h b/...badvpn/generated/blog_channel_ncd_index.h → ...badvpn/generated/blog_channel_ncd_index.h
diff --git a/.../badvpn/generated/blog_channel_ncd_list.h → jni/badvpn/generated/blog_channel_ncd_list.h b/.../badvpn/generated/blog_channel_ncd_list.h → jni/badvpn/generated/blog_channel_ncd_list.h
diff --git a/.../generated/blog_channel_ncd_load_module.h → .../generated/blog_channel_ncd_load_module.h b/.../generated/blog_channel_ncd_load_module.h → .../generated/blog_channel_ncd_load_module.h
diff --git a/...i/badvpn/generated/blog_channel_ncd_log.h → jni/badvpn/generated/blog_channel_ncd_log.h b/...i/badvpn/generated/blog_channel_ncd_log.h → jni/badvpn/generated/blog_channel_ncd_log.h
diff --git a/...dvpn/generated/blog_channel_ncd_log_msg.h → ...dvpn/generated/blog_channel_ncd_log_msg.h b/...dvpn/generated/blog_channel_ncd_log_msg.h → ...dvpn/generated/blog_channel_ncd_log_msg.h
diff --git a/...dvpn/generated/blog_channel_ncd_logical.h → ...dvpn/generated/blog_channel_ncd_logical.h b/...dvpn/generated/blog_channel_ncd_logical.h → ...dvpn/generated/blog_channel_ncd_logical.h
diff --git a/.../generated/blog_channel_ncd_multidepend.h → .../generated/blog_channel_ncd_multidepend.h b/.../generated/blog_channel_ncd_multidepend.h → .../generated/blog_channel_ncd_multidepend.h
diff --git a/...ted/blog_channel_ncd_net_backend_badvpn.h → ...ted/blog_channel_ncd_net_backend_badvpn.h b/...ted/blog_channel_ncd_net_backend_badvpn.h → ...ted/blog_channel_ncd_net_backend_badvpn.h