December 2013 - tor-commits - lists.torproject.org

[orbot/master] remove static openssl android and replace with real openssl
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit d2006b219f82db6cd502a76351acdc9394d62b64 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Dec 28 00:44:45 2013 -0500 remove static openssl android and replace with real openssl --- .gitmodules | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1bf6832..b9a36f9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "external/openssl-static"] - path = external/openssl-static - url = https://github.com/guardianproject/android-external-openssl-ndk-static.git [submodule "external/tor"] path = external/tor url = https://git.torproject.org/git/tor.git

1 0

[orbot/master] updated AUTHORS for amoghbl1
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit b48bbc14871359b801f96b2cb370f3e49878a52c Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Dec 28 09:39:59 2013 -0500 updated AUTHORS for amoghbl1 --- AUTHORS | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index d9d62ef..1e00944 100644 --- a/AUTHORS +++ b/AUTHORS @@ -35,6 +35,10 @@ __sporkbomb <manuel(a)acanthephyra.net> implemented an updated set of logic in TorTransProxy for handling the "transproxy all" mode of operation. Before certain system processes were leaking traffic, and this was also detected by his excellent auditing. + +Amogh Pradeep <amoghbl1(a)gmail.com> submitted a patch to address an issue +with the ongoing data transfer notification dying now and then, and is +working on improving the notification display in general We found a nice new power button vector set here under the CC license: -http://vector4free.com/vector/free-vector-power-buttons/ \ No newline at end of file +http://vector4free.com/vector/free-vector-power-buttons/

1 0

[orbot/master] update to build openssl latest
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit 198974a0536e284c47592ebc9b8e3655175454fa Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Dec 27 16:41:54 2013 -0500 update to build openssl latest --- external/Makefile | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/external/Makefile b/external/Makefile index 5c32404..95f7f87 100644 --- a/external/Makefile +++ b/external/Makefile @@ -23,7 +23,6 @@ NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-arm NDK_UNAME:=`uname -s | tr '[A-Z]' '[a-z]'` NDK_PROCESSOR:=`uname -m` -#NDK_TOOLCHAIN=$(NDK_BASE)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/$(NDK_UNAME)-$(NDK_PROCESSOR) NDK_TOOLCHAIN=$(NDK_BASE)/toolchains/arm-linux-androideabi-4.6/prebuilt/$(NDK_UNAME)-$(NDK_PROCESSOR) # to use the real HOST tag, you need the latest libtool files: @@ -58,36 +57,38 @@ LDFLAGS += -Wl,--gc-sections all: assets #------------------------------------------------------------------------------# -# openssl-static +# openssl lib/libcrypto.a: - cd openssl-static && \ - ndk-build + cd openssl && \ + CC="$(CC)" \ + ./Configure android-armv7 && \ + ANDROID_DEV=$(NDK_BASE)/platforms/android-8/arch-arm/usr make build_libs lib/libssl.a: - cp config.sub openssl-static - cp config.guess openssl-static - cd openssl-static && \ - ndk-build + cp config.sub openssl + cp config.guess openssl + cd openssl && \ + CC="$(CC)"\ + ./Configure android-armv7 && \ + ANDROID_DEV=$(NDK_BASE)/platforms/android-8/arch-arm/usr make build_libs -openssl-static-build-stamp: lib/libcrypto.a lib/libssl.a - touch openssl-static-build-stamp +openssl-build-stamp: lib/libcrypto.a lib/libssl.a + touch openssl-build-stamp -openssl-static: openssl-static-build-stamp +openssl: openssl-build-stamp test -d lib || mkdir lib test -d include || mkdir include test -d include/openssl || mkdir include/openssl - cp openssl-static/obj/local/armeabi/libcrypto.a lib/libcrypto.a - cp openssl-static/obj/local/armeabi/libssl.a lib/libssl.a - cp openssl-static/include/openssl/* include/openssl - -openssl-static-clean: - -cd openssl-static && \ - ndk-build clean - -rm openssl-static-build-stamp + cp openssl/libcrypto.a lib/libcrypto.a + cp openssl/libssl.a lib/libssl.a + cp openssl/include/openssl/* include/openssl + +openssl-clean: + -rm openssl-build-stamp -rm lib/libcrypto.a -rm lib/libssl.a - -cd openssl-static && \ + -cd openssl && \ git clean -fdx #------------------------------------------------------------------------------# @@ -107,7 +108,7 @@ libevent-build-stamp: libevent/Makefile $(MAKE) -C libevent touch libevent-build-stamp -libevent: openssl-static libevent-build-stamp +libevent: openssl libevent-build-stamp test -d lib || mkdir lib test -d include || mkdir include cp libevent/.libs/libevent.a lib @@ -168,7 +169,7 @@ tor-build-stamp: tor/Makefile $(MAKE) -C tor touch tor-build-stamp -tor: libevent openssl-static tor-build-stamp +tor: libevent openssl tor-build-stamp test -d bin || mkdir bin cp tor/src/or/tor bin @@ -203,7 +204,7 @@ obfsproxy-build-stamp: obfsproxy/Makefile $(MAKE) -C obfsproxy touch obfsproxy-build-stamp -obfsproxy: openssl-static libevent obfsproxy-build-stamp +obfsproxy: openssl libevent obfsproxy-build-stamp test -d bin || mkdir bin cp obfsproxy/obfsproxy bin @@ -289,4 +290,4 @@ assets-clean: #------------------------------------------------------------------------------# # cleanup, cleanup, put the toys away -clean: openssl-static-clean libevent-clean tor-clean privoxy-clean jtorctl-clean assets-clean +clean: openssl-clean libevent-clean tor-clean privoxy-clean jtorctl-clean assets-clean

