diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-08-13 12:07:52 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-08-13 12:07:52 +0200 |
| commit | 09ae3d79ca0f1143736a0de45678915a3ebe5a3f (patch) | |
| tree | d304e8e618450d0e4867dfc72e14ed575a442c20 /src/libstrongswan/threading/thread.c | |
| parent | e4ef4c9877d5ccb773ace0edf655351428c39572 (diff) | |
| parent | efbb5e8c57330ec730825aa31ac5153f1d1c5913 (diff) | |
| download | strongswan-09ae3d79ca0f1143736a0de45678915a3ebe5a3f.tar.bz2 strongswan-09ae3d79ca0f1143736a0de45678915a3ebe5a3f.tar.xz | |
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.
Diffstat (limited to 'src/libstrongswan/threading/thread.c')
| -rw-r--r-- | src/libstrongswan/threading/thread.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstrongswan/threading/thread.c b/src/libstrongswan/threading/thread.c index 49a1b8430..9ef514ebc 100644 --- a/src/libstrongswan/threading/thread.c +++ b/src/libstrongswan/threading/thread.c @@ -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); } - |