OpenBSC

openbsc@lists.osmocom.org

4315 discussions

[PATCH] api doc: auth_core.c: add \returns, cosmetic
by Neels Hofmeyr 08 May '16

08 May '16

Add various missing \returns doxygen entries. In osmo_auth_3g_from_2g(), also adjust two comment-closing instances to match common style and add a period to end a sentence. (The recent addition of osmo_auth_3g_from_2g() raised my attention, and I added more return value docs while at it.) --- src/gsm/auth_core.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/gsm/auth_core.c b/src/gsm/auth_core.c index b78cdd5..f1ec2ed 100644 --- a/src/gsm/auth_core.c +++ b/src/gsm/auth_core.c @@ -43,6 +43,7 @@ static struct osmo_auth_impl *selected_auths[_OSMO_AUTH_ALG_NUM]; /*! \brief Register an authentication algorithm implementation with the core * \param[in] impl Structure describing implementation and it's callbacks + * \returns 0 on success, or a negative error code on failure * * This function is called by an authentication implementation plugin to * register itself with the authentication core. @@ -64,6 +65,7 @@ int osmo_auth_register(struct osmo_auth_impl *impl) /*! \brief Load all available authentication plugins from the given path * \param[in] path Path name of the directory containing the plugins + * \returns number of plugins loaded in case of success, negative in case of error * * This function will load all plugins contained in the specified path. */ @@ -75,6 +77,7 @@ int osmo_auth_load(const char *path) /*! \brief Determine if a given authentication algorithm is supported * \param[in] algo Algorithm which should be checked + * \returns 1 if algo is supported, 0 if not, negative error on failure * * This function is used by an application to determine at runtime if a * given authentication algorithm is supported or not. @@ -111,10 +114,12 @@ static inline void c4_function(uint8_t *ck, const uint8_t *kc) /*! \brief Generate 3G CK + IK from 2G authentication vector * \param vec Authentication Vector to be modified + * \returns 1 if the vector was changed, 0 otherwise * * This function performs the C5 and C4 functions to derive the UMTS key * material from the GSM key material in the supplied vector, _if_ the input - * vector doesn't yet have UMTS authentication capability */ + * vector doesn't yet have UMTS authentication capability. + */ int osmo_auth_3g_from_2g(struct osmo_auth_vector *vec) { if ((vec->auth_types & OSMO_AUTH_TYPE_GSM) && @@ -124,7 +129,7 @@ int osmo_auth_3g_from_2g(struct osmo_auth_vector *vec) /* We cannot actually set OSMO_AUTH_TYPE_UMTS as we have no * AUTN and no RES, and thus can only perform GSM * authentication with this tuple. - * */ + */ return 1; } @@ -135,6 +140,7 @@ int osmo_auth_3g_from_2g(struct osmo_auth_vector *vec) * \param[out] vec Generated authentication vector * \param[in] aud Subscriber-specific key material * \param[in] _rand Random challenge to be used + * \returns 0 on success, negative error on failure * * This function performs the core cryptographic function of the AUC, * computing authentication triples/quintuples based on the permanent @@ -167,6 +173,7 @@ int osmo_auth_gen_vec(struct osmo_auth_vector *vec, * \param[in] rand_auts RAND value sent by the SIM/MS * \param[in] auts AUTS value sent by the SIM/MS * \param[in] _rand Random challenge to be used to generate vector + * \returns 0 on success, negative error on failure * * This function performs a special variant of the core cryptographic * function of the AUC: computing authentication triples/quintuples -- 2.1.4

1 0

Persistent Uplink activity from Moto KRZR K3
by Keith 05 May '16

05 May '16

Hi all, I have two Motorola KRZR K3 phones, purchased some years ago. They generate constant bursts on the uplink, and this is what I can see that corresponds from osmo-bts log output: <0000> ../../../../osmo-bts/src/common/rsl.c:1642 (bts=0,trx=0,ts=0,ss=0) Handing RLL msg UNIT_DATA_IND from LAPDm to MEAS REP <0000> ../../../../osmo-bts/src/common/rsl.c:1592 (bts=0,trx=0,ts=0,ss=0) Tx MEAS RES No other handset does this. As this is somewhat irritating, I'd like to fix it and it's a good opportunity for me to dig into the code a little. I'm posting to ask if anyone recognizes the issue or could give me some pointers towards what the MS might be looking for that it is not getting from the network? I considered posting a bunch of other log output, but I'm not sure quite what might be useful. I don't see any remarkable difference in the LUR sequence with this phone and any other for example. Happy to hear some guidance as to what might be useful. I might also mention that this phone fails the USSD *#100# own number request - The message "Not Successful" appears on the screen very quickly if not immediately after pressing send. There is no network communication that I can detect. As a side note, I resolved the somewhat baffling problem with my Ettus N210 recently, uninstalling the UHD from the ettus repo (ubuntu 12) and compiling UHD from git worked. I have not as yet (and probably won't) dig any further into finding out why. But now I have a working environment to test osmo-trx and osmo-bts-trx. Keith.

1 0

"DLP Failed" and "Disabled RSP" from ipAccess BTS
by Christopher Trudeau 05 May '16

05 May '16