1 0

[orbot/master] service should be unbound when activity is destroyed
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit 5891feee9acc910148203be20ad1841b5065f155 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Dec 28 00:43:36 2013 -0500 service should be unbound when activity is destroyed also some other cleanup of unused code --- src/org/torproject/android/Orbot.java | 42 ++++++++++----------------------- 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 670de66..9b1d6d8 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -34,7 +34,6 @@ import android.os.Handler; import android.os.IBinder; import android.os.Message; import android.os.RemoteException; -import android.preference.PreferenceManager; import android.text.ClipboardManager; import android.text.Layout; import android.text.method.ScrollingMovementMethod; @@ -47,7 +46,6 @@ import android.view.View; import android.view.View.OnLongClickListener; import android.view.View.OnTouchListener; import android.view.animation.AccelerateInterpolator; -import android.view.animation.Animation; import android.widget.Button; import android.widget.SlidingDrawer; import android.widget.TextView; @@ -97,7 +95,9 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick StrictMode.setVmPolicy(vmpolicy); } */ - + //Kill tor if the button stop tor (in the notification) was clicked! + //Same code needs to be executed in onResume + mPrefs = getPrefs(); mPrefs.registerOnSharedPreferenceChangeListener(this); @@ -341,10 +341,6 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick */ protected void onPause() { super.onPause(); - - //unbindService(); - - //hideProgressDialog(); if (aDialog != null) aDialog.dismiss(); @@ -427,7 +423,6 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick super.onResume(); bindService(); - updateStatus(""); } @@ -511,26 +506,6 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick } - /* - else if (Intent.ACTION_SEND.equals(action)) - { - Uri dataUri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM); - - try { - String shareUrl = mService.addOnionShare(dataUri, type); - - Toast.makeText(this, "Share available at: " + shareUrl, Toast.LENGTH_LONG).show(); - ClipboardManager cm = (ClipboardManager)getSystemService(Context.CLIPBOARD_SERVICE); - cm.setText(shareUrl); - - intent.setAction(null); - - - } catch (RemoteException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - }*/ else { @@ -574,7 +549,6 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick protected void onStop() { super.onStop(); - //unbindService(); } @@ -1157,6 +1131,7 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick } */ + private void setLocale () { @@ -1174,7 +1149,14 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick } } - public class DataCount { + @Override + protected void onDestroy() { + super.onDestroy(); + + unbindService(); + } + + public class DataCount { // data uploaded public long Upload; // data downloaded

1 0

[orbot/master] stop button for notification bar
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit c4d8c97321e014dbb2291e53191ba0dbcfb2a339 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Dec 28 00:44:09 2013 -0500 stop button for notification bar --- res/drawable/button_stop.png | Bin 0 -> 1462 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/res/drawable/button_stop.png b/res/drawable/button_stop.png new file mode 100644 index 0000000..d97a3a8 Binary files /dev/null and b/res/drawable/button_stop.png differ

1 0

[orbot/master] add new openssl
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit 0e6bb4292d541c9469bfc034b6eeda4bf83853b2 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Dec 28 00:44:16 2013 -0500 add new openssl --- .gitmodules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitmodules b/.gitmodules index cdcc96c..1bf6832 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,6 @@ [submodule "external/ActionBarSherlock"] path = external/ActionBarSherlock url = https://github.com/JakeWharton/ActionBarSherlock.git +[submodule "external/openssl"] + path = external/openssl + url = git://git.openssl.org/openssl

