diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-10-21 21:27:49 +0200 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-10-21 21:27:49 +0200 |
| commit | 39e92c066f210b0b550489e98d3b767ee1553e52 (patch) | |
| tree | 70928b277635d25cb717b8ceb103dd1d5e26f732 /ripd | |
| parent | lib: Clean up some bgp show functions (diff) | |
| parent | vtysh: handle case if there is no match in "write terminal $daemon" (diff) | |
| download | frr-39e92c066f210b0b550489e98d3b767ee1553e52.tar.xz frr-39e92c066f210b0b550489e98d3b767ee1553e52.zip | |
Merge branch 'cmaster-next' into vtysh-grammar
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Conflicts:
bgpd/bgp_encap.c
bgpd/bgp_route.c
lib/command.c
lib/command.h
ospf6d/ospf6d.c
vtysh/vtysh.c
Diffstat (limited to 'ripd')
| -rw-r--r-- | ripd/ripd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ripd/ripd.c b/ripd/ripd.c index 7b0436849..24ba74c73 100644 --- a/ripd/ripd.c +++ b/ripd/ripd.c @@ -748,9 +748,9 @@ rip_packet_dump (struct rip_packet *packet, int size, const char *sndrcv) zlog_debug (" family 0x%X type %d (MD5 data)", ntohs (rte->family), ntohs (rte->tag)); zlog_debug (" MD5: %02X%02X%02X%02X%02X%02X%02X%02X" - "%02X%02X%02X%02X%02X%02X%02X", + "%02X%02X%02X%02X%02X%02X%02X%02X", p[0], p[1], p[2], p[3], p[4], p[5], p[6], - p[7], p[9], p[10], p[11], p[12], p[13], + p[7], p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15]); } else |