I apologize if this is in the incorrect place or if I am not providing the correct information - First time asking a question about this, rather than just figuring it out, so please go easy [😊] After upgrading my completely working copy of OpenBSC to the latest git version, it stopped working and is stating an error of "DLP FAILED" and "DISABLED RSP" and the BTS seems to just reboot. This process repeats over and over. Unfortunately I do not have the version/commit of the one it was previously on, however it was likely from a month or two ago. To troubleshoot that my equipment wasn't at fault, i restored a VMWare snapshot I took before upgrading and it worked perfectly. I also reproduced this exact issue by doing a complete new install of Ubuntu and installing OpenBSC (and installing all of the required components), DLP FAILED + DISABLED RSP. Am I missing anything silly here, or is this a bug? I appreciate any help anyone can offer. Thank you. OpenBSC Debug Output: DB: Database initialized. DB: Database prepared. Thu Apr 28 09:56:37 2016 <001a> input/ipa.c:265 accept()ed new link from 10.210.2.167 to port 3002 Thu Apr 28 09:56:37 2016 <0005> abis_nm.c:316 OC=SITE-MANAGER(00) INST=(ff,ff,ff) STATE CHG: OP_STATE=Disabled AVAIL=Not installed(07) Thu Apr 28 09:56:37 2016 <0005> abis_nm.c:316 OC=BTS(01) INST=(00,ff,ff) STATE CHG: OP_STATE=Disabled AVAIL=Not installed(07) ADM=Locked Thu Apr 28 09:56:37 2016 <0005> abis_nm.c:316 OC=BASEBAND-TRANSCEIVER(04) INST=(00,00,ff) STATE CHG: OP_STATE=Disabled AVAIL=Not installed(07) ADM=Locked Thu Apr 28 09:56:37 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,00) STATE CHG: OP_STATE=Disabled AVAIL=Not installed(07) ADM=Locked Thu Apr 28 09:56:37 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,01) STATE CHG: OP_STATE=Disabled AVAIL=Not installed(07) ADM=Locked Thu Apr 28 09:56:37 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,02) STATE CHG: OP_STATE=Disabled AVAIL=Not installed(07) ADM=Locked Thu Apr 28 09:56:37 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,03) STATE CHG: OP_STATE=Disabled AVAIL=Not installed(07) ADM=Locked Thu Apr 28 09:56:37 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,04) STATE CHG: OP_STATE=Disabled AVAIL=Not installed(07) ADM=Locked Thu Apr 28 09:56:37 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,05) STATE CHG: OP_STATE=Disabled AVAIL=Not installed(07) ADM=Locked Thu Apr 28 09:56:37 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,06) STATE CHG: OP_STATE=Disabled AVAIL=Not installed(07) ADM=Locked Thu Apr 28 09:56:37 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,07) STATE CHG: OP_STATE=Disabled AVAIL=Not installed(07) ADM=Locked Thu Apr 28 09:56:37 2016 <0005> abis_nm.c:316 OC=RADIO-CARRIER(02) INST=(00,00,ff) STATE CHG: OP_STATE=Disabled AVAIL=Not installed(07) ADM=Locked Thu Apr 28 09:56:37 2016 <0005> abis_nm.c:316 OC=GPRS-NSE(f0) INST=(00,ff,ff) STATE CHG: OP_STATE=Disabled AVAIL=Not installed(07) ADM=Locked Thu Apr 28 09:56:37 2016 <0005> abis_nm.c:316 OC=GPRS-CELL(f1) INST=(00,00,ff) STATE CHG: OP_STATE=Disabled AVAIL=Not installed(07) ADM=Locked Thu Apr 28 09:56:37 2016 <0005> abis_nm.c:316 OC=GPRS-NSVC(f2) INST=(00,00,ff) STATE CHG: OP_STATE=Disabled AVAIL=Not installed(07) ADM=Locked Thu Apr 28 09:56:37 2016 <0005> abis_nm.c:316 OC=GPRS-NSVC(f2) INST=(00,01,ff) STATE CHG: OP_STATE=Disabled AVAIL=Not installed(07) ADM=Locked Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:451 OC=SITE-MANAGER(00) INST=(ff,ff,ff) SW Activate Request: Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:455 Software Activate Request, ACKing and Activating Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:476 Found SW config: 42 12 00 08 31 32 30 61 30 30 32 00 13 00 0a 76 32 30 30 62 33 30 64 30 00 Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:488 Selected sw description 0 of 1 Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=SITE-MANAGER(00) INST=(ff,ff,ff) STATE CHG: OP_STATE=Enabled AVAIL=OK(ff) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:1765 OC=SITE-MANAGER(00) INST=(ff,ff,ff) Sending OPSTART Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=SITE-MANAGER(00) INST=(ff,ff,ff) Software Activated Report Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:451 OC=BTS(01) INST=(00,ff,ff) SW Activate Request: Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:455 Software Activate Request, ACKing and Activating Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:476 Found SW config: 42 12 00 08 31 32 30 61 30 30 32 00 13 00 0a 76 32 30 30 62 33 30 64 30 00 Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:488 Selected sw description 0 of 1 Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:451 OC=GPRS-NSE(f0) INST=(00,ff,ff) SW Activate Request: Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:455 Software Activate Request, ACKing and Activating Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:476 Found SW config: 42 12 00 08 31 32 30 61 30 30 32 00 13 00 0a 76 32 30 30 62 33 30 64 30 00 Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:488 Selected sw description 0 of 1 Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=BTS(01) INST=(00,ff,ff) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:1449 Set BTS Attr (bts=0) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:1765 OC=BTS(01) INST=(00,ff,ff) Sending OPSTART Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=BTS(01) INST=(00,ff,ff) Software Activated Report Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:451 OC=BASEBAND-TRANSCEIVER(04) INST=(00,00,ff) SW Activate Request: Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:455 Software Activate Request, ACKing and Activating Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:476 Found SW config: 42 12 00 08 31 32 30 61 30 30 31 00 13 00 0a 76 32 30 30 62 33 30 64 30 00 42 12 00 08 31 32 30 61 30 30 32 00 13 00 0a 76 32 30 30 62 33 30 64 30 00 Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:488 Selected sw description 0 of 2 Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:451 OC=RADIO-CARRIER(02) INST=(00,00,ff) SW Activate Request: Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:455 Software Activate Request, ACKing and Activating Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:476 Found SW config: 42 12 00 08 31 32 30 61 30 30 31 00 13 00 0a 76 32 30 30 62 33 30 64 30 00 42 12 00 08 31 32 30 61 30 30 32 00 13 00 0a 76 32 30 30 62 33 30 64 30 00 Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:488 Selected sw description 0 of 2 Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=GPRS-NSE(f0) INST=(00,ff,ff) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=GPRS-NSE(f0) INST=(00,ff,ff) Software Activated Report Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:451 OC=GPRS-CELL(f1) INST=(00,00,ff) SW Activate Request: Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:455 Software Activate Request, ACKing and Activating Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:476 Found SW config: 42 12 00 08 31 32 30 61 30 30 32 00 13 00 0a 76 32 30 30 62 33 30 64 30 00 Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:488 Selected sw description 0 of 1 Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:451 OC=GPRS-NSVC(f2) INST=(00,00,ff) SW Activate Request: Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:455 Software Activate Request, ACKing and Activating Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:476 Found SW config: 42 12 00 08 31 32 30 61 30 30 32 00 13 00 0a 76 32 30 30 62 33 30 64 30 00 Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:488 Selected sw description 0 of 1 Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:451 OC=GPRS-NSVC(f2) INST=(00,01,ff) SW Activate Request: Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:455 Software Activate Request, ACKing and Activating Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:476 Found SW config: 42 12 00 08 31 32 30 61 30 30 32 00 13 00 0a 76 32 30 30 62 33 30 64 30 00 Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:488 Selected sw description 0 of 1 Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=BTS(01) INST=(00,ff,ff) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) ADM=Unlocked Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=GPRS-CELL(f1) INST=(00,00,ff) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=GPRS-CELL(f1) INST=(00,00,ff) Software Activated Report Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=GPRS-NSVC(f2) INST=(00,00,ff) STATE CHG: OP_STATE=Disabled AVAIL=Off line(03) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=GPRS-NSVC(f2) INST=(00,01,ff) STATE CHG: OP_STATE=Disabled AVAIL=Off line(03) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=GPRS-NSVC(f2) INST=(00,00,ff) Software Activated Report Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=GPRS-NSVC(f2) INST=(00,01,ff) Software Activated Report Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=BASEBAND-TRANSCEIVER(04) INST=(00,00,ff) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=BASEBAND-TRANSCEIVER(04) INST=(00,00,ff) Software Activated Report Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:1765 OC=BASEBAND-TRANSCEIVER(04) INST=(00,00,ff) Sending OPSTART Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:2584 ip.access RSL CONNECT IP=0.0.0.0 PORT=3003 STREAM=0x00 Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,00) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:1658 Set Chan Attr (bts=0,trx=0,ts=0) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:1765 OC=CHANNEL(03) INST=(00,00,00) Sending OPSTART Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,01) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:1658 Set Chan Attr (bts=0,trx=0,ts=1) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:1765 OC=CHANNEL(03) INST=(00,00,01) Sending OPSTART Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,02) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:1658 Set Chan Attr (bts=0,trx=0,ts=2) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:1765 OC=CHANNEL(03) INST=(00,00,02) Sending OPSTART Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,03) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:1658 Set Chan Attr (bts=0,trx=0,ts=3) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:1765 OC=CHANNEL(03) INST=(00,00,03) Sending OPSTART Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,04) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:1658 Set Chan Attr (bts=0,trx=0,ts=4) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:1765 OC=CHANNEL(03) INST=(00,00,04) Sending OPSTART Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,05) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:1658 Set Chan Attr (bts=0,trx=0,ts=5) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:1765 OC=CHANNEL(03) INST=(00,00,05) Sending OPSTART Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,06) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:1658 Set Chan Attr (bts=0,trx=0,ts=6) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:1765 OC=CHANNEL(03) INST=(00,00,06) Sending OPSTART Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,07) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:1658 Set Chan Attr (bts=0,trx=0,ts=7) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:1765 OC=CHANNEL(03) INST=(00,00,07) Sending OPSTART Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,00) Software Activated Report Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,01) Software Activated Report Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,02) Software Activated Report Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,03) Software Activated Report Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,04) Software Activated Report Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,05) Software Activated Report Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,06) Software Activated Report Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,07) Software Activated Report Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=BASEBAND-TRANSCEIVER(04) INST=(00,00,ff) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) ADM=Unlocked Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=RADIO-CARRIER(02) INST=(00,00,ff) STATE CHG: OP_STATE=Disabled AVAIL=Off line(03) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=RADIO-CARRIER(02) INST=(00,00,ff) Software Activated Report Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:1466 Set TRX Attr (bts=0,trx=0) Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:1765 OC=RADIO-CARRIER(02) INST=(00,00,ff) Sending OPSTART Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:2426 OC=BASEBAND-TRANSCEIVER(04) INST=(00,00,ff) IPACCESS(0xe1): RSL CONNECT ACK IP=10.210.2.226 PORT=3003 STREAM=0x00 Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,00) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) ADM=Unlocked Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,01) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) ADM=Unlocked Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,02) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) ADM=Unlocked Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,03) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) ADM=Unlocked Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,04) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) ADM=Unlocked Thu Apr 28 09:56:39 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,05) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) ADM=Unlocked Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,06) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) ADM=Unlocked Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,07) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) ADM=Unlocked Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:316 OC=RADIO-CARRIER(02) INST=(00,00,ff) STATE CHG: OP_STATE=Disabled AVAIL=OK(ff) ADM=Unlocked Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:1765 OC=RADIO-CARRIER(02) INST=(00,00,ff) Sending OPSTART Thu Apr 28 09:56:40 2016 <001a> input/ipa.c:265 accept()ed new link from 10.210.2.167 to port 3003 Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:316 OC=RADIO-CARRIER(02) INST=(00,00,ff) STATE CHG: OP_STATE=Enabled AVAIL=OK(ff) Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:316 OC=BASEBAND-TRANSCEIVER(04) INST=(00,00,ff) STATE CHG: OP_STATE=Disabled AVAIL=Off line(03) Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:316 OC=BASEBAND-TRANSCEIVER(04) INST=(00,00,ff) STATE CHG: OP_STATE=Enabled AVAIL=OK(ff) Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,00) STATE CHG: OP_STATE=Disabled AVAIL=Off line(03) Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,01) STATE CHG: OP_STATE=Disabled AVAIL=Off line(03) Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,02) STATE CHG: OP_STATE=Disabled AVAIL=Off line(03) Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,03) STATE CHG: OP_STATE=Disabled AVAIL=Off line(03) Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,04) STATE CHG: OP_STATE=Disabled AVAIL=Off line(03) Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,05) STATE CHG: OP_STATE=Disabled AVAIL=Off line(03) Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,06) STATE CHG: OP_STATE=Disabled AVAIL=Off line(03) Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,07) STATE CHG: OP_STATE=Disabled AVAIL=Off line(03) Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,00) STATE CHG: OP_STATE=Enabled AVAIL=OK(ff) Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:316 OC=BTS(01) INST=(00,ff,ff) STATE CHG: OP_STATE=Enabled AVAIL=OK(ff) Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,01) STATE CHG: OP_STATE=Enabled AVAIL=OK(ff) Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,02) STATE CHG: OP_STATE=Enabled AVAIL=OK(ff) Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,03) STATE CHG: OP_STATE=Enabled AVAIL=OK(ff) Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,04) STATE CHG: OP_STATE=Enabled AVAIL=OK(ff) Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,05) STATE CHG: OP_STATE=Enabled AVAIL=OK(ff) Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,06) STATE CHG: OP_STATE=Enabled AVAIL=OK(ff) Thu Apr 28 09:56:40 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,07) STATE CHG: OP_STATE=Enabled AVAIL=OK(ff) Thu Apr 28 09:56:43 2016 <0004> bsc_init.c:287 bootstrapping RSL for BTS/TRX (0/0) on ARFCN 514 using MCC=310 MNC=227 LAC=1 CID=0 BSIC=63 Thu Apr 28 09:56:43 2016 <0003> system_information.c:525 Serving cell: 514 Thu Apr 28 09:56:43 2016 <0003> system_information.c:727 SI 2quater is included. Thu Apr 28 09:56:43 2016 <0003> bsc_init.c:104 SI1: 55 06 19 8f 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 e5 04 00 2b Thu Apr 28 09:56:43 2016 <0003> bsc_init.c:104 SI2: 59 06 1a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ff e5 04 00 Thu Apr 28 09:56:43 2016 <0003> bsc_init.c:104 SI2quater: 59 06 07 c0 00 04 86 59 00 03 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b Thu Apr 28 09:56:43 2016 <0003> bsc_init.c:104 SI3: 49 06 1b 00 00 13 70 22 00 01 49 03 05 27 47 40 e5 04 00 38 2b 2b 2b Thu Apr 28 09:56:43 2016 <0003> bsc_init.c:104 SI4: 31 06 1c 13 70 22 00 01 47 40 e5 04 00 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b Thu Apr 28 09:56:43 2016 <0003> bsc_init.c:104 SI5: 49 06 1d 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 2b 2b 2b 2b Thu Apr 28 09:56:43 2016 <0003> bsc_init.c:104 SI6: 2d 06 1e 00 00 13 70 22 00 01 27 ff 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b Thu Apr 28 09:56:59 2016 <0005> abis_nm.c:316 OC=BASEBAND-TRANSCEIVER(04) INST=(00,00,ff) Failure Event Report Type=processing failure Severity=critical failure Probable cause= 03 00 02 Additional Text=lme_manage_fsm_actions.c:636IPC Ping timeout - DLP FAILED Thu Apr 28 09:56:59 2016 <0005> abis_nm.c:316 OC=BASEBAND-TRANSCEIVER(04) INST=(00,00,ff) STATE CHG: OP_STATE=Disabled AVAIL=Failed(01) Thu Apr 28 09:56:59 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,00) STATE CHG: OP_STATE=Disabled AVAIL=Off line(03) Thu Apr 28 09:56:59 2016 <0005> abis_nm.c:316 OC=BTS(01) INST=(00,ff,ff) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) Thu Apr 28 09:56:59 2016 <0005> abis_nm.c:1449 Set BTS Attr (bts=0) Thu Apr 28 09:56:59 2016 <0005> abis_nm.c:1765 OC=BTS(01) INST=(00,ff,ff) Sending OPSTART Thu Apr 28 09:56:59 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,01) STATE CHG: OP_STATE=Disabled AVAIL=Off line(03) Thu Apr 28 09:56:59 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,02) STATE CHG: OP_STATE=Disabled AVAIL=Off line(03) Thu Apr 28 09:56:59 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,03) STATE CHG: OP_STATE=Disabled AVAIL=Off line(03) Thu Apr 28 09:56:59 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,04) STATE CHG: OP_STATE=Disabled AVAIL=Off line(03) Thu Apr 28 09:56:59 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,05) STATE CHG: OP_STATE=Disabled AVAIL=Off line(03) Thu Apr 28 09:56:59 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,06) STATE CHG: OP_STATE=Disabled AVAIL=Off line(03) Thu Apr 28 09:56:59 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,07) STATE CHG: OP_STATE=Disabled AVAIL=Off line(03) Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:316 OC=BASEBAND-TRANSCEIVER(04) INST=(00,00,ff) Failure Event Report Type=processing failure Severity=warning level failure Probable cause= 03 00 01 Additional Text=22064:WARN:OAM_RES:res_trx_status.c#209:TRX is not responding - reinitialising Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:316 OC=BASEBAND-TRANSCEIVER(04) INST=(00,00,ff) STATE CHG: OP_STATE=Disabled AVAIL=Off line(03) Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:316 OC=RADIO-CARRIER(02) INST=(00,00,ff) STATE CHG: OP_STATE=Disabled AVAIL=Off line(03) Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:316 OC=BASEBAND-TRANSCEIVER(04) INST=(00,00,ff) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,00) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:1658 Set Chan Attr (bts=0,trx=0,ts=0) Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:1765 OC=CHANNEL(03) INST=(00,00,00) Sending OPSTART Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,01) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:1658 Set Chan Attr (bts=0,trx=0,ts=1) Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:1765 OC=CHANNEL(03) INST=(00,00,01) Sending OPSTART Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,02) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:1658 Set Chan Attr (bts=0,trx=0,ts=2) Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:1765 OC=CHANNEL(03) INST=(00,00,02) Sending OPSTART Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,03) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:1658 Set Chan Attr (bts=0,trx=0,ts=3) Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:1765 OC=CHANNEL(03) INST=(00,00,03) Sending OPSTART Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,04) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:1658 Set Chan Attr (bts=0,trx=0,ts=4) Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:1765 OC=CHANNEL(03) INST=(00,00,04) Sending OPSTART Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,05) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:1658 Set Chan Attr (bts=0,trx=0,ts=5) Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:1765 OC=CHANNEL(03) INST=(00,00,05) Sending OPSTART Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,06) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:1658 Set Chan Attr (bts=0,trx=0,ts=6) Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:1765 OC=CHANNEL(03) INST=(00,00,06) Sending OPSTART Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:316 OC=CHANNEL(03) INST=(00,00,07) STATE CHG: OP_STATE=Disabled AVAIL=Dependency(05) Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:1658 Set Chan Attr (bts=0,trx=0,ts=7) Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:1765 OC=CHANNEL(03) INST=(00,00,07) Sending OPSTART Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:316 OC=BASEBAND-TRANSCEIVER(04) INST=(00,00,ff) Failure Event Report Type=processing failure Severity=warning level failure Probable cause= 03 00 01 Additional Text=FSM Unhandled Event class=Baseband Transceiver inst=0 ev="DISABLED RSP" st=ini Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:316 OC=RADIO-CARRIER(02) INST=(00,00,ff) Failure Event Report Type=processing failure Severity=warning level failure Probable cause= 03 00 01 Additional Text=FSM Unhandled Event class=Radio Carrier inst=0 ev="DISABLED RSP" st=initial Thu Apr 28 09:57:04 2016 <0005> abis_nm.c:316 OC=BASEBAND-TRANSCEIVER(04) INST=(00,00,ff) Failure Event Report Type=processing failure Severity=warning level failure Probable cause= 03 00 01 Additional Text=FSM Unhandled Event class=Baseband Transceiver inst=0 ev="CLEAR I REQ" st=init Thu Apr 28 09:57:10 2016 <001a> input/ipaccess.c:236 Sign link vanished, dead socket Thu Apr 28 09:57:10 2016 <001a> input/ipaccess.c:69 Forcing socket shutdown with no signal link set Thu Apr 28 09:57:10 2016 <001c> bsc_init.c:340 Lost some E1 TEI link: 1 0x45c98d0 Thu Apr 28 09:57:10 2016 <001c> bsc_init.c:340 Lost some E1 TEI link: 2 0x45c98d0 [detached from 762.OpenBSC] root@OpenBSC:~/gsm/openbsc/openbsc# ipAccess Telnet Console Output: root@OpenBSC:~# root@OpenBSC:~# ipaccess-telnet 10.210.2.167 nanoBTS (c) ip.access Ltd 2001 9633:DBG:CLI_SKT:Remote client 10.210.2.226 connected >i 9688:DBG:TRX_BOOT:ULM has requested baud rate change to 38400 >i 9705:DBG:TRX_BOOT:Changed baud OK >i 9744:DBG:TRX_BOOT:DEBUG from TRX: Masterloader. >i > Invalid CLI command. > 12119:DBG:TRX_BOOT:DEBUG from TRX: ChangeBaudSlv downloaded to ULS > 12165:DBG:TRX_BOOT:DEBUG from TRX: Changed baud OK > 14462:DBG:TRX_BOOT:DEBUG from TRX: ChangeBaudSlv downloaded to DLP > 14507:DBG:TRX_BOOT:DEBUG from TRX: Changed baud OK > 14520:DBG:TRX_BOOT:Got POST msg for ULS: All OK > 15198:DBG:TRX_BOOT:Got POST msg for DLP: All OK > 15285:DBG:TRX_BOOT:DEBUG from TRX: Got Image Req msg ImageId [0x1003] > 15478:DBG:TRX_BOOT:DEBUG from TRX: Got Image Req msg ImageId [0x1003] > 15647:DBG:TRX_BOOT:DEBUG from TRX: Changed baud OK > 15734:DBG:TRX_BOOT:DEBUG from TRX: Got Image Req msg ImageId [0x1009] > 15751:DBG:TRX_BOOT:Got Image Req msg ImageId [0x1008] > 16210:DBG:TRX_BOOT:DEBUG from TRX: Changed baud OK > 16297:DBG:TRX_BOOT:DEBUG from TRX: Got Image Req msg ImageId [0x1009] > 16314:DBG:TRX_BOOT:Got Image Req msg ImageId [0x1009] > 16835:DBG:TRX_BOOT:Got Image Req msg ImageId [0x1007] > 17348:DBG:TRX_BOOT:TRX status report: Application code activated > 17540:DBG:TRX_BOOT:Booted TRX idx=0 > 17542:DBG:RSL:1423:rsl: EVENT 0x00001008 rxd in STATE initial > 17542:DBG:RSL:1423:rsl: ENTERING open > 18518:DBG:GENIE_SERVER:TRX now ready for genie signals. > 18526:DBG:HDLC_UL:AlarmInd rx'd:":0ULM:ULM_FIFODRV:fifodrv.c#1864 (6082)" > 18526:DBG:HDLC_UL:AlarmInd rx'd:":0TxQueue full" > 18526:DBG:HDLC_UL:AlarmInd rx'd:":0ULM ra=080009b4 sp=40015910" > 18527:DBG:HDLC_UL:AlarmInd rx'd:":0ULM [400158c0] |00000093|4000b588|00002000|00000093|" > 18527:DBG:HDLC_UL:AlarmInd rx'd:":0ULM [400158d0] |40003c6c|00000093|00000040|08000af0|" > 18527:DBG:HDLC_UL:AlarmInd rx'd:":0ULM [400158e0] |40015a10|40004f98|40003c6c|00000000|" > 18527:DBG:HDLC_UL:AlarmInd rx'd:":0ULM [400158f0] |20000093|40003c6c|00000093|4000b520|" > 18527:DBG:HDLC_UL:AlarmInd rx'd:":0ULM [40015900] |00000000|40015910|08000998|080009b4|" > 18527:DBG:HDLC_UL:AlarmInd rx'd:":0ULM [40015910] |08000af0|08000998|00000093|080018a7|" > 18527:DBG:HDLC_UL:AlarmInd rx'd:":0ULM [40015920] |40015a10|40004f98|40003c6c|40015978|" > 18527:DBG:HDLC_UL:AlarmInd rx'd:":0ULM [40015930] |00000000|00000000|80380000|00000000|" > 18527:DBG:HDLC_UL:AlarmInd rx'd:":0ULM [40015940] |40003c6c|40004fcc|40015a10|400159a4|" > 18527:DBG:HDLC_UL:AlarmInd rx'd:":0ULM [40015950] |08002b07|00000093|40015a50|40015a50|" > 18546:DBG:HDLC_UL:AlarmInd rx'd:":0ULS:ULS_FIFODRV:fifodrv.c#1864 (7726)" > 18546:DBG:HDLC_UL:AlarmInd rx'd:":0TxQueue full" > 18546:DBG:HDLC_UL:AlarmInd rx'd:":0ULS ra=08002ad2 sp=4000fc9c" > 18546:DBG:HDLC_UL:AlarmInd rx'd:":0ULS [4000fc4c] |40003b18|00000000|40003b18|08000af0|" > 18547:DBG:HDLC_UL:AlarmInd rx'd:":0ULS [4000fc5c] |08000998|00000093|080018a7|4000fd58|" > 18547:DBG:HDLC_UL:AlarmInd rx'd:":0ULS [4000fc6c] |40004b6c|40003b18|4000fcc0|00000000|" > 18547:DBG:HDLC_UL:AlarmInd rx'd:":0ULS [4000fc7c] |00000000|80380000|00000000|40003b18|" > 18547:DBG:HDLC_UL:AlarmInd rx'd:":0ULS [4000fc8c] |40004ba0|4000fd58|4000fcec|08002b07|" > 18547:DBG:HDLC_UL:AlarmInd rx'd:":0ULS [4000fc9c] |00000093|4000fd98|4000fd98|40004ba8|" > 18547:DBG:HDLC_UL:AlarmInd rx'd:":0ULS [4000fcac] |40004ba8|00000001|4000fd58|40004ba0|" > 18547:DBG:HDLC_UL:AlarmInd rx'd:":0ULS [4000fcbc] |4000fcec|00000001|4000fd58|40004ba0|" > 18547:DBG:HDLC_UL:AlarmInd rx'd:":0ULS [4000fccc] |4000fcec|00000001|00000000|00004008|" > 18547:DBG:HDLC_UL:AlarmInd rx'd:":0ULS [4000fcdc] |08022c48|00000008|4000fd34|08006bf3|" > 18569:DBG:HDLC_UL:AlarmInd rx'd:":0DLP:L2_BCH:l2_bch.c#1065 (2331)" > 18569:DBG:HDLC_UL:AlarmInd rx'd:":0BCHbcchSItypeValid( prim_p->infoType )" > 18569:DBG:HDLC_UL:AlarmInd rx'd:":0DLP ra=0800732c sp=40004e08" > 18569:DBG:HDLC_UL:AlarmInd rx'd:":0DLP [40004db8] |ffffffff|400049e0|40005c70|40004e48|" > 18570:DBG:HDLC_UL:AlarmInd rx'd:":0DLP [40004dc8] |ffffffff|40005c70|00000093|0000000d|" > 18570:DBG:HDLC_UL:AlarmInd rx'd:":0DLP [40004dd8] |400049e0|08002d0f|40007be0|40003d50|" > 18570:DBG:HDLC_UL:AlarmInd rx'd:":0DLP [40004de8] |40005c70|40004e48|00000000|40004ea4|" > 18570:DBG:HDLC_UL:AlarmInd rx'd:":0DLP [40004df8] |0804327c|0000000d|40007d44|08007411|" > 18570:DBG:HDLC_UL:AlarmInd rx'd:":0DLP [40004e08] |40003474|400034b4|0800929b|08001270|" > 18570:DBG:HDLC_UL:AlarmInd rx'd:":0DLP [40004e18] |00000002|40000093|18000008|08043195|" > 18570:DBG:HDLC_UL:AlarmInd rx'd:":0DLP [40004e28] |00000000|40004ea0|00000001|400034a4|" > 18570:DBG:HDLC_UL:AlarmInd rx'd:":0DLP [40004e38] |0000fafe|00000000|00000000|40005588|" > 18570:DBG:HDLC_UL:AlarmInd rx'd:":0DLP [40004e48] |0804327c|00000001|080432b4|0802e338|" > 18880:DBG:OAM_MOI:oid=BBTRX:0-0 publisher attributes set > 18976:DBG:OAM_MOI:oid=Carrier:0-0 subscriber attributes set > 18977:DBG:RSL:2328:rsl: EVENT 0x00001009 rxd in STATE opennotconnected > 18980:DBG:OAM_MOI:oid=BBTRX:0-0 subscriber attributes set > 18981:DBG:OAM_MOI:oid=Carrier:0-0 publisher attributes set > 19018:DBG:RSL:2767:rsl: EVENT 0x00001007 rxd in STATE configurednotconnected > 19018:DBG:RSL:2767:rsl: ENTERING on > 19018:DBG:IP_CHANNEL:Assigning RX Client B > 19019:DBG:RSL:2798:rsl: EVENT 0x00001003 rxd in STATE ongoingconnecting > 19019:DBG:IP_CHAN_RX_B:Attempting connection to 10.210.2.226:3003 > 19021:DBG:RSL:2806:rsl: EVENT 0x00001002 rxd in STATE onconnecting > 19021:DBG:RSL:2806:rsl: ENTERING onconnected > 3906:WARNING:ULM:ULM_FIFODRV:fifodrv.c#1484:IPC Ping timeout - PEER_A FAILED > 4473:WARNING:ULS:ULS_FIFODRV:fifodrv.c#1484:IPC Ping timeout - PEER_A FAILED > 4990:WARNING:ULM:ULM_FIFODRV:fifodrv.c#1484:IPC Ping timeout - PEER_A FAILED > 5557:WARNING:ULS:ULS_FIFODRV:fifodrv.c#1484:IPC Ping timeout - PEER_A FAILED > 6074:WARNING:ULM:ULM_FIFODRV:fifodrv.c#1484:IPC Ping timeout - PEER_A FAILED > 23505:DBG:HDLC_UL:AlarmInd rx'd:"lme_manage_fsm_actions.c:636IPC Ping timeout - DLP FAILED" > 24739:WARN:OAM_RES:res_trx_status.c#209:TRX is not responding - reinitialising the unit... > 25825:DBG:OAM_IM:Stopping "Primary OML Fallback Client" > 25825:DBG:OAM_IM:Stopping "Secondary OML Server" > 25825:DBG:OAM_IM:Not stopping "IML Site Server" - has not been started > 25825:DBG:OAM_IM:Stopping "IML Bts Server" > 25825:DBG:OAM_IM:Stopping "IRL Patched Routing Link" > 25825:DBG:OAM_IM:Failed to inject event=1="STOP" into link source (token=7) > 25857:DBG:RSL:3476:rsl: EVENT 0x00001004 rxd in STATE onconnected > 25857:DBG:RSL:3476:rsl: EXITING on > 25857:DBG:RSL:Removed all traffic routes on chan 0x08 > 25857:DBG:RSL:Removed all traffic routes on chan 0x09 > 25857:DBG:RSL:Removed all traffic routes on chan 0x0A > 25857:DBG:RSL:Removed all traffic routes on chan 0x0B > 25857:DBG:RSL:Removed all traffic routes on chan 0x0C > 25857:DBG:RSL:Removed all traffic routes on chan 0x0D > 25857:DBG:RSL:Removed all traffic routes on chan 0x0E > 25857:DBG:RSL:Removed all traffic routes on chan 0x0F > 25857:DBG:RSL:3476:rsl: ENTERING failed > 25857:DBG:RSL:3476:rsl: ENTERING failedon > 25867:DBG:IP_CHAN_SERVER:Closed server listening on port 3006 > 25867:DBG:IP_CHAN_SERVER:Closed server listening on port 3014 > >SIGINT terminating. root@OpenBSC:~# ipaccess-telnet 10.210.2.167 server() failed: No route to host

