pim6d: Add [no] ipv6 pim bsm" command

[mirror_frr.git] / zebra / label_manager.c

diff --git a/zebra/label_manager.c b/zebra/label_manager.c
index d312a661f3601bfe915f3e19778b5e4e5e102793..2634a333eec2f233a1daabd9587abebf0dfc2e72 100644 (file)
--- a/zebra/label_manager.c
+++ b/zebra/label_manager.c
@@ -175,11 +175,9 @@ void label_manager_init(void)
 }
 
 /* alloc and fill a label chunk */
-struct label_manager_chunk *create_label_chunk(uint8_t proto,
-                                              unsigned short instance,
-                                              uint32_t session_id,
-                                              uint8_t keep, uint32_t start,
-                                              uint32_t end)
+struct label_manager_chunk *
+create_label_chunk(uint8_t proto, unsigned short instance, uint32_t session_id,
+                  uint8_t keep, uint32_t start, uint32_t end)
 {
        /* alloc chunk, fill it and return it */
        struct label_manager_chunk *lmc =
@@ -302,15 +300,13 @@ assign_specific_label_chunk(uint8_t proto, unsigned short instance,
  * @param base Desired starting label of the chunk; if MPLS_LABEL_BASE_ANY it does not apply
  * @return Pointer to the assigned label chunk, or NULL if the request could not be satisfied
  */
-struct label_manager_chunk *assign_label_chunk(uint8_t proto,
-                                              unsigned short instance,
-                                              uint32_t session_id,
-                                              uint8_t keep, uint32_t size,
-                                              uint32_t base)
+struct label_manager_chunk *
+assign_label_chunk(uint8_t proto, unsigned short instance, uint32_t session_id,
+                  uint8_t keep, uint32_t size, uint32_t base)
 {
        struct label_manager_chunk *lmc;
        struct listnode *node;
-       uint32_t prev_end = 0;
+       uint32_t prev_end = MPLS_LABEL_UNRESERVED_MIN;
 
        /* handle chunks request with a specific base label */
        if (base != MPLS_LABEL_BASE_ANY)
@@ -332,8 +328,7 @@ struct label_manager_chunk *assign_label_chunk(uint8_t proto,
                }
                /* check if we hadve a "hole" behind us that we can squeeze into
                 */
-               if ((lmc->start > prev_end)
-                   && (lmc->start - prev_end >= size)) {
+               if ((lmc->start > prev_end) && (lmc->start - prev_end > size)) {
                        lmc = create_label_chunk(proto, instance, session_id,
                                                 keep, prev_end + 1,
                                                 prev_end + size);
@@ -390,6 +385,7 @@ static int label_manager_release_label_chunk(struct zserv *client,
  *
  * @param proto Daemon protocol of client, to identify the owner
  * @param instance Instance, to identify the owner
+ * @param session_id Zclient session ID, to identify the zclient session
  * @param start First label of the chunk
  * @param end Last label of the chunk
  * @return 0 on success, -1 otherwise