Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ikev2: fix logging init
[vpp.git]
/
src
/
plugins
/
ikev2
/
ikev2.c
diff --git
a/src/plugins/ikev2/ikev2.c
b/src/plugins/ikev2/ikev2.c
index
75b9dcb
..
3d37dff
100644
(file)
--- a/
src/plugins/ikev2/ikev2.c
+++ b/
src/plugins/ikev2/ikev2.c
@@
-832,9
+832,6
@@
ikev2_initial_contact_cleanup (ikev2_sa_t * sa)
vec_free (delete);
sa->initial_contact = 0;
vec_free (delete);
sa->initial_contact = 0;
-
- km->log_level = IKEV2_LOG_ERROR;
- km->log_class = vlib_log_register_class ("ikev2", 0);
}
static void
}
static void
@@
-1525,7
+1522,10
@@
ikev2_add_tunnel_from_main (ikev2_add_ipsec_tunnel_args_t * a)
hash_set1 (km->sw_if_indices, sw_if_index);
}
else
hash_set1 (km->sw_if_indices, sw_if_index);
}
else
- sw_if_index = a->sw_if_index;
+ {
+ sw_if_index = a->sw_if_index;
+ vnet_sw_interface_admin_up (vnet_get_main (), sw_if_index);
+ }
if (rv)
{
if (rv)
{
@@
-1797,7
+1797,10
@@
ikev2_del_tunnel_from_main (ikev2_del_ipsec_tunnel_args_t * a)
sw_if_index = ~0;
}
else
sw_if_index = ~0;
}
else
- sw_if_index = a->sw_if_index;
+ {
+ sw_if_index = a->sw_if_index;
+ vnet_sw_interface_admin_down (vnet_get_main (), sw_if_index);
+ }
if (~0 != sw_if_index)
ipsec_tun_protect_del (sw_if_index);
if (~0 != sw_if_index)
ipsec_tun_protect_del (sw_if_index);
@@
-3525,6
+3528,8
@@
ikev2_init (vlib_main_t * vm)
ikev2_cli_reference ();
ikev2_cli_reference ();
+ km->log_level = IKEV2_LOG_ERROR;
+ km->log_class = vlib_log_register_class ("ikev2", 0);
return 0;
}
return 0;
}