3 2

Gerrit and which project to migrate first?
by Holger Freyther 04 May '16

04 May '16

Hi guys, at our wonderful OsmoDevCon 2016 we have decided to give a Gerrit based workflow a try. Right now the components are set-up and we need to figure out where to start, how to integrate and then also how to migrate. URL: https://gerrit.osmocom.org will host our installation of Gerrit. Authentication: It is using the OpenID authentication scheme to register to it. I have found and massaged a redmine plugin to turn our redmine into an OpenID provider[1]. Set-up/ACLs: There is a complex set of rules for ACLs. In terms of user branches it will be the easiest if they are located at "user/*" instead of our current "*" scheme. For a transition period we can continue to allow to push directly into gerrit as well. Registering: https://gerrit.osmocom.org/login, sign-in with your OpenID provider. And then set a username (this will be used for the git log-in). Register additional email addresses and install your ssh key. Projects: I have currently created "osmo-ci" for some CI scripts and Dockerfiles and started to play with it, e.g. using git to manage notifications of this project. Jenkins: http://jenkins.osmocom.org/jenkins/job/osmo-pcpap-gerrit/16/ is an example of a build triggered (and failed and reported as failure) to the Gerrit installation. Tricks: $ git ls-remote gerrit ... 5f3b6b8472a319d8d1184266cf9f80b5dbb709b6 refs/changes/23/23/1 '23' the 'hashed' structure '23' the actual change #23 '1' the first patch so one can use git fetch to fetch the patchset and browse $ ssh -p 29418 zecke(a)gerrit.osmocom.org gerrit --help Next: We need to pick some projects to start with. I would propose to start with libosmocore and OpenBSC or one of the two. Approach: Regardless of what we start with the approach would be: * Create project on Gerrit * Make current code available to gerrit * Set-up jenkins integration * Remove all but gerrit's push right for this specific repository * Set-up replication What is missing: * Which projects to migrate when * Gerrit / Jenkins integration * Gerrit => git.osmocom.org replication (and github?) * Additional build jobs (with docker). Decision if we * Group set-up if we want fine-grained review per project. I think we can start without. * Create wiki page/documentation sorry, the mail is a bit too long. holger [1] Don't trust it as your general ID provider, but you might prefer using it for gerrit instead of yahoo or canonical. The URL is https://osmocom.org/openid. The heavy lifting is done by a ruby library (which has some DH code.. but I didn't see a configure knob to change the prime.. so probably everyone is using https://openid.net/specs/openid-authentication-2_0.html#pvalue?

2 2

[PATCH] Make random MSISDN assignment optional
by msuraev＠sysmocom.de 04 May '16

04 May '16

