#include <string.h>
#include <sys/utsname.h>
#include <android/log.h>
+#include <errno.h>
#include "charonservice.h"
#include "android_jni.h"
}
}
+/**
+ * Initialize file logger
+ */
+static void initialize_logger(char *logfile)
+{
+ file_logger_t *file_logger;
+ debug_t group;
+ FILE *file;
+
+ /* truncate an existing file */
+ file = fopen(logfile, "w");
+ if (!file)
+ {
+ DBG1(DBG_DMN, "opening file %s for logging failed: %s",
+ logfile, strerror(errno));
+ return;
+ }
+ /* flush each line */
+ setlinebuf(file);
+
+ file_logger = file_logger_create(file, "%b %e %T", FALSE);
+ for (group = 0; group < DBG_MAX; group++)
+ {
+ file_logger->set_level(file_logger, group, ANDROID_DEBUG_LEVEL);
+ }
+ charon->file_loggers->insert_last(charon->file_loggers, file_logger);
+ charon->bus->add_logger(charon->bus, &file_logger->logger);
+}
+
METHOD(charonservice_t, update_status, bool,
private_charonservice_t *this, android_vpn_state_t code)
{
* Initialize charon and the libraries via JNI
*/
JNI_METHOD(CharonVpnService, initializeCharon, void,
- jobject builder)
+ jobject builder, jstring jlogfile)
{
struct sigaction action;
struct utsname utsname;
+ char *logfile;
/* logging for library during initialization, as we have no bus yet */
dbg = dbg_android;
return;
}
+ logfile = androidjni_convert_jstring(env, jlogfile);
+ initialize_logger(logfile);
+ free(logfile);
+
charonservice_init(env, this, builder);
if (uname(&utsname) != 0)
package org.strongswan.android.logic;
+import java.io.File;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
public class CharonVpnService extends VpnService implements Runnable
{
private static final String TAG = CharonVpnService.class.getSimpleName();
+ public static final String LOG_FILE = "charon.log";
+
+ private String mLogFile;
private VpnProfileDataSource mDataSource;
private Thread mConnectionHandler;
private VpnProfile mCurrentProfile;
@Override
public void onCreate()
{
+ mLogFile = getFilesDir().getAbsolutePath() + File.separator + LOG_FILE;
+
mDataSource = new VpnProfileDataSource(this);
mDataSource.open();
/* use a separate thread as main thread for charon */
mIsDisconnecting = false;
BuilderAdapter builder = new BuilderAdapter(mCurrentProfile.getName());
- initializeCharon(builder);
+ initializeCharon(builder, mLogFile);
Log.i(TAG, "charon started");
String local_address = getLocalIPv4Address();
* Initialization of charon, provided by libandroidbridge.so
*
* @param builder BuilderAdapter for this connection
+ * @param logfile absolute path to the logfile
*/
- public native void initializeCharon(BuilderAdapter builder);
+ public native void initializeCharon(BuilderAdapter builder, String logfile);
/**
* Deinitialize charon, provided by libandroidbridge.so