summaryrefslogtreecommitdiff
path: root/zebra/label_manager.c
diff options
context:
space:
mode:
Diffstat (limited to 'zebra/label_manager.c')
-rw-r--r--zebra/label_manager.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/zebra/label_manager.c b/zebra/label_manager.c
index b58f0c9ff8..38869e80ec 100644
--- a/zebra/label_manager.c
+++ b/zebra/label_manager.c
@@ -64,11 +64,11 @@ static int relay_response_back(struct zserv *zserv)
{
int ret = 0;
struct stream *src, *dst;
- u_int16_t size = 0;
- u_char marker;
- u_char version;
+ uint16_t size = 0;
+ uint8_t marker;
+ uint8_t version;
vrf_id_t vrf_id;
- u_int16_t resp_cmd;
+ uint16_t resp_cmd;
src = zclient->ibuf;
dst = obuf;
@@ -269,8 +269,9 @@ void label_manager_init(char *lm_zserv_path)
* @para size Size of the label chunk
* @return Pointer to the assigned label chunk
*/
-struct label_manager_chunk *assign_label_chunk(u_char proto, u_short instance,
- u_char keep, uint32_t size)
+struct label_manager_chunk *assign_label_chunk(uint8_t proto,
+ unsigned short instance,
+ uint8_t keep, uint32_t size)
{
struct label_manager_chunk *lmc;
struct listnode *node;
@@ -321,7 +322,7 @@ struct label_manager_chunk *assign_label_chunk(u_char proto, u_short instance,
* @param end Last label of the chunk
* @return 0 on success, -1 otherwise
*/
-int release_label_chunk(u_char proto, u_short instance, uint32_t start,
+int release_label_chunk(uint8_t proto, unsigned short instance, uint32_t start,
uint32_t end)
{
struct listnode *node;
@@ -362,7 +363,7 @@ int release_label_chunk(u_char proto, u_short instance, uint32_t start,
* @param instance Instance, to identify the owner
* @return Number of chunks released
*/
-int release_daemon_chunks(u_char proto, u_short instance)
+int release_daemon_label_chunks(uint8_t proto, unsigned short instance)
{
struct listnode *node;
struct label_manager_chunk *lmc;