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

zebra: fix indentation problems introduced by wrong conflict resolution

Browse Source 
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2017-02-06 11:57:34 -02:00
parent 06109208a5
commit a16d0e7bb3
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
zebra/zserv.c
View File

@ -751,28 +751,28 @@ zsend_redistribute_route (int add, struct zserv *client, struct prefix *p,
/* ldpd needs all nexthops */ /* ldpd needs all nexthops */
if (client->proto != ZEBRA_ROUTE_LDP) if (client->proto != ZEBRA_ROUTE_LDP)
break; break;
} }
} }
/* Distance */ /* Distance */
SET_FLAG (zapi_flags, ZAPI_MESSAGE_DISTANCE); SET_FLAG (zapi_flags, ZAPI_MESSAGE_DISTANCE);
stream_putc (s, rib->distance); stream_putc (s, rib->distance);
/* Metric */ /* Metric */
SET_FLAG (zapi_flags, ZAPI_MESSAGE_METRIC); SET_FLAG (zapi_flags, ZAPI_MESSAGE_METRIC);
stream_putl (s, rib->metric); stream_putl (s, rib->metric);
/* Tag */ /* Tag */
if (rib->tag) if (rib->tag)
{ {
SET_FLAG(zapi_flags, ZAPI_MESSAGE_TAG); SET_FLAG(zapi_flags, ZAPI_MESSAGE_TAG);
stream_putl(s, rib->tag); stream_putl(s, rib->tag);
} }
/* MTU */ /* MTU */
SET_FLAG (zapi_flags, ZAPI_MESSAGE_MTU); SET_FLAG (zapi_flags, ZAPI_MESSAGE_MTU);
stream_putl (s, rib->mtu); stream_putl (s, rib->mtu);
/* write real message flags value */ /* write real message flags value */
stream_putc_at (s, messmark, zapi_flags); stream_putc_at (s, messmark, zapi_flags);