gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix: calling zts_free() before zts_start() would enter infinite loop

Browse Source
This commit is contained in:
Joseph Henry
2021-03-13 22:30:33 -08:00
parent 575cfc364e
commit 26454d2939
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/VirtualTap.cpp
View File

@@ -288,6 +288,7 @@ void VirtualTap::phyOnUnixClose(PhySocket *sock,void **uptr) {}
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
bool _has_exited = false; bool _has_exited = false;
bool _has_started = false;
// Used to generate enumerated lwIP interface names // Used to generate enumerated lwIP interface names
int netifCount = 0; int netifCount = 0;
@@ -301,6 +302,7 @@ static void _tcpip_init_done(void *arg)
sys_sem_t *sem; sys_sem_t *sem;
sem = (sys_sem_t *)arg; sem = (sys_sem_t *)arg;
_setState(ZTS_STATE_STACK_RUNNING); _setState(ZTS_STATE_STACK_RUNNING);
_has_started = true;
_enqueueEvent(ZTS_EVENT_STACK_UP); _enqueueEvent(ZTS_EVENT_STACK_UP);
sys_sem_signal(sem); sys_sem_signal(sem);
} }
@@ -359,7 +361,9 @@ void _lwip_driver_shutdown()
// Set flag to stop sending frames into the core // Set flag to stop sending frames into the core
_clrState(ZTS_STATE_STACK_RUNNING); _clrState(ZTS_STATE_STACK_RUNNING);
// Wait until the main lwIP thread has exited // Wait until the main lwIP thread has exited
while (!_has_exited) { zts_delay_ms(LWIP_DRIVER_LOOP_INTERVAL); } if (_has_started) {
while (!_has_exited) { zts_delay_ms(LWIP_DRIVER_LOOP_INTERVAL); }
}
} }
void _lwip_remove_netif(void *netif) void _lwip_remove_netif(void *netif)