1 0

[orbot/master] put threading of settings reload into TorService
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit 8722db9f2dd188a4018e76a73ae3616d4fa5995e Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Dec 28 01:07:54 2013 -0500 put threading of settings reload into TorService --- src/org/torproject/android/Orbot.java | 31 ++++++------------ src/org/torproject/android/service/TorService.java | 33 +++++++++++--------- .../android/settings/ProcessSettingsAsyncTask.java | 32 ------------------- 3 files changed, 27 insertions(+), 69 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 9b1d6d8..15a3a1c 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -9,7 +9,6 @@ import org.torproject.android.service.ITorService; import org.torproject.android.service.ITorServiceCallback; import org.torproject.android.service.TorService; import org.torproject.android.service.TorServiceConstants; -import org.torproject.android.settings.ProcessSettingsAsyncTask; import org.torproject.android.settings.SettingsPreferences; import org.torproject.android.wizard.ChooseLocaleWizardActivity; import org.torproject.android.wizard.TipsAndTricks; @@ -83,27 +82,9 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick /** Called when the activity is first created. */ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - - //this is not the best thing to do, but we sometimes have to do strange things with Orbot - /* - if (android.os.Build.VERSION.SDK_INT > 9) { - StrictMode.ThreadPolicy policy = - new StrictMode.ThreadPolicy.Builder().permitAll().build(); - StrictMode.setThreadPolicy(policy); - StrictMode.VmPolicy vmpolicy = - new StrictMode.VmPolicy.Builder().penaltyLog().build(); - StrictMode.setVmPolicy(vmpolicy); - } - */ - //Kill tor if the button stop tor (in the notification) was clicked! - //Same code needs to be executed in onResume - + mPrefs = getPrefs(); mPrefs.registerOnSharedPreferenceChangeListener(this); - - //if Tor binary is not running, then start the service up - //might want to look at whether we need to call this every time - //or whether binding to the service is enough setLocale(); @@ -671,8 +652,14 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick if (requestCode == 1 && mService != null) { - new ProcessSettingsAsyncTask().execute(mService); - setLocale(); + try { + mService.processSettings(); + setLocale(); + + } catch (RemoteException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index af4198e..0d4982e 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -101,8 +101,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst private static int notificationCounter = 0; private NotificationManager mNotificationManager = null; - - + private Builder mNotifyBuilder; + public void logMessage(String msg) { if (ENABLE_DEBUG_LOG) @@ -199,8 +199,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - - @SuppressLint("NewApi") private void showToolbarNotification (String notifyMsg, int notifyId, int icon, int flags) { @@ -1004,9 +1002,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } } - Builder mNotifyBuilder; - - @SuppressLint("NewApi") + private void startNotification (String message, boolean persistent) { //Reusable code. @@ -1284,16 +1280,23 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void processSettings () { + Thread thread = new Thread() + { - try { - - processSettingsImpl (); - - - } catch (Exception e) { - logException ("error applying mPrefs",e); - } + public void run () + { + try { + + processSettingsImpl (); + + + } catch (Exception e) { + logException ("error applying mPrefs",e); + } + } + }; + thread.start(); } diff --git a/src/org/torproject/android/settings/ProcessSettingsAsyncTask.java b/src/org/torproject/android/settings/ProcessSettingsAsyncTask.java deleted file mode 100644 index 5e14709..0000000 --- a/src/org/torproject/android/settings/ProcessSettingsAsyncTask.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.torproject.android.settings; - -import org.torproject.android.service.ITorService; - -import android.os.AsyncTask; -import android.os.RemoteException; - -public class ProcessSettingsAsyncTask extends AsyncTask<ITorService, Integer, Long> -{ - - - @Override - protected Long doInBackground(ITorService... torService) { - - try { - torService[0].processSettings(); - } catch (RemoteException e) { - e.printStackTrace(); - } - - return 100L; - } - - protected void onProgressUpdate(Integer... progress) { - - } - - protected void onPostExecute(Long result) { - - } - -}

1 0

