move allocating new transaction_ids to transaction.c

This commit is contained in:
Harald Welte 2009-07-23 21:36:44 +02:00
parent 9ee4825bbf
commit 78283ef151
3 changed files with 18 additions and 19 deletions

View File

@ -13,4 +13,6 @@ struct gsm_trans *trans_alloc(struct gsm_subscriber *subscr,
u_int32_t callref);
void trans_free(struct gsm_trans *trans);
int trans_assign_trans_id(struct gsm_subscriber *subscr,
u_int8_t protocol, u_int8_t ti_flag);
#endif

View File

@ -2257,9 +2257,7 @@ static int gsm48_cc_tx_setup(struct gsm_trans *trans, void *arg)
struct msgb *msg = gsm48_msgb_alloc();
struct gsm48_hdr *gh;
struct gsm_mncc *setup = arg;
struct gsm_trans *transt;
u_int16_t trans_id_mask = 0;
int rc, i;
int rc, trans_id;
gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh));
@ -2277,14 +2275,8 @@ static int gsm48_cc_tx_setup(struct gsm_trans *trans, void *arg)
}
/* Get free transaction_id */
llist_for_each_entry(transt, &trans->subscr->net->trans_list, entry) {
/* Transaction of our lchan? */
if (transt->lchan == trans->lchan &&
transt->transaction_id != 0xff)
trans_id_mask |= (1 << transt->transaction_id);
}
/* Assign free transaction ID */
if ((trans_id_mask & 0x007f) == 0x7f) {
trans_id = trans_assign_trans_id(trans->subscr, GSM48_PDISC_CC, 0);
if (trans_id < 0) {
/* no free transaction ID */
rc = mncc_release_ind(trans->subscr->net, trans, trans->callref,
GSM48_CAUSE_LOC_PRN_S_LU,
@ -2293,12 +2285,7 @@ static int gsm48_cc_tx_setup(struct gsm_trans *trans, void *arg)
trans_free(trans);
return rc;
}
for (i = 0; i < 7; i++) {
if ((trans_id_mask & (1 << i)) == 0) {
trans->transaction_id = i; /* flag = 0 */
break;
}
}
trans->transaction_id = trans_id;
gh->msg_type = GSM48_MT_CC_SETUP;

View File

@ -113,13 +113,18 @@ void trans_free(struct gsm_trans *trans)
talloc_free(trans);
}
#if 0
/* allocate an unused transaction ID for the given subscriber
* in the given protocol using the ti_flag specified */
int trans_assign_trans_id(struct gsm_subscriber *subscr,
u_int8_t protocol, u_int8_t ti_flag)
{
struct gsm_network *net = subscr->net;
struct gsm_trans *trans;
unsigned int used_tid_bitmask = 0;
int i;
if (ti_flag)
ti_flag = 0x8;
/* generate bitmask of already-used TIDs for this (subscr,proto) */
llist_for_each_entry(trans, &net->trans_list, entry) {
@ -130,5 +135,10 @@ int trans_assign_trans_id(struct gsm_subscriber *subscr,
used_tid_bitmask |= (1 << trans->transaction_id);
}
for (i = 0; i <= 7; i++) {
if ((used_tid_bitmask & (1 << (i | ti_flag))) == 0)
return i | ti_flag;
}
return -1;
}
#endif