OpenBSC September 2013

openbsc@lists.osmocom.org

18 participants
27 discussions

[PATCH 1/4] Added new auth policy black-list.

by Ivan Kluchnikov

In this mode by default we set authorized = 1 for all new subscribers. BSC accepts all MS, except subscribers not authorized in DB. All subscribers with authorized = 0 are part of the black list and not accepted. --- openbsc/include/openbsc/gsm_data.h | 1 + openbsc/src/libbsc/bsc_vty.c | 5 +++-- openbsc/src/libcommon/gsm_data.c | 1 + openbsc/src/libmsc/db.c | 12 +++++++++--- openbsc/src/libmsc/gsm_04_08.c | 2 ++ 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index 8741505..99e9b27 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -194,6 +194,7 @@ enum gsm_auth_policy { GSM_AUTH_POLICY_CLOSED, /* only subscribers authorized in DB */ GSM_AUTH_POLICY_ACCEPT_ALL, /* accept everyone, even if not authorized in DB */ GSM_AUTH_POLICY_TOKEN, /* accept first, send token per sms, then revoke authorization */ + GSM_AUTH_POLICY_BLACK_LIST /* accept everyone, except subscribers not authorized in DB */ }; #define GSM_T3101_DEFAULT 10 diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c index 5748945..7a89ca6 100644 --- a/openbsc/src/libbsc/bsc_vty.c +++ b/openbsc/src/libbsc/bsc_vty.c @@ -1186,12 +1186,13 @@ DEFUN(cfg_net_name_long, DEFUN(cfg_net_auth_policy, cfg_net_auth_policy_cmd, - "auth policy (closed|accept-all|token)", + "auth policy (closed|accept-all|token|black-list)", "Authentication (not cryptographic)\n" "Set the GSM network authentication policy\n" "Require the MS to be activated in HLR\n" "Accept all MS, whether in HLR or not\n" - "Use SMS-token based authentication\n") + "Use SMS-token based authentication\n" + "Accept all MS, except not authorized in HLR\n") { enum gsm_auth_policy policy = gsm_auth_policy_parse(argv[0]); struct gsm_network *gsmnet = gsmnet_from_vty(vty); diff --git a/openbsc/src/libcommon/gsm_data.c b/openbsc/src/libcommon/gsm_data.c index 5f7e32e..31b65ee 100644 --- a/openbsc/src/libcommon/gsm_data.c +++ b/openbsc/src/libcommon/gsm_data.c @@ -256,6 +256,7 @@ static const struct value_string auth_policy_names[] = { { GSM_AUTH_POLICY_CLOSED, "closed" }, { GSM_AUTH_POLICY_ACCEPT_ALL, "accept-all" }, { GSM_AUTH_POLICY_TOKEN, "token" }, + { GSM_AUTH_POLICY_BLACK_LIST, "black-list"}, { 0, NULL } }; diff --git a/openbsc/src/libmsc/db.c b/openbsc/src/libmsc/db.c index 21abce9..440509a 100644 --- a/openbsc/src/libmsc/db.c +++ b/openbsc/src/libmsc/db.c @@ -319,6 +319,7 @@ struct gsm_subscriber *db_create_subscriber(struct gsm_network *net, char *imsi) { dbi_result result; struct gsm_subscriber *subscr; + int authorized = 0; /* Is this subscriber known in the db? */ subscr = db_get_subscriber(net, GSM_SUBSCRIBER_IMSI, imsi); @@ -337,17 +338,22 @@ struct gsm_subscriber *db_create_subscriber(struct gsm_network *net, char *imsi) if (!subscr) return NULL; subscr->flags |= GSM_SUBSCRIBER_FIRST_CONTACT; + + if (net->auth_policy == GSM_AUTH_POLICY_BLACK_LIST) + authorized = 1; + result = dbi_conn_queryf(conn, "INSERT INTO Subscriber " - "(imsi, created, updated) " + "(imsi, created, updated, authorized) " "VALUES " - "(%s, datetime('now'), datetime('now')) ", - imsi + "(%s, datetime('now'), datetime('now'), %d) ", + imsi, authorized ); if (!result) LOGP(DDB, LOGL_ERROR, "Failed to create Subscriber by IMSI.\n"); subscr->net = net; subscr->id = dbi_conn_sequence_last(conn, NULL); + subscr->authorized = authorized; 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); diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index d81dab9..8f8eaa9 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -241,6 +241,8 @@ static int authorize_subscriber(struct gsm_loc_updating_operation *loc, return (subscriber->flags & GSM_SUBSCRIBER_FIRST_CONTACT); case GSM_AUTH_POLICY_ACCEPT_ALL: return 1; + case GSM_AUTH_POLICY_BLACK_LIST: + return subscriber->authorized; default: return 0; } -- 1.7.9.5