From: Max <msuraev(a)sysmocom.de> Previously if subscriber was automatically created it got assigned random MSISDN number between 20000 and 49999. Make it optional (defaulting to previous behavior) by adding following: * optional "no-extension" argument to subscriber-create-on-demand * db unit tests * vty test The range for random extension can now be specified with "subscriber-create-on-demand random" command. Note: using the db made with new code might result in subscribers with empty extension. Such subscribers cannot be deleted using old code. Make sure not to mix db versions or manually fix it by editing sqlite with external program. Fixes: OS#1658 --- openbsc/include/openbsc/db.h | 8 ++- openbsc/include/openbsc/gsm_data.h | 8 +++ openbsc/include/openbsc/gsm_subscriber.h | 5 +- openbsc/src/libbsc/net_init.c | 5 +- openbsc/src/libcommon/gsm_subscriber_base.c | 1 + openbsc/src/libmsc/ctrl_commands.c | 9 ++- openbsc/src/libmsc/db.c | 37 +++++++---- openbsc/src/libmsc/gsm_04_08.c | 12 +++- openbsc/src/libmsc/gsm_subscriber.c | 6 +- openbsc/src/libmsc/vty_interface_layer3.c | 52 +++++++++++++-- openbsc/tests/db/db_test.c | 99 +++++++++++++---------------- openbsc/tests/vty_test_runner.py | 14 ++++ 12 files changed, 170 insertions(+), 86 deletions(-) diff --git a/openbsc/include/openbsc/db.h b/openbsc/include/openbsc/db.h index 6699a86..bb90705 100644 --- a/openbsc/include/openbsc/db.h +++ b/openbsc/include/openbsc/db.h @@ -20,6 +20,8 @@ #ifndef _DB_H #define _DB_H +#include <stdbool.h> + #include "gsm_subscriber.h" struct gsm_equipment; @@ -35,13 +37,15 @@ int db_prepare(void); int db_fini(void); /* subscriber management */ -struct gsm_subscriber *db_create_subscriber(const char *imsi); +struct gsm_subscriber *db_create_subscriber(const char *imsi, uint64_t smin, + uint64_t smax, bool alloc_exten); struct gsm_subscriber *db_get_subscriber(enum gsm_subscriber_field field, const char *subscr); int db_sync_subscriber(struct gsm_subscriber *subscriber); int db_subscriber_expire(void *priv, void (*callback)(void *priv, long long unsigned int id)); int db_subscriber_alloc_tmsi(struct gsm_subscriber *subscriber); -int db_subscriber_alloc_exten(struct gsm_subscriber *subscriber); +int db_subscriber_alloc_exten(struct gsm_subscriber *subscriber, uint64_t smin, + uint64_t smax); int db_subscriber_alloc_token(struct gsm_subscriber *subscriber, uint32_t* token); int db_subscriber_assoc_imei(struct gsm_subscriber *subscriber, char *imei); int db_subscriber_delete(struct gsm_subscriber *subscriber); diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index 6d7aba3..6f94e69 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -18,6 +18,12 @@ struct gsm_subscriber_group; #define OBSC_LINKID_CB(__msgb) (__msgb)->cb[3] +enum gsm_subscr_ext_alloc_policy { + GSM_SUBSCR_DONT_CREATE = 0, + GSM_SUBSCR_RANDOM_EXT = 1, + GSM_SUBSCR_NO_EXT = 2 +}; + enum gsm_security_event { GSM_SECURITY_NOAVAIL, GSM_SECURITY_AUTH_FAILED, @@ -283,6 +289,8 @@ struct gsm_network { /* subscriber related features */ int create_subscriber; + uint64_t ext_min; + uint64_t ext_max; struct gsm_subscriber_group *subscr_group; struct gsm_sms_queue *sms_queue; diff --git a/openbsc/include/openbsc/gsm_subscriber.h b/openbsc/include/openbsc/gsm_subscriber.h index 7d6c776..5030d65 100644 --- a/openbsc/include/openbsc/gsm_subscriber.h +++ b/openbsc/include/openbsc/gsm_subscriber.h @@ -1,6 +1,8 @@ #ifndef _GSM_SUBSCR_H #define _GSM_SUBSCR_H +#include <stdbool.h> + #include "gsm_data.h" #include <osmocom/core/linuxlist.h> @@ -91,7 +93,8 @@ enum gsm_subscriber_update_reason { struct gsm_subscriber *subscr_get(struct gsm_subscriber *subscr); struct gsm_subscriber *subscr_put(struct gsm_subscriber *subscr); struct gsm_subscriber *subscr_create_subscriber(struct gsm_subscriber_group *sgrp, - const char *imsi); + const char *imsi, uint64_t smin, + uint64_t smax, bool ext); struct gsm_subscriber *subscr_get_by_tmsi(struct gsm_subscriber_group *sgrp, uint32_t tmsi); struct gsm_subscriber *subscr_get_by_imsi(struct gsm_subscriber_group *sgrp, diff --git a/openbsc/src/libbsc/net_init.c b/openbsc/src/libbsc/net_init.c index 568a0b8..a524ead 100644 --- a/openbsc/src/libbsc/net_init.c +++ b/openbsc/src/libbsc/net_init.c @@ -48,7 +48,7 @@ struct gsm_network *gsm_network_init(uint16_t country_code, uint16_t network_cod INIT_LLIST_HEAD(&net->bsc_data->mscs); net->subscr_group->net = net; - net->create_subscriber = 1; + net->create_subscriber = GSM_SUBSCR_RANDOM_EXT; net->country_code = country_code; net->network_code = network_code; @@ -104,7 +104,8 @@ struct gsm_network *gsm_network_init(uint16_t country_code, uint16_t network_cod net->stats.bts.rsl_fail = osmo_counter_alloc("net.bts.rsl_fail"); net->mncc_recv = mncc_recv; - + net->ext_min = GSM_MIN_EXTEN; + net->ext_max = GSM_MAX_EXTEN; gsm_net_update_ctype(net); return net; diff --git a/openbsc/src/libcommon/gsm_subscriber_base.c b/openbsc/src/libcommon/gsm_subscriber_base.c index a455824..5f0a1be 100644 --- a/openbsc/src/libcommon/gsm_subscriber_base.c +++ b/openbsc/src/libcommon/gsm_subscriber_base.c @@ -60,6 +60,7 @@ struct gsm_subscriber *subscr_alloc(void) llist_add_tail(&s->entry, &active_subscribers); s->use_count = 1; s->tmsi = GSM_RESERVED_TMSI; + s->extension[0] = '\0'; INIT_LLIST_HEAD(&s->requests); diff --git a/openbsc/src/libmsc/ctrl_commands.c b/openbsc/src/libmsc/ctrl_commands.c index 9ac39de..44b1ebd 100644 --- a/openbsc/src/libmsc/ctrl_commands.c +++ b/openbsc/src/libmsc/ctrl_commands.c @@ -18,6 +18,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + +#include <stdbool.h> + #include <osmocom/ctrl/control_cmd.h> #include <openbsc/gsm_data.h> #include <openbsc/gsm_subscriber.h> @@ -83,6 +86,8 @@ static int set_subscriber_modify(struct ctrl_cmd *cmd, void *data) char *tmp, *imsi, *msisdn, *alg, *ki, *saveptr = NULL; struct gsm_subscriber* subscr; int rc; + bool ext = (GSM_SUBSCR_RANDOM_EXT == net->create_subscriber) ? true : + false; tmp = talloc_strdup(cmd, cmd->value); if (!tmp) @@ -95,7 +100,9 @@ static int set_subscriber_modify(struct ctrl_cmd *cmd, void *data) subscr = subscr_get_by_imsi(net->subscr_group, imsi); if (!subscr) - subscr = subscr_create_subscriber(net->subscr_group, imsi); + subscr = subscr_create_subscriber(net->subscr_group, imsi, + net->ext_min, + net->ext_max, ext); if (!subscr) goto fail; diff --git a/openbsc/src/libmsc/db.c b/openbsc/src/libmsc/db.c index 267b5ef..c2a956d 100644 --- a/openbsc/src/libmsc/db.c +++ b/openbsc/src/libmsc/db.c @@ -23,6 +23,7 @@ #include <inttypes.h> #include <libgen.h> #include <stdio.h> +#include <stdbool.h> #include <stdlib.h> #include <string.h> #include <errno.h> @@ -500,7 +501,8 @@ int db_fini(void) return 0; } -struct gsm_subscriber *db_create_subscriber(const char *imsi) +struct gsm_subscriber *db_create_subscriber(const char *imsi, uint64_t smin, + uint64_t smax, bool alloc_exten) { dbi_result result; struct gsm_subscriber *subscr; @@ -532,7 +534,8 @@ struct gsm_subscriber *db_create_subscriber(const char *imsi) strncpy(subscr->imsi, imsi, GSM_IMSI_LENGTH-1); dbi_result_free(result); LOGP(DDB, LOGL_INFO, "New Subscriber: ID %llu, IMSI %s\n", subscr->id, subscr->imsi); - db_subscriber_alloc_exten(subscr); + if (alloc_exten) + db_subscriber_alloc_exten(subscr, smin, smax); return subscr; } @@ -937,8 +940,11 @@ int db_sync_subscriber(struct gsm_subscriber *subscriber) dbi_conn_quote_string_copy(conn, subscriber->name, &q_name); - dbi_conn_quote_string_copy(conn, - subscriber->extension, &q_extension); + if (subscriber->extension[0] != '\0') + dbi_conn_quote_string_copy(conn, + subscriber->extension, &q_extension); + else + q_extension = strdup("NULL"); if (subscriber->tmsi != GSM_RESERVED_TMSI) { sprintf(tmsi, "%u", subscriber->tmsi); @@ -1043,15 +1049,17 @@ int db_subscriber_delete(struct gsm_subscriber *subscr) } dbi_result_free(result); - result = dbi_conn_queryf(conn, - "DELETE FROM SMS WHERE src_addr=%s OR dest_addr=%s", - subscr->extension, subscr->extension); - if (!result) { - LOGP(DDB, LOGL_ERROR, - "Failed to delete SMS for %llu\n", subscr->id); - return -1; + if (subscr->extension[0] != '\0') { + result = dbi_conn_queryf(conn, + "DELETE FROM SMS WHERE src_addr=%s OR dest_addr=%s", + subscr->extension, subscr->extension); + if (!result) { + LOGP(DDB, LOGL_ERROR, + "Failed to delete SMS for %llu\n", subscr->id); + return -1; + } + dbi_result_free(result); } - dbi_result_free(result); result = dbi_conn_queryf(conn, "DELETE FROM VLR WHERE subscriber_id=%llu", @@ -1231,13 +1239,14 @@ int db_subscriber_alloc_tmsi(struct gsm_subscriber *subscriber) return 0; } -int db_subscriber_alloc_exten(struct gsm_subscriber *subscriber) +int db_subscriber_alloc_exten(struct gsm_subscriber *subscriber, uint64_t smin, + uint64_t smax) { dbi_result result = NULL; uint32_t try; for (;;) { - try = (rand()%(GSM_MAX_EXTEN-GSM_MIN_EXTEN+1)+GSM_MIN_EXTEN); + try = (rand() % (smax - smin + 1) + smin); result = dbi_conn_queryf(conn, "SELECT * FROM Subscriber " "WHERE extension = %i", diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index 05cb886..d22db73 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -25,6 +25,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <stdbool.h> #include <errno.h> #include <time.h> #include <netinet/in.h> @@ -517,6 +518,8 @@ static int mm_rx_id_resp(struct gsm_subscriber_connection *conn, struct msgb *ms struct gsm_network *net = bts->network; uint8_t mi_type = gh->data[1] & GSM_MI_TYPE_MASK; char mi_string[GSM48_MI_SIZE]; + bool ext = (GSM_SUBSCR_RANDOM_EXT == net->create_subscriber) ? true : + false; gsm48_mi_to_string(mi_string, sizeof(mi_string), &gh->data[1], gh->data[0]); DEBUGP(DMM, "IDENTITY RESPONSE: MI(%s)=%s\n", @@ -532,7 +535,8 @@ static int mm_rx_id_resp(struct gsm_subscriber_connection *conn, struct msgb *ms mi_string); if (!conn->subscr && net->create_subscriber) conn->subscr = subscr_create_subscriber( - net->subscr_group, mi_string); + net->subscr_group, mi_string, + net->ext_min, net->ext_max, ext); } if (!conn->subscr && conn->loc_operation) { gsm0408_loc_upd_rej(conn, bts->network->reject_cause); @@ -593,6 +597,8 @@ static int mm_rx_loc_upd_req(struct gsm_subscriber_connection *conn, struct msgb struct gsm_bts *bts = conn->bts; uint8_t mi_type; char mi_string[GSM48_MI_SIZE]; + bool ext = (GSM_SUBSCR_RANDOM_EXT == bts->network->create_subscriber) ? + true : false; lu = (struct gsm48_loc_upd_req *) gh->data; @@ -643,7 +649,9 @@ static int mm_rx_loc_upd_req(struct gsm_subscriber_connection *conn, struct msgb subscr = subscr_get_by_imsi(bts->network->subscr_group, mi_string); if (!subscr && bts->network->create_subscriber) { subscr = subscr_create_subscriber( - bts->network->subscr_group, mi_string); + bts->network->subscr_group, mi_string, + bts->network->ext_min, bts->network->ext_max, + ext); } if (!subscr) { gsm0408_loc_upd_rej(conn, bts->network->reject_cause); diff --git a/openbsc/src/libmsc/gsm_subscriber.c b/openbsc/src/libmsc/gsm_subscriber.c index 57c10cf..7d62888 100644 --- a/openbsc/src/libmsc/gsm_subscriber.c +++ b/openbsc/src/libmsc/gsm_subscriber.c @@ -203,9 +203,11 @@ void subscr_remove_request(struct subscr_request *request) } struct gsm_subscriber *subscr_create_subscriber(struct gsm_subscriber_group *sgrp, - const char *imsi) + const char *imsi, uint64_t smin, + uint64_t smax, bool ext) { - struct gsm_subscriber *subscr = db_create_subscriber(imsi); + struct gsm_subscriber *subscr = + db_create_subscriber(imsi, smin, smax, ext); if (subscr) subscr->group = sgrp; return subscr; diff --git a/openbsc/src/libmsc/vty_interface_layer3.c b/openbsc/src/libmsc/vty_interface_layer3.c index 790fedf..2beb77a 100644 --- a/openbsc/src/libmsc/vty_interface_layer3.c +++ b/openbsc/src/libmsc/vty_interface_layer3.c @@ -21,6 +21,8 @@ #include <stdlib.h> #include <limits.h> #include <unistd.h> +#include <stdbool.h> +#include <inttypes.h> #include <time.h> #include <osmocom/vty/command.h> @@ -235,12 +237,16 @@ DEFUN(subscriber_create, { struct gsm_network *gsmnet = gsmnet_from_vty(vty); struct gsm_subscriber *subscr; + bool ext = (GSM_SUBSCR_RANDOM_EXT == gsmnet->create_subscriber) ? true : + false; subscr = subscr_get_by_imsi(gsmnet->subscr_group, argv[0]); if (subscr) db_sync_subscriber(subscr); else { - subscr = subscr_create_subscriber(gsmnet->subscr_group, argv[0]); + subscr = subscr_create_subscriber(gsmnet->subscr_group, argv[0], + gsmnet->ext_min, + gsmnet->ext_max, ext); if (!subscr) { vty_out(vty, "%% No subscriber created for IMSI %s%s", @@ -1032,11 +1038,34 @@ DEFUN(cfg_nitb, cfg_nitb_cmd, } DEFUN(cfg_nitb_subscr_create, cfg_nitb_subscr_create_cmd, - "subscriber-create-on-demand", - "Make a new record when a subscriber is first seen.\n") + "subscriber-create-on-demand [no-extension]", + "Make a new record when a subscriber is first seen.\n" + "Do not assign random extension when creating subscriber\n") { struct gsm_network *gsmnet = gsmnet_from_vty(vty); - gsmnet->create_subscriber = 1; + if (argc) + gsmnet->create_subscriber = GSM_SUBSCR_NO_EXT; + else + gsmnet->create_subscriber = GSM_SUBSCR_RANDOM_EXT; + return CMD_SUCCESS; +} + +DEFUN(cfg_nitb_subscr_random, cfg_nitb_subscr_random_cmd, + "subscriber-create-on-demand random <1-999999999999999> " + "<2-999999999999999>", + "Set random parameters for a new record when a subscriber is first seen.\n" + "Set random parameters for a new record when a subscriber is first seen.\n" + "Minimum for subscriber extension\n""Maximum for subscriber extension\n") +{ + struct gsm_network *gsmnet = gsmnet_from_vty(vty); + uint64_t mi = atoi(argv[0]), ma = atoi(argv[1]); + if (mi >= ma) { + vty_out(vty, "Incorrect range: %s >= %s, expected MIN < MAX%s", + argv[0], argv[1], VTY_NEWLINE); + return CMD_WARNING; + } + gsmnet->ext_min = mi; + gsmnet->ext_max = ma; return CMD_SUCCESS; } @@ -1045,7 +1074,7 @@ DEFUN(cfg_nitb_no_subscr_create, cfg_nitb_no_subscr_create_cmd, NO_STR "Make a new record when a subscriber is first seen.\n") { struct gsm_network *gsmnet = gsmnet_from_vty(vty); - gsmnet->create_subscriber = 0; + gsmnet->create_subscriber = GSM_SUBSCR_DONT_CREATE; return CMD_SUCCESS; } @@ -1070,9 +1099,17 @@ DEFUN(cfg_nitb_no_assign_tmsi, cfg_nitb_no_assign_tmsi_cmd, static int config_write_nitb(struct vty *vty) { struct gsm_network *gsmnet = gsmnet_from_vty(vty); + const char *pref = gsmnet->create_subscriber ? "" : "no ", *post = + (GSM_SUBSCR_NO_EXT == gsmnet->create_subscriber) ? + " no-extension" : ""; + vty_out(vty, "nitb%s", VTY_NEWLINE); - vty_out(vty, " %ssubscriber-create-on-demand%s", - gsmnet->create_subscriber ? "" : "no ", VTY_NEWLINE); + vty_out(vty, " %ssubscriber-create-on-demand%s%s", pref, post, + VTY_NEWLINE); + if (gsmnet->ext_min != GSM_MIN_EXTEN || gsmnet->ext_max != GSM_MAX_EXTEN) + vty_out(vty, "subscriber-create-on-demand random %"PRIu64" %" + PRIu64"%s", gsmnet->ext_min, gsmnet->ext_max, + VTY_NEWLINE); vty_out(vty, " %sassign-tmsi%s", gsmnet->avoid_tmsi ? "no " : "", VTY_NEWLINE); return CMD_SUCCESS; @@ -1127,6 +1164,7 @@ int bsc_vty_init_extra(void) install_element(CONFIG_NODE, &cfg_nitb_cmd); install_node(&nitb_node, config_write_nitb); install_element(NITB_NODE, &cfg_nitb_subscr_create_cmd); + install_element(NITB_NODE, &cfg_nitb_subscr_random_cmd); install_element(NITB_NODE, &cfg_nitb_no_subscr_create_cmd); install_element(NITB_NODE, &cfg_nitb_assign_tmsi_cmd); install_element(NITB_NODE, &cfg_nitb_no_assign_tmsi_cmd); diff --git a/openbsc/tests/db/db_test.c b/openbsc/tests/db/db_test.c index fb159a5..a689789 100644 --- a/openbsc/tests/db/db_test.c +++ b/openbsc/tests/db/db_test.c @@ -28,6 +28,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> +#include <stdbool.h> #include <inttypes.h> static struct gsm_network dummy_net; @@ -159,10 +160,44 @@ static void test_sms_migrate(void) subscr_put(rcv_subscr); } -int main() +static void test_subs(const char *alice_imsi, char *imei1, char *imei2, bool ext) { + struct gsm_subscriber *alice = NULL, *alice_db; char scratch_str[256]; + alice = db_create_subscriber(alice_imsi, GSM_MIN_EXTEN, GSM_MAX_EXTEN, + ext); + db_subscriber_assoc_imei(alice, imei1); + if (imei2) + db_subscriber_assoc_imei(alice, imei2); + db_subscriber_alloc_tmsi(alice); + alice->lac=42; + db_sync_subscriber(alice); + /* Get by TMSI */ + snprintf(scratch_str, sizeof(scratch_str), "%"PRIu32, alice->tmsi); + alice_db = db_get_subscriber(GSM_SUBSCRIBER_TMSI, scratch_str); + COMPARE(alice, alice_db); + SUBSCR_PUT(alice_db); + /* Get by IMSI */ + alice_db = db_get_subscriber(GSM_SUBSCRIBER_IMSI, alice_imsi); + COMPARE(alice, alice_db); + SUBSCR_PUT(alice_db); + /* Get by id */ + snprintf(scratch_str, sizeof(scratch_str), "%llu", alice->id); + alice_db = db_get_subscriber(GSM_SUBSCRIBER_ID, scratch_str); + COMPARE(alice, alice_db); + SUBSCR_PUT(alice_db); + /* Get by extension */ + alice_db = db_get_subscriber(GSM_SUBSCRIBER_EXTENSION, alice->extension); + if (alice_db) { + COMPARE(alice, alice_db); + SUBSCR_PUT(alice_db); + } + SUBSCR_PUT(alice); +} + +int main() +{ printf("Testing subscriber database code.\n"); osmo_init_logging(&log_info); log_set_print_filename(osmo_stderr_target, 0); @@ -186,68 +221,22 @@ int main() struct gsm_subscriber *alice_db; char *alice_imsi = "3243245432345"; - alice = db_create_subscriber(alice_imsi); + alice = db_create_subscriber(alice_imsi, GSM_MIN_EXTEN, GSM_MAX_EXTEN, + true); db_sync_subscriber(alice); alice_db = db_get_subscriber(GSM_SUBSCRIBER_IMSI, alice->imsi); COMPARE(alice, alice_db); SUBSCR_PUT(alice_db); SUBSCR_PUT(alice); - alice_imsi = "3693245423445"; - alice = db_create_subscriber(alice_imsi); - db_subscriber_assoc_imei(alice, "1234567890"); - db_subscriber_alloc_tmsi(alice); - alice->lac=42; - db_sync_subscriber(alice); - /* Get by TMSI */ - snprintf(scratch_str, sizeof(scratch_str), "%"PRIu32, alice->tmsi); - alice_db = db_get_subscriber(GSM_SUBSCRIBER_TMSI, scratch_str); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by IMSI */ - alice_db = db_get_subscriber(GSM_SUBSCRIBER_IMSI, alice_imsi); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by id */ - snprintf(scratch_str, sizeof(scratch_str), "%llu", alice->id); - alice_db = db_get_subscriber(GSM_SUBSCRIBER_ID, scratch_str); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by extension */ - alice_db = db_get_subscriber(GSM_SUBSCRIBER_EXTENSION, alice->extension); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - SUBSCR_PUT(alice); - - alice_imsi = "9993245423445"; - alice = db_create_subscriber(alice_imsi); - db_subscriber_alloc_tmsi(alice); - alice->lac=42; - db_sync_subscriber(alice); - db_subscriber_assoc_imei(alice, "1234567890"); - db_subscriber_assoc_imei(alice, "6543560920"); - /* Get by TMSI */ - snprintf(scratch_str, sizeof(scratch_str), "%"PRIu32, alice->tmsi); - alice_db = db_get_subscriber(GSM_SUBSCRIBER_TMSI, scratch_str); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by IMSI */ - alice_db = db_get_subscriber(GSM_SUBSCRIBER_IMSI, alice_imsi); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by id */ - snprintf(scratch_str, sizeof(scratch_str), "%llu", alice->id); - alice_db = db_get_subscriber(GSM_SUBSCRIBER_ID, scratch_str); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by extension */ - alice_db = db_get_subscriber(GSM_SUBSCRIBER_EXTENSION, alice->extension); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - SUBSCR_PUT(alice); + test_subs("3693245423445", "1234567890", NULL, true); + test_subs("9993245423445", "1234567890", "6543560920", true); + test_subs("3123122223445", "1234567890", NULL, false); + test_subs("9123121223445", "1234567890", "6543560920", false); /* create it again and see it fails */ - alice = db_create_subscriber(alice_imsi); + alice = db_create_subscriber(alice_imsi, GSM_MIN_EXTEN, GSM_MAX_EXTEN, + true); OSMO_ASSERT(!alice); test_sms(); diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py index c088855..6c49a03 100644 --- a/openbsc/tests/vty_test_runner.py +++ b/openbsc/tests/vty_test_runner.py @@ -408,11 +408,13 @@ class TestVTYNITB(TestVTYGenericBSC): self.vty.enable() imsi = "204300854013739" + imsi2 = "204300854013769" wrong_imsi = "204300999999999" # Lets create one res = self.vty.command('subscriber create imsi '+imsi) self.assert_(res.find(" IMSI: "+imsi) > 0) + self.assert_(res.find("Extension") > 0) self.vty.verify('subscriber imsi '+wrong_imsi+' name wrong', ['% No subscriber found for imsi '+wrong_imsi]) res = self.vty.command('subscriber imsi '+imsi+' name '+('X' * 160)) @@ -426,9 +428,21 @@ class TestVTYNITB(TestVTYGenericBSC): self.vty.verify('subscriber imsi '+imsi+' extension '+('1' * 14), ['']) + # Another one - without extension + self.vty.command("configure terminal") + self.vty.command("nitb") + self.vty.command("subscriber-create-on-demand no-extension") + self.vty.command("end") + + res = self.vty.command('subscriber create imsi ' + imsi2) + self.assert_(res.find(" IMSI: " + imsi2) > 0) + self.assertEquals(res.find("Extension"), -1) + # Delete it res = self.vty.command('subscriber delete imsi '+imsi) self.assert_(res != "") + res = self.vty.command('subscriber delete imsi ' + imsi2) + self.assert_(res != "") def testShowPagingGroup(self): res = self.vty.command("show paging-group 255 1234567") -- 2.8.2

