diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-12-22 17:47:59 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-12-22 17:47:59 +0100 |
| commit | 904ce469f833d005b9d209b415924d3ba64bfb01 (patch) | |
| tree | a15fc316559880a5cffadb02241efdc115d5f2a2 /openvpn/src | |
| parent | 1e26d7cfb3a4d951847f08de5cbeac361a83ddb6 (diff) | |
Add google-breakpad support to ics-openvpn
Diffstat (limited to 'openvpn/src')
| -rw-r--r-- | openvpn/src/openvpn/init.c | 5 | ||||
| -rw-r--r-- | openvpn/src/openvpn/openvpn.c | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/openvpn/src/openvpn/init.c b/openvpn/src/openvpn/init.c index 6a1ed02d..e2942c00 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 104c9e93..4bae5274 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 |