Fix external packing calculation for ospf3

rtbrick · Sep 20, 2023 · c93c028 · c93c028
1 parent f47538a
commit c93c028
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/code/lspgen/src/lspgen.c b/code/lspgen/src/lspgen.c
@@ -721,7 +721,7 @@ lspgen_gen_ospf3_attr(struct lsdb_ctx_ *ctx)
     struct lsdb_attr_ attr_template;
     dict_itor *itor;
     __uint128_t addr, inc, ext_addr6, ext_incr6, addr_offset;
-    uint32_t ext_per_node, metric;
+    uint32_t ext_per_node, metric, nodes_left, ext_left;
 
     /*
      * Walk the node DB.
@@ -746,6 +746,9 @@ lspgen_gen_ospf3_attr(struct lsdb_ctx_ *ctx)
     ext_addr6 = lspgen_load_addr((uint8_t*)&ctx->ipv6_ext_prefix.address, IPV6_ADDR_LEN);
     ext_incr6 = lspgen_get_prefix_inc(AF_INET6, ctx->ipv6_ext_prefix.len);
 
+    nodes_left = ctx->num_nodes;
+    ext_left = ctx->num_ext;
+
     do {
         node = *dict_itor_datum(itor);
 
@@ -787,7 +790,8 @@ lspgen_gen_ospf3_attr(struct lsdb_ctx_ *ctx)
 #endif
 
         /* external prefixes */
-        ext_per_node = ctx->num_ext / ctx->num_nodes;
+	ext_per_node = ext_left / nodes_left;
+	ext_left -= ext_per_node;
         while (ext_per_node--) {
             /* ipv6 external prefix */
             lsdb_reset_attr_template(&attr_template);
@@ -879,6 +883,7 @@ lspgen_gen_ospf3_attr(struct lsdb_ctx_ *ctx)
 #endif
 	}
 
+	nodes_left--;
     } while (dict_itor_next(itor));
 
     dict_itor_free(itor);