3 2

Re: osmo-nitb
by Holger Freyther 03 May '16

03 May '16

> On 03 May 2016, at 11:18, loay abdelrazek <loay.razek(a)gmail.com> wrote: > > Dear Holger Hi! > The project is under development yet bec I need to simulate first cases in order to train the algorithms I will use OpenBSC is under development too and yet our sourcecode and intermediate versions are available. If you ask for free help, you should ask yourself what you can provide to the project in return? Anyway, osmo-nitb doesn't have a SIGTRAN/MAP interface. A project like OpenBSC works because people with different interest collaborate and exchange information freely. So please consider making a contribution towards a project like OpenBSC. kind regards holger

1 0

osmo-nitb
by loay abdelrazek 03 May '16

03 May '16

Dears, hope this finds you well, kiindly i need to know how to configure the GT and PC for the various simulated nodes in osmo-nitb as am testing some security scripts to simulate different roaming attacks using the MAP protocol appreciate your support best regards

2 3

[PATCH] Make random MSISDN assignment optional
by msuraev＠sysmocom.de 02 May '16

02 May '16

From: Max <msuraev(a)sysmocom.de> Previously if subscriber was automatically created it got assigned random MSISDN number between 20000 and 49999. Make it optional (defaulting to previous behavior) by adding following: * optional "no-extension" argument to subscriber-create-on-demand * db unit tests * vty test The range for random extension can now be specified with "subscriber-create-on-demand random" command. Note: using the db made with new code might result in subscribers with empty extension. Such subscribers cannot be deleted using old code. Make sure not to mix db versions or manually fix it by editing sqlite with external program. Fixes: OS#1658 --- openbsc/include/openbsc/db.h | 8 ++- openbsc/include/openbsc/gsm_data.h | 8 +++ openbsc/include/openbsc/gsm_subscriber.h | 5 +- openbsc/src/libbsc/net_init.c | 5 +- openbsc/src/libcommon/gsm_subscriber_base.c | 1 + openbsc/src/libmsc/ctrl_commands.c | 9 ++- openbsc/src/libmsc/db.c | 37 +++++++---- openbsc/src/libmsc/gsm_04_08.c | 12 +++- openbsc/src/libmsc/gsm_subscriber.c | 6 +- openbsc/src/libmsc/vty_interface_layer3.c | 51 +++++++++++++-- openbsc/tests/db/db_test.c | 99 +++++++++++++---------------- openbsc/tests/vty_test_runner.py | 14 ++++ 12 files changed, 169 insertions(+), 86 deletions(-) diff --git a/openbsc/include/openbsc/db.h b/openbsc/include/openbsc/db.h index 6699a86..4da9634 100644 --- a/openbsc/include/openbsc/db.h +++ b/openbsc/include/openbsc/db.h @@ -20,6 +20,8 @@ #ifndef _DB_H #define _DB_H +#include <stdbool.h> + #include "gsm_subscriber.h" struct gsm_equipment; @@ -35,13 +37,15 @@ int db_prepare(void); int db_fini(void); /* subscriber management */ -struct gsm_subscriber *db_create_subscriber(const char *imsi); +struct gsm_subscriber *db_create_subscriber(const char *imsi, uint64_t smin, + uint64_t smax, bool ext); struct gsm_subscriber *db_get_subscriber(enum gsm_subscriber_field field, const char *subscr); int db_sync_subscriber(struct gsm_subscriber *subscriber); int db_subscriber_expire(void *priv, void (*callback)(void *priv, long long unsigned int id)); int db_subscriber_alloc_tmsi(struct gsm_subscriber *subscriber); -int db_subscriber_alloc_exten(struct gsm_subscriber *subscriber); +int db_subscriber_alloc_exten(struct gsm_subscriber *subscriber, uint64_t smin, + uint64_t smax); int db_subscriber_alloc_token(struct gsm_subscriber *subscriber, uint32_t* token); int db_subscriber_assoc_imei(struct gsm_subscriber *subscriber, char *imei); int db_subscriber_delete(struct gsm_subscriber *subscriber); diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index 6d7aba3..14b002a 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -18,6 +18,12 @@ struct gsm_subscriber_group; #define OBSC_LINKID_CB(__msgb) (__msgb)->cb[3] +enum gsm_subscr_ext { + GSM_SUBSCR_DONT_CREATE = 0, + GSM_SUBSCR_RANDOM_EXT = 1, + GSM_SUBSCR_NO_EXT = 2 +}; + enum gsm_security_event { GSM_SECURITY_NOAVAIL, GSM_SECURITY_AUTH_FAILED, @@ -283,6 +289,8 @@ struct gsm_network { /* subscriber related features */ int create_subscriber; + uint64_t ext_min; + uint64_t ext_max; struct gsm_subscriber_group *subscr_group; struct gsm_sms_queue *sms_queue; diff --git a/openbsc/include/openbsc/gsm_subscriber.h b/openbsc/include/openbsc/gsm_subscriber.h index 7d6c776..5030d65 100644 --- a/openbsc/include/openbsc/gsm_subscriber.h +++ b/openbsc/include/openbsc/gsm_subscriber.h @@ -1,6 +1,8 @@ #ifndef _GSM_SUBSCR_H #define _GSM_SUBSCR_H +#include <stdbool.h> + #include "gsm_data.h" #include <osmocom/core/linuxlist.h> @@ -91,7 +93,8 @@ enum gsm_subscriber_update_reason { struct gsm_subscriber *subscr_get(struct gsm_subscriber *subscr); struct gsm_subscriber *subscr_put(struct gsm_subscriber *subscr); struct gsm_subscriber *subscr_create_subscriber(struct gsm_subscriber_group *sgrp, - const char *imsi); + const char *imsi, uint64_t smin, + uint64_t smax, bool ext); struct gsm_subscriber *subscr_get_by_tmsi(struct gsm_subscriber_group *sgrp, uint32_t tmsi); struct gsm_subscriber *subscr_get_by_imsi(struct gsm_subscriber_group *sgrp, diff --git a/openbsc/src/libbsc/net_init.c b/openbsc/src/libbsc/net_init.c index 568a0b8..a524ead 100644 --- a/openbsc/src/libbsc/net_init.c +++ b/openbsc/src/libbsc/net_init.c @@ -48,7 +48,7 @@ struct gsm_network *gsm_network_init(uint16_t country_code, uint16_t network_cod INIT_LLIST_HEAD(&net->bsc_data->mscs); net->subscr_group->net = net; - net->create_subscriber = 1; + net->create_subscriber = GSM_SUBSCR_RANDOM_EXT; net->country_code = country_code; net->network_code = network_code; @@ -104,7 +104,8 @@ struct gsm_network *gsm_network_init(uint16_t country_code, uint16_t network_cod net->stats.bts.rsl_fail = osmo_counter_alloc("net.bts.rsl_fail"); net->mncc_recv = mncc_recv; - + net->ext_min = GSM_MIN_EXTEN; + net->ext_max = GSM_MAX_EXTEN; gsm_net_update_ctype(net); return net; diff --git a/openbsc/src/libcommon/gsm_subscriber_base.c b/openbsc/src/libcommon/gsm_subscriber_base.c index a455824..5f0a1be 100644 --- a/openbsc/src/libcommon/gsm_subscriber_base.c +++ b/openbsc/src/libcommon/gsm_subscriber_base.c @@ -60,6 +60,7 @@ struct gsm_subscriber *subscr_alloc(void) llist_add_tail(&s->entry, &active_subscribers); s->use_count = 1; s->tmsi = GSM_RESERVED_TMSI; + s->extension[0] = '\0'; INIT_LLIST_HEAD(&s->requests); diff --git a/openbsc/src/libmsc/ctrl_commands.c b/openbsc/src/libmsc/ctrl_commands.c index 9ac39de..44b1ebd 100644 --- a/openbsc/src/libmsc/ctrl_commands.c +++ b/openbsc/src/libmsc/ctrl_commands.c @@ -18,6 +18,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + +#include <stdbool.h> + #include <osmocom/ctrl/control_cmd.h> #include <openbsc/gsm_data.h> #include <openbsc/gsm_subscriber.h> @@ -83,6 +86,8 @@ static int set_subscriber_modify(struct ctrl_cmd *cmd, void *data) char *tmp, *imsi, *msisdn, *alg, *ki, *saveptr = NULL; struct gsm_subscriber* subscr; int rc; + bool ext = (GSM_SUBSCR_RANDOM_EXT == net->create_subscriber) ? true : + false; tmp = talloc_strdup(cmd, cmd->value); if (!tmp) @@ -95,7 +100,9 @@ static int set_subscriber_modify(struct ctrl_cmd *cmd, void *data) subscr = subscr_get_by_imsi(net->subscr_group, imsi); if (!subscr) - subscr = subscr_create_subscriber(net->subscr_group, imsi); + subscr = subscr_create_subscriber(net->subscr_group, imsi, + net->ext_min, + net->ext_max, ext); if (!subscr) goto fail; diff --git a/openbsc/src/libmsc/db.c b/openbsc/src/libmsc/db.c index 267b5ef..1e112cb 100644 --- a/openbsc/src/libmsc/db.c +++ b/openbsc/src/libmsc/db.c @@ -23,6 +23,7 @@ #include <inttypes.h> #include <libgen.h> #include <stdio.h> +#include <stdbool.h> #include <stdlib.h> #include <string.h> #include <errno.h> @@ -500,7 +501,8 @@ int db_fini(void) return 0; } -struct gsm_subscriber *db_create_subscriber(const char *imsi) +struct gsm_subscriber *db_create_subscriber(const char *imsi, uint64_t smin, + uint64_t smax, bool ext) { dbi_result result; struct gsm_subscriber *subscr; @@ -532,7 +534,8 @@ struct gsm_subscriber *db_create_subscriber(const char *imsi) strncpy(subscr->imsi, imsi, GSM_IMSI_LENGTH-1); dbi_result_free(result); LOGP(DDB, LOGL_INFO, "New Subscriber: ID %llu, IMSI %s\n", subscr->id, subscr->imsi); - db_subscriber_alloc_exten(subscr); + if (ext) + db_subscriber_alloc_exten(subscr, smin, smax); return subscr; } @@ -937,8 +940,11 @@ int db_sync_subscriber(struct gsm_subscriber *subscriber) dbi_conn_quote_string_copy(conn, subscriber->name, &q_name); - dbi_conn_quote_string_copy(conn, - subscriber->extension, &q_extension); + if (subscriber->extension[0] != '\0') + dbi_conn_quote_string_copy(conn, + subscriber->extension, &q_extension); + else + q_extension = strdup("NULL"); if (subscriber->tmsi != GSM_RESERVED_TMSI) { sprintf(tmsi, "%u", subscriber->tmsi); @@ -1043,15 +1049,17 @@ int db_subscriber_delete(struct gsm_subscriber *subscr) } dbi_result_free(result); - result = dbi_conn_queryf(conn, - "DELETE FROM SMS WHERE src_addr=%s OR dest_addr=%s", - subscr->extension, subscr->extension); - if (!result) { - LOGP(DDB, LOGL_ERROR, - "Failed to delete SMS for %llu\n", subscr->id); - return -1; + if (subscr->extension[0] != '\0') { + result = dbi_conn_queryf(conn, + "DELETE FROM SMS WHERE src_addr=%s OR dest_addr=%s", + subscr->extension, subscr->extension); + if (!result) { + LOGP(DDB, LOGL_ERROR, + "Failed to delete SMS for %llu\n", subscr->id); + return -1; + } + dbi_result_free(result); } - dbi_result_free(result); result = dbi_conn_queryf(conn, "DELETE FROM VLR WHERE subscriber_id=%llu", @@ -1231,13 +1239,14 @@ int db_subscriber_alloc_tmsi(struct gsm_subscriber *subscriber) return 0; } -int db_subscriber_alloc_exten(struct gsm_subscriber *subscriber) +int db_subscriber_alloc_exten(struct gsm_subscriber *subscriber, uint64_t smin, + uint64_t smax) { dbi_result result = NULL; uint32_t try; for (;;) { - try = (rand()%(GSM_MAX_EXTEN-GSM_MIN_EXTEN+1)+GSM_MIN_EXTEN); + try = (rand() % (smax - smin + 1) + smin); result = dbi_conn_queryf(conn, "SELECT * FROM Subscriber " "WHERE extension = %i", diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index 05cb886..d22db73 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -25,6 +25,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <stdbool.h> #include <errno.h> #include <time.h> #include <netinet/in.h> @@ -517,6 +518,8 @@ static int mm_rx_id_resp(struct gsm_subscriber_connection *conn, struct msgb *ms struct gsm_network *net = bts->network; uint8_t mi_type = gh->data[1] & GSM_MI_TYPE_MASK; char mi_string[GSM48_MI_SIZE]; + bool ext = (GSM_SUBSCR_RANDOM_EXT == net->create_subscriber) ? true : + false; gsm48_mi_to_string(mi_string, sizeof(mi_string), &gh->data[1], gh->data[0]); DEBUGP(DMM, "IDENTITY RESPONSE: MI(%s)=%s\n", @@ -532,7 +535,8 @@ static int mm_rx_id_resp(struct gsm_subscriber_connection *conn, struct msgb *ms mi_string); if (!conn->subscr && net->create_subscriber) conn->subscr = subscr_create_subscriber( - net->subscr_group, mi_string); + net->subscr_group, mi_string, + net->ext_min, net->ext_max, ext); } if (!conn->subscr && conn->loc_operation) { gsm0408_loc_upd_rej(conn, bts->network->reject_cause); @@ -593,6 +597,8 @@ static int mm_rx_loc_upd_req(struct gsm_subscriber_connection *conn, struct msgb struct gsm_bts *bts = conn->bts; uint8_t mi_type; char mi_string[GSM48_MI_SIZE]; + bool ext = (GSM_SUBSCR_RANDOM_EXT == bts->network->create_subscriber) ? + true : false; lu = (struct gsm48_loc_upd_req *) gh->data; @@ -643,7 +649,9 @@ static int mm_rx_loc_upd_req(struct gsm_subscriber_connection *conn, struct msgb subscr = subscr_get_by_imsi(bts->network->subscr_group, mi_string); if (!subscr && bts->network->create_subscriber) { subscr = subscr_create_subscriber( - bts->network->subscr_group, mi_string); + bts->network->subscr_group, mi_string, + bts->network->ext_min, bts->network->ext_max, + ext); } if (!subscr) { gsm0408_loc_upd_rej(conn, bts->network->reject_cause); diff --git a/openbsc/src/libmsc/gsm_subscriber.c b/openbsc/src/libmsc/gsm_subscriber.c index 57c10cf..7d62888 100644 --- a/openbsc/src/libmsc/gsm_subscriber.c +++ b/openbsc/src/libmsc/gsm_subscriber.c @@ -203,9 +203,11 @@ void subscr_remove_request(struct subscr_request *request) } struct gsm_subscriber *subscr_create_subscriber(struct gsm_subscriber_group *sgrp, - const char *imsi) + const char *imsi, uint64_t smin, + uint64_t smax, bool ext) { - struct gsm_subscriber *subscr = db_create_subscriber(imsi); + struct gsm_subscriber *subscr = + db_create_subscriber(imsi, smin, smax, ext); if (subscr) subscr->group = sgrp; return subscr; diff --git a/openbsc/src/libmsc/vty_interface_layer3.c b/openbsc/src/libmsc/vty_interface_layer3.c index 790fedf..51b7258 100644 --- a/openbsc/src/libmsc/vty_interface_layer3.c +++ b/openbsc/src/libmsc/vty_interface_layer3.c @@ -21,6 +21,8 @@ #include <stdlib.h> #include <limits.h> #include <unistd.h> +#include <stdbool.h> +#include <inttypes.h> #include <time.h> #include <osmocom/vty/command.h> @@ -235,12 +237,16 @@ DEFUN(subscriber_create, { struct gsm_network *gsmnet = gsmnet_from_vty(vty); struct gsm_subscriber *subscr; + bool ext = (GSM_SUBSCR_RANDOM_EXT == gsmnet->create_subscriber) ? true : + false; subscr = subscr_get_by_imsi(gsmnet->subscr_group, argv[0]); if (subscr) db_sync_subscriber(subscr); else { - subscr = subscr_create_subscriber(gsmnet->subscr_group, argv[0]); + subscr = subscr_create_subscriber(gsmnet->subscr_group, argv[0], + gsmnet->ext_min, + gsmnet->ext_max, ext); if (!subscr) { vty_out(vty, "%% No subscriber created for IMSI %s%s", @@ -1032,11 +1038,33 @@ DEFUN(cfg_nitb, cfg_nitb_cmd, } DEFUN(cfg_nitb_subscr_create, cfg_nitb_subscr_create_cmd, - "subscriber-create-on-demand", - "Make a new record when a subscriber is first seen.\n") + "subscriber-create-on-demand [no-extension]", + "Make a new record when a subscriber is first seen.\n" + "Do not assign random extension when creating subscriber\n") { struct gsm_network *gsmnet = gsmnet_from_vty(vty); - gsmnet->create_subscriber = 1; + if (argc) + gsmnet->create_subscriber = GSM_SUBSCR_NO_EXT; + else + gsmnet->create_subscriber = GSM_SUBSCR_RANDOM_EXT; + return CMD_SUCCESS; +} + +DEFUN(cfg_nitb_subscr_random, cfg_nitb_subscr_random_cmd, + "subscriber-create-on-demand random <1-99999> <2-99999>", + "Set random parameters for a new record when a subscriber is first seen.\n" + "Set random parameters for a new record when a subscriber is first seen.\n" + "Minimum for subscriber extension\n""Maximum for subscriber extension\n") +{ + struct gsm_network *gsmnet = gsmnet_from_vty(vty); + uint64_t mi = atoi(argv[0]), ma = atoi(argv[1]); + if (mi >= ma) { + vty_out(vty, "Incorrect range: %s >= %s, expected MIN < MAX%s", + argv[0], argv[1], VTY_NEWLINE); + return CMD_WARNING; + } + gsmnet->ext_min = mi; + gsmnet->ext_max = ma; return CMD_SUCCESS; } @@ -1045,7 +1073,7 @@ DEFUN(cfg_nitb_no_subscr_create, cfg_nitb_no_subscr_create_cmd, NO_STR "Make a new record when a subscriber is first seen.\n") { struct gsm_network *gsmnet = gsmnet_from_vty(vty); - gsmnet->create_subscriber = 0; + gsmnet->create_subscriber = GSM_SUBSCR_DONT_CREATE; return CMD_SUCCESS; } @@ -1070,9 +1098,17 @@ DEFUN(cfg_nitb_no_assign_tmsi, cfg_nitb_no_assign_tmsi_cmd, static int config_write_nitb(struct vty *vty) { struct gsm_network *gsmnet = gsmnet_from_vty(vty); + const char *pref = gsmnet->create_subscriber ? "" : "no ", *post = + (GSM_SUBSCR_NO_EXT == gsmnet->create_subscriber) ? + " no-extension" : ""; + vty_out(vty, "nitb%s", VTY_NEWLINE); - vty_out(vty, " %ssubscriber-create-on-demand%s", - gsmnet->create_subscriber ? "" : "no ", VTY_NEWLINE); + vty_out(vty, " %ssubscriber-create-on-demand%s%s", pref, post, + VTY_NEWLINE); + if (gsmnet->ext_min != GSM_MIN_EXTEN || gsmnet->ext_max != GSM_MAX_EXTEN) + vty_out(vty, "subscriber-create-on-demand random %"PRIu64" %" + PRIu64"%s", gsmnet->ext_min, gsmnet->ext_max, + VTY_NEWLINE); vty_out(vty, " %sassign-tmsi%s", gsmnet->avoid_tmsi ? "no " : "", VTY_NEWLINE); return CMD_SUCCESS; @@ -1127,6 +1163,7 @@ int bsc_vty_init_extra(void) install_element(CONFIG_NODE, &cfg_nitb_cmd); install_node(&nitb_node, config_write_nitb); install_element(NITB_NODE, &cfg_nitb_subscr_create_cmd); + install_element(NITB_NODE, &cfg_nitb_subscr_random_cmd); install_element(NITB_NODE, &cfg_nitb_no_subscr_create_cmd); install_element(NITB_NODE, &cfg_nitb_assign_tmsi_cmd); install_element(NITB_NODE, &cfg_nitb_no_assign_tmsi_cmd); diff --git a/openbsc/tests/db/db_test.c b/openbsc/tests/db/db_test.c index fb159a5..a689789 100644 --- a/openbsc/tests/db/db_test.c +++ b/openbsc/tests/db/db_test.c @@ -28,6 +28,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> +#include <stdbool.h> #include <inttypes.h> static struct gsm_network dummy_net; @@ -159,10 +160,44 @@ static void test_sms_migrate(void) subscr_put(rcv_subscr); } -int main() +static void test_subs(const char *alice_imsi, char *imei1, char *imei2, bool ext) { + struct gsm_subscriber *alice = NULL, *alice_db; char scratch_str[256]; + alice = db_create_subscriber(alice_imsi, GSM_MIN_EXTEN, GSM_MAX_EXTEN, + ext); + db_subscriber_assoc_imei(alice, imei1); + if (imei2) + db_subscriber_assoc_imei(alice, imei2); + db_subscriber_alloc_tmsi(alice); + alice->lac=42; + db_sync_subscriber(alice); + /* Get by TMSI */ + snprintf(scratch_str, sizeof(scratch_str), "%"PRIu32, alice->tmsi); + alice_db = db_get_subscriber(GSM_SUBSCRIBER_TMSI, scratch_str); + COMPARE(alice, alice_db); + SUBSCR_PUT(alice_db); + /* Get by IMSI */ + alice_db = db_get_subscriber(GSM_SUBSCRIBER_IMSI, alice_imsi); + COMPARE(alice, alice_db); + SUBSCR_PUT(alice_db); + /* Get by id */ + snprintf(scratch_str, sizeof(scratch_str), "%llu", alice->id); + alice_db = db_get_subscriber(GSM_SUBSCRIBER_ID, scratch_str); + COMPARE(alice, alice_db); + SUBSCR_PUT(alice_db); + /* Get by extension */ + alice_db = db_get_subscriber(GSM_SUBSCRIBER_EXTENSION, alice->extension); + if (alice_db) { + COMPARE(alice, alice_db); + SUBSCR_PUT(alice_db); + } + SUBSCR_PUT(alice); +} + +int main() +{ printf("Testing subscriber database code.\n"); osmo_init_logging(&log_info); log_set_print_filename(osmo_stderr_target, 0); @@ -186,68 +221,22 @@ int main() struct gsm_subscriber *alice_db; char *alice_imsi = "3243245432345"; - alice = db_create_subscriber(alice_imsi); + alice = db_create_subscriber(alice_imsi, GSM_MIN_EXTEN, GSM_MAX_EXTEN, + true); db_sync_subscriber(alice); alice_db = db_get_subscriber(GSM_SUBSCRIBER_IMSI, alice->imsi); COMPARE(alice, alice_db); SUBSCR_PUT(alice_db); SUBSCR_PUT(alice); - alice_imsi = "3693245423445"; - alice = db_create_subscriber(alice_imsi); - db_subscriber_assoc_imei(alice, "1234567890"); - db_subscriber_alloc_tmsi(alice); - alice->lac=42; - db_sync_subscriber(alice); - /* Get by TMSI */ - snprintf(scratch_str, sizeof(scratch_str), "%"PRIu32, alice->tmsi); - alice_db = db_get_subscriber(GSM_SUBSCRIBER_TMSI, scratch_str); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by IMSI */ - alice_db = db_get_subscriber(GSM_SUBSCRIBER_IMSI, alice_imsi); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by id */ - snprintf(scratch_str, sizeof(scratch_str), "%llu", alice->id); - alice_db = db_get_subscriber(GSM_SUBSCRIBER_ID, scratch_str); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by extension */ - alice_db = db_get_subscriber(GSM_SUBSCRIBER_EXTENSION, alice->extension); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - SUBSCR_PUT(alice); - - alice_imsi = "9993245423445"; - alice = db_create_subscriber(alice_imsi); - db_subscriber_alloc_tmsi(alice); - alice->lac=42; - db_sync_subscriber(alice); - db_subscriber_assoc_imei(alice, "1234567890"); - db_subscriber_assoc_imei(alice, "6543560920"); - /* Get by TMSI */ - snprintf(scratch_str, sizeof(scratch_str), "%"PRIu32, alice->tmsi); - alice_db = db_get_subscriber(GSM_SUBSCRIBER_TMSI, scratch_str); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by IMSI */ - alice_db = db_get_subscriber(GSM_SUBSCRIBER_IMSI, alice_imsi); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by id */ - snprintf(scratch_str, sizeof(scratch_str), "%llu", alice->id); - alice_db = db_get_subscriber(GSM_SUBSCRIBER_ID, scratch_str); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by extension */ - alice_db = db_get_subscriber(GSM_SUBSCRIBER_EXTENSION, alice->extension); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - SUBSCR_PUT(alice); + test_subs("3693245423445", "1234567890", NULL, true); + test_subs("9993245423445", "1234567890", "6543560920", true); + test_subs("3123122223445", "1234567890", NULL, false); + test_subs("9123121223445", "1234567890", "6543560920", false); /* create it again and see it fails */ - alice = db_create_subscriber(alice_imsi); + alice = db_create_subscriber(alice_imsi, GSM_MIN_EXTEN, GSM_MAX_EXTEN, + true); OSMO_ASSERT(!alice); test_sms(); diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py index c088855..6c49a03 100644 --- a/openbsc/tests/vty_test_runner.py +++ b/openbsc/tests/vty_test_runner.py @@ -408,11 +408,13 @@ class TestVTYNITB(TestVTYGenericBSC): self.vty.enable() imsi = "204300854013739" + imsi2 = "204300854013769" wrong_imsi = "204300999999999" # Lets create one res = self.vty.command('subscriber create imsi '+imsi) self.assert_(res.find(" IMSI: "+imsi) > 0) + self.assert_(res.find("Extension") > 0) self.vty.verify('subscriber imsi '+wrong_imsi+' name wrong', ['% No subscriber found for imsi '+wrong_imsi]) res = self.vty.command('subscriber imsi '+imsi+' name '+('X' * 160)) @@ -426,9 +428,21 @@ class TestVTYNITB(TestVTYGenericBSC): self.vty.verify('subscriber imsi '+imsi+' extension '+('1' * 14), ['']) + # Another one - without extension + self.vty.command("configure terminal") + self.vty.command("nitb") + self.vty.command("subscriber-create-on-demand no-extension") + self.vty.command("end") + + res = self.vty.command('subscriber create imsi ' + imsi2) + self.assert_(res.find(" IMSI: " + imsi2) > 0) + self.assertEquals(res.find("Extension"), -1) + # Delete it res = self.vty.command('subscriber delete imsi '+imsi) self.assert_(res != "") + res = self.vty.command('subscriber delete imsi ' + imsi2) + self.assert_(res != "") def testShowPagingGroup(self): res = self.vty.command("show paging-group 255 1234567") -- 2.8.1

