7u83/freewtp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean code

Browse Source
This commit is contained in:
vemax78 2013-07-20 22:00:02 +02:00
parent 29ceb493fb
commit c857ab0d7f
2 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/ac/ac_discovery.c
View File

@ -25,41 +25,6 @@ struct ac_discovery_packet {
static struct ac_discovery_t g_ac_discovery; static struct ac_discovery_t g_ac_discovery;
/* */
int ac_discovery_start(void) {
int result;
memset(&g_ac_discovery, 0, sizeof(struct ac_discovery_t));
/* Init */
capwap_event_init(&g_ac_discovery.waitpacket);
capwap_lock_init(&g_ac_discovery.packetslock);
g_ac_discovery.packets = capwap_list_create();
/* Create thread */
result = pthread_create(&g_ac_discovery.threadid, NULL, ac_discovery_thread, NULL);
if (result) {
capwap_logging_debug("Unable create discovery thread");
return 0;
}
return 1;
}
/* */
void ac_discovery_stop(void) {
void* dummy;
g_ac_discovery.endthread = 1;
capwap_event_signal(&g_ac_discovery.waitpacket);
pthread_join(g_ac_discovery.threadid, &dummy);
/* Free memory */
capwap_event_destroy(&g_ac_discovery.waitpacket);
capwap_lock_exit(&g_ac_discovery.packetslock);
capwap_list_free(g_ac_discovery.packets);
}
/* */ /* */
void ac_discovery_add_packet(void* buffer, int buffersize, int sock, struct sockaddr_storage* sender) { void ac_discovery_add_packet(void* buffer, int buffersize, int sock, struct sockaddr_storage* sender) {
struct capwap_list_item* item; struct capwap_list_item* item;
@ -246,7 +211,7 @@ static void ac_discovery_run(void) {
} }
/* */ /* */
void* ac_discovery_thread(void* param) { static void* ac_discovery_thread(void* param) {
capwap_logging_debug("Discovery start"); capwap_logging_debug("Discovery start");
ac_discovery_run(); ac_discovery_run();
@ -256,3 +221,38 @@ void* ac_discovery_thread(void* param) {
pthread_exit(NULL); pthread_exit(NULL);
return NULL; return NULL;
} }
/* */
int ac_discovery_start(void) {
int result;
memset(&g_ac_discovery, 0, sizeof(struct ac_discovery_t));
/* Init */
capwap_event_init(&g_ac_discovery.waitpacket);
capwap_lock_init(&g_ac_discovery.packetslock);
g_ac_discovery.packets = capwap_list_create();
/* Create thread */
result = pthread_create(&g_ac_discovery.threadid, NULL, ac_discovery_thread, NULL);
if (result) {
capwap_logging_debug("Unable create discovery thread");
return 0;
}
return 1;
}
/* */
void ac_discovery_stop(void) {
void* dummy;
g_ac_discovery.endthread = 1;
capwap_event_signal(&g_ac_discovery.waitpacket);
pthread_join(g_ac_discovery.threadid, &dummy);
/* Free memory */
capwap_event_destroy(&g_ac_discovery.waitpacket);
capwap_lock_exit(&g_ac_discovery.packetslock);
capwap_list_free(g_ac_discovery.packets);
}

2
src/ac/ac_discovery.h
View File

@ -1,8 +1,6 @@
#ifndef __AC_DISCOVERY_HEADER__ #ifndef __AC_DISCOVERY_HEADER__
#define __AC_DISCOVERY_HEADER__ #define __AC_DISCOVERY_HEADER__
void* ac_discovery_thread(void* param);
int ac_discovery_start(void); int ac_discovery_start(void);
void ac_discovery_stop(void); void ac_discovery_stop(void);
void ac_discovery_add_packet(void* buffer, int buffersize, int sock, struct sockaddr_storage* sender); void ac_discovery_add_packet(void* buffer, int buffersize, int sock, struct sockaddr_storage* sender);