summaryrefslogtreecommitdiff
path: root/openvpn/src
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-12-22 17:47:59 +0100
committerArne Schwabe <arne@rfc2549.org>2012-12-22 17:47:59 +0100
commit1fb9c1158ecb1df4499ccfef98fa71568a35fb90 (patch)
tree47d406eea17bb4aa703fcf75d1d1260eac049718 /openvpn/src
parent5ae6e66c76a8d7da2c22882d487576234ca21c26 (diff)
Add google-breakpad support to ics-openvpn
Diffstat (limited to 'openvpn/src')
-rw-r--r--openvpn/src/openvpn/init.c5
-rw-r--r--openvpn/src/openvpn/openvpn.c6
2 files changed, 10 insertions, 1 deletions
diff --git a/openvpn/src/openvpn/init.c b/openvpn/src/openvpn/init.c
index 6a1ed02..e2942c0 100644
--- a/openvpn/src/openvpn/init.c
+++ b/openvpn/src/openvpn/init.c
@@ -3704,7 +3704,10 @@ close_context (struct context *c, int sig, unsigned int flags)
{
if ((flags & CC_USR1_TO_HUP)
|| (c->sig->source == SIG_SOURCE_HARD && (flags & CC_HARD_USR1_TO_HUP)))
- c->sig->signal_received = SIGHUP;
+ {
+ c->sig->signal_received = SIGHUP;
+ c->sig->signal_text = "close_context usr1 to hup";
+ }
}
if (!(flags & CC_NO_CLOSE))
diff --git a/openvpn/src/openvpn/openvpn.c b/openvpn/src/openvpn/openvpn.c
index 104c9e9..4bae527 100644
--- a/openvpn/src/openvpn/openvpn.c
+++ b/openvpn/src/openvpn/openvpn.c
@@ -321,6 +321,12 @@ wmain (int argc, wchar_t *wargv[]) {
#else
int
main (int argc, char *argv[]) {
+#ifdef TARGET_ANDROID
+#ifdef GOOGLE_BREAKPAD
+#include "../jni/icsandroid.h"
+ setup_breakpad();
+#endif
+#endif
return openvpn_main(argc, argv);
}
#endif