X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fdhcp%2Fclient.c;h=5986438b85f6ce2a80e889b0168da0784c70de25;hb=1c7104514cd40d2377caca36cf40c13b791bc5aa;hp=cfe62a6f45b64c9056925da6b0c32fdc3ecba4ea;hpb=808c5b21c2759564689933d004223052b7895a42;p=vpp.git

diff --git a/src/vnet/dhcp/client.c b/src/vnet/dhcp/client.c
index cfe62a6f45b..5986438b85f 100644
--- a/src/vnet/dhcp/client.c
+++ b/src/vnet/dhcp/client.c
@@ -120,6 +120,17 @@ set_l2_rewrite (dhcp_client_main_t * dcm, dhcp_client_t * c)
 		      0 /* broadcast */);
 }
 
+void vl_api_rpc_call_main_thread (void *fp, u8 * data, u32 data_length);
+
+static void
+dhcp_client_proc_callback (uword * client_index)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  ASSERT (vlib_get_thread_index () == 0);
+  vlib_process_signal_event (vm, dhcp_client_process_node.index, 
+			     EVENT_DHCP_CLIENT_WAKEUP, *client_index);
+}
+
 /* 
  * dhcp_client_for_us - server-to-client callback.
  * Called from proxy_node.c:dhcp_proxy_to_client_input().
@@ -251,8 +262,9 @@ int dhcp_client_for_us (u32 bi, vlib_buffer_t * b,
       c->retry_count = 0;
       c->next_transmit = 0;     /* send right now... */
       /* Poke the client process, which will send the request */
-      vlib_process_signal_event (vm, dhcp_client_process_node.index, 
-                                 EVENT_DHCP_CLIENT_WAKEUP, c - dcm->clients);
+      uword client_id =  c - dcm->clients;
+      vl_api_rpc_call_main_thread (dhcp_client_proc_callback,
+			       (u8 *) &client_id, sizeof (uword));
       break;
 
     case DHCP_BOUND:
@@ -296,7 +308,7 @@ int dhcp_client_for_us (u32 bi, vlib_buffer_t * b,
 					&all_0s,
 					FIB_SOURCE_DHCP,
 					FIB_ENTRY_FLAG_NONE,
-					FIB_PROTOCOL_IP4,
+					DPO_PROTO_IP4,
 					&nh,
 					c->sw_if_index,
 					~0,
@@ -605,7 +617,7 @@ dhcp_bound_state (dhcp_client_main_t * dcm, dhcp_client_t * c, f64 now)
 					  c->sw_if_index),
 				      &all_0s,
 				      FIB_SOURCE_DHCP,
-				      FIB_PROTOCOL_IP4,
+				      DPO_PROTO_IP4,
 				      &nh,
 				      c->sw_if_index,
 				      ~0,
@@ -900,7 +912,7 @@ int dhcp_client_add_del (dhcp_client_add_del_args_t * a)
 					  c->sw_if_index),
 				      &all_0s,
 				      FIB_SOURCE_DHCP,
-				      FIB_PROTOCOL_IP4,
+				      DPO_PROTO_IP4,
 				      &nh,
 				      c->sw_if_index,
 				      ~0,