]> git.puffer.fish Git - mirror/frr.git/commitdiff
zebra: use zserv_send_message instead of writen 7698/head
authorMark Stapp <mjs@voltanet.io>
Wed, 9 Dec 2020 14:17:25 +0000 (09:17 -0500)
committerMark Stapp <mjs@voltanet.io>
Wed, 9 Dec 2020 14:17:25 +0000 (09:17 -0500)
Following functions is using writen to dispatch message
into socket, but another function uses zserv_send_message.
This commit does tiny unification for zapi's socket messaging.

Funcs:
- zsend_assign_label_chunk_response()
- zsend_label_manager_connect_response()

Signed-off-by: Hiroki Shirokura <slank.dev@gmail.com>
Signed-off-by: Mark Stapp <mjs@voltanet.io>
zebra/zapi_msg.c

index e436e5a288a0bdd86ff4ce0c0acc3fdd8bbcdd55..9a9be3ac40512df7d158668389e366abdcc88e6d 100644 (file)
@@ -958,7 +958,6 @@ int zsend_pw_update(struct zserv *client, struct zebra_pw *pw)
 int zsend_assign_label_chunk_response(struct zserv *client, vrf_id_t vrf_id,
                                      struct label_manager_chunk *lmc)
 {
-       int ret;
        struct stream *s = stream_new(ZEBRA_MAX_PACKET_SIZ);
 
        zclient_create_header(s, ZEBRA_GET_LABEL_CHUNK, vrf_id);
@@ -978,16 +977,13 @@ int zsend_assign_label_chunk_response(struct zserv *client, vrf_id_t vrf_id,
        /* Write packet size. */
        stream_putw_at(s, 0, stream_get_endp(s));
 
-       ret = writen(client->sock, s->data, stream_get_endp(s));
-       stream_free(s);
-       return ret;
+       return zserv_send_message(client, s);
 }
 
 /* Send response to a label manager connect request to client */
 int zsend_label_manager_connect_response(struct zserv *client, vrf_id_t vrf_id,
                                         unsigned short result)
 {
-       int ret;
        struct stream *s = stream_new(ZEBRA_MAX_PACKET_SIZ);
 
        zclient_create_header(s, ZEBRA_LABEL_MANAGER_CONNECT, vrf_id);
@@ -1004,10 +1000,7 @@ int zsend_label_manager_connect_response(struct zserv *client, vrf_id_t vrf_id,
        /* Write packet size. */
        stream_putw_at(s, 0, stream_get_endp(s));
 
-       ret = writen(client->sock, s->data, stream_get_endp(s));
-       stream_free(s);
-
-       return ret;
+       return zserv_send_message(client, s);
 }
 
 /* Send response to a get table chunk request to client */