11 years, 9 months

nanobts and sgsn

by Andreas Eversberg

hi, after upgrading to latest openbsc/master, i experienced the following problem with sgsn: <0013> gprs_llc.c:506 LLC SAPI=1 C FCS=0x7b8d5fCMD=UI DATA <0013> gprs_llc.c:142 TLLI 0x990ea532 is foreign, converting to local TLLI 0xd90ea532 <0013> gprs_llc.c:789 LLC RX: unknown TLLI 0x990ea532, creating LLME on the fly <0013> gprs_llc.c:142 TLLI 0x990ea532 is foreign, converting to local TLLI 0xd90ea532 <0013> gprs_llc.c:372 LLC TX: unknown TLLI 0x990ea532, creating LLME on the fly <0012> gprs_bssgp.c:503 BSSGP BVCI=0 TLLI=990ea532 Rx LLC DISCARDED <0012> gprs_bssgp.c:376 BSSGP TLLI=0x990ea532 Rx UPLINK-UNITDATA <0013> gprs_llc.c:506 LLC SAPI=1 C FCS=0x30b960CMD=UI DATA <0013> gprs_llc.c:142 TLLI 0x990ea532 is foreign, converting to local TLLI 0xd90ea532 <0013> gprs_llc.c:789 LLC RX: unknown TLLI 0x990ea532, creating LLME on the fly <0013> gprs_llc.c:142 TLLI 0x990ea532 is foreign, converting to local TLLI 0xd90ea532 <0013> gprs_llc.c:372 LLC TX: unknown TLLI 0x990ea532, creating LLME on the fly <0012> gprs_bssgp.c:503 BSSGP BVCI=0 TLLI=990ea532 Rx LLC DISCARDED <0012> gprs_bssgp.c:376 BSSGP TLLI=0x990ea532 Rx UPLINK-UNITDATA <0013> gprs_llc.c:506 LLC SAPI=1 C FCS=0x280569CMD=UI DATA <0013> gprs_llc.c:142 TLLI 0x990ea532 is foreign, converting to local TLLI 0xd90ea532 <0013> gprs_llc.c:789 LLC RX: unknown TLLI 0x990ea532, creating LLME on the fly <0013> gprs_llc.c:142 TLLI 0x990ea532 is foreign, converting to local TLLI 0xd90ea532 <0013> gprs_llc.c:372 LLC TX: unknown TLLI 0x990ea532, creating LLME on the fly <0012> gprs_bssgp.c:503 BSSGP BVCI=0 TLLI=990ea532 Rx LLC DISCARDED the auth-policy is configured to "accept-all". any idea how to do deeper debugging? regards, andreass

11 years, 9 months

[PATCH 0/3] Build libosmo-sccp shared objects.

by Vasil Velichckov

Hi, While I was playing around with openbsc project I noticed that the libosmo-sccp libraries are built as a static libraries only and I decided that it will be useful to build them as shared objects too. I also enabled colored output of the test suite and ignore all tag files that are generated by the Makefiles. Cheers Vasil Velichckov (3): Build shared objects with libtool Enable colored test results by default Ignore the tag files that are generated by Makefile .gitignore | 9 +++++++++ configure.ac | 2 +- src/Makefile.am | 18 +++++++++++++----- tests/m2ua/Makefile.am | 2 +- tests/sccp/Makefile.am | 4 ++-- tests/testsuite.at | 1 + 6 files changed, 27 insertions(+), 9 deletions(-) -- 1.7.10.4

