rte_panic("Unable to allocate new message\n");
/* Fill request message */
- req = (struct app_msg_req *) ((struct rte_mbuf *)msg)->ctrl.data;
+ req = (struct app_msg_req *)rte_ctrlmbuf_data((struct rte_mbuf *)msg);
req->type = APP_MSG_REQ_RX_PORT_ENABLE;
req->rx_up.port = params->port;
do {
status = rte_ring_sc_dequeue(ring_resp, &msg);
} while (status != 0);
- resp = (struct app_msg_resp *) ((struct rte_mbuf *)msg)->ctrl.data;
+ resp = (struct app_msg_resp *)rte_ctrlmbuf_data((struct rte_mbuf *)msg);
/* Check response */
if (resp->result != 0)
printf("Request LINK_UP failed (%u)\n", resp->result);
rte_panic("Unable to allocate new message\n");
/* Fill request message */
- req = (struct app_msg_req *) ((struct rte_mbuf *)msg)->ctrl.data;
+ req = (struct app_msg_req *)rte_ctrlmbuf_data((struct rte_mbuf *)msg);
req->type = APP_MSG_REQ_RX_PORT_DISABLE;
req->rx_down.port = params->port;
do {
status = rte_ring_sc_dequeue(ring_resp, &msg);
} while (status != 0);
- resp = (struct app_msg_resp *) ((struct rte_mbuf *)msg)->ctrl.data;
+ resp = (struct app_msg_resp *)rte_ctrlmbuf_data((struct rte_mbuf *)msg);
/* Check response */
if (resp->result != 0)
rte_panic("Unable to allocate new message\n");
/* Fill request message */
- req = (struct app_msg_req *) ((struct rte_mbuf *)msg)->ctrl.data;
+ req = (struct app_msg_req *)rte_ctrlmbuf_data((struct rte_mbuf *)msg);
req->type = APP_MSG_REQ_ARP_ADD;
req->arp_add.out_iface = rule.arp.key.out_iface;
req->arp_add.nh_ip = rule.arp.key.nh_ip;
do {
status = rte_ring_sc_dequeue(ring_resp, &msg);
} while (status != 0);
- resp = (struct app_msg_resp *) ((struct rte_mbuf *)msg)->ctrl.data;
+ resp = (struct app_msg_resp *)rte_ctrlmbuf_data((struct rte_mbuf *)msg);
/* Check response */
if (resp->result != 0)
struct app_rule *new_rule = (struct app_rule *)
rte_zmalloc_socket("CLI",
sizeof(struct app_rule),
- CACHE_LINE_SIZE,
+ RTE_CACHE_LINE_SIZE,
rte_socket_id());
if (new_rule == NULL)
rte_panic("Unable to allocate new message\n");
/* Fill request message */
- req = (struct app_msg_req *) ((struct rte_mbuf *)msg)->ctrl.data;
+ req = (struct app_msg_req *)rte_ctrlmbuf_data((struct rte_mbuf *)msg);
req->type = APP_MSG_REQ_ARP_DEL;
req->arp_del.out_iface = rule.arp.key.out_iface;
req->arp_del.nh_ip = rule.arp.key.nh_ip;
do {
status = rte_ring_sc_dequeue(ring_resp, &msg);
} while (status != 0);
- resp = (struct app_msg_resp *) ((struct rte_mbuf *)msg)->ctrl.data;
+ resp = (struct app_msg_resp *)rte_ctrlmbuf_data((struct rte_mbuf *)msg);
/* Check response */
if (resp->result != 0)
rte_panic("Unable to allocate new message\n");
/* Fill request message */
- req = (struct app_msg_req *) ((struct rte_mbuf *)msg)->ctrl.data;
+ req = (struct app_msg_req *)rte_ctrlmbuf_data((struct rte_mbuf *)msg);
req->type = APP_MSG_REQ_RT_ADD;
req->routing_add.ip = rule.routing.key.ip;
req->routing_add.depth = rule.routing.key.depth;
do {
status = rte_ring_sc_dequeue(ring_resp, &msg);
} while (status != 0);
- resp = (struct app_msg_resp *) ((struct rte_mbuf *)msg)->ctrl.data;
+ resp = (struct app_msg_resp *)rte_ctrlmbuf_data((struct rte_mbuf *)msg);
/* Check response */
if (resp->result != 0)
struct app_rule *new_rule = (struct app_rule *)
rte_zmalloc_socket("CLI",
sizeof(struct app_rule),
- CACHE_LINE_SIZE,
+ RTE_CACHE_LINE_SIZE,
rte_socket_id());
if (new_rule == NULL)
rte_panic("Unable to allocate new message\n");
/* Fill request message */
- req = (struct app_msg_req *) ((struct rte_mbuf *)msg)->ctrl.data;
+ req = (struct app_msg_req *)rte_ctrlmbuf_data((struct rte_mbuf *)msg);
req->type = APP_MSG_REQ_RT_DEL;
req->routing_del.ip = rule.routing.key.ip;
req->routing_del.depth = rule.routing.key.depth;
do {
status = rte_ring_sc_dequeue(ring_resp, &msg);
} while (status != 0);
- resp = (struct app_msg_resp *) ((struct rte_mbuf *)msg)->ctrl.data;
+ resp = (struct app_msg_resp *)rte_ctrlmbuf_data((struct rte_mbuf *)msg);
/* Check response */
if (resp->result != 0)
__attribute__((unused)) void *data)
{
struct cmd_firewall_add_result *params = parsed_result;
- struct app_rule rule, *old_rule;
+ struct app_rule rule, *old_rule, *new_rule = NULL;
struct rte_mbuf *msg;
struct app_msg_req *req;
struct app_msg_resp *resp;
if (msg == NULL)
rte_panic("Unable to allocate new message\n");
+ /* if we need a new rule structure, allocate it before we go further */
+ if (old_rule == NULL) {
+ new_rule = rte_zmalloc_socket("CLI", sizeof(struct app_rule),
+ RTE_CACHE_LINE_SIZE, rte_socket_id());
+ if (new_rule == NULL) {
+ printf("Cannot allocate memory for new rule\n");
+ rte_ctrlmbuf_free(msg);
+ return;
+ }
+ }
+
+
/* Fill request message */
- req = (struct app_msg_req *) msg->ctrl.data;
+ req = (struct app_msg_req *)rte_ctrlmbuf_data(msg);
req->type = APP_MSG_REQ_FW_ADD;
req->firewall_add.add_params.priority = rule.firewall.priority;
req->firewall_add.add_params.field_value[1].value.u32 =
do {
status = rte_ring_sc_dequeue(ring_resp, (void **) &msg);
} while (status != 0);
- resp = (struct app_msg_resp *) msg->ctrl.data;
+ resp = (struct app_msg_resp *)rte_ctrlmbuf_data(msg);
/* Check response */
if (resp->result != 0)
printf("Request FIREWALL_ADD failed (%u)\n", resp->result);
else {
if (old_rule == NULL) {
- struct app_rule *new_rule = (struct app_rule *)
- rte_zmalloc_socket("CLI",
- sizeof(struct app_rule),
- CACHE_LINE_SIZE,
- rte_socket_id());
-
memcpy(new_rule, &rule, sizeof(rule));
TAILQ_INSERT_TAIL(&firewall_table, new_rule, entries);
n_firewall_rules++;
rte_panic("Unable to allocate new message\n");
/* Fill request message */
- req = (struct app_msg_req *) msg->ctrl.data;
+ req = (struct app_msg_req *)rte_ctrlmbuf_data(msg);
memset(&req->firewall_del, 0, sizeof(req->firewall_del));
req->type = APP_MSG_REQ_FW_DEL;
req->firewall_del.delete_params.field_value[1].value.u32 =
do {
status = rte_ring_sc_dequeue(ring_resp, (void **) &msg);
} while (status != 0);
- resp = (struct app_msg_resp *) msg->ctrl.data;
+ resp = (struct app_msg_resp *)rte_ctrlmbuf_data(msg);
/* Check response */
if (resp->result != 0)
rte_panic("Unable to allocate new message\n");
/* Fill request message */
- req = (struct app_msg_req *) ((struct rte_mbuf *)msg)->ctrl.data;
+ req = (struct app_msg_req *)rte_ctrlmbuf_data((struct rte_mbuf *)msg);
memset(req, 0, sizeof(struct app_msg_req));
req->type = APP_MSG_REQ_FC_ADD_ALL;
do {
status = rte_ring_sc_dequeue(ring_resp, &msg);
} while (status != 0);
- resp = (struct app_msg_resp *) ((struct rte_mbuf *)msg)->ctrl.data;
+ resp = (struct app_msg_resp *)rte_ctrlmbuf_data((struct rte_mbuf *)msg);
/* Check response */
if (resp->result != 0)
rte_panic("Unable to allocate new message\n");
/* Fill request message */
- req = (struct app_msg_req *) ((struct rte_mbuf *)msg)->ctrl.data;
+ req = (struct app_msg_req *)rte_ctrlmbuf_data((struct rte_mbuf *)msg);
memset(req, 0, sizeof(struct app_msg_req));
req->type = APP_MSG_REQ_FC_ADD;
do {
status = rte_ring_sc_dequeue(ring_resp, &msg);
} while (status != 0);
- resp = (struct app_msg_resp *) ((struct rte_mbuf *)msg)->ctrl.data;
+ resp = (struct app_msg_resp *)rte_ctrlmbuf_data((struct rte_mbuf *)msg);
/* Check response */
if (resp->result != 0)
struct app_rule *new_rule = (struct app_rule *)
rte_zmalloc_socket("CLI",
sizeof(struct app_rule),
- CACHE_LINE_SIZE,
+ RTE_CACHE_LINE_SIZE,
rte_socket_id());
if (new_rule == NULL)
rte_panic("Unable to allocate new message\n");
/* Fill request message */
- req = (struct app_msg_req *) ((struct rte_mbuf *)msg)->ctrl.data;
+ req = (struct app_msg_req *)rte_ctrlmbuf_data((struct rte_mbuf *)msg);
memset(req, 0, sizeof(struct app_msg_req));
req->type = APP_MSG_REQ_FC_DEL;
do {
status = rte_ring_sc_dequeue(ring_resp, &msg);
} while (status != 0);
- resp = (struct app_msg_resp *) ((struct rte_mbuf *)msg)->ctrl.data;
+ resp = (struct app_msg_resp *)rte_ctrlmbuf_data((struct rte_mbuf *)msg);
/* Check response */
if (resp->result != 0)