2 1

test-ranap failures
by Neels Hofmeyr 02 May '16

02 May '16

Hi Harald & others, just dropping a note on a recent test failure with some confusion included concerning the osmo-iuh test-ranap.c test suite... I fixed it in master's HEAD 95d0ba5, this mail is just in case anyone else hits this confusion. from Harald's recent commits on osmo-iuh, I see two test failures. The first that came to my attention is a missing free: [[[ --- expout 2016-05-02 14:23:55.303083568 +0200 +++ /n/s/osmo/git/osmo-iuh/src/tests/testsuite.dir/at-groups/3/stdout 2016-05-02 14:23:55.311083487 +0200 @@ -213,6 +213,7 @@ </RANAP_IE> 00 0a 00 11 00 00 01 00 29 40 0a 00 00 01 00 28 40 03 05 c2 d0 report -talloc report on 'asn1_context' (total 0 bytes in 1 blocks) +talloc report on 'asn1_context' (total 40 bytes in 2 blocks) + constr_CHOICE.c:927 contains 40 bytes in 1 blocks (ref 0) 0x1c81690 talloc report on 'msgb' (total 1 bytes in 1 blocks) exit 3. testsuite.at:18: 3. ranap (testsuite.at:18): FAILED (testsuite.at:21) ]]] I found that it is introduced by 14da5411a4fbe05eccff5b4f0934d52773a3f97a ("test-ranap: Add test case about constrained integer range decode") -- merely a missing free of the decoded RANAP_Cause_t*. However, when warping back to that commit I also see an unexpected reversal of the byte order of two bytes in six places, introduced in f764a15c2339d5b24f ("Add test case about RANAP MaxBitrate encoding") and later secretly fixed in bb289e3b810683d ("RAB parameters: add Extended Max Bitrate") which is actually my commit but now appears in master as authored by you. The failure looks like this: [[[ ./testsuite.at:21: $abs_top_builddir/src/tests/test-ranap --- expout 2016-05-02 14:24:18.018852893 +0200 +++ /n/s/osmo/git/osmo-iuh/src/tests/testsuite.dir/at-groups/3/stdout 2016-05-02 14:24:18.046852609 +0200 @@ -88,7 +88,7 @@ <firstValue> 38 02 D8 01 2F A7 20 2F A8 00 00 F4 4C 08 0A 02 80 00 51 40 00 27 20 28 14 00 67 40 00 00 22 28 - 14 00 3C 40 00 00 00 50 3D 02 02 00 0D C0 35 00 + 14 00 3C 40 00 00 00 50 3D 02 00 02 0D C0 35 00 01 0A 0B 0C 0D 40 00 00 00 01 </firstValue> <secondCriticality><ignore/></secondCriticality> @@ -101,11 +101,11 @@ 00 00 01 00 35 00 3A 38 02 D8 01 2F A7 20 2F A8 00 00 F4 4C 08 0A 02 80 00 51 40 00 27 20 28 14 00 67 40 00 00 22 28 14 00 3C 40 00 00 00 50 3D - 02 02 00 0D C0 35 00 01 0A 0B 0C 0D 40 00 00 00 + 02 00 02 0D C0 35 00 01 0A 0B 0C 0D 40 00 00 00 01 40 01 00 </value> </RANAP_IE> -00 00 00 4b 00 00 01 00 36 40 44 00 00 01 00 35 00 3a 38 02 d8 01 2f a7 20 2f a8 00 00 f4 4c 08 0a 02 80 00 51 40 00 27 20 28 14 00 67 40 00 00 22 28 14 00 3c 40 00 00 00 50 3d 02 02 00 0d c0 35 00 01 0a 0b 0c 0d 40 00 00 00 01 40 01 00 +00 00 00 4b 00 00 01 00 36 40 44 00 00 01 00 35 00 3a 38 02 d8 01 2f a7 20 2f a8 00 00 f4 4c 08 0a 02 80 00 51 40 00 27 20 28 14 00 67 40 00 00 22 28 14 00 3c 40 00 00 00 50 3d 02 00 02 0d c0 35 00 01 0a 0b 0c 0d 40 00 00 00 01 40 01 00 ==> RAB ASSIGNMENT COMMAND (DATA) <RANAP_ProtocolIE-FieldPair> @@ -113,7 +113,7 @@ <firstCriticality><reject/></firstCriticality> <firstValue> 38 04 10 DE 18 69 FF 80 0C 34 FF 00 1F 40 08 06 - 08 9E 00 04 00 1B 80 35 00 01 1A 1B 1C 1D 00 11 + 08 9E 00 00 04 1B 80 35 00 01 1A 1B 1C 1D 00 11 22 33 44 </firstValue> <secondCriticality><ignore/></secondCriticality> @@ -124,12 +124,12 @@ <criticality><ignore/></criticality> <value> 00 00 01 00 35 00 23 38 04 10 DE 18 69 FF 80 0C - 34 FF 00 1F 40 08 06 08 9E 00 04 00 1B 80 35 00 + 34 FF 00 1F 40 08 06 08 9E 00 00 04 1B 80 35 00 01 1A 1B 1C 1D 00 11 22 33 44 40 06 78 1C 00 00 00 00 </value> </RANAP_IE> -00 00 00 39 00 00 01 00 36 40 32 00 00 01 00 35 00 23 38 04 10 de 18 69 ff 80 0c 34 ff 00 1f 40 08 06 08 9e 00 04 00 1b 80 35 00 01 1a 1b 1c 1d 00 11 22 33 44 40 06 78 1c 00 00 00 00 +00 00 00 39 00 00 01 00 36 40 32 00 00 01 00 35 00 23 38 04 10 de 18 69 ff 80 0c 34 ff 00 1f 40 08 06 08 9e 00 00 04 1b 80 35 00 01 1a 1b 1c 1d 00 11 22 33 44 40 06 78 1c 00 00 00 00 ==> RESET CMD <RANAP_IE> 3. testsuite.at:18: 3. ranap (testsuite.at:18): FAILED (testsuite.at:21) ]]] I'm not sure how this reversal came to be in test-ranap.ok. All I know is it works in master's HEAD, but not in 14da5411a4fbe05eccff5b4f0. ~Neels -- - Neels Hofmeyr <nhofmeyr(a)sysmocom.de> http://www.sysmocom.de/ ======================================================================= * sysmocom - systems for mobile communications GmbH * Alt-Moabit 93 * 10559 Berlin, Germany * Sitz / Registered office: Berlin, HRB 134158 B * Geschäftsführer / Managing Directors: Holger Freyther, Harald Welte

