X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fnat%2Fnat_api.c;h=f23efa8d89f7ea2f9bf195697e951ae70f41ca3e;hb=e82488f10f20f464961c5c7b381b4a419bca0bbc;hp=5071609c0b995c2a56844d3ba2dd798c1e2e4a9e;hpb=b932d26ea48ba8aa7677dc3b6ffd5d4729176c8f;p=vpp.git diff --git a/src/plugins/nat/nat_api.c b/src/plugins/nat/nat_api.c index 5071609c0b9..f23efa8d89f 100644 --- a/src/plugins/nat/nat_api.c +++ b/src/plugins/nat/nat_api.c @@ -174,7 +174,7 @@ vl_api_nat_set_workers_t_print (vl_api_nat_set_workers_t * mp, void *handle) } static void -send_nat_worker_details (u32 worker_index, unix_shared_memory_queue_t * q, +send_nat_worker_details (u32 worker_index, vl_api_registration_t * reg, u32 context) { vl_api_nat_worker_details_t *rmp; @@ -190,23 +190,23 @@ send_nat_worker_details (u32 worker_index, unix_shared_memory_queue_t * q, rmp->lcore_id = htonl (w->lcore_id); strncpy ((char *) rmp->name, (char *) w->name, ARRAY_LEN (rmp->name) - 1); - vl_msg_api_send_shmem (q, (u8 *) & rmp); + vl_api_send_msg (reg, (u8 *) rmp); } static void vl_api_nat_worker_dump_t_handler (vl_api_nat_worker_dump_t * mp) { - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; snat_main_t *sm = &snat_main; u32 *worker_index; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) return; /* *INDENT-OFF* */ vec_foreach (worker_index, sm->workers) - send_nat_worker_details(*worker_index, q, mp->context); + send_nat_worker_details(*worker_index, reg, mp->context); /* *INDENT-ON* */ } @@ -316,7 +316,7 @@ vl_api_nat_get_reass_t_print (vl_api_nat_get_reass_t * mp, void *handle) typedef struct nat_api_walk_ctx_t_ { - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; u32 context; } nat_api_walk_ctx_t; @@ -338,7 +338,7 @@ nat_ip4_reass_walk_api (nat_reass_ip4_t * reass, void *arg) rmp->frag_n = reass->frag_n; rmp->is_ip4 = 1; - vl_msg_api_send_shmem (ctx->q, (u8 *) & rmp); + vl_api_send_msg (ctx->reg, (u8 *) rmp); return 0; } @@ -361,7 +361,7 @@ nat_ip6_reass_walk_api (nat_reass_ip6_t * reass, void *arg) rmp->frag_n = reass->frag_n; rmp->is_ip4 = 0; - vl_msg_api_send_shmem (ctx->q, (u8 *) & rmp); + vl_api_send_msg (ctx->reg, (u8 *) rmp); return 0; } @@ -369,14 +369,14 @@ nat_ip6_reass_walk_api (nat_reass_ip6_t * reass, void *arg) static void vl_api_nat_reass_dump_t_handler (vl_api_nat_reass_dump_t * mp) { - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) return; nat_api_walk_ctx_t ctx = { - .q = q, + .reg = reg, .context = mp->context, }; @@ -442,6 +442,9 @@ static void if (rv) goto send_reply; + if (sm->out2in_dpo) + nat44_add_del_address_dpo (this_addr, mp->is_add); + increment_v4_address (&this_addr); } @@ -466,7 +469,7 @@ static void *vl_api_nat44_add_del_address_range_t_print static void send_nat44_address_details (snat_address_t * a, - unix_shared_memory_queue_t * q, u32 context, + vl_api_registration_t * reg, u32 context, u8 twice_nat) { vl_api_nat44_address_details_t *rmp; @@ -486,25 +489,25 @@ send_nat44_address_details (snat_address_t * a, rmp->twice_nat = twice_nat; rmp->context = context; - vl_msg_api_send_shmem (q, (u8 *) & rmp); + vl_api_send_msg (reg, (u8 *) rmp); } static void vl_api_nat44_address_dump_t_handler (vl_api_nat44_address_dump_t * mp) { - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; snat_main_t *sm = &snat_main; snat_address_t *a; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) return; /* *INDENT-OFF* */ vec_foreach (a, sm->addresses) - send_nat44_address_details (a, q, mp->context, 0); + send_nat44_address_details (a, reg, mp->context, 0); vec_foreach (a, sm->twice_nat_addresses) - send_nat44_address_details (a, q, mp->context, 1); + send_nat44_address_details (a, reg, mp->context, 1); /* *INDENT-ON* */ } @@ -553,7 +556,7 @@ static void *vl_api_nat44_interface_add_del_feature_t_print static void send_nat44_interface_details (snat_interface_t * i, - unix_shared_memory_queue_t * q, u32 context) + vl_api_registration_t * reg, u32 context) { vl_api_nat44_interface_details_t *rmp; snat_main_t *sm = &snat_main; @@ -567,24 +570,24 @@ send_nat44_interface_details (snat_interface_t * i, nat_interface_is_inside (i); rmp->context = context; - vl_msg_api_send_shmem (q, (u8 *) & rmp); + vl_api_send_msg (reg, (u8 *) rmp); } static void vl_api_nat44_interface_dump_t_handler (vl_api_nat44_interface_dump_t * mp) { - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; snat_main_t *sm = &snat_main; snat_interface_t *i; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) return; /* *INDENT-OFF* */ pool_foreach (i, sm->interfaces, ({ - send_nat44_interface_details(i, q, mp->context); + send_nat44_interface_details(i, reg, mp->context); })); /* *INDENT-ON* */ } @@ -635,7 +638,7 @@ static void *vl_api_nat44_interface_add_del_output_feature_t_print static void send_nat44_interface_output_feature_details (snat_interface_t * i, - unix_shared_memory_queue_t * q, + vl_api_registration_t * reg, u32 context) { vl_api_nat44_interface_output_feature_details_t *rmp; @@ -649,25 +652,25 @@ send_nat44_interface_output_feature_details (snat_interface_t * i, rmp->context = context; rmp->is_inside = nat_interface_is_inside (i); - vl_msg_api_send_shmem (q, (u8 *) & rmp); + vl_api_send_msg (reg, (u8 *) rmp); } static void vl_api_nat44_interface_output_feature_dump_t_handler (vl_api_nat44_interface_output_feature_dump_t * mp) { - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; snat_main_t *sm = &snat_main; snat_interface_t *i; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) return; /* *INDENT-OFF* */ pool_foreach (i, sm->output_feature_interfaces, ({ - send_nat44_interface_output_feature_details(i, q, mp->context); + send_nat44_interface_output_feature_details(i, reg, mp->context); })); /* *INDENT-ON* */ } @@ -708,7 +711,7 @@ static void rv = snat_add_static_mapping (local_addr, external_addr, local_port, external_port, vrf_id, mp->addr_only, external_sw_if_index, proto, mp->is_add, - mp->twice_nat); + mp->twice_nat, mp->out2in_only); REPLY_MACRO (VL_API_NAT44_ADD_DEL_STATIC_MAPPING_REPLY); } @@ -729,7 +732,8 @@ static void *vl_api_nat44_add_del_static_mapping_t_print clib_net_to_host_u16 (mp->local_port), clib_net_to_host_u16 (mp->external_port)); - s = format (s, "twice_nat %d ", mp->twice_nat); + s = format (s, "twice_nat %d out2in_only %d ", + mp->twice_nat, mp->out2in_only); if (mp->vrf_id != ~0) s = format (s, "vrf %d", clib_net_to_host_u32 (mp->vrf_id)); @@ -742,8 +746,7 @@ static void *vl_api_nat44_add_del_static_mapping_t_print static void send_nat44_static_mapping_details (snat_static_mapping_t * m, - unix_shared_memory_queue_t * q, - u32 context) + vl_api_registration_t * reg, u32 context) { vl_api_nat44_static_mapping_details_t *rmp; snat_main_t *sm = &snat_main; @@ -762,13 +765,14 @@ send_nat44_static_mapping_details (snat_static_mapping_t * m, rmp->protocol = snat_proto_to_ip_proto (m->proto); rmp->context = context; rmp->twice_nat = m->twice_nat; + rmp->out2in_only = m->out2in_only; - vl_msg_api_send_shmem (q, (u8 *) & rmp); + vl_api_send_msg (reg, (u8 *) rmp); } static void send_nat44_static_map_resolve_details (snat_static_map_resolve_t * m, - unix_shared_memory_queue_t * q, + vl_api_registration_t * reg, u32 context) { vl_api_nat44_static_mapping_details_t *rmp; @@ -788,28 +792,28 @@ send_nat44_static_map_resolve_details (snat_static_map_resolve_t * m, rmp->context = context; rmp->twice_nat = m->twice_nat; - vl_msg_api_send_shmem (q, (u8 *) & rmp); + vl_api_send_msg (reg, (u8 *) rmp); } static void vl_api_nat44_static_mapping_dump_t_handler (vl_api_nat44_static_mapping_dump_t * mp) { - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; snat_main_t *sm = &snat_main; snat_static_mapping_t *m; snat_static_map_resolve_t *rp; int j; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) return; /* *INDENT-OFF* */ pool_foreach (m, sm->static_mappings, ({ if (!vec_len(m->locals) && (m->local_addr.as_u32 != m->external_addr.as_u32)) - send_nat44_static_mapping_details (m, q, mp->context); + send_nat44_static_mapping_details (m, reg, mp->context); })); /* *INDENT-ON* */ @@ -817,7 +821,7 @@ vl_api_nat44_static_mapping_dump_t_handler (vl_api_nat44_static_mapping_dump_t { rp = sm->to_resolve + j; if (rp->l_addr.as_u32 != 0) - send_nat44_static_map_resolve_details (rp, q, mp->context); + send_nat44_static_map_resolve_details (rp, reg, mp->context); } } @@ -859,7 +863,7 @@ static void rv = snat_add_static_mapping (addr, addr, port, port, vrf_id, mp->addr_only, - sw_if_index, proto, mp->is_add, 0); + sw_if_index, proto, mp->is_add, 0, 0); REPLY_MACRO (VL_API_NAT44_ADD_DEL_IDENTITY_MAPPING_REPLY); } @@ -888,8 +892,7 @@ static void *vl_api_nat44_add_del_identity_mapping_t_print static void send_nat44_identity_mapping_details (snat_static_mapping_t * m, - unix_shared_memory_queue_t * q, - u32 context) + vl_api_registration_t * reg, u32 context) { vl_api_nat44_identity_mapping_details_t *rmp; snat_main_t *sm = &snat_main; @@ -906,12 +909,12 @@ send_nat44_identity_mapping_details (snat_static_mapping_t * m, rmp->protocol = snat_proto_to_ip_proto (m->proto); rmp->context = context; - vl_msg_api_send_shmem (q, (u8 *) & rmp); + vl_api_send_msg (reg, (u8 *) rmp); } static void send_nat44_identity_map_resolve_details (snat_static_map_resolve_t * m, - unix_shared_memory_queue_t * q, + vl_api_registration_t * reg, u32 context) { vl_api_nat44_identity_mapping_details_t *rmp; @@ -928,28 +931,28 @@ send_nat44_identity_map_resolve_details (snat_static_map_resolve_t * m, rmp->protocol = snat_proto_to_ip_proto (m->proto); rmp->context = context; - vl_msg_api_send_shmem (q, (u8 *) & rmp); + vl_api_send_msg (reg, (u8 *) rmp); } static void vl_api_nat44_identity_mapping_dump_t_handler (vl_api_nat44_identity_mapping_dump_t * mp) { - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; snat_main_t *sm = &snat_main; snat_static_mapping_t *m; snat_static_map_resolve_t *rp; int j; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) return; /* *INDENT-OFF* */ pool_foreach (m, sm->static_mappings, ({ if (!vec_len(m->locals) && (m->local_addr.as_u32 == m->external_addr.as_u32)) - send_nat44_identity_mapping_details (m, q, mp->context); + send_nat44_identity_mapping_details (m, reg, mp->context); })); /* *INDENT-ON* */ @@ -957,7 +960,7 @@ static void { rp = sm->to_resolve + j; if (rp->l_addr.as_u32 == 0) - send_nat44_identity_map_resolve_details (rp, q, mp->context); + send_nat44_identity_map_resolve_details (rp, reg, mp->context); } } @@ -1005,8 +1008,8 @@ static void *vl_api_nat44_add_del_interface_addr_t_print static void send_nat44_interface_addr_details (u32 sw_if_index, - unix_shared_memory_queue_t * q, - u32 context, u8 twice_nat) + vl_api_registration_t * reg, u32 context, + u8 twice_nat) { vl_api_nat44_interface_addr_details_t *rmp; snat_main_t *sm = &snat_main; @@ -1019,26 +1022,26 @@ send_nat44_interface_addr_details (u32 sw_if_index, rmp->twice_nat = twice_nat; rmp->context = context; - vl_msg_api_send_shmem (q, (u8 *) & rmp); + vl_api_send_msg (reg, (u8 *) rmp); } static void vl_api_nat44_interface_addr_dump_t_handler (vl_api_nat44_interface_addr_dump_t * mp) { - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; snat_main_t *sm = &snat_main; u32 *i; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) return; /* *INDENT-OFF* */ vec_foreach (i, sm->auto_add_sw_if_indices) - send_nat44_interface_addr_details(*i, q, mp->context, 0); + send_nat44_interface_addr_details(*i, reg, mp->context, 0); vec_foreach (i, sm->auto_add_sw_if_indices_twice_nat) - send_nat44_interface_addr_details(*i, q, mp->context, 1); + send_nat44_interface_addr_details(*i, reg, mp->context, 1); /* *INDENT-ON* */ } @@ -1054,7 +1057,7 @@ vl_api_nat44_interface_addr_dump_t_print (vl_api_nat44_interface_addr_dump_t * } static void -send_nat44_user_details (snat_user_t * u, unix_shared_memory_queue_t * q, +send_nat44_user_details (snat_user_t * u, vl_api_registration_t * reg, u32 context) { vl_api_nat44_user_details_t *rmp; @@ -1072,25 +1075,25 @@ send_nat44_user_details (snat_user_t * u, unix_shared_memory_queue_t * q, rmp->nstaticsessions = ntohl (u->nstaticsessions); rmp->context = context; - vl_msg_api_send_shmem (q, (u8 *) & rmp); + vl_api_send_msg (reg, (u8 *) rmp); } static void vl_api_nat44_user_dump_t_handler (vl_api_nat44_user_dump_t * mp) { - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; snat_main_t *sm = &snat_main; snat_main_per_thread_data_t *tsm; snat_user_t *u; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) return; /* *INDENT-OFF* */ vec_foreach (tsm, sm->per_thread_data) vec_foreach (u, tsm->users) - send_nat44_user_details (u, q, mp->context); + send_nat44_user_details (u, reg, mp->context); /* *INDENT-ON* */ } @@ -1106,7 +1109,7 @@ vl_api_nat44_user_dump_t_print (vl_api_nat44_user_dump_t * mp, void *handle) static void send_nat44_user_session_details (snat_session_t * s, - unix_shared_memory_queue_t * q, u32 context) + vl_api_registration_t * reg, u32 context) { vl_api_nat44_user_session_details_t *rmp; snat_main_t *sm = &snat_main; @@ -1135,14 +1138,14 @@ send_nat44_user_session_details (snat_session_t * s, rmp->protocol = ntohs (snat_proto_to_ip_proto (s->in2out.protocol)); } - vl_msg_api_send_shmem (q, (u8 *) & rmp); + vl_api_send_msg (reg, (u8 *) rmp); } static void vl_api_nat44_user_session_dump_t_handler (vl_api_nat44_user_session_dump_t * mp) { - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; snat_main_t *sm = &snat_main; snat_main_per_thread_data_t *tsm; snat_session_t *s; @@ -1153,8 +1156,8 @@ vl_api_nat44_user_session_dump_t_handler (vl_api_nat44_user_session_dump_t * dlist_elt_t *head, *elt; ip4_header_t ip; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) return; clib_memcpy (&ukey.addr, mp->ip_address, 4); @@ -1182,7 +1185,7 @@ vl_api_nat44_user_session_dump_t_handler (vl_api_nat44_user_session_dump_t * { s = pool_elt_at_index (tsm->sessions, session_index); - send_nat44_user_session_details (s, q, mp->context); + send_nat44_user_session_details (s, reg, mp->context); elt_index = elt->next; elt = pool_elt_at_index (tsm->list_pool, elt_index); @@ -1244,7 +1247,8 @@ static void nat44_add_del_lb_static_mapping (e_addr, clib_net_to_host_u16 (mp->external_port), proto, clib_net_to_host_u32 (mp->vrf_id), - locals, mp->is_add, mp->twice_nat); + locals, mp->is_add, mp->twice_nat, + mp->out2in_only); vec_free (locals); @@ -1257,14 +1261,15 @@ static void *vl_api_nat44_add_del_lb_static_mapping_t_print u8 *s; s = format (0, "SCRIPT: nat44_add_del_lb_static_mapping "); - s = format (s, "is_add %d twice_nat %d", mp->is_add, mp->twice_nat); + s = format (s, "is_add %d twice_nat %d out2in_only %d ", + mp->is_add, mp->twice_nat, mp->out2in_only); FINISH; } static void send_nat44_lb_static_mapping_details (snat_static_mapping_t * m, - unix_shared_memory_queue_t * q, + vl_api_registration_t * reg, u32 context) { vl_api_nat44_lb_static_mapping_details_t *rmp; @@ -1285,6 +1290,7 @@ send_nat44_lb_static_mapping_details (snat_static_mapping_t * m, rmp->vrf_id = ntohl (m->vrf_id); rmp->context = context; rmp->twice_nat = m->twice_nat; + rmp->out2in_only = m->out2in_only; locals = (vl_api_nat44_lb_addr_port_t *) rmp->locals; vec_foreach (ap, m->locals) @@ -1296,26 +1302,26 @@ send_nat44_lb_static_mapping_details (snat_static_mapping_t * m, rmp->local_num++; } - vl_msg_api_send_shmem (q, (u8 *) & rmp); + vl_api_send_msg (reg, (u8 *) rmp); } static void vl_api_nat44_lb_static_mapping_dump_t_handler (vl_api_nat44_lb_static_mapping_dump_t * mp) { - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; snat_main_t *sm = &snat_main; snat_static_mapping_t *m; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) return; /* *INDENT-OFF* */ pool_foreach (m, sm->static_mappings, ({ if (vec_len(m->locals)) - send_nat44_lb_static_mapping_details (m, q, mp->context); + send_nat44_lb_static_mapping_details (m, reg, mp->context); })); /* *INDENT-ON* */ } @@ -1366,6 +1372,63 @@ vl_api_nat44_del_session_t_print (vl_api_nat44_del_session_t * mp, FINISH; } +static void + vl_api_nat44_forwarding_enable_disable_t_handler + (vl_api_nat44_forwarding_enable_disable_t * mp) +{ + snat_main_t *sm = &snat_main; + vl_api_nat44_forwarding_enable_disable_reply_t *rmp; + int rv = 0; + + sm->forwarding_enabled = mp->enable != 0; + + REPLY_MACRO (VL_API_NAT44_FORWARDING_ENABLE_DISABLE_REPLY); +} + +static void *vl_api_nat44_forwarding_enable_disable_t_print + (vl_api_nat44_forwarding_enable_disable_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: nat44_forwarding_enable_disable "); + s = format (s, "enable %d", mp->enable != 0); + + FINISH; +} + +static void + vl_api_nat44_forwarding_is_enabled_t_handler + (vl_api_nat44_forwarding_is_enabled_t * mp) +{ + vl_api_registration_t *reg; + snat_main_t *sm = &snat_main; + vl_api_nat44_forwarding_is_enabled_reply_t *rmp; + + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) + return; + + rmp = vl_msg_api_alloc (sizeof (*rmp)); + memset (rmp, 0, sizeof (*rmp)); + rmp->_vl_msg_id = + ntohs (VL_API_NAT44_FORWARDING_IS_ENABLED_REPLY + sm->msg_id_base); + rmp->context = mp->context; + + rmp->enabled = sm->forwarding_enabled; + + vl_api_send_msg (reg, (u8 *) rmp); +} + +static void *vl_api_nat44_forwarding_is_enabled_t_print + (vl_api_nat44_forwarding_is_enabled_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: nat44_forwarding_is_enabled "); + + FINISH; +} + /*******************************/ /*** Deterministic NAT (CGN) ***/ /*******************************/ @@ -1502,7 +1565,7 @@ vl_api_nat_det_reverse_t_print (vl_api_nat_det_reverse_t * mp, void *handle) } static void -sent_nat_det_map_details (snat_det_map_t * m, unix_shared_memory_queue_t * q, +sent_nat_det_map_details (snat_det_map_t * m, vl_api_registration_t * reg, u32 context) { vl_api_nat_det_map_details_t *rmp; @@ -1521,23 +1584,23 @@ sent_nat_det_map_details (snat_det_map_t * m, unix_shared_memory_queue_t * q, rmp->ses_num = htonl (m->ses_num); rmp->context = context; - vl_msg_api_send_shmem (q, (u8 *) & rmp); + vl_api_send_msg (reg, (u8 *) rmp); } static void vl_api_nat_det_map_dump_t_handler (vl_api_nat_det_map_dump_t * mp) { - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; snat_main_t *sm = &snat_main; snat_det_map_t *m; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) return; /* *INDENT-OFF* */ vec_foreach(m, sm->det_maps) - sent_nat_det_map_details(m, q, mp->context); + sent_nat_det_map_details(m, reg, mp->context); /* *INDENT-ON* */ } @@ -1718,7 +1781,7 @@ vl_api_nat_det_close_session_in_t_print (vl_api_nat_det_close_session_in_t * static void send_nat_det_session_details (snat_det_session_t * s, - unix_shared_memory_queue_t * q, u32 context) + vl_api_registration_t * reg, u32 context) { vl_api_nat_det_session_details_t *rmp; snat_main_t *sm = &snat_main; @@ -1734,21 +1797,21 @@ send_nat_det_session_details (snat_det_session_t * s, rmp->expire = ntohl (s->expire); rmp->context = context; - vl_msg_api_send_shmem (q, (u8 *) & rmp); + vl_api_send_msg (reg, (u8 *) rmp); } static void vl_api_nat_det_session_dump_t_handler (vl_api_nat_det_session_dump_t * mp) { - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; snat_main_t *sm = &snat_main; ip4_address_t user_addr; snat_det_map_t *dm; snat_det_session_t *s, empty_ses; u16 i; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) return; if (!mp->is_nat44) return; @@ -1763,7 +1826,7 @@ vl_api_nat_det_session_dump_t_handler (vl_api_nat_det_session_dump_t * mp) for (i = 0; i < SNAT_DET_SES_PER_USER; i++) { if (s->out.as_u64) - send_nat_det_session_details (s, q, mp->context); + send_nat_det_session_details (s, reg, mp->context); s++; } } @@ -1836,7 +1899,7 @@ static void *vl_api_nat64_add_del_pool_addr_range_t_print typedef struct nat64_api_walk_ctx_t_ { - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; u32 context; nat64_db_t *db; } nat64_api_walk_ctx_t; @@ -1863,7 +1926,7 @@ nat64_api_pool_walk (snat_address_t * a, void *arg) rmp->vrf_id = ~0; rmp->context = ctx->context; - vl_msg_api_send_shmem (ctx->q, (u8 *) & rmp); + vl_api_send_msg (ctx->reg, (u8 *) rmp); return 0; } @@ -1871,14 +1934,14 @@ nat64_api_pool_walk (snat_address_t * a, void *arg) static void vl_api_nat64_pool_addr_dump_t_handler (vl_api_nat64_pool_addr_dump_t * mp) { - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) return; nat64_api_walk_ctx_t ctx = { - .q = q, + .reg = reg, .context = mp->context, }; @@ -1945,7 +2008,7 @@ nat64_api_interface_walk (snat_interface_t * i, void *arg) nat_interface_is_inside (i); rmp->context = ctx->context; - vl_msg_api_send_shmem (ctx->q, (u8 *) & rmp); + vl_api_send_msg (ctx->reg, (u8 *) rmp); return 0; } @@ -1953,14 +2016,14 @@ nat64_api_interface_walk (snat_interface_t * i, void *arg) static void vl_api_nat64_interface_dump_t_handler (vl_api_nat64_interface_dump_t * mp) { - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) return; nat64_api_walk_ctx_t ctx = { - .q = q, + .reg = reg, .context = mp->context, }; @@ -2043,7 +2106,7 @@ nat64_api_bib_walk (nat64_db_bib_entry_t * bibe, void *arg) rmp->is_static = bibe->is_static; rmp->ses_num = ntohl (bibe->ses_num); - vl_msg_api_send_shmem (ctx->q, (u8 *) & rmp); + vl_api_send_msg (ctx->reg, (u8 *) rmp); return 0; } @@ -2051,16 +2114,16 @@ nat64_api_bib_walk (nat64_db_bib_entry_t * bibe, void *arg) static void vl_api_nat64_bib_dump_t_handler (vl_api_nat64_bib_dump_t * mp) { - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; nat64_main_t *nm = &nat64_main; nat64_db_t *db; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) return; nat64_api_walk_ctx_t ctx = { - .q = q, + .reg = reg, .context = mp->context, }; @@ -2176,7 +2239,7 @@ nat64_api_st_walk (nat64_db_st_entry_t * ste, void *arg) rmp->vrf_id = ntohl (fib->ft_table_id); rmp->proto = ste->proto; - vl_msg_api_send_shmem (ctx->q, (u8 *) & rmp); + vl_api_send_msg (ctx->reg, (u8 *) rmp); return 0; } @@ -2184,16 +2247,16 @@ nat64_api_st_walk (nat64_db_st_entry_t * ste, void *arg) static void vl_api_nat64_st_dump_t_handler (vl_api_nat64_st_dump_t * mp) { - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; nat64_main_t *nm = &nat64_main; nat64_db_t *db; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) return; nat64_api_walk_ctx_t ctx = { - .q = q, + .reg = reg, .context = mp->context, }; @@ -2260,7 +2323,7 @@ nat64_api_prefix_walk (nat64_prefix_t * p, void *arg) rmp->vrf_id = ntohl (p->vrf_id); rmp->context = ctx->context; - vl_msg_api_send_shmem (ctx->q, (u8 *) & rmp); + vl_api_send_msg (ctx->reg, (u8 *) rmp); return 0; } @@ -2268,14 +2331,14 @@ nat64_api_prefix_walk (nat64_prefix_t * p, void *arg) static void vl_api_nat64_prefix_dump_t_handler (vl_api_nat64_prefix_dump_t * mp) { - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) return; nat64_api_walk_ctx_t ctx = { - .q = q, + .reg = reg, .context = mp->context, }; @@ -2336,10 +2399,14 @@ vl_api_dslite_set_aftr_addr_t_handler (vl_api_dslite_set_aftr_addr_t * mp) dslite_main_t *dm = &dslite_main; int rv = 0; ip6_address_t ip6_addr; + ip4_address_t ip4_addr; memcpy (&ip6_addr.as_u8, mp->ip6_addr, 16); + memcpy (&ip4_addr.as_u8, mp->ip4_addr, 4); rv = dslite_set_aftr_ip6_addr (dm, &ip6_addr); + if (rv == 0) + rv = dslite_set_aftr_ip4_addr (dm, &ip4_addr); REPLY_MACRO (VL_API_DSLITE_SET_AFTR_ADDR_REPLY); } @@ -2358,6 +2425,96 @@ vl_api_dslite_set_aftr_addr_t_print (vl_api_dslite_set_aftr_addr_t * mp, FINISH; } +static void +vl_api_dslite_get_aftr_addr_t_handler (vl_api_dslite_get_aftr_addr_t * mp) +{ + snat_main_t *sm = &snat_main; + vl_api_dslite_get_aftr_addr_reply_t *rmp; + dslite_main_t *dm = &dslite_main; + int rv = 0; + + /* *INDENT-OFF* */ + REPLY_MACRO2 (VL_API_DSLITE_GET_AFTR_ADDR_REPLY, + ({ + memcpy (rmp->ip4_addr, &dm->aftr_ip4_addr.as_u8, 4); + memcpy (rmp->ip6_addr, &dm->aftr_ip6_addr.as_u8, 16); + })) + /* *INDENT-ON* */ +} + +static void * +vl_api_dslite_get_aftr_addr_t_print (vl_api_dslite_get_aftr_addr_t * mp, + void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: dslite_get_aftr_addr"); + + FINISH; +} + +static void +vl_api_dslite_set_b4_addr_t_handler (vl_api_dslite_set_b4_addr_t * mp) +{ + vl_api_dslite_set_b4_addr_reply_t *rmp; + snat_main_t *sm = &snat_main; + dslite_main_t *dm = &dslite_main; + int rv = 0; + ip6_address_t ip6_addr; + ip4_address_t ip4_addr; + + memcpy (&ip6_addr.as_u8, mp->ip6_addr, 16); + memcpy (&ip4_addr.as_u8, mp->ip4_addr, 4); + + rv = dslite_set_b4_ip6_addr (dm, &ip6_addr); + if (rv == 0) + rv = dslite_set_b4_ip4_addr (dm, &ip4_addr); + + REPLY_MACRO (VL_API_DSLITE_SET_B4_ADDR_REPLY); +} + +static void * +vl_api_dslite_set_b4_addr_t_print (vl_api_dslite_set_b4_addr_t * mp, + void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: dslite_set_b4_addr "); + s = format (s, "ip6_addr %U ip4_addr %U\n", + format_ip6_address, mp->ip6_addr, + format_ip6_address, mp->ip4_addr); + + FINISH; +} + +static void +vl_api_dslite_get_b4_addr_t_handler (vl_api_dslite_get_b4_addr_t * mp) +{ + snat_main_t *sm = &snat_main; + vl_api_dslite_get_b4_addr_reply_t *rmp; + dslite_main_t *dm = &dslite_main; + int rv = 0; + + /* *INDENT-OFF* */ + REPLY_MACRO2 (VL_API_DSLITE_GET_AFTR_ADDR_REPLY, + ({ + memcpy (rmp->ip4_addr, &dm->b4_ip4_addr.as_u8, 4); + memcpy (rmp->ip6_addr, &dm->b4_ip6_addr.as_u8, 16); + })) + /* *INDENT-ON* */ +} + +static void * +vl_api_dslite_get_b4_addr_t_print (vl_api_dslite_get_b4_addr_t * mp, + void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: dslite_get_b4_addr"); + + FINISH; +} + static void vl_api_dslite_add_del_pool_addr_range_t_handler (vl_api_dslite_add_del_pool_addr_range_t * mp) @@ -2434,6 +2591,8 @@ _(NAT44_INTERFACE_OUTPUT_FEATURE_DUMP, \ _(NAT44_ADD_DEL_LB_STATIC_MAPPING, nat44_add_del_lb_static_mapping) \ _(NAT44_LB_STATIC_MAPPING_DUMP, nat44_lb_static_mapping_dump) \ _(NAT44_DEL_SESSION, nat44_del_session) \ +_(NAT44_FORWARDING_ENABLE_DISABLE, nat44_forwarding_enable_disable) \ +_(NAT44_FORWARDING_IS_ENABLED, nat44_forwarding_is_enabled) \ _(NAT_DET_ADD_DEL_MAP, nat_det_add_del_map) \ _(NAT_DET_FORWARD, nat_det_forward) \ _(NAT_DET_REVERSE, nat_det_reverse) \ @@ -2456,7 +2615,10 @@ _(NAT64_ADD_DEL_PREFIX, nat64_add_del_prefix) \ _(NAT64_PREFIX_DUMP, nat64_prefix_dump) \ _(NAT64_ADD_DEL_INTERFACE_ADDR, nat64_add_del_interface_addr) \ _(DSLITE_ADD_DEL_POOL_ADDR_RANGE, dslite_add_del_pool_addr_range) \ -_(DSLITE_SET_AFTR_ADDR, dslite_set_aftr_addr) +_(DSLITE_SET_AFTR_ADDR, dslite_set_aftr_addr) \ +_(DSLITE_GET_AFTR_ADDR, dslite_get_aftr_addr) \ +_(DSLITE_SET_B4_ADDR, dslite_set_b4_addr) \ +_(DSLITE_GET_B4_ADDR, dslite_get_b4_addr) /* Set up the API message handling tables */ static clib_error_t *