[orbot/master] clean up of error notifications
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit 8b65332bbbc2218d4f5cf415690038bed92a47e1 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Dec 28 02:18:00 2013 -0500 clean up of error notifications --- src/org/torproject/android/service/TorService.java | 21 ++++++++++++++++---- .../torproject/android/service/TorTransProxy.java | 1 - 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 0d4982e..dbad1be 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -43,6 +43,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; +import android.graphics.Color; import android.net.ConnectivityManager; import android.os.Build; import android.os.Handler; @@ -208,8 +209,16 @@ public class TorService extends Service implements TorServiceConstants, TorConst mNotifyBuilder.setContentText(notifyMsg); mNotifyBuilder.setSmallIcon(icon); + if (notifyId == ERROR_NOTIFY_ID) + { + mNotifyBuilder.setTicker(notifyMsg); + mNotifyBuilder.setOngoing(false); + mNotifyBuilder.setLights(Color.GREEN, 1000, 1000); + } + + mNotificationManager.notify( - NOTIFY_ID, + notifyId, mNotifyBuilder.getNotification()); @@ -1580,6 +1589,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst private boolean processSettingsImpl () throws RemoteException, IOException { + logNotice("updating settings in Tor service"); + SharedPreferences prefs = getSharedPrefs(getApplicationContext()); boolean useBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_ENABLED, false); @@ -1645,7 +1656,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { - showToolbarNotification (getString(R.string.error_installing_binares),ERROR_NOTIFY_ID,R.drawable.ic_stat_tor, Notification.FLAG_ONGOING_EVENT); + showToolbarNotification (getString(R.string.error_installing_binares),ERROR_NOTIFY_ID,R.drawable.ic_stat_notifyerr, Notification.FLAG_ONGOING_EVENT); return false; } @@ -1727,7 +1738,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { - showToolbarNotification (getString(R.string.your_reachableaddresses_settings_caused_an_exception_),ERROR_NOTIFY_ID,R.drawable.ic_stat_tor, Notification.FLAG_ONGOING_EVENT); + showToolbarNotification (getString(R.string.your_reachableaddresses_settings_caused_an_exception_),ERROR_NOTIFY_ID,R.drawable.ic_stat_notifyerr, Notification.FLAG_ONGOING_EVENT); return false; } @@ -1756,7 +1767,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { - showToolbarNotification (getString(R.string.your_relay_settings_caused_an_exception_),ERROR_NOTIFY_ID,R.drawable.ic_stat_tor, Notification.FLAG_ONGOING_EVENT); + showToolbarNotification (getString(R.string.your_relay_settings_caused_an_exception_),ERROR_NOTIFY_ID,R.drawable.ic_stat_notifyerr, Notification.FLAG_ONGOING_EVENT); return false; @@ -1764,6 +1775,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (enableHiddenServices) { + logNotice("hidden services are enabled"); + mBinder.updateConfiguration("HiddenServiceDir",appCacheHome.getAbsolutePath(), false); //mBinder.updateConfiguration("RendPostPeriod", "600 seconds", false); //possible feature to investigate diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index 5c85140..f18d140 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -288,7 +288,6 @@ public class TorTransProxy implements TorServiceConstants { String srcChainName = "OUTPUT"; - //run the delete commands in a separate process as it might error out String[] cmdExecClear = {script.toString()}; code = TorServiceUtils.doShellCommand(cmdExecClear, res, runRoot, waitFor);

1 0

[orbot/master] use new bundled xtables binary appropriately
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit e9396b7cc2beacf7e7b4f2d933512632c858b5e2 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Dec 28 09:21:25 2013 -0500 use new bundled xtables binary appropriately --- src/org/torproject/android/service/TorServiceConstants.java | 5 +++++ src/org/torproject/android/service/TorTransProxy.java | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index c22b2bb..ce16be2 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -87,5 +87,10 @@ public interface TorServiceConstants { public static final String OBFSPROXY_ASSET_KEY = "libobfsproxy.so"; public static final int MESSAGE_TRAFFIC_COUNT = 5; + + + //name of the iptables binary + public final static String IPTABLES_BINARY_ASSET_KEY = "libxtables.so"; + } diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index f18d140..7760d92 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -42,8 +42,9 @@ public class TorTransProxy implements TorServiceConstants { else { //use the bundled version - - ipTablesPath = new File(context.getDir("bin", 0),"iptables").getAbsolutePath(); + File appLibsHome = new File(context.getApplicationInfo().nativeLibraryDir); + ipTablesPath = new File(appLibsHome,IPTABLES_BINARY_ASSET_KEY).getAbsolutePath(); + ipTablesPath += " iptables"; //append subcommand since we are using xtables now }

1 0

[orbot/master] add patches for iptables/xtables building on Android
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit ca28aded12d81c80817435701158c617faae09ad Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Dec 28 09:21:13 2013 -0500 add patches for iptables/xtables building on Android --- external/iptables-patch-1 | 39 +++++++++++++++++++++++++++++++++++++++ external/iptables-patch-2 | 26 ++++++++++++++++++++++++++ external/iptables-patch-3 | 30 ++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+) diff --git a/external/iptables-patch-1 b/external/iptables-patch-1 new file mode 100644 index 0000000..a2657a5 --- /dev/null +++ b/external/iptables-patch-1 @@ -0,0 +1,39 @@ +Bionic defines socklen_t as a signed int, so redefining it as unsigned +breaks the build. + +This change comes from AOSP. + +Signed-off-by: Kevin Cernekee <cernekee@xxxxxxxxx> +--- + libiptc/libip4tc.c | 2 +- + libiptc/libip6tc.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libiptc/libip4tc.c b/libiptc/libip4tc.c +index dd59951..2b029d4 100644 +--- a/libiptc/libip4tc.c ++++ b/libiptc/libip4tc.c +@@ -22,7 +22,7 @@ + #define inline + #endif + +-#if !defined(__GLIBC__) || (__GLIBC__ < 2) ++#if !defined(__ANDROID__) && (!defined(__GLIBC__) || (__GLIBC__ < 2)) + typedef unsigned int socklen_t; + #endif + +diff --git a/libiptc/libip6tc.c b/libiptc/libip6tc.c +index ca01bcb..4e47e69 100644 +--- a/libiptc/libip6tc.c ++++ b/libiptc/libip6tc.c +@@ -23,7 +23,7 @@ + #define inline + #endif + +-#if !defined(__GLIBC__) || (__GLIBC__ < 2) ++#if !defined(__ANDROID__) && (!defined(__GLIBC__) || (__GLIBC__ < 2)) + typedef unsigned int socklen_t; + #endif + +-- +1.7.9.5 diff --git a/external/iptables-patch-2 b/external/iptables-patch-2 new file mode 100644 index 0000000..c740da0 --- /dev/null +++ b/external/iptables-patch-2 @@ -0,0 +1,26 @@ +<netinet/ip.h> and <linux/ip.h> redefine a couple of structs, including +iphdr. Handle this the same way as on glibc, i.e. don't include +<linux/ip.h>. + +This change comes from AOSP. + +Signed-off-by: Kevin Cernekee <cernekee@xxxxxxxxx> +--- + include/libiptc/ipt_kernel_headers.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/libiptc/ipt_kernel_headers.h b/include/libiptc/ipt_kernel_headers.h +index 18861fe..60c7998 100644 +--- a/include/libiptc/ipt_kernel_headers.h ++++ b/include/libiptc/ipt_kernel_headers.h +@@ -5,7 +5,7 @@ + + #include <limits.h> + +-#if defined(__GLIBC__) && __GLIBC__ == 2 ++#if defined(__ANDROID__) || (defined(__GLIBC__) && __GLIBC__ == 2) + #include <netinet/ip.h> + #include <netinet/in.h> + #include <netinet/ip_icmp.h> +-- +1.7.9.5 diff --git a/external/iptables-patch-3 b/external/iptables-patch-3 new file mode 100644 index 0000000..b5517b3 --- /dev/null +++ b/external/iptables-patch-3 @@ -0,0 +1,30 @@ +Bionic's <netinet/tcp.h> is missing constants needed to build this module, +so have autoconf check for this condition before trying to build it. + +Signed-off-by: Kevin Cernekee <cernekee@xxxxxxxxx> +--- + configure.ac | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 76d0b37..53a9ded 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -91,6 +91,14 @@ if test "$nfconntrack" -ne 1; then + echo "WARNING: libnetfilter_conntrack not found, connlabel match will not be built"; + fi; + ++AC_CHECK_DECL([TCPOPT_WINDOW], [tcpopt_ok=1], [tcpopt_ok=0], ++ [[#include <netinet/tcp.h>]]) ++ ++if test "$tcpopt_ok" -ne 1; then ++ blacklist_modules="$blacklist_modules TCPOPTSTRIP"; ++ echo "WARNING: TCPOPT_* constants not found, TCPOPTSTRIP target will not be built"; ++fi; ++ + AC_SUBST([blacklist_modules]) + AC_CHECK_SIZEOF([struct ip6_hdr], [], [#include <netinet/ip6.h>]) + +-- +1.7.9.5 +

1 0