Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Repair Doxygen build infrastructure
[vpp.git]
/
plugins
/
ioam-plugin
/
ioam
/
encap
/
ip6_ioam_pot.c
diff --git
a/plugins/ioam-plugin/ioam/encap/ip6_ioam_pot.c
b/plugins/ioam-plugin/ioam/encap/ip6_ioam_pot.c
index
0a23945
..
05f42c9
100644
(file)
--- a/
plugins/ioam-plugin/ioam/encap/ip6_ioam_pot.c
+++ b/
plugins/ioam-plugin/ioam/encap/ip6_ioam_pot.c
@@
-87,7
+87,7
@@
static u8 * format_ioam_pot (u8 * s, va_list * args)
}
s = format (s, "random = 0x%Lx, Cumulative = 0x%Lx, Index = 0x%x",
}
s = format (s, "random = 0x%Lx, Cumulative = 0x%Lx, Index = 0x%x",
- random, cumulative, pot0
->reserved_profile_id
);
+ random, cumulative, pot0
? pot0->reserved_profile_id : ~0
);
return s;
}
return s;
}
@@
-171,7
+171,7
@@
ip6_hbh_ioam_proof_of_transit_handler (vlib_buffer_t *b,
}
int
}
int
-ip6_hbh_ioam_proof_of_transit_pop_handler (ip6_header_t *ip,
+ip6_hbh_ioam_proof_of_transit_pop_handler (
vlib_buffer_t *b,
ip6_header_t *ip,
ip6_hop_by_hop_option_t *opt0)
{
ioam_pot_option_t * pot0;
ip6_hop_by_hop_option_t *opt0)
{
ioam_pot_option_t * pot0;
@@
-199,10
+199,10
@@
ip6_hbh_ioam_proof_of_transit_pop_handler (ip6_header_t *ip,
return (rv);
}
return (rv);
}
-int ip6_hop_by_hop_ioam_pot_rewrite_handler (u8 *rewrite_string, u8 rewrite_size)
+int ip6_hop_by_hop_ioam_pot_rewrite_handler (u8 *rewrite_string, u8
*
rewrite_size)
{
ioam_pot_option_t * pot_option;
{
ioam_pot_option_t * pot_option;
- if (rewrite_string && rewrite_size == sizeof(ioam_pot_option_t))
+ if (rewrite_string &&
*
rewrite_size == sizeof(ioam_pot_option_t))
{
pot_option = (ioam_pot_option_t *)rewrite_string;
pot_option->hdr.type = HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT
{
pot_option = (ioam_pot_option_t *)rewrite_string;
pot_option->hdr.type = HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT
@@
-248,12
+248,6
@@
ip6_hop_by_hop_ioam_pot_init (vlib_main_t * vm)
ip6_hop_by_hop_ioam_pot_main_t * hm = &ip6_hop_by_hop_ioam_pot_main;
clib_error_t * error;
ip6_hop_by_hop_ioam_pot_main_t * hm = &ip6_hop_by_hop_ioam_pot_main;
clib_error_t * error;
- if ((error = vlib_call_init_function (vm, ip_main_init)))
- return(error);
-
- if ((error = vlib_call_init_function (vm, ip6_lookup_init)))
- return error;
-
if ((error = vlib_call_init_function (vm, ip6_hop_by_hop_ioam_init)))
return(error);
if ((error = vlib_call_init_function (vm, ip6_hop_by_hop_ioam_init)))
return(error);