diff options
| author | Renato Westphal <renato@opensourcerouting.org> | 2016-12-05 17:31:42 -0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2016-12-05 20:37:15 +0100 |
| commit | 4305dfd18ce0dfaa91b0c161f784f73d25b1de55 (patch) | |
| tree | d82f9497b8ca183d6a978e08769c3dc0a4e3a3b6 /ripd/rip_interface.c | |
| parent | d7d73ffc8f575a5fd24714dd121f40828eb61a41 (diff) | |
ripd: fix indentation problems introduced by wrong conflict resolution
Restore trailing whitespaces from rip_interface_new() as well. If we
want to fix this, we need a separate commit just for this purpose.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
[DL: removed "restoring wrong whitespace" bits]
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'ripd/rip_interface.c')
| -rw-r--r-- | ripd/rip_interface.c | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c index 744880360f..2ce28f0c96 100644 --- a/ripd/rip_interface.c +++ b/ripd/rip_interface.c @@ -498,17 +498,17 @@ rip_interface_delete (int command, struct zclient *zclient, static void rip_interface_clean (struct rip_interface *ri) - { - ri->enable_network = 0; - ri->enable_interface = 0; - ri->running = 0; +{ + ri->enable_network = 0; + ri->enable_interface = 0; + ri->running = 0; - if (ri->t_wakeup) - { - thread_cancel (ri->t_wakeup); - ri->t_wakeup = NULL; - } + if (ri->t_wakeup) + { + thread_cancel (ri->t_wakeup); + ri->t_wakeup = NULL; } +} void rip_interfaces_clean (void) @@ -522,7 +522,7 @@ rip_interfaces_clean (void) static void rip_interface_reset (struct rip_interface *ri) - { +{ /* Default authentication type is simple password for Cisco compatibility. */ ri->auth_type = RIP_NO_AUTH; @@ -535,36 +535,36 @@ rip_interface_reset (struct rip_interface *ri) ri->split_horizon_default = RIP_SPLIT_HORIZON; ri->split_horizon = ri->split_horizon_default; - ri->ri_send = RI_RIP_UNSPEC; - ri->ri_receive = RI_RIP_UNSPEC; + ri->ri_send = RI_RIP_UNSPEC; + ri->ri_receive = RI_RIP_UNSPEC; - ri->v2_broadcast = 0; + ri->v2_broadcast = 0; - if (ri->auth_str) - { - free (ri->auth_str); - ri->auth_str = NULL; - } - if (ri->key_chain) - { - free (ri->key_chain); - ri->key_chain = NULL; - } + if (ri->auth_str) + { + free (ri->auth_str); + ri->auth_str = NULL; + } + if (ri->key_chain) + { + free (ri->key_chain); + ri->key_chain = NULL; + } - ri->list[RIP_FILTER_IN] = NULL; - ri->list[RIP_FILTER_OUT] = NULL; + ri->list[RIP_FILTER_IN] = NULL; + ri->list[RIP_FILTER_OUT] = NULL; - ri->prefix[RIP_FILTER_IN] = NULL; - ri->prefix[RIP_FILTER_OUT] = NULL; - - ri->recv_badpackets = 0; - ri->recv_badroutes = 0; - ri->sent_updates = 0; + ri->prefix[RIP_FILTER_IN] = NULL; + ri->prefix[RIP_FILTER_OUT] = NULL; - ri->passive = 0; + ri->recv_badpackets = 0; + ri->recv_badroutes = 0; + ri->sent_updates = 0; + + ri->passive = 0; rip_interface_clean (ri); - } +} void rip_interfaces_reset (void) |