2 2

[PATCH] Make random MSISDN assignment optional
by msuraev＠sysmocom.de 02 May '16

02 May '16

From: Max <msuraev(a)sysmocom.de> Previously if subscriber was automatically created it got assigned random MSISDN number between 20000 and 49999. Make it optional (defaulting to previous behavior) by adding following: * optional "no-extension" argument to subscriber-create-on-demand * db unit tests * vty test The range for random extension can now be specified with "subscriber-create-on-demand random" command. Fixes: OS#1658 --- openbsc/include/openbsc/db.h | 8 ++- openbsc/include/openbsc/gsm_data.h | 8 +++ openbsc/include/openbsc/gsm_subscriber.h | 5 +- openbsc/src/libbsc/net_init.c | 5 +- openbsc/src/libcommon/gsm_subscriber_base.c | 1 + openbsc/src/libmsc/ctrl_commands.c | 9 ++- openbsc/src/libmsc/db.c | 37 +++++++---- openbsc/src/libmsc/gsm_04_08.c | 12 +++- openbsc/src/libmsc/gsm_subscriber.c | 6 +- openbsc/src/libmsc/vty_interface_layer3.c | 51 +++++++++++++-- openbsc/tests/db/db_test.c | 99 +++++++++++++---------------- openbsc/tests/vty_test_runner.py | 14 ++++ 12 files changed, 169 insertions(+), 86 deletions(-) diff --git a/openbsc/include/openbsc/db.h b/openbsc/include/openbsc/db.h index 6699a86..4da9634 100644 --- a/openbsc/include/openbsc/db.h +++ b/openbsc/include/openbsc/db.h @@ -20,6 +20,8 @@ #ifndef _DB_H #define _DB_H +#include <stdbool.h> + #include "gsm_subscriber.h" struct gsm_equipment; @@ -35,13 +37,15 @@ int db_prepare(void); int db_fini(void); /* subscriber management */ -struct gsm_subscriber *db_create_subscriber(const char *imsi); +struct gsm_subscriber *db_create_subscriber(const char *imsi, uint64_t smin, + uint64_t smax, bool ext); struct gsm_subscriber *db_get_subscriber(enum gsm_subscriber_field field, const char *subscr); int db_sync_subscriber(struct gsm_subscriber *subscriber); int db_subscriber_expire(void *priv, void (*callback)(void *priv, long long unsigned int id)); int db_subscriber_alloc_tmsi(struct gsm_subscriber *subscriber); -int db_subscriber_alloc_exten(struct gsm_subscriber *subscriber); +int db_subscriber_alloc_exten(struct gsm_subscriber *subscriber, uint64_t smin, + uint64_t smax); int db_subscriber_alloc_token(struct gsm_subscriber *subscriber, uint32_t* token); int db_subscriber_assoc_imei(struct gsm_subscriber *subscriber, char *imei); int db_subscriber_delete(struct gsm_subscriber *subscriber); diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index 6d7aba3..14b002a 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -18,6 +18,12 @@ struct gsm_subscriber_group; #define OBSC_LINKID_CB(__msgb) (__msgb)->cb[3] +enum gsm_subscr_ext { + GSM_SUBSCR_DONT_CREATE = 0, + GSM_SUBSCR_RANDOM_EXT = 1, + GSM_SUBSCR_NO_EXT = 2 +}; + enum gsm_security_event { GSM_SECURITY_NOAVAIL, GSM_SECURITY_AUTH_FAILED, @@ -283,6 +289,8 @@ struct gsm_network { /* subscriber related features */ int create_subscriber; + uint64_t ext_min; + uint64_t ext_max; struct gsm_subscriber_group *subscr_group; struct gsm_sms_queue *sms_queue; diff --git a/openbsc/include/openbsc/gsm_subscriber.h b/openbsc/include/openbsc/gsm_subscriber.h index 7d6c776..5030d65 100644 --- a/openbsc/include/openbsc/gsm_subscriber.h +++ b/openbsc/include/openbsc/gsm_subscriber.h @@ -1,6 +1,8 @@ #ifndef _GSM_SUBSCR_H #define _GSM_SUBSCR_H +#include <stdbool.h> + #include "gsm_data.h" #include <osmocom/core/linuxlist.h> @@ -91,7 +93,8 @@ enum gsm_subscriber_update_reason { struct gsm_subscriber *subscr_get(struct gsm_subscriber *subscr); struct gsm_subscriber *subscr_put(struct gsm_subscriber *subscr); struct gsm_subscriber *subscr_create_subscriber(struct gsm_subscriber_group *sgrp, - const char *imsi); + const char *imsi, uint64_t smin, + uint64_t smax, bool ext); struct gsm_subscriber *subscr_get_by_tmsi(struct gsm_subscriber_group *sgrp, uint32_t tmsi); struct gsm_subscriber *subscr_get_by_imsi(struct gsm_subscriber_group *sgrp, diff --git a/openbsc/src/libbsc/net_init.c b/openbsc/src/libbsc/net_init.c index 568a0b8..a524ead 100644 --- a/openbsc/src/libbsc/net_init.c +++ b/openbsc/src/libbsc/net_init.c @@ -48,7 +48,7 @@ struct gsm_network *gsm_network_init(uint16_t country_code, uint16_t network_cod INIT_LLIST_HEAD(&net->bsc_data->mscs); net->subscr_group->net = net; - net->create_subscriber = 1; + net->create_subscriber = GSM_SUBSCR_RANDOM_EXT; net->country_code = country_code; net->network_code = network_code; @@ -104,7 +104,8 @@ struct gsm_network *gsm_network_init(uint16_t country_code, uint16_t network_cod net->stats.bts.rsl_fail = osmo_counter_alloc("net.bts.rsl_fail"); net->mncc_recv = mncc_recv; - + net->ext_min = GSM_MIN_EXTEN; + net->ext_max = GSM_MAX_EXTEN; gsm_net_update_ctype(net); return net; diff --git a/openbsc/src/libcommon/gsm_subscriber_base.c b/openbsc/src/libcommon/gsm_subscriber_base.c index a455824..5f0a1be 100644 --- a/openbsc/src/libcommon/gsm_subscriber_base.c +++ b/openbsc/src/libcommon/gsm_subscriber_base.c @@ -60,6 +60,7 @@ struct gsm_subscriber *subscr_alloc(void) llist_add_tail(&s->entry, &active_subscribers); s->use_count = 1; s->tmsi = GSM_RESERVED_TMSI; + s->extension[0] = '\0'; INIT_LLIST_HEAD(&s->requests); diff --git a/openbsc/src/libmsc/ctrl_commands.c b/openbsc/src/libmsc/ctrl_commands.c index 9ac39de..44b1ebd 100644 --- a/openbsc/src/libmsc/ctrl_commands.c +++ b/openbsc/src/libmsc/ctrl_commands.c @@ -18,6 +18,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + +#include <stdbool.h> + #include <osmocom/ctrl/control_cmd.h> #include <openbsc/gsm_data.h> #include <openbsc/gsm_subscriber.h> @@ -83,6 +86,8 @@ static int set_subscriber_modify(struct ctrl_cmd *cmd, void *data) char *tmp, *imsi, *msisdn, *alg, *ki, *saveptr = NULL; struct gsm_subscriber* subscr; int rc; + bool ext = (GSM_SUBSCR_RANDOM_EXT == net->create_subscriber) ? true : + false; tmp = talloc_strdup(cmd, cmd->value); if (!tmp) @@ -95,7 +100,9 @@ static int set_subscriber_modify(struct ctrl_cmd *cmd, void *data) subscr = subscr_get_by_imsi(net->subscr_group, imsi); if (!subscr) - subscr = subscr_create_subscriber(net->subscr_group, imsi); + subscr = subscr_create_subscriber(net->subscr_group, imsi, + net->ext_min, + net->ext_max, ext); if (!subscr) goto fail; diff --git a/openbsc/src/libmsc/db.c b/openbsc/src/libmsc/db.c index 267b5ef..5e55433 100644 --- a/openbsc/src/libmsc/db.c +++ b/openbsc/src/libmsc/db.c @@ -23,6 +23,7 @@ #include <inttypes.h> #include <libgen.h> #include <stdio.h> +#include <stdbool.h> #include <stdlib.h> #include <string.h> #include <errno.h> @@ -500,7 +501,8 @@ int db_fini(void) return 0; } -struct gsm_subscriber *db_create_subscriber(const char *imsi) +struct gsm_subscriber *db_create_subscriber(const char *imsi, uint64_t smin, + uint64_t smax, bool ext) { dbi_result result; struct gsm_subscriber *subscr; @@ -532,7 +534,8 @@ struct gsm_subscriber *db_create_subscriber(const char *imsi) strncpy(subscr->imsi, imsi, GSM_IMSI_LENGTH-1); dbi_result_free(result); LOGP(DDB, LOGL_INFO, "New Subscriber: ID %llu, IMSI %s\n", subscr->id, subscr->imsi); - db_subscriber_alloc_exten(subscr); + if (ext) + db_subscriber_alloc_exten(subscr, smin, smax); return subscr; } @@ -937,8 +940,11 @@ int db_sync_subscriber(struct gsm_subscriber *subscriber) dbi_conn_quote_string_copy(conn, subscriber->name, &q_name); - dbi_conn_quote_string_copy(conn, - subscriber->extension, &q_extension); + if ('\0' != subscriber->extension[0]) + dbi_conn_quote_string_copy(conn, + subscriber->extension, &q_extension); + else + q_extension = strdup("NULL"); if (subscriber->tmsi != GSM_RESERVED_TMSI) { sprintf(tmsi, "%u", subscriber->tmsi); @@ -1043,15 +1049,17 @@ int db_subscriber_delete(struct gsm_subscriber *subscr) } dbi_result_free(result); - result = dbi_conn_queryf(conn, - "DELETE FROM SMS WHERE src_addr=%s OR dest_addr=%s", - subscr->extension, subscr->extension); - if (!result) { - LOGP(DDB, LOGL_ERROR, - "Failed to delete SMS for %llu\n", subscr->id); - return -1; + if ('\0' != subscr->extension[0]) { + result = dbi_conn_queryf(conn, + "DELETE FROM SMS WHERE src_addr=%s OR dest_addr=%s", + subscr->extension, subscr->extension); + if (!result) { + LOGP(DDB, LOGL_ERROR, + "Failed to delete SMS for %llu\n", subscr->id); + return -1; + } + dbi_result_free(result); } - dbi_result_free(result); result = dbi_conn_queryf(conn, "DELETE FROM VLR WHERE subscriber_id=%llu", @@ -1231,13 +1239,14 @@ int db_subscriber_alloc_tmsi(struct gsm_subscriber *subscriber) return 0; } -int db_subscriber_alloc_exten(struct gsm_subscriber *subscriber) +int db_subscriber_alloc_exten(struct gsm_subscriber *subscriber, uint64_t smin, + uint64_t smax) { dbi_result result = NULL; uint32_t try; for (;;) { - try = (rand()%(GSM_MAX_EXTEN-GSM_MIN_EXTEN+1)+GSM_MIN_EXTEN); + try = (rand() % (smax - smin + 1) + smin); result = dbi_conn_queryf(conn, "SELECT * FROM Subscriber " "WHERE extension = %i", diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index 05cb886..d22db73 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -25,6 +25,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <stdbool.h> #include <errno.h> #include <time.h> #include <netinet/in.h> @@ -517,6 +518,8 @@ static int mm_rx_id_resp(struct gsm_subscriber_connection *conn, struct msgb *ms struct gsm_network *net = bts->network; uint8_t mi_type = gh->data[1] & GSM_MI_TYPE_MASK; char mi_string[GSM48_MI_SIZE]; + bool ext = (GSM_SUBSCR_RANDOM_EXT == net->create_subscriber) ? true : + false; gsm48_mi_to_string(mi_string, sizeof(mi_string), &gh->data[1], gh->data[0]); DEBUGP(DMM, "IDENTITY RESPONSE: MI(%s)=%s\n", @@ -532,7 +535,8 @@ static int mm_rx_id_resp(struct gsm_subscriber_connection *conn, struct msgb *ms mi_string); if (!conn->subscr && net->create_subscriber) conn->subscr = subscr_create_subscriber( - net->subscr_group, mi_string); + net->subscr_group, mi_string, + net->ext_min, net->ext_max, ext); } if (!conn->subscr && conn->loc_operation) { gsm0408_loc_upd_rej(conn, bts->network->reject_cause); @@ -593,6 +597,8 @@ static int mm_rx_loc_upd_req(struct gsm_subscriber_connection *conn, struct msgb struct gsm_bts *bts = conn->bts; uint8_t mi_type; char mi_string[GSM48_MI_SIZE]; + bool ext = (GSM_SUBSCR_RANDOM_EXT == bts->network->create_subscriber) ? + true : false; lu = (struct gsm48_loc_upd_req *) gh->data; @@ -643,7 +649,9 @@ static int mm_rx_loc_upd_req(struct gsm_subscriber_connection *conn, struct msgb subscr = subscr_get_by_imsi(bts->network->subscr_group, mi_string); if (!subscr && bts->network->create_subscriber) { subscr = subscr_create_subscriber( - bts->network->subscr_group, mi_string); + bts->network->subscr_group, mi_string, + bts->network->ext_min, bts->network->ext_max, + ext); } if (!subscr) { gsm0408_loc_upd_rej(conn, bts->network->reject_cause); diff --git a/openbsc/src/libmsc/gsm_subscriber.c b/openbsc/src/libmsc/gsm_subscriber.c index 57c10cf..7d62888 100644 --- a/openbsc/src/libmsc/gsm_subscriber.c +++ b/openbsc/src/libmsc/gsm_subscriber.c @@ -203,9 +203,11 @@ void subscr_remove_request(struct subscr_request *request) } struct gsm_subscriber *subscr_create_subscriber(struct gsm_subscriber_group *sgrp, - const char *imsi) + const char *imsi, uint64_t smin, + uint64_t smax, bool ext) { - struct gsm_subscriber *subscr = db_create_subscriber(imsi); + struct gsm_subscriber *subscr = + db_create_subscriber(imsi, smin, smax, ext); if (subscr) subscr->group = sgrp; return subscr; diff --git a/openbsc/src/libmsc/vty_interface_layer3.c b/openbsc/src/libmsc/vty_interface_layer3.c index 790fedf..51b7258 100644 --- a/openbsc/src/libmsc/vty_interface_layer3.c +++ b/openbsc/src/libmsc/vty_interface_layer3.c @@ -21,6 +21,8 @@ #include <stdlib.h> #include <limits.h> #include <unistd.h> +#include <stdbool.h> +#include <inttypes.h> #include <time.h> #include <osmocom/vty/command.h> @@ -235,12 +237,16 @@ DEFUN(subscriber_create, { struct gsm_network *gsmnet = gsmnet_from_vty(vty); struct gsm_subscriber *subscr; + bool ext = (GSM_SUBSCR_RANDOM_EXT == gsmnet->create_subscriber) ? true : + false; subscr = subscr_get_by_imsi(gsmnet->subscr_group, argv[0]); if (subscr) db_sync_subscriber(subscr); else { - subscr = subscr_create_subscriber(gsmnet->subscr_group, argv[0]); + subscr = subscr_create_subscriber(gsmnet->subscr_group, argv[0], + gsmnet->ext_min, + gsmnet->ext_max, ext); if (!subscr) { vty_out(vty, "%% No subscriber created for IMSI %s%s", @@ -1032,11 +1038,33 @@ DEFUN(cfg_nitb, cfg_nitb_cmd, } DEFUN(cfg_nitb_subscr_create, cfg_nitb_subscr_create_cmd, - "subscriber-create-on-demand", - "Make a new record when a subscriber is first seen.\n") + "subscriber-create-on-demand [no-extension]", + "Make a new record when a subscriber is first seen.\n" + "Do not assign random extension when creating subscriber\n") { struct gsm_network *gsmnet = gsmnet_from_vty(vty); - gsmnet->create_subscriber = 1; + if (argc) + gsmnet->create_subscriber = GSM_SUBSCR_NO_EXT; + else + gsmnet->create_subscriber = GSM_SUBSCR_RANDOM_EXT; + return CMD_SUCCESS; +} + +DEFUN(cfg_nitb_subscr_random, cfg_nitb_subscr_random_cmd, + "subscriber-create-on-demand random <1-99999> <2-99999>", + "Set random parameters for a new record when a subscriber is first seen.\n" + "Set random parameters for a new record when a subscriber is first seen.\n" + "Minimum for subscriber extension\n""Maximum for subscriber extension\n") +{ + struct gsm_network *gsmnet = gsmnet_from_vty(vty); + uint64_t mi = atoi(argv[0]), ma = atoi(argv[1]); + if (mi >= ma) { + vty_out(vty, "Incorrect range: %s >= %s, expected MIN < MAX%s", + argv[0], argv[1], VTY_NEWLINE); + return CMD_WARNING; + } + gsmnet->ext_min = mi; + gsmnet->ext_max = ma; return CMD_SUCCESS; } @@ -1045,7 +1073,7 @@ DEFUN(cfg_nitb_no_subscr_create, cfg_nitb_no_subscr_create_cmd, NO_STR "Make a new record when a subscriber is first seen.\n") { struct gsm_network *gsmnet = gsmnet_from_vty(vty); - gsmnet->create_subscriber = 0; + gsmnet->create_subscriber = GSM_SUBSCR_DONT_CREATE; return CMD_SUCCESS; } @@ -1070,9 +1098,17 @@ DEFUN(cfg_nitb_no_assign_tmsi, cfg_nitb_no_assign_tmsi_cmd, static int config_write_nitb(struct vty *vty) { struct gsm_network *gsmnet = gsmnet_from_vty(vty); + const char *pref = gsmnet->create_subscriber ? "" : "no ", *post = + (GSM_SUBSCR_NO_EXT == gsmnet->create_subscriber) ? + " no-extension" : ""; + vty_out(vty, "nitb%s", VTY_NEWLINE); - vty_out(vty, " %ssubscriber-create-on-demand%s", - gsmnet->create_subscriber ? "" : "no ", VTY_NEWLINE); + vty_out(vty, " %ssubscriber-create-on-demand%s%s", pref, post, + VTY_NEWLINE); + if (gsmnet->ext_min != GSM_MIN_EXTEN || gsmnet->ext_max != GSM_MAX_EXTEN) + vty_out(vty, "subscriber-create-on-demand random %"PRIu64" %" + PRIu64"%s", gsmnet->ext_min, gsmnet->ext_max, + VTY_NEWLINE); vty_out(vty, " %sassign-tmsi%s", gsmnet->avoid_tmsi ? "no " : "", VTY_NEWLINE); return CMD_SUCCESS; @@ -1127,6 +1163,7 @@ int bsc_vty_init_extra(void) install_element(CONFIG_NODE, &cfg_nitb_cmd); install_node(&nitb_node, config_write_nitb); install_element(NITB_NODE, &cfg_nitb_subscr_create_cmd); + install_element(NITB_NODE, &cfg_nitb_subscr_random_cmd); install_element(NITB_NODE, &cfg_nitb_no_subscr_create_cmd); install_element(NITB_NODE, &cfg_nitb_assign_tmsi_cmd); install_element(NITB_NODE, &cfg_nitb_no_assign_tmsi_cmd); diff --git a/openbsc/tests/db/db_test.c b/openbsc/tests/db/db_test.c index fb159a5..a689789 100644 --- a/openbsc/tests/db/db_test.c +++ b/openbsc/tests/db/db_test.c @@ -28,6 +28,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> +#include <stdbool.h> #include <inttypes.h> static struct gsm_network dummy_net; @@ -159,10 +160,44 @@ static void test_sms_migrate(void) subscr_put(rcv_subscr); } -int main() +static void test_subs(const char *alice_imsi, char *imei1, char *imei2, bool ext) { + struct gsm_subscriber *alice = NULL, *alice_db; char scratch_str[256]; + alice = db_create_subscriber(alice_imsi, GSM_MIN_EXTEN, GSM_MAX_EXTEN, + ext); + db_subscriber_assoc_imei(alice, imei1); + if (imei2) + db_subscriber_assoc_imei(alice, imei2); + db_subscriber_alloc_tmsi(alice); + alice->lac=42; + db_sync_subscriber(alice); + /* Get by TMSI */ + snprintf(scratch_str, sizeof(scratch_str), "%"PRIu32, alice->tmsi); + alice_db = db_get_subscriber(GSM_SUBSCRIBER_TMSI, scratch_str); + COMPARE(alice, alice_db); + SUBSCR_PUT(alice_db); + /* Get by IMSI */ + alice_db = db_get_subscriber(GSM_SUBSCRIBER_IMSI, alice_imsi); + COMPARE(alice, alice_db); + SUBSCR_PUT(alice_db); + /* Get by id */ + snprintf(scratch_str, sizeof(scratch_str), "%llu", alice->id); + alice_db = db_get_subscriber(GSM_SUBSCRIBER_ID, scratch_str); + COMPARE(alice, alice_db); + SUBSCR_PUT(alice_db); + /* Get by extension */ + alice_db = db_get_subscriber(GSM_SUBSCRIBER_EXTENSION, alice->extension); + if (alice_db) { + COMPARE(alice, alice_db); + SUBSCR_PUT(alice_db); + } + SUBSCR_PUT(alice); +} + +int main() +{ printf("Testing subscriber database code.\n"); osmo_init_logging(&log_info); log_set_print_filename(osmo_stderr_target, 0); @@ -186,68 +221,22 @@ int main() struct gsm_subscriber *alice_db; char *alice_imsi = "3243245432345"; - alice = db_create_subscriber(alice_imsi); + alice = db_create_subscriber(alice_imsi, GSM_MIN_EXTEN, GSM_MAX_EXTEN, + true); db_sync_subscriber(alice); alice_db = db_get_subscriber(GSM_SUBSCRIBER_IMSI, alice->imsi); COMPARE(alice, alice_db); SUBSCR_PUT(alice_db); SUBSCR_PUT(alice); - alice_imsi = "3693245423445"; - alice = db_create_subscriber(alice_imsi); - db_subscriber_assoc_imei(alice, "1234567890"); - db_subscriber_alloc_tmsi(alice); - alice->lac=42; - db_sync_subscriber(alice); - /* Get by TMSI */ - snprintf(scratch_str, sizeof(scratch_str), "%"PRIu32, alice->tmsi); - alice_db = db_get_subscriber(GSM_SUBSCRIBER_TMSI, scratch_str); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by IMSI */ - alice_db = db_get_subscriber(GSM_SUBSCRIBER_IMSI, alice_imsi); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by id */ - snprintf(scratch_str, sizeof(scratch_str), "%llu", alice->id); - alice_db = db_get_subscriber(GSM_SUBSCRIBER_ID, scratch_str); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by extension */ - alice_db = db_get_subscriber(GSM_SUBSCRIBER_EXTENSION, alice->extension); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - SUBSCR_PUT(alice); - - alice_imsi = "9993245423445"; - alice = db_create_subscriber(alice_imsi); - db_subscriber_alloc_tmsi(alice); - alice->lac=42; - db_sync_subscriber(alice); - db_subscriber_assoc_imei(alice, "1234567890"); - db_subscriber_assoc_imei(alice, "6543560920"); - /* Get by TMSI */ - snprintf(scratch_str, sizeof(scratch_str), "%"PRIu32, alice->tmsi); - alice_db = db_get_subscriber(GSM_SUBSCRIBER_TMSI, scratch_str); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by IMSI */ - alice_db = db_get_subscriber(GSM_SUBSCRIBER_IMSI, alice_imsi); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by id */ - snprintf(scratch_str, sizeof(scratch_str), "%llu", alice->id); - alice_db = db_get_subscriber(GSM_SUBSCRIBER_ID, scratch_str); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by extension */ - alice_db = db_get_subscriber(GSM_SUBSCRIBER_EXTENSION, alice->extension); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - SUBSCR_PUT(alice); + test_subs("3693245423445", "1234567890", NULL, true); + test_subs("9993245423445", "1234567890", "6543560920", true); + test_subs("3123122223445", "1234567890", NULL, false); + test_subs("9123121223445", "1234567890", "6543560920", false); /* create it again and see it fails */ - alice = db_create_subscriber(alice_imsi); + alice = db_create_subscriber(alice_imsi, GSM_MIN_EXTEN, GSM_MAX_EXTEN, + true); OSMO_ASSERT(!alice); test_sms(); diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py index c088855..6c49a03 100644 --- a/openbsc/tests/vty_test_runner.py +++ b/openbsc/tests/vty_test_runner.py @@ -408,11 +408,13 @@ class TestVTYNITB(TestVTYGenericBSC): self.vty.enable() imsi = "204300854013739" + imsi2 = "204300854013769" wrong_imsi = "204300999999999" # Lets create one res = self.vty.command('subscriber create imsi '+imsi) self.assert_(res.find(" IMSI: "+imsi) > 0) + self.assert_(res.find("Extension") > 0) self.vty.verify('subscriber imsi '+wrong_imsi+' name wrong', ['% No subscriber found for imsi '+wrong_imsi]) res = self.vty.command('subscriber imsi '+imsi+' name '+('X' * 160)) @@ -426,9 +428,21 @@ class TestVTYNITB(TestVTYGenericBSC): self.vty.verify('subscriber imsi '+imsi+' extension '+('1' * 14), ['']) + # Another one - without extension + self.vty.command("configure terminal") + self.vty.command("nitb") + self.vty.command("subscriber-create-on-demand no-extension") + self.vty.command("end") + + res = self.vty.command('subscriber create imsi ' + imsi2) + self.assert_(res.find(" IMSI: " + imsi2) > 0) + self.assertEquals(res.find("Extension"), -1) + # Delete it res = self.vty.command('subscriber delete imsi '+imsi) self.assert_(res != "") + res = self.vty.command('subscriber delete imsi ' + imsi2) + self.assert_(res != "") def testShowPagingGroup(self): res = self.vty.command("show paging-group 255 1234567") -- 2.8.1

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC