]> git.puffer.fish Git - mirror/frr.git/commitdiff
zebra: drop un-needed info in locator-zapi
authorHiroki Shirokura <slank.dev@gmail.com>
Mon, 22 Mar 2021 02:24:06 +0000 (02:24 +0000)
committerMark Stapp <mjs@voltanet.io>
Wed, 2 Jun 2021 14:24:48 +0000 (10:24 -0400)
Signed-off-by: Hiroki Shirokura <slank.dev@gmail.com>
lib/zclient.c
zebra/zapi_msg.c

index de3aed46e92b24207717e1238cbd5a7bdb8f89bb..4d8fbdf157d215043a4b9cc236bb4c18ce3ae996 100644 (file)
@@ -2762,12 +2762,6 @@ int srv6_manager_get_locator_chunk(struct zclient *zclient,
        zclient_create_header(s, ZEBRA_SRV6_MANAGER_GET_LOCATOR_CHUNK,
                              VRF_DEFAULT);
 
-       /* proto */
-       stream_putc(s, zclient->redist_default);
-
-       /* instance */
-       stream_putw(s, zclient->instance);
-
        /* locator_name */
        stream_putw(s, len);
        stream_put(s, locator_name, len);
@@ -2803,12 +2797,6 @@ int srv6_manager_release_locator_chunk(struct zclient *zclient,
        zclient_create_header(s, ZEBRA_SRV6_MANAGER_RELEASE_LOCATOR_CHUNK,
                              VRF_DEFAULT);
 
-       /* proto */
-       stream_putc(s, zclient->redist_default);
-
-       /* instance */
-       stream_putw(s, zclient->instance);
-
        /* locator_name */
        stream_putw(s, len);
        stream_put(s, locator_name, len);
index 4f6663fe2b0198fd953b267db830eeaa24f573ed..d97d876cf5e8c6726a25639d9a061d7394009e26 100644 (file)
@@ -2870,19 +2870,13 @@ static void zread_srv6_manager_get_locator_chunk(struct zserv *client,
                                                 vrf_id_t vrf_id)
 {
        struct stream *s = msg;
-       uint8_t proto;
-       uint16_t instance;
        uint16_t len;
        char locator_name[SRV6_LOCNAME_SIZE] = {0};
 
        /* Get data. */
-       STREAM_GETC(s, proto);
-       STREAM_GETW(s, instance);
        STREAM_GETW(s, len);
        STREAM_GET(locator_name, s, len);
 
-       assert(proto == client->proto && instance == client->instance);
-
        /* call hook to get a chunk using wrapper */
        struct srv6_locator *loc = NULL;
        srv6_manager_get_locator_chunk_call(&loc, client, locator_name, vrf_id);
@@ -2896,19 +2890,13 @@ static void zread_srv6_manager_release_locator_chunk(struct zserv *client,
                                                     vrf_id_t vrf_id)
 {
        struct stream *s = msg;
-       uint8_t proto;
-       uint16_t instance;
        uint16_t len;
        char locator_name[SRV6_LOCNAME_SIZE] = {0};
 
        /* Get data. */
-       STREAM_GETC(s, proto);
-       STREAM_GETW(s, instance);
        STREAM_GETW(s, len);
        STREAM_GET(locator_name, s, len);
 
-       assert(proto == client->proto && instance == client->instance);
-
        /* call hook to release a chunk using wrapper */
        srv6_manager_release_locator_chunk_call(client, locator_name, vrf_id);