diff options
| -rw-r--r-- | include/openbsc/gsm_subscriber.h | 1 | ||||
| -rw-r--r-- | src/gsm_04_08.c | 10 | ||||
| -rw-r--r-- | src/gsm_subscriber.c | 11 |
3 files changed, 20 insertions, 2 deletions
diff --git a/include/openbsc/gsm_subscriber.h b/include/openbsc/gsm_subscriber.h index 170e5236f..7da896e8b 100644 --- a/include/openbsc/gsm_subscriber.h +++ b/include/openbsc/gsm_subscriber.h @@ -43,6 +43,7 @@ struct gsm_subscriber *subscr_get_by_tmsi(const char *tmsi); struct gsm_subscriber *subscr_get_by_imsi(const char *imsi); struct gsm_subscriber *subscr_get_by_extension(const char *ext); int subscr_update(struct gsm_subscriber *s, struct gsm_bts *bts, int reason); +void subscr_put_channel(struct gsm_lchan *lchan); /* internal */ struct gsm_subscriber *subscr_alloc(void); diff --git a/src/gsm_04_08.c b/src/gsm_04_08.c index a9183deff..85af5020e 100644 --- a/src/gsm_04_08.c +++ b/src/gsm_04_08.c @@ -1208,7 +1208,13 @@ static int gsm48_cc_rx_disconnect(struct msgb *msg) DEBUGP(DCC, "A <- RELEASE\n"); rc = gsm48_tx_simple(msg->lchan, GSM48_PDISC_CC, GSM48_MT_CC_RELEASE); - put_lchan(msg->lchan); + + /* + * FIXME: This looks wrong! We should have a single + * place to do MMCC-REL-CNF/-REQ/-IND and then switch + * to the NULL state and relase the call + */ + subscr_put_channel(msg->lchan); /* forward DISCONNECT to other party */ if (!call->remote_lchan) @@ -1294,7 +1300,7 @@ static int gsm0408_rcv_cc(struct msgb *msg) /* need to respond with RELEASE_COMPLETE */ rc = gsm48_tx_simple(msg->lchan, GSM48_PDISC_CC, GSM48_MT_CC_RELEASE_COMPL); - put_lchan(msg->lchan); + subscr_put_channel(msg->lchan); call->state = GSM_CSTATE_NULL; break; case GSM48_MT_CC_STATUS_ENQ: diff --git a/src/gsm_subscriber.c b/src/gsm_subscriber.c index e3cd5eb25..0c2dd7c52 100644 --- a/src/gsm_subscriber.c +++ b/src/gsm_subscriber.c @@ -122,3 +122,14 @@ struct gsm_subscriber *subscr_put(struct gsm_subscriber *subscr) subscr_free(subscr); return NULL; } + +void subscr_put_channel(struct gsm_lchan *lchan) +{ + /* + * FIXME: Continue with other requests now... by checking + * the gsm_subscriber inside the gsm_lchan. Drop the ref count + * of the lchan after having asked the next requestee to handle + * the channel. + */ + put_lchan(lchan); +} |