vcl: wait for sendto to connect if needed

Type: fix

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I39948b046c79dea1b034619e1eaa22dd8a4997fb

diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c
index 947bf28..229a251 100644 (file)
--- a/src/vcl/vppcom.c
+++ b/src/vcl/vppcom.c
@@ -3683,21 +3683,28 @@ vppcom_session_sendto (uint32_t session_handle, void *buffer,
 
   if (ep)
     {
-      if (s->session_type != VPPCOM_PROTO_UDP
-         || (s->flags & VCL_SESSION_F_CONNECTED))
+      if (!vcl_session_is_cl (s))
        return VPPCOM_EINVAL;
 
       /* Session not connected/bound in vpp. Create it by 'connecting' it */
       if (PREDICT_FALSE (s->session_state == VCL_STATE_CLOSED))
        {
+         u32 session_index = s->session_index;
+         f64 timeout = vcm->cfg.session_timeout;
+         int rv;
+
          vcl_send_session_connect (wrk, s);
+         rv = vppcom_wait_for_session_state_change (session_index,
+                                                    VCL_STATE_READY,
+                                                    timeout);
+         if (rv < 0)
+           return rv;
+         s = vcl_session_get (wrk, session_index);
        }
-      else
-       {
-         s->transport.is_ip4 = ep->is_ip4;
-         s->transport.rmt_port = ep->port;
-         vcl_ip_copy_from_ep (&s->transport.rmt_ip, ep);
-       }
+
+      s->transport.is_ip4 = ep->is_ip4;
+      s->transport.rmt_port = ep->port;
+      vcl_ip_copy_from_ep (&s->transport.rmt_ip, ep);
     }
 
   if (flags)