Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Convert a pcap file to a set of C initializers
[vpp.git]
/
src
/
vnet
/
ip
/
ping.c
diff --git
a/src/vnet/ip/ping.c
b/src/vnet/ip/ping.c
index
c847e69
..
a142754
100755
(executable)
--- a/
src/vnet/ip/ping.c
+++ b/
src/vnet/ip/ping.c
@@
-20,6
+20,8
@@
#include <vnet/fib/fib_entry.h>
#include <vlib/vlib.h>
#include <vnet/fib/fib_entry.h>
#include <vlib/vlib.h>
+ping_main_t ping_main;
+
/**
* @file
* @brief IPv4 and IPv6 ICMP Ping.
/**
* @file
* @brief IPv4 and IPv6 ICMP Ping.
@@
-97,7
+99,7
@@
signal_ip46_icmp_reply_event (u8 event_type, vlib_buffer_t * b0)
clib_memcpy (vnet_buffer
(vlib_get_buffer
(vm, bi0_copy))->unused, &nowts, sizeof (nowts));
clib_memcpy (vnet_buffer
(vlib_get_buffer
(vm, bi0_copy))->unused, &nowts, sizeof (nowts));
- vlib_process_signal_event (vm, pr->cli_process_id, event_type, bi0_copy);
+ vlib_process_signal_event
_mt
(vm, pr->cli_process_id, event_type, bi0_copy);
return 1;
}
return 1;
}
@@
-153,8
+155,8
@@
VLIB_REGISTER_NODE (ip6_icmp_echo_reply_node, static) =
.format_trace = format_icmp_echo_trace,
.n_next_nodes = ICMP6_ECHO_REPLY_N_NEXT,
.next_nodes = {
.format_trace = format_icmp_echo_trace,
.n_next_nodes = ICMP6_ECHO_REPLY_N_NEXT,
.next_nodes = {
- [ICMP6_ECHO_REPLY_NEXT_DROP] = "
error
-drop",
- [ICMP6_ECHO_REPLY_NEXT_PUNT] = "
error
-punt",
+ [ICMP6_ECHO_REPLY_NEXT_DROP] = "
ip6
-drop",
+ [ICMP6_ECHO_REPLY_NEXT_PUNT] = "
ip6
-punt",
},
};
/* *INDENT-ON* */
},
};
/* *INDENT-ON* */
@@
-211,8
+213,8
@@
VLIB_REGISTER_NODE (ip4_icmp_echo_reply_node, static) =
.format_trace = format_icmp_echo_trace,
.n_next_nodes = ICMP4_ECHO_REPLY_N_NEXT,
.next_nodes = {
.format_trace = format_icmp_echo_trace,
.n_next_nodes = ICMP4_ECHO_REPLY_N_NEXT,
.next_nodes = {
- [ICMP4_ECHO_REPLY_NEXT_DROP] = "
error
-drop",
- [ICMP4_ECHO_REPLY_NEXT_PUNT] = "
error
-punt",
+ [ICMP4_ECHO_REPLY_NEXT_DROP] = "
ip4
-drop",
+ [ICMP4_ECHO_REPLY_NEXT_PUNT] = "
ip4
-punt",
},
};
/* *INDENT-ON* */
},
};
/* *INDENT-ON* */
@@
-646,7
+648,7
@@
run_ping_ip46_address (vlib_main_t * vm, u32 table_id, ip4_address_t * pa4,
i = 1 + ping_repeat;
break;
}
i = 1 + ping_repeat;
break;
}
-
vec_free
(event_data);
+
vec_free
(event_data);
}
}
vlib_cli_output (vm, "\n");
}
}
vlib_cli_output (vm, "\n");