11 years, 9 months

[PATCH] bsc/mminfo: Patch timezone and DST in MM Info messages

by Jacob Erlbeck

This adds in-place patching of the time information in the MM INFORMATION message. The timezone in the 'Local time zone' and the 'Universal time and local time zone' information elements and the offset in the 'Network Daylight Saving Time' information element are optionally set. The new values are determined by the 'timezone' vty command in the config_net_bts node. That command is extended by an optional DST offset parameter. Ticket: OW#978 --- openbsc/include/openbsc/gsm_data_shared.h | 1 + openbsc/src/libbsc/bsc_vty.c | 37 +++++++++++++++++- openbsc/src/osmo-bsc/osmo_bsc_filter.c | 58 ++++++++++++++++++++++++++++- openbsc/tests/vty_test_runner.py | 34 +++++++++++++++++ 4 files changed, 127 insertions(+), 3 deletions(-) diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h index 3ef1457..437378a 100644 --- a/openbsc/include/openbsc/gsm_data_shared.h +++ b/openbsc/include/openbsc/gsm_data_shared.h @@ -594,6 +594,7 @@ struct gsm_bts { int hr; int mn; int override; + int dst; } tz; /* ip.accesss Unit ID's have Site/BTS/TRX layout */ diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c index 2cbcf44..7c0d998 100644 --- a/openbsc/src/libbsc/bsc_vty.c +++ b/openbsc/src/libbsc/bsc_vty.c @@ -489,8 +489,14 @@ static void config_write_bts_single(struct vty *vty, struct gsm_bts *bts) VTY_NEWLINE); vty_out(vty, " training_sequence_code %u%s", bts->tsc, VTY_NEWLINE); vty_out(vty, " base_station_id_code %u%s", bts->bsic, VTY_NEWLINE); - if (bts->tz.override != 0) - vty_out(vty, " timezone %d %d%s", bts->tz.hr, bts->tz.mn, VTY_NEWLINE); + if (bts->tz.override != 0) { + if (bts->tz.dst) + vty_out(vty, " timezone %d %d %d%s", + bts->tz.hr, bts->tz.mn, bts->tz.dst, VTY_NEWLINE); + else + vty_out(vty, " timezone %d %d%s", + bts->tz.hr, bts->tz.mn, VTY_NEWLINE); + } vty_out(vty, " ms max power %u%s", bts->ms_max_power, VTY_NEWLINE); vty_out(vty, " cell reselection hysteresis %u%s", bts->si_common.cell_sel_par.cell_resel_hyst*2, VTY_NEWLINE); @@ -1613,6 +1619,32 @@ DEFUN(cfg_bts_timezone, bts->tz.hr = tzhr; bts->tz.mn = tzmn; + bts->tz.dst = 0; + bts->tz.override = 1; + + return CMD_SUCCESS; +} + +DEFUN(cfg_bts_timezone_dst, + cfg_bts_timezone_dst_cmd, + "timezone <-19-19> (0|15|30|45) <0-2>", + "Set the Timezone Offset of this BTS\n" + "Timezone offset (hours)\n" + "Timezone offset (00 minutes)\n" + "Timezone offset (15 minutes)\n" + "Timezone offset (30 minutes)\n" + "Timezone offset (45 minutes)\n" + "DST offset (hours)\n" + ) +{ + struct gsm_bts *bts = vty->index; + int tzhr = atoi(argv[0]); + int tzmn = atoi(argv[1]); + int tzdst = atoi(argv[2]); + + bts->tz.hr = tzhr; + bts->tz.mn = tzmn; + bts->tz.dst = tzdst; bts->tz.override = 1; return CMD_SUCCESS; @@ -3064,6 +3096,7 @@ int bsc_vty_init(const struct log_info *cat) install_element(BTS_NODE, &cfg_bts_unit_id_cmd); install_element(BTS_NODE, &cfg_bts_rsl_ip_cmd); install_element(BTS_NODE, &cfg_bts_timezone_cmd); + install_element(BTS_NODE, &cfg_bts_timezone_dst_cmd); install_element(BTS_NODE, &cfg_bts_no_timezone_cmd); install_element(BTS_NODE, &cfg_bts_nokia_site_skip_reset_cmd); install_element(BTS_NODE, &cfg_bts_stream_id_cmd); diff --git a/openbsc/src/osmo-bsc/osmo_bsc_filter.c b/openbsc/src/osmo-bsc/osmo_bsc_filter.c index 957ceaf..6b8313e 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_filter.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_filter.c @@ -251,6 +251,57 @@ int bsc_send_welcome_ussd(struct gsm_subscriber_connection *conn) return 0; } +static int bsc_patch_mm_info(struct gsm_subscriber_connection *conn, + uint8_t *data, unsigned int length) +{ + struct tlv_parsed tp; + int parse_res; + struct gsm_bts *bts = conn->bts; + + parse_res = tlv_parse(&tp, &gsm48_mm_att_tlvdef, data, length, 0, 0); + if (parse_res <= 0 && parse_res != -3) + return 0; + + if (bts->tz.override) { + /* TZ patching is enabled */ + int tzunits; + uint8_t tzbsd = 0; + uint8_t dst = 0; + + /* Convert tz.hr and tz.mn to units */ + if (bts->tz.hr < 0) { + tzunits = -bts->tz.hr*4; + tzbsd |= 0x08; + } else + tzunits = bts->tz.hr*4; + + tzunits = tzunits + (bts->tz.mn/15); + + tzbsd |= (tzunits % 10)*0x10 + (tzunits / 10); + + /* Convert DST value */ + if (bts->tz.dst >= 0 && bts->tz.dst <= 2) + dst = bts->tz.dst; + + if (TLVP_PRESENT(&tp, GSM48_IE_UTC)) { + LOGP(DMSC, LOGL_DEBUG, "Changing 'Local time zone' from 0x%02x to 0x%02x.\n", TLVP_VAL(&tp, GSM48_IE_UTC)[6], tzbsd); + ((uint8_t *)(TLVP_VAL(&tp, GSM48_IE_UTC)))[0] = tzbsd; + } + if (TLVP_PRESENT(&tp, GSM48_IE_NET_TIME_TZ)) { + LOGP(DMSC, LOGL_DEBUG, "Changing 'Universal time and local time zone' TZ from 0x%02x to 0x%02x.\n", TLVP_VAL(&tp, GSM48_IE_NET_TIME_TZ)[6], tzbsd); + ((uint8_t *)(TLVP_VAL(&tp, GSM48_IE_NET_TIME_TZ)))[6] = tzbsd; + } +#ifdef GSM48_IE_NET_DST + if (TLVP_PRESENT(&tp, GSM48_IE_NET_DST)) { + LOGP(DMSC, LOGL_DEBUG, "Changing 'Network daylight saving time' from 0x%02x to 0x%02x.\n", TLVP_VAL(&tp, GSM48_IE_NET_DST)[0], dst); + ((uint8_t *)(TLVP_VAL(&tp, GSM48_IE_NET_DST)))[0] = dst; + } +#endif + } + + return 0; +} + /** * Messages coming back from the MSC. */ @@ -261,13 +312,16 @@ int bsc_scan_msc_msg(struct gsm_subscriber_connection *conn, struct msgb *msg) struct gsm48_loc_area_id *lai; struct gsm48_hdr *gh; uint8_t mtype; + int length = msgb_l3len(msg); - if (msgb_l3len(msg) < sizeof(*gh)) { + if (length < sizeof(*gh)) { LOGP(DMSC, LOGL_ERROR, "GSM48 header does not fit.\n"); return -1; } gh = (struct gsm48_hdr *) msgb_l3(msg); + length -= (const char *)&gh->data[0] - (const char *)gh; + mtype = gh->msg_type & 0xbf; net = conn->bts->network; msc = conn->sccp_con->msc; @@ -285,6 +339,8 @@ int bsc_scan_msc_msg(struct gsm_subscriber_connection *conn, struct msgb *msg) if (conn->sccp_con->new_subscriber) return send_welcome_ussd(conn); return 0; + } else if (mtype == GSM48_MT_MM_INFO) { + bsc_patch_mm_info(conn, &gh->data[0], length); } return 0; diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py index 7f71288..c0ba57d 100644 --- a/openbsc/tests/vty_test_runner.py +++ b/openbsc/tests/vty_test_runner.py @@ -280,6 +280,40 @@ class TestVTYBSC(TestVTYGenericBSC): self.assertEquals(res.find('missing-msc-text No MSC found'), -1) self.assert_(res.find('no missing-msc-text') > 0) + def testNetworkTimezone(self): + self.vty.enable() + self.vty.verify("configure terminal", ['']) + self.vty.verify("network", ['']) + self.vty.verify("bts 0", ['']) + + # Test invalid input + self.vty.verify("timezone", ['% Command incomplete.']) + self.vty.verify("timezone 20 0", ['% Unknown command.']) + self.vty.verify("timezone 0 11", ['% Unknown command.']) + self.vty.verify("timezone 0 0 99", ['% Unknown command.']) + + # Set time zone without DST + self.vty.verify("timezone 2 30", ['']) + + # Verify settings + res = self.vty.command("write terminal") + self.assert_(res.find('timezone 2 30') > 0) + self.assertEquals(res.find('timezone 2 30 '), -1) + + # Set time zone with DST + self.vty.verify("timezone 2 30 1", ['']) + + # Verify settings + res = self.vty.command("write terminal") + self.assert_(res.find('timezone 2 30 1') > 0) + + # Now disable it.. + self.vty.verify("no timezone", ['']) + + # Verify settings + res = self.vty.command("write terminal") + self.assertEquals(res.find(' timezone'), -1) + class TestVTYNAT(TestVTYGenericBSC): def vty_command(self): -- 1.7.9.5

