gbproxy: Use gbprox_delete_tlli if possible
Make use of the delete routine in more places and get test coverage for it. Done with Jacob
This commit is contained in:
parent
7127b0295e
commit
4d9fc422d2
|
@ -433,12 +433,10 @@ static void gbprox_delete_tllis(struct gbproxy_peer *peer)
|
||||||
struct gbproxy_tlli_info *tlli_info, *nxt;
|
struct gbproxy_tlli_info *tlli_info, *nxt;
|
||||||
struct gbproxy_patch_state *state = &peer->patch_state;
|
struct gbproxy_patch_state *state = &peer->patch_state;
|
||||||
|
|
||||||
llist_for_each_entry_safe(tlli_info, nxt, &state->enabled_tllis, list) {
|
llist_for_each_entry_safe(tlli_info, nxt, &state->enabled_tllis, list)
|
||||||
llist_del(&tlli_info->list);
|
gbprox_delete_tlli(peer, tlli_info);
|
||||||
talloc_free(tlli_info);
|
|
||||||
}
|
|
||||||
state->enabled_tllis_count = 0;
|
|
||||||
|
|
||||||
|
OSMO_ASSERT(state->enabled_tllis_count == 0);
|
||||||
OSMO_ASSERT(llist_empty(&state->enabled_tllis));
|
OSMO_ASSERT(llist_empty(&state->enabled_tllis));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -634,9 +632,7 @@ static void gbprox_unregister_tlli(struct gbproxy_peer *peer, uint32_t tlli)
|
||||||
LOGP(DGPRS, LOGL_INFO,
|
LOGP(DGPRS, LOGL_INFO,
|
||||||
"Removing TLLI %08x from list\n",
|
"Removing TLLI %08x from list\n",
|
||||||
tlli);
|
tlli);
|
||||||
llist_del(&tlli_info->list);
|
gbprox_delete_tlli(peer, tlli_info);
|
||||||
talloc_free(tlli_info);
|
|
||||||
state->enabled_tllis_count -= 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
peer->ctrg->ctr[GBPROX_PEER_CTR_TLLI_CACHE_SIZE].current =
|
peer->ctrg->ctr[GBPROX_PEER_CTR_TLLI_CACHE_SIZE].current =
|
||||||
|
|
Loading…
Reference in New Issue