diff options
| author | Skylar Chang <chiaweic@codeaurora.org> | 2014-02-24 17:04:26 -0800 |
|---|---|---|
| committer | Skylar Chang <chiaweic@codeaurora.org> | 2014-03-20 14:03:57 -0700 |
| commit | b17124fe29ff200554c09a64b4ccf07b3b9dafdf (patch) | |
| tree | 2c779387d2f80f61f72fa1a5fdcfbeb6f3dd4911 /ipacm/src/IPACM_ConntrackListener.cpp | |
| parent | 945e148b270ca90e48a8a1fe717f0a4bb8ab741b (diff) | |
| download | ipacfg-mgr-b17124fe29ff200554c09a64b4ccf07b3b9dafdf.tar.gz | |
IPACM: support 8994 linux Android build
changes are needed to make IPACM compile in
Android platform as 8994 for example
Change-Id: Ic3aa95cb962a5ec7cae1a622d9355afad7986a3c
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
Diffstat (limited to 'ipacm/src/IPACM_ConntrackListener.cpp')
| -rw-r--r-- | ipacm/src/IPACM_ConntrackListener.cpp | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/ipacm/src/IPACM_ConntrackListener.cpp b/ipacm/src/IPACM_ConntrackListener.cpp index 3b62bd4..4f4fc58 100644 --- a/ipacm/src/IPACM_ConntrackListener.cpp +++ b/ipacm/src/IPACM_ConntrackListener.cpp @@ -29,11 +29,13 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <sys/ioctl.h> #include <net/if.h> +#include <unistd.h> #include "IPACM_ConntrackListener.h" #include "IPACM_ConntrackClient.h" #include "IPACM_EvtDispatcher.h" + IPACM_ConntrackListener::IPACM_ConntrackListener() { IPACMDBG("\n"); @@ -335,34 +337,9 @@ int IPACM_ConntrackListener::CreateNatThreads(void) isCTReg = true; } - - //pthread_join(tcp_thread, NULL); - //pthread_join(udp_thread, NULL); - //pthread_join(udpcto_thread, NULL); - return 0; error: - if(tcp_thread) - { - pthread_cancel(tcp_thread); - } - - if(udp_thread) - { - pthread_cancel(tcp_thread); - } - - if(udpcto_thread) - { - pthread_cancel(udpcto_thread); - } - - if(to_monitor_thread) - { - pthread_cancel(to_monitor_thread); - } - return -1; } |