Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Move the vnet cdp protocol implementation to a plugin
[vpp.git]
/
src
/
plugins
/
cdp
/
cdp_input.c
diff --git
a/src/vnet/cdp/cdp_input.c
b/src/plugins/cdp/cdp_input.c
similarity index 97%
rename from
src/vnet/cdp/cdp_input.c
rename to
src/plugins/cdp/cdp_input.c
index
3574de6
..
fa993b8
100644
(file)
--- a/
src/vnet/cdp/cdp_input.c
+++ b/
src/plugins/cdp/cdp_input.c
@@
-12,16
+12,12
@@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include <
vnet/cdp/cdp_node
.h>
+#include <
cdp/cdp
.h>
cdp_main_t cdp_main;
#define DEBUG_TLV_DUMP 0 /* 1=> dump TLV's to stdout while processing them */
cdp_main_t cdp_main;
#define DEBUG_TLV_DUMP 0 /* 1=> dump TLV's to stdout while processing them */
-/* Reliable multicast messages we use to keep peers updated */
-mc_serialize_msg_t serialize_cdp_neighbor_msg;
-mc_serialize_msg_t serialize_cdp_keepalive_msg;
-
/*
* ported from an unspecified Cisco cdp implementation.
* Compute / return in HOST byte order. 0 => good checksum.
/*
* ported from an unspecified Cisco cdp implementation.
* Compute / return in HOST byte order. 0 => good checksum.
@@
-384,7
+380,7
@@
cdp_input (vlib_main_t * vm, vlib_buffer_t * b0, u32 bi0)
* setup neighbor hash table
*/
static clib_error_t *
* setup neighbor hash table
*/
static clib_error_t *
-cdp_init (vlib_main_t * vm)
+cdp_in
put_in
it (vlib_main_t * vm)
{
clib_error_t *error;
cdp_main_t *cm = &cdp_main;
{
clib_error_t *error;
cdp_main_t *cm = &cdp_main;
@@
-402,7
+398,7
@@
cdp_init (vlib_main_t * vm)
return 0;
}
return 0;
}
-VLIB_INIT_FUNCTION (cdp_init);
+VLIB_INIT_FUNCTION (cdp_in
put_in
it);
static u8 *
static u8 *
@@
-432,14
+428,16
@@
format_cdp_neighbors (u8 * s, va_list * va)
return s;
}
return s;
}
-
static clib_error_t *
show_cdp (vlib_main_t * vm,
unformat_input_t * input, vlib_cli_command_t * cmd)
{
cdp_main_t *cm = &cdp_main;
static clib_error_t *
show_cdp (vlib_main_t * vm,
unformat_input_t * input, vlib_cli_command_t * cmd)
{
cdp_main_t *cm = &cdp_main;
- vlib_cli_output (vm, "%U\n", format_cdp_neighbors, vm, cm);
+ if (cm->enabled == 0)
+ vlib_cli_output (vm, "CDP is not enabled...");
+ else
+ vlib_cli_output (vm, "%U\n", format_cdp_neighbors, vm, cm);
return 0;
}
return 0;
}