11 years, 9 months

[PATCH 1/4] Added new auth policy black-list.

by Ivan Kluchnikov

11 years, 9 months

[PATCH] gsm48: Added 'Network Daylight Saving Time' info element

by Jacob Erlbeck

This information element has been added to the MM Information message in GSM24.008. This patch adds it to the tlv_definition to keep the TLV parser from breaking. Ticket: OW#978 --- include/osmocom/gsm/protocol/gsm_04_08.h | 1 + src/gsm/gsm48.c | 1 + 2 files changed, 2 insertions(+) diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index bd6d707..8fa5d9a 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -925,6 +925,7 @@ struct gsm48_rr_status { #define GSM48_IE_UTC 0x46 /* 10.5.3.8 */ #define GSM48_IE_NET_TIME_TZ 0x47 /* 10.5.3.9 */ #define GSM48_IE_LSA_IDENT 0x48 /* 10.5.3.11 */ +#define GSM48_IE_NET_DST 0x49 /* 10.5.3.12 [24.008] */ #define GSM48_IE_BEARER_CAP 0x04 /* 10.5.4.5 */ #define GSM48_IE_CAUSE 0x08 /* 10.5.4.11 */ diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index 313d9a3..80f7502 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -131,6 +131,7 @@ const struct tlv_definition gsm48_mm_att_tlvdef = { [GSM48_IE_UTC] = { TLV_TYPE_TV }, [GSM48_IE_NET_TIME_TZ] = { TLV_TYPE_FIXED, 7 }, [GSM48_IE_LSA_IDENT] = { TLV_TYPE_TLV }, + [GSM48_IE_NET_DST] = { TLV_TYPE_TLV }, [GSM48_IE_LOCATION_AREA] = { TLV_TYPE_FIXED, 5 }, [GSM48_IE_PRIORITY_LEV] = { TLV_TYPE_SINGLE_TV }, -- 1.7.9.5

