proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 17:18:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

eigrp: Fix Compile issues

Browse Source 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-03-10 19:07:15 -05:00
parent 5ffc9780fb
commit a724893036
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eigrpd/eigrp_hello.c
View File

@ -94,8 +94,8 @@ eigrp_hello_timer (struct thread *thread)
ei->t_hello = NULL; ei->t_hello = NULL;
if (IS_DEBUG_EIGRP(0, TIMERS)) if (IS_DEBUG_EIGRP(0, TIMERS))
zlog (NULL, LOG_DEBUG, "Start Hello Timer (%s) Expire [%u]", zlog_debug ("Start Hello Timer (%s) Expire [%u]",
IF_NAME(ei), EIGRP_IF_PARAM(ei, v_hello)); IF_NAME(ei), EIGRP_IF_PARAM(ei, v_hello));
/* Sending hello packet. */ /* Sending hello packet. */
eigrp_hello_send(ei, EIGRP_HELLO_NORMAL, NULL); eigrp_hello_send(ei, EIGRP_HELLO_NORMAL, NULL);

12
eigrpd/eigrp_packet.c
View File

@ -519,13 +519,16 @@ eigrp_read (struct thread *thread)
/* Note that sockopt_iphdrincl_swab_systoh was called in eigrp_recv_packet. */ /* Note that sockopt_iphdrincl_swab_systoh was called in eigrp_recv_packet. */
if (ifp == NULL) if (ifp == NULL)
{ {
struct connected *c;
/* Handle cases where the platform does not support retrieving the ifindex, /* Handle cases where the platform does not support retrieving the ifindex,
and also platforms (such as Solaris 8) that claim to support ifindex and also platforms (such as Solaris 8) that claim to support ifindex
retrieval but do not. */ retrieval but do not. */
ifp = if_lookup_address((void *)&iph->ip_src, VRF_DEFAULT); c = if_lookup_address((void *)&iph->ip_src, VRF_DEFAULT);
if (ifp == NULL) if (c == NULL)
return 0; return 0;
ifp = c->ifp;
} }
/* associate packet with eigrp interface */ /* associate packet with eigrp interface */
@ -706,9 +709,8 @@ eigrp_read (struct thread *thread)
eigrp_update_receive(eigrp, iph, eigrph, ibuf, ei, length); eigrp_update_receive(eigrp, iph, eigrph, ibuf, ei, length);
break; break;
default: default:
zlog(NULL, LOG_WARNING, zlog_warn("interface %s: EIGRP packet header type %d unsupported",
"interface %s: EIGRP packet header type %d unsupported", IF_NAME(ei), opcode);
IF_NAME(ei), opcode);
break; break;
} }