cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into sms

This commit is contained in:
Harald Welte 2009-07-04 10:38:11 +02:00
parent 8a396b73e1 24516ea2d6
commit 6c1a21367b
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openbsc/src/abis_rsl.c
View File

@ -811,10 +811,8 @@ static int rsl_rx_conn_fail(struct msgb *msg)
if (TLVP_PRESENT(&tp, RSL_IE_CAUSE) &&
TLVP_LEN(&tp, RSL_IE_CAUSE) >= 1 &&
*TLVP_VAL(&tp, RSL_IE_CAUSE) == 0x18) {
if (msg->lchan->use_count > 0) {
DEBUGPC(DRSL, "Cause 0x18 IGNORING, lchan in use! (%d times)\n", msg->lchan->use_count);
return 0;
}
DEBUGPC(DRSL, "Cause 0x18 IGNORING\n");
return 0;
}
}
@ -1106,6 +1104,9 @@ static int rsl_rx_rll_err_ind(struct msgb *msg)
DEBUGPC(DRLL, "cause=0x%02x", rlm_cause[1]);
if (rlm_cause[1] == RLL_CAUSE_T200_EXPIRED)
return rsl_chan_release(msg->lchan);
return 0;
}

16
openbsc/src/gsm_04_08.c
View File

@ -385,7 +385,7 @@ static int gsm0408_handle_lchan_signal(unsigned int subsys, unsigned int signal,
* Cancel any outstanding location updating request
* operation taking place on the lchan.
*/
struct gsm_lchan *lchan = (struct gsm_lchan *)handler_data;
struct gsm_lchan *lchan = (struct gsm_lchan *)signal_data;
if (!lchan)
return 0;
@ -1256,6 +1256,9 @@ static int mm_rx_loc_upd_req(struct msgb *msg)
break;
}
/* schedule the reject timer */
schedule_reject(lchan);
if (!subscr) {
DEBUGPC(DRR, "<- Can't find any subscriber for this ID\n");
/* FIXME: request id? close channel? */
@ -1264,12 +1267,8 @@ static int mm_rx_loc_upd_req(struct msgb *msg)
lchan->subscr = subscr;
/*
* Schedule the reject timer and check if we can let the
* subscriber into our network immediately or if we need to wait
* for identity responses.
*/
schedule_reject(lchan);
/* check if we can let the subscriber into our network immediately
* or if we need to wait for identity responses. */
return gsm0408_authorize(lchan, msg);
}
@ -3381,8 +3380,7 @@ int mncc_send(struct gsm_network *net, int msg_type, void *arg)
/* Callref unknown */
if (!trans) {
if (msg_type != MNCC_SETUP_REQ ||
(!data->called.number[0] && !data->imsi[0])) {
if (msg_type != MNCC_SETUP_REQ) {
DEBUGP(DCC, "(bts - trx - ts - ti -- sub %s) "
"Received '%s' from MNCC with "
"unknown callref %d\n", data->called.number,

1
openbsc/src/input/misdn.c
View File

@ -154,6 +154,7 @@ static int handle_ts1_read(struct bsc_fd *bfd)
ret = e1inp_event(e1i_ts, EVT_E1_TEI_DN, l2addr.tei, l2addr.sapi);
break;
case DL_DATA_IND:
case DL_UNITDATA_IND:
msg->l2h = msg->data + MISDN_HEADER_LEN;
DEBUGP(DMI, "RX: %s\n", hexdump(msgb_l2(msg), ret - MISDN_HEADER_LEN));
ret = e1inp_rx_ts(e1i_ts, msg, l2addr.tei, l2addr.sapi);