11 years, 9 months

[PATCH 4/4] Added test for "rach access-control-class" VTY command.

by Ivan Kluchnikov

--- openbsc/tests/vty_test_runner.py | 83 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py index 3594129..6f45939 100755 --- a/openbsc/tests/vty_test_runner.py +++ b/openbsc/tests/vty_test_runner.py @@ -205,6 +205,89 @@ class TestVTYNITB(TestVTYGenericBSC): res = self.vty.command("write terminal") self.assert_(res.find('auth policy black-list') > 0) + def testRachAccessControlClass(self): + self.vty.enable() + self.vty.command("configure terminal") + self.vty.command("network") + self.vty.command("bts 0") + + # Test invalid input + self.vty.verify("rach access-control-class", ['% Command incomplete.']) + self.vty.verify("rach access-control-class 1", ['% Command incomplete.']) + self.vty.verify("rach access-control-class -1", ['% Unknown command.']) + self.vty.verify("rach access-control-class 10", ['% Unknown command.']) + self.vty.verify("rach access-control-class 16", ['% Unknown command.']) + + # Barred rach access control classes + self.vty.verify("rach access-control-class 0 barred", ['']) + self.vty.verify("rach access-control-class 1 barred", ['']) + self.vty.verify("rach access-control-class 2 barred", ['']) + self.vty.verify("rach access-control-class 3 barred", ['']) + self.vty.verify("rach access-control-class 4 barred", ['']) + self.vty.verify("rach access-control-class 5 barred", ['']) + self.vty.verify("rach access-control-class 6 barred", ['']) + self.vty.verify("rach access-control-class 7 barred", ['']) + self.vty.verify("rach access-control-class 8 barred", ['']) + self.vty.verify("rach access-control-class 9 barred", ['']) + self.vty.verify("rach access-control-class 11 barred", ['']) + self.vty.verify("rach access-control-class 12 barred", ['']) + self.vty.verify("rach access-control-class 13 barred", ['']) + self.vty.verify("rach access-control-class 14 barred", ['']) + self.vty.verify("rach access-control-class 15 barred", ['']) + + # Verify settings + res = self.vty.command("write terminal") + self.assert_(res.find('rach access-control-class 0 barred') > 0) + self.assert_(res.find('rach access-control-class 1 barred') > 0) + self.assert_(res.find('rach access-control-class 2 barred') > 0) + self.assert_(res.find('rach access-control-class 3 barred') > 0) + self.assert_(res.find('rach access-control-class 4 barred') > 0) + self.assert_(res.find('rach access-control-class 5 barred') > 0) + self.assert_(res.find('rach access-control-class 6 barred') > 0) + self.assert_(res.find('rach access-control-class 7 barred') > 0) + self.assert_(res.find('rach access-control-class 8 barred') > 0) + self.assert_(res.find('rach access-control-class 9 barred') > 0) + self.assert_(res.find('rach access-control-class 11 barred') > 0) + self.assert_(res.find('rach access-control-class 12 barred') > 0) + self.assert_(res.find('rach access-control-class 13 barred') > 0) + self.assert_(res.find('rach access-control-class 14 barred') > 0) + self.assert_(res.find('rach access-control-class 15 barred') > 0) + + # Allowed rach access control classes + self.vty.verify("rach access-control-class 0 allowed", ['']) + self.vty.verify("rach access-control-class 1 allowed", ['']) + self.vty.verify("rach access-control-class 2 allowed", ['']) + self.vty.verify("rach access-control-class 3 allowed", ['']) + self.vty.verify("rach access-control-class 4 allowed", ['']) + self.vty.verify("rach access-control-class 5 allowed", ['']) + self.vty.verify("rach access-control-class 6 allowed", ['']) + self.vty.verify("rach access-control-class 7 allowed", ['']) + self.vty.verify("rach access-control-class 8 allowed", ['']) + self.vty.verify("rach access-control-class 9 allowed", ['']) + self.vty.verify("rach access-control-class 11 allowed", ['']) + self.vty.verify("rach access-control-class 12 allowed", ['']) + self.vty.verify("rach access-control-class 13 allowed", ['']) + self.vty.verify("rach access-control-class 14 allowed", ['']) + self.vty.verify("rach access-control-class 15 allowed", ['']) + + # Verify settings + res = self.vty.command("write terminal") + self.assertEquals(res.find('rach access-control-class 0 barred'), -1) + self.assertEquals(res.find('rach access-control-class 1 barred'), -1) + self.assertEquals(res.find('rach access-control-class 2 barred'), -1) + self.assertEquals(res.find('rach access-control-class 3 barred'), -1) + self.assertEquals(res.find('rach access-control-class 4 barred'), -1) + self.assertEquals(res.find('rach access-control-class 5 barred'), -1) + self.assertEquals(res.find('rach access-control-class 6 barred'), -1) + self.assertEquals(res.find('rach access-control-class 7 barred'), -1) + self.assertEquals(res.find('rach access-control-class 8 barred'), -1) + self.assertEquals(res.find('rach access-control-class 9 barred'), -1) + self.assertEquals(res.find('rach access-control-class 11 barred'), -1) + self.assertEquals(res.find('rach access-control-class 12 barred'), -1) + self.assertEquals(res.find('rach access-control-class 13 barred'), -1) + self.assertEquals(res.find('rach access-control-class 14 barred'), -1) + self.assertEquals(res.find('rach access-control-class 15 barred'), -1) + class TestVTYBSC(TestVTYGenericBSC): def vty_command(self): -- 1.7.9.5 -- Regards, Ivan Kluchnikov. http://fairwaves.ru

