proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-06 12:52:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ripd: reduce excessive indentation in a few places

Browse Source 
Make the code a bit easier to read. No binary changes.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2018-07-02 15:51:15 -03:00
parent 1dde2fbf78
commit 2e37ad7fd2
1 changed files with 44 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
ripd/rip_interface.c
View File

@ -158,34 +158,32 @@ static void rip_request_interface_send(struct interface *ifp, uint8_t version)
for (ALL_LIST_ELEMENTS(ifp->connected, cnode, cnnode, for (ALL_LIST_ELEMENTS(ifp->connected, cnode, cnnode,
connected)) { connected)) {
if (connected->address->family == AF_INET) { if (connected->address->family != AF_INET)
memset(&to, 0, sizeof(struct sockaddr_in)); continue;
to.sin_port = htons(RIP_PORT_DEFAULT);
if (connected->destination)
/* use specified broadcast or peer
* destination addr */
to.sin_addr = connected->destination->u
.prefix4;
else if (connected->address->prefixlen
< IPV4_MAX_PREFIXLEN)
/* calculate the appropriate broadcast
* address */
to.sin_addr
.s_addr = ipv4_broadcast_addr(
connected->address->u.prefix4
.s_addr,
connected->address->prefixlen);
else
/* do not know where to send the packet
*/
continue;
if (IS_RIP_DEBUG_EVENT) memset(&to, 0, sizeof(struct sockaddr_in));
zlog_debug("SEND request to %s", to.sin_port = htons(RIP_PORT_DEFAULT);
inet_ntoa(to.sin_addr)); if (connected->destination)
/* use specified broadcast or peer
* destination addr */
to.sin_addr = connected->destination->u.prefix4;
else if (connected->address->prefixlen
< IPV4_MAX_PREFIXLEN)
/* calculate the appropriate broadcast
* address */
to.sin_addr.s_addr = ipv4_broadcast_addr(
connected->address->u.prefix4.s_addr,
connected->address->prefixlen);
else
/* do not know where to send the packet
*/
continue;
rip_request_send(&to, ifp, version, connected); if (IS_RIP_DEBUG_EVENT)
} zlog_debug("SEND request to %s",
inet_ntoa(to.sin_addr));
rip_request_send(&to, ifp, version, connected);
} }
} }
} }
@ -194,6 +192,7 @@ static void rip_request_interface_send(struct interface *ifp, uint8_t version)
static void rip_request_interface(struct interface *ifp) static void rip_request_interface(struct interface *ifp)
{ {
struct rip_interface *ri; struct rip_interface *ri;
int vsend;
/* In default ripd doesn't send RIP_REQUEST to the loopback interface. /* In default ripd doesn't send RIP_REQUEST to the loopback interface.
*/ */
@ -209,14 +208,12 @@ static void rip_request_interface(struct interface *ifp)
/* If there is no version configuration in the interface, /* If there is no version configuration in the interface,
use rip's version setting. */ use rip's version setting. */
{ vsend = ((ri->ri_send == RI_RIP_UNSPEC) ? rip->version_send
int vsend = ((ri->ri_send == RI_RIP_UNSPEC) ? rip->version_send : ri->ri_send);
: ri->ri_send); if (vsend & RIPv1)
if (vsend & RIPv1) rip_request_interface_send(ifp, RIPv1);
rip_request_interface_send(ifp, RIPv1); if (vsend & RIPv2)
if (vsend & RIPv2) rip_request_interface_send(ifp, RIPv2);
rip_request_interface_send(ifp, RIPv2);
}
} }
#if 0 #if 0
@ -957,25 +954,21 @@ void rip_enable_apply(struct interface *ifp)
/* Update running status of the interface. */ /* Update running status of the interface. */
if (ri->enable_network || ri->enable_interface) { if (ri->enable_network || ri->enable_interface) {
{ if (IS_RIP_DEBUG_EVENT)
if (IS_RIP_DEBUG_EVENT) zlog_debug("turn on %s", ifp->name);
zlog_debug("turn on %s", ifp->name);
/* Add interface wake up thread. */ /* Add interface wake up thread. */
thread_add_timer(master, rip_interface_wakeup, ifp, 1, thread_add_timer(master, rip_interface_wakeup, ifp, 1,
&ri->t_wakeup); &ri->t_wakeup);
rip_connect_set(ifp, 1); rip_connect_set(ifp, 1);
} } else if (ri->running) {
} else { /* Might as well clean up the route table as well
if (ri->running) { * rip_if_down sets to 0 ri->running, and displays "turn
/* Might as well clean up the route table as well *off %s"
* rip_if_down sets to 0 ri->running, and displays "turn **/
*off %s" rip_if_down(ifp);
**/
rip_if_down(ifp);
rip_connect_set(ifp, 0); rip_connect_set(ifp, 0);
}
} }
} }