diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2005-10-26 23:46:30 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2005-10-26 23:46:30 +0000 |
| commit | ba3ff466e8c42b4f22a445106554e46ae86463ac (patch) | |
| tree | 9111e5840ce92df376d1420d2ee9e91f971311a2 /multi.c | |
| parent | dfb4b0fa748a3d95434b9946d88801cc0f45ca42 (diff) | |
| download | openvpn-ba3ff466e8c42b4f22a445106554e46ae86463ac.tar.gz openvpn-ba3ff466e8c42b4f22a445106554e46ae86463ac.tar.xz openvpn-ba3ff466e8c42b4f22a445106554e46ae86463ac.zip | |
svn merge -r 672:731 $SO/trunk/openvpn
Merged multi.c:1586 assertion fix attempt
from trunk.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@732 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'multi.c')
| -rw-r--r-- | multi.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1728,7 +1728,8 @@ multi_process_incoming_link (struct multi_context *m, struct multi_instance *ins struct multi_instance *mi; bool ret = true; - ASSERT (!m->pending); + if (m->pending) + return true; if (!instance) { @@ -1882,7 +1883,8 @@ multi_process_incoming_tun (struct multi_context *m, const unsigned int mpp_flag printf ("TUN -> TCP/UDP [%d]\n", BLEN (&m->top.c2.buf)); #endif - ASSERT (!m->pending); + if (m->pending) + return true; /* * Route an incoming tun/tap packet to |