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

zebra: use zserv_send_message instead of writen

Browse Source 
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>
This commit is contained in:
Hiroki Shirokura 2020-12-09 17:17:13 +09:00
parent 08b17099f2
commit 732d22cbf2
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zebra/zapi_msg.c
View File

@ -995,7 +995,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, int zsend_assign_label_chunk_response(struct zserv *client, vrf_id_t vrf_id,
struct label_manager_chunk *lmc) struct label_manager_chunk *lmc)
{ {
int ret;
struct stream *s = stream_new(ZEBRA_MAX_PACKET_SIZ); struct stream *s = stream_new(ZEBRA_MAX_PACKET_SIZ);
zclient_create_header(s, ZEBRA_GET_LABEL_CHUNK, vrf_id); zclient_create_header(s, ZEBRA_GET_LABEL_CHUNK, vrf_id);
@ -1015,16 +1014,13 @@ int zsend_assign_label_chunk_response(struct zserv *client, vrf_id_t vrf_id,
/* Write packet size. */ /* Write packet size. */
stream_putw_at(s, 0, stream_get_endp(s)); stream_putw_at(s, 0, stream_get_endp(s));
ret = writen(client->sock, s->data, stream_get_endp(s)); return zserv_send_message(client, s);
stream_free(s);
return ret;
} }
/* Send response to a label manager connect request to client */ /* Send response to a label manager connect request to client */
int zsend_label_manager_connect_response(struct zserv *client, vrf_id_t vrf_id, int zsend_label_manager_connect_response(struct zserv *client, vrf_id_t vrf_id,
unsigned short result) unsigned short result)
{ {
int ret;
struct stream *s = stream_new(ZEBRA_MAX_PACKET_SIZ); struct stream *s = stream_new(ZEBRA_MAX_PACKET_SIZ);
zclient_create_header(s, ZEBRA_LABEL_MANAGER_CONNECT, vrf_id); zclient_create_header(s, ZEBRA_LABEL_MANAGER_CONNECT, vrf_id);
@ -1041,10 +1037,7 @@ int zsend_label_manager_connect_response(struct zserv *client, vrf_id_t vrf_id,
/* Write packet size. */ /* Write packet size. */
stream_putw_at(s, 0, stream_get_endp(s)); stream_putw_at(s, 0, stream_get_endp(s));
ret = writen(client->sock, s->data, stream_get_endp(s)); return zserv_send_message(client, s);
stream_free(s);
return ret;
} }
/* Send response to a get table chunk request to client */ /* Send response to a get table chunk request to client */