11 years, 9 months

[PATCH 3/4] Added vty command for setting Access control classes.

by Ivan Kluchnikov

--- openbsc/src/libbsc/bsc_vty.c | 54 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c index 7a89ca6..a06aa90 100644 --- a/openbsc/src/libbsc/bsc_vty.c +++ b/openbsc/src/libbsc/bsc_vty.c @@ -539,6 +539,14 @@ static void config_write_bts_single(struct vty *vty, struct gsm_bts *bts) vty_out(vty, " cell barred 1%s", VTY_NEWLINE); if ((bts->si_common.rach_control.t2 & 0x4) == 0) vty_out(vty, " rach emergency call allowed 1%s", VTY_NEWLINE); + if ((bts->si_common.rach_control.t3) != 0) + for (i = 0; i < 8; i++) + if (bts->si_common.rach_control.t3 & (0x1 << i)) + vty_out(vty, " rach access-control-class %d barred%s", i, VTY_NEWLINE); + if ((bts->si_common.rach_control.t2 & 0xfb) != 0) + for (i = 0; i < 8; i++) + if ((i != 2) && (bts->si_common.rach_control.t2 & (0x1 << i))) + vty_out(vty, " rach access-control-class %d barred%s", i+8, VTY_NEWLINE); for (i = SYSINFO_TYPE_1; i < _MAX_SYSINFO_TYPE; i++) { if (bts->si_mode_static & (1 << i)) { vty_out(vty, " system-information %s mode static%s", @@ -1899,6 +1907,51 @@ DEFUN(cfg_bts_rach_ec_allowed, cfg_bts_rach_ec_allowed_cmd, return CMD_SUCCESS; } +DEFUN(cfg_bts_rach_ac_class, cfg_bts_rach_ac_class_cmd, + "rach access-control-class (0|1|2|3|4|5|6|7|8|9|11|12|13|14|15) (barred|allowed)", + RACH_STR + "Set access control class\n" + "Access control class 0\n" + "Access control class 1\n" + "Access control class 2\n" + "Access control class 3\n" + "Access control class 4\n" + "Access control class 5\n" + "Access control class 6\n" + "Access control class 7\n" + "Access control class 8\n" + "Access control class 9\n" + "Access control class 11 for PLMN use\n" + "Access control class 12 for security services\n" + "Access control class 13 for public utilities (e.g. water/gas suppliers)\n" + "Access control class 14 for emergency services\n" + "Access control class 15 for PLMN staff\n" + "barred to use access control class\n" + "allowed to use access control class\n") +{ + struct gsm_bts *bts = vty->index; + + uint8_t control_class; + uint8_t allowed = 0; + + if (strcmp(argv[1],"allowed") == 0) + allowed = 1; + + control_class = atoi(argv[0]); + if (control_class < 8) + if (allowed) + bts->si_common.rach_control.t3 &= ~(0x1 << control_class); + else + bts->si_common.rach_control.t3 |= (0x1 << control_class); + else + if (allowed) + bts->si_common.rach_control.t2 &= ~(0x1 << (control_class - 8)); + else + bts->si_common.rach_control.t2 |= (0x1 << (control_class - 8)); + + return CMD_SUCCESS; +} + DEFUN(cfg_bts_ms_max_power, cfg_bts_ms_max_power_cmd, "ms max power <0-40>", "MS Options\n" @@ -3066,6 +3119,7 @@ int bsc_vty_init(const struct log_info *cat) install_element(BTS_NODE, &cfg_bts_rach_nm_ldavg_cmd); install_element(BTS_NODE, &cfg_bts_cell_barred_cmd); install_element(BTS_NODE, &cfg_bts_rach_ec_allowed_cmd); + install_element(BTS_NODE, &cfg_bts_rach_ac_class_cmd); install_element(BTS_NODE, &cfg_bts_ms_max_power_cmd); install_element(BTS_NODE, &cfg_bts_per_loc_upd_cmd); install_element(BTS_NODE, &cfg_bts_no_per_loc_upd_cmd); -- 1.7.9.5 -- Regards, Ivan Kluchnikov. http://fairwaves.ru

11 years, 9 months

[PATCH 2/4] Added test for "auth policy" VTY command.

by Ivan Kluchnikov

--- openbsc/tests/vty_test_runner.py | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) mode change 100644 => 100755 openbsc/tests/vty_test_runner.py diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py old mode 100644 new mode 100755 index ab9670c..3594129 --- a/openbsc/tests/vty_test_runner.py +++ b/openbsc/tests/vty_test_runner.py @@ -169,6 +169,42 @@ class TestVTYNITB(TestVTYGenericBSC): self.assertEquals(res.find('periodic location update 60'), -1) self.assert_(res.find('no periodic location update') > 0) + def testAuthPolicy (self): + self.vty.enable() + self.vty.command("configure terminal") + self.vty.command("network") + + # Test invalid input + self.vty.verify("auth policy", ['% Command incomplete.']) + + # Enable auth policy closed + self.vty.verify("auth policy closed", ['']) + + # Verify settings + res = self.vty.command("write terminal") + self.assert_(res.find('auth policy closed') > 0) + + # Enable auth policy accept-all + self.vty.verify("auth policy accept-all", ['']) + + # Verify settings + res = self.vty.command("write terminal") + self.assert_(res.find('auth policy accept-all') > 0) + + # Enable auth policy token + self.vty.verify("auth policy token", ['']) + + # Verify settings + res = self.vty.command("write terminal") + self.assert_(res.find('auth policy token') > 0) + + # Enable auth policy black-list + self.vty.verify("auth policy black-list", ['']) + + # Verify settings + res = self.vty.command("write terminal") + self.assert_(res.find('auth policy black-list') > 0) + class TestVTYBSC(TestVTYGenericBSC): def vty_command(self): -- 1.7.9.5 -- Regards, Ivan Kluchnikov. http://fairwaves.ru

11 years, 9 months

[PATCH] Added new auth policy black-list.

by Ivan Kluchnikov

11 years, 9 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC September 2013