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

Merge pull request #2086 from donaldsharp/zebra_capabilities

Browse Source 
zebra: Add pass up through zapi what zebra is capable of handling
This commit is contained in:
Russ White 2018-04-20 08:06:54 -04:00 committed by GitHub
commit 9ae97474fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/zclient.c
View File

@ -2485,6 +2485,25 @@ void zebra_read_pw_status_update(int command, struct zclient *zclient,
pw->status = stream_getl(s);
}
static void zclient_capability_decode(int command, struct zclient *zclient,
zebra_size_t length, vrf_id_t vrf_id)
{
struct zclient_capabilities cap;
struct stream *s = zclient->ibuf;
uint8_t mpls_enabled;
memset(&cap, 0, sizeof(cap));
STREAM_GETC(s, mpls_enabled);
cap.mpls_enabled = !!mpls_enabled;
STREAM_GETL(s, cap.ecmp);
if (zclient->zebra_capabilities)
(*zclient->zebra_capabilities)(&cap);
stream_failure:
return;
}
/* Zebra client message read function. */
static int zclient_read(struct thread *thread)
{
@ -2582,6 +2601,9 @@ static int zclient_read(struct thread *thread)
(void *)zclient, command, vrf_id);
switch (command) {
case ZEBRA_CAPABILITIES:
zclient_capability_decode(command, zclient, length, vrf_id);
break;
case ZEBRA_ROUTER_ID_UPDATE:
if (zclient->router_id_update)
(*zclient->router_id_update)(command, zclient, length,

7
lib/zclient.h
View File

@ -85,6 +85,7 @@ typedef enum {
ZEBRA_ROUTER_ID_DELETE,
ZEBRA_ROUTER_ID_UPDATE,
ZEBRA_HELLO,
ZEBRA_CAPABILITIES,
ZEBRA_NEXTHOP_REGISTER,
ZEBRA_NEXTHOP_UNREGISTER,
ZEBRA_NEXTHOP_UPDATE,
@ -162,6 +163,11 @@ struct redist_proto {
struct list *instances;
};
struct zclient_capabilities {
uint32_t ecmp;
bool mpls_enabled;
};
/* Structure for the zebra client. */
struct zclient {
/* The thread master we schedule ourselves on */
@ -206,6 +212,7 @@ struct zclient {
/* Pointer to the callback functions. */
void (*zebra_connected)(struct zclient *);
void (*zebra_capabilities)(struct zclient_capabilities *cap);
int (*router_id_update)(int, struct zclient *, uint16_t, vrf_id_t);
int (*interface_add)(int, struct zclient *, uint16_t, vrf_id_t);
int (*interface_delete)(int, struct zclient *, uint16_t, vrf_id_t);

13
zebra/zserv.c
View File

@ -2148,6 +2148,18 @@ static void zread_router_id_delete(ZAPI_HANDLER_ARGS)
vrf_bitmap_unset(client->ridinfo, zvrf_id(zvrf));
}
static void zsend_capabilities(struct zserv *client, struct zebra_vrf *zvrf)
{
struct stream *s = stream_new(ZEBRA_MAX_PACKET_SIZ);
zclient_create_header(s, ZEBRA_CAPABILITIES, zvrf->vrf->vrf_id);
stream_putc(s, mpls_enabled);
stream_putl(s, multipath_num);
stream_putw_at(s, 0, stream_get_endp(s));
zebra_server_send_message(client, s);
}
/* Tie up route-type and client->sock */
static void zread_hello(ZAPI_HANDLER_ARGS)
{
@ -2175,6 +2187,7 @@ static void zread_hello(ZAPI_HANDLER_ARGS)
client->instance = instance;
}
zsend_capabilities(client, zvrf);
stream_failure:
return;
}