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

bsc: A BTS excluded from the RF lock should be allowed to make a connection 

When introducing the exclude for the BTS lock the RF stayed up but
all connections were immediately released. Optionally pass the BTS
as second parameter and check the exclude bit.

Tested-with: rf-lock-exclude/RFLockExcludeTest.st
This commit is contained in:
Holger Hans Peter Freyther 2012-08-30 16:43:28 +02:00
parent e30d40de0e
commit 3d119f1de4
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openbsc/include/openbsc/osmo_bsc_grace.h
View File

@ -1,6 +1,6 @@
/*
* (C) 2010 by Holger Hans Peter Freyther <zecke@selfish.org>
* (C) 2010 by On-Waves
* (C) 2010-2012 by Holger Hans Peter Freyther <zecke@selfish.org>
* (C) 2010-2012 by On-Waves
* All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
@ -23,6 +23,6 @@
#include "gsm_data.h"
int bsc_grace_allow_new_connection(struct gsm_network *network);
int bsc_grace_allow_new_connection(struct gsm_network *net, struct gsm_bts *bts);
#endif

2
openbsc/src/osmo-bsc/osmo_bsc_bssap.c
View File

@ -413,7 +413,7 @@ static int bssmap_rcvmsg_udt(struct osmo_msc_data *msc,
ret = bssmap_handle_reset_ack(msc, msg, length);
break;
case BSS_MAP_MSG_PAGING:
if (bsc_grace_allow_new_connection(msc->network))
if (bsc_grace_allow_new_connection(msc->network, NULL))
ret = bssmap_handle_paging(msc, msg, length);
break;
}

4
openbsc/src/osmo-bsc/osmo_bsc_grace.c
View File

@ -24,10 +24,12 @@
#include <openbsc/gsm_04_80.h>
#include <openbsc/signal.h>
int bsc_grace_allow_new_connection(struct gsm_network *network)
int bsc_grace_allow_new_connection(struct gsm_network *network, struct gsm_bts *bts)
{
if (!network->bsc_data->rf_ctrl)
return 1;
if (bts && bts->excl_from_rf_lock)
return 1;
return network->bsc_data->rf_ctrl->policy == S_RF_ON;
}

5
openbsc/src/osmo-bsc/osmo_bsc_sccp.c
View File

@ -190,12 +190,9 @@ int bsc_queue_for_msc(struct osmo_bsc_sccp_con *conn, struct msgb *msg)
int bsc_create_new_connection(struct gsm_subscriber_connection *conn,
struct osmo_msc_data *msc)
{
struct gsm_network *net;
struct osmo_bsc_sccp_con *bsc_con;
struct sccp_connection *sccp;
net = conn->bts->network;
/* This should not trigger */
if (!msc->msc_con->is_authenticated) {
LOGP(DMSC, LOGL_ERROR,
@ -203,7 +200,7 @@ int bsc_create_new_connection(struct gsm_subscriber_connection *conn,
return -1;
}
if (!bsc_grace_allow_new_connection(net)) {
if (!bsc_grace_allow_new_connection(conn->bts->network, conn->bts)) {
LOGP(DMSC, LOGL_NOTICE, "BSC in grace period. No new connections.\n");
return -1;
}