Merge branch 'android-app'
This branch introduces a userland IPsec implementation (libipsec) and an Android App which targets the VpnService API that is provided by Android 4+. The implementation is based on the bachelor thesis 'Userland IPsec for Android 4' by Giuliano Grassi and Ralf Sager.
This commit is contained in:
@@ -114,7 +114,7 @@ typedef struct {
|
||||
/**
|
||||
* Next thread ID.
|
||||
*/
|
||||
static u_int next_id = 1;
|
||||
static u_int next_id;
|
||||
|
||||
/**
|
||||
* Mutex to safely access the next thread ID.
|
||||
@@ -452,6 +452,7 @@ void threads_init()
|
||||
|
||||
dummy1 = thread_value_create(NULL);
|
||||
|
||||
next_id = 1;
|
||||
main_thread->id = 0;
|
||||
main_thread->thread_id = pthread_self();
|
||||
current_thread = thread_value_create(NULL);
|
||||
@@ -482,4 +483,3 @@ void threads_deinit()
|
||||
current_thread->destroy(current_thread);
|
||||
id_mutex->destroy(id_mutex);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user