- clib_memcpy (&a->tep.ip, mp->ip,
- (mp->is_ip4 ? sizeof (ip4_address_t) :
- sizeof (ip6_address_t)));
+ unix_shared_memory_queue_t *client_q;
+ ip46_address_t *ip46 = (ip46_address_t *) mp->ip;
+
+ client_q = vl_api_client_index_to_input_queue (mp->client_index);
+ mp->client_queue_address = pointer_to_uword (client_q);
+ a->tep.is_ip4 = mp->is_ip4;
+ a->tep.ip = *ip46;
+ a->tep.port = mp->port;
+ a->tep.vrf = mp->vrf;