aboutsummaryrefslogtreecommitdiff
path: root/multi.c
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-10-26 23:46:30 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-10-26 23:46:30 +0000
commitba3ff466e8c42b4f22a445106554e46ae86463ac (patch)
tree9111e5840ce92df376d1420d2ee9e91f971311a2 /multi.c
parentMerge with https://svn.openvpn.net/projects/openvpn/contrib/alon/BETA21@726 (diff)
downloadopenvpn-ba3ff466e8c42b4f22a445106554e46ae86463ac.tar.xz
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.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/multi.c b/multi.c
index e3444df..45cdf5c 100644
--- a/multi.c
+++ b/multi.c
@@ -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