diff options
Diffstat (limited to 'zebra/zebra_pbr.c')
| -rw-r--r-- | zebra/zebra_pbr.c | 60 |
1 files changed, 34 insertions, 26 deletions
diff --git a/zebra/zebra_pbr.c b/zebra/zebra_pbr.c index 275e045d43..40f97765da 100644 --- a/zebra/zebra_pbr.c +++ b/zebra/zebra_pbr.c @@ -565,8 +565,8 @@ void zebra_pbr_create_ipset(struct zebra_ns *zns, ret = hook_call(zebra_pbr_ipset_wrap_script_update, zns, 1, ipset); kernel_pbr_ipset_add_del_status(ipset, - ret ? DP_INSTALL_SUCCESS - : DP_INSTALL_FAILURE); + ret ? ZEBRA_DPLANE_INSTALL_SUCCESS + : ZEBRA_DPLANE_INSTALL_FAILURE); } void zebra_pbr_destroy_ipset(struct zebra_ns *zns, @@ -650,8 +650,8 @@ void zebra_pbr_add_ipset_entry(struct zebra_ns *zns, ret = hook_call(zebra_pbr_ipset_entry_wrap_script_update, zns, 1, ipset); kernel_pbr_ipset_entry_add_del_status(ipset, - ret ? DP_INSTALL_SUCCESS - : DP_INSTALL_FAILURE); + ret ? ZEBRA_DPLANE_INSTALL_SUCCESS + : ZEBRA_DPLANE_INSTALL_FAILURE); } void zebra_pbr_del_ipset_entry(struct zebra_ns *zns, @@ -693,8 +693,8 @@ void zebra_pbr_add_iptable(struct zebra_ns *zns, pbr_iptable_alloc_intern); ret = hook_call(zebra_pbr_iptable_wrap_script_update, zns, 1, iptable); kernel_pbr_iptable_add_del_status(iptable, - ret ? DP_INSTALL_SUCCESS - : DP_INSTALL_FAILURE); + ret ? ZEBRA_DPLANE_INSTALL_SUCCESS + : ZEBRA_DPLANE_INSTALL_FAILURE); } void zebra_pbr_del_iptable(struct zebra_ns *zns, @@ -725,21 +725,23 @@ void zebra_pbr_del_iptable(struct zebra_ns *zns, * Handle success or failure of rule (un)install in the kernel. */ void kernel_pbr_rule_add_del_status(struct zebra_pbr_rule *rule, - enum dp_results res) + enum zebra_dplane_status res) { switch (res) { - case DP_INSTALL_SUCCESS: + case ZEBRA_DPLANE_INSTALL_SUCCESS: zsend_rule_notify_owner(rule, ZAPI_RULE_INSTALLED); break; - case DP_INSTALL_FAILURE: + case ZEBRA_DPLANE_INSTALL_FAILURE: zsend_rule_notify_owner(rule, ZAPI_RULE_FAIL_INSTALL); break; - case DP_DELETE_SUCCESS: + case ZEBRA_DPLANE_DELETE_SUCCESS: zsend_rule_notify_owner(rule, ZAPI_RULE_REMOVED); break; - case DP_DELETE_FAILURE: + case ZEBRA_DPLANE_DELETE_FAILURE: zsend_rule_notify_owner(rule, ZAPI_RULE_FAIL_REMOVE); break; + case ZEBRA_DPLANE_STATUS_NONE: + break; } } @@ -747,21 +749,23 @@ void kernel_pbr_rule_add_del_status(struct zebra_pbr_rule *rule, * Handle success or failure of ipset (un)install in the kernel. */ void kernel_pbr_ipset_add_del_status(struct zebra_pbr_ipset *ipset, - enum dp_results res) + enum zebra_dplane_status res) { switch (res) { - case DP_INSTALL_SUCCESS: + case ZEBRA_DPLANE_INSTALL_SUCCESS: zsend_ipset_notify_owner(ipset, ZAPI_IPSET_INSTALLED); break; - case DP_INSTALL_FAILURE: + case ZEBRA_DPLANE_INSTALL_FAILURE: zsend_ipset_notify_owner(ipset, ZAPI_IPSET_FAIL_INSTALL); break; - case DP_DELETE_SUCCESS: + case ZEBRA_DPLANE_DELETE_SUCCESS: zsend_ipset_notify_owner(ipset, ZAPI_IPSET_REMOVED); break; - case DP_DELETE_FAILURE: + case ZEBRA_DPLANE_DELETE_FAILURE: zsend_ipset_notify_owner(ipset, ZAPI_IPSET_FAIL_REMOVE); break; + case ZEBRA_DPLANE_STATUS_NONE: + break; } } @@ -770,25 +774,27 @@ void kernel_pbr_ipset_add_del_status(struct zebra_pbr_ipset *ipset, */ void kernel_pbr_ipset_entry_add_del_status( struct zebra_pbr_ipset_entry *ipset, - enum dp_results res) + enum zebra_dplane_status res) { switch (res) { - case DP_INSTALL_SUCCESS: + case ZEBRA_DPLANE_INSTALL_SUCCESS: zsend_ipset_entry_notify_owner(ipset, ZAPI_IPSET_ENTRY_INSTALLED); break; - case DP_INSTALL_FAILURE: + case ZEBRA_DPLANE_INSTALL_FAILURE: zsend_ipset_entry_notify_owner(ipset, ZAPI_IPSET_ENTRY_FAIL_INSTALL); break; - case DP_DELETE_SUCCESS: + case ZEBRA_DPLANE_DELETE_SUCCESS: zsend_ipset_entry_notify_owner(ipset, ZAPI_IPSET_ENTRY_REMOVED); break; - case DP_DELETE_FAILURE: + case ZEBRA_DPLANE_DELETE_FAILURE: zsend_ipset_entry_notify_owner(ipset, ZAPI_IPSET_ENTRY_FAIL_REMOVE); break; + case ZEBRA_DPLANE_STATUS_NONE: + break; } } @@ -796,23 +802,25 @@ void kernel_pbr_ipset_entry_add_del_status( * Handle success or failure of ipset (un)install in the kernel. */ void kernel_pbr_iptable_add_del_status(struct zebra_pbr_iptable *iptable, - enum dp_results res) + enum zebra_dplane_status res) { switch (res) { - case DP_INSTALL_SUCCESS: + case ZEBRA_DPLANE_INSTALL_SUCCESS: zsend_iptable_notify_owner(iptable, ZAPI_IPTABLE_INSTALLED); break; - case DP_INSTALL_FAILURE: + case ZEBRA_DPLANE_INSTALL_FAILURE: zsend_iptable_notify_owner(iptable, ZAPI_IPTABLE_FAIL_INSTALL); break; - case DP_DELETE_SUCCESS: + case ZEBRA_DPLANE_DELETE_SUCCESS: zsend_iptable_notify_owner(iptable, ZAPI_IPTABLE_REMOVED); break; - case DP_DELETE_FAILURE: + case ZEBRA_DPLANE_DELETE_FAILURE: zsend_iptable_notify_owner(iptable, ZAPI_IPTABLE_FAIL_REMOVE); break; + case ZEBRA_DPLANE_STATUS_NONE: + break; } } |