OpenBSC

openbsc@lists.osmocom.org

4315 discussions

[PATCH 1/2] subscr: Fix potential subscr ref count issue
by Holger Hans Peter Freyther 04 Aug '15

04 Aug '15

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> In case the subscriber is currently busy we would omit the subscr_put. This seems to be very hard to hit as the subscr need to be active and at the same time be selected for the purge operation. --- openbsc/src/libmsc/gsm_subscriber.c | 1 + 1 file changed, 1 insertion(+) diff --git a/openbsc/src/libmsc/gsm_subscriber.c b/openbsc/src/libmsc/gsm_subscriber.c index 4559de5..085acb1 100644 --- a/openbsc/src/libmsc/gsm_subscriber.c +++ b/openbsc/src/libmsc/gsm_subscriber.c @@ -353,6 +353,7 @@ static void subscr_expire_callback(void *data, long long unsigned int id) LOGP(DMM, LOGL_DEBUG, "Not expiring subscriber %s (ID %llu)\n", subscr_name(s), id); subscr_update_expire_lu(s, conn->bts); + subscr_put(s); return; } -- 2.3.5

1 1

cheap femtocell
by Albert Paijmans 03 Aug '15

03 Aug '15

Hello, I was wondering if there is any progress with femtocells specifically the AT&T/Cisco 3g microcell, SFR Home 3g or the Vodafone Sure Signal v1/v2? These are quite cheap to pick up on ebay so it would be great if one could use those as a femtocell for Openbsc. The AT&T version 1 at least is hackable and I haven´t found much info on it working with Openbsc. http://comments.gmane.org/gmane.comp.mobile.openbsc.general/544 Most of the info is quite old. Is anybody still working on this? Thanks, Albert

1 0

[PATCH 1/5] paging: Move the silent_call code to use the subscriber request
by Holger Hans Peter Freyther 03 Aug '15

03 Aug '15

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Coordinate with the normal subscriber channel requests instead of going to page ourselves. This might lead to getting a channel that is of a different type though. --- openbsc/src/libmsc/silent_call.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/openbsc/src/libmsc/silent_call.c b/openbsc/src/libmsc/silent_call.c index 010c2b4..e9ece18 100644 --- a/openbsc/src/libmsc/silent_call.c +++ b/openbsc/src/libmsc/silent_call.c @@ -118,11 +118,10 @@ int silent_call_reroute(struct gsm_subscriber_connection *conn, struct msgb *msg /* initiate a silent call with a given subscriber */ int gsm_silent_call_start(struct gsm_subscriber *subscr, void *data, int type) { - int rc; + struct subscr_request *req; - rc = paging_request(subscr->group->net, subscr, type, - paging_cb_silent, data); - return rc; + req = subscr_request_channel(subscr, type, paging_cb_silent, data); + return req != NULL; } /* end a silent call with a given subscriber */ -- 2.3.5

1 4

[PATCH] vty: Change API to have node installation be done by int
by Holger Freyther 03 Aug '15

03 Aug '15

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> We are mixing enums and hope that no short-enums are used. This is leading to a lot compiler warnings generated by clang. Change the API to work with integers. Porting: The go_parent_cb implementations in the applications need to be fixed. The API change leads to a compile time warning. Fixes: abis_om2000_vty.c:46:2: warning: implicit conversion from enumeration type 'enum bsc_vty_node' to different enumeration type 'enum node_type' [-Wenum-conversion] OM2K_NODE, ^~~~~~~~~ --- include/osmocom/vty/command.h | 8 ++++---- include/osmocom/vty/vty.h | 4 ++-- src/vty/command.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/osmocom/vty/command.h b/include/osmocom/vty/command.h index 89dc28f..4eb519f 100644 --- a/include/osmocom/vty/command.h +++ b/include/osmocom/vty/command.h @@ -92,7 +92,7 @@ enum node_type { * configuration function pointer . */ struct cmd_node { /*! \brief Node index */ - enum node_type node; + int node; /*! \brief Prompt character at vty interface. */ const char *prompt; @@ -334,15 +334,15 @@ struct desc { /* Prototypes. */ void install_node(struct cmd_node *, int (*)(struct vty *)); -void install_default(enum node_type); -void install_element(enum node_type, struct cmd_element *); +void install_default(int node_type); +void install_element(int node_type, struct cmd_element *); void install_element_ve(struct cmd_element *cmd); void sort_node(void); /* This is similar to install_default() but it also creates * 'exit' and 'end' commands. */ -void vty_install_default(enum node_type); +void vty_install_default(int node_type); /* Concatenates argv[shift] through argv[argc-1] into a single NUL-terminated string with a space between each element (allocated using diff --git a/include/osmocom/vty/vty.h b/include/osmocom/vty/vty.h index 1dcc230..3684397 100644 --- a/include/osmocom/vty/vty.h +++ b/include/osmocom/vty/vty.h @@ -156,7 +156,7 @@ struct vty_app_info { /*! \brief \ref talloc context */ void *tall_ctx; /*! \brief call-back for returning to parent n ode */ - enum node_type (*go_parent_cb)(struct vty *vty); + int (*go_parent_cb)(struct vty *vty); /*! \brief call-back to determine if node is config node */ int (*is_config_node)(struct vty *vty, int node); /*! \brief Check if the config is consistent before write */ @@ -184,7 +184,7 @@ int vty_shell_serv (struct vty *); void vty_hello (struct vty *); void *vty_current_index(struct vty *); int vty_current_node(struct vty *vty); -enum node_type vty_go_parent(struct vty *vty); +int vty_go_parent(struct vty *vty); extern void *tall_vty_ctx; diff --git a/src/vty/command.c b/src/vty/command.c index 3ff5f77..290b12d 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -548,7 +548,7 @@ static int vty_dump_nodes(struct vty *vty) * \param[in] ntype Node Type * \param[cmd] element to be installed */ -void install_element(enum node_type ntype, struct cmd_element *cmd) +void install_element(int ntype, struct cmd_element *cmd) { struct cmd_node *cnode; @@ -1897,7 +1897,7 @@ char **cmd_complete_command(vector vline, struct vty *vty, int *status) * Note also that this function relies on the is_config_child callback to * recognize non-config nodes if go_parent_cb is not set. */ -enum node_type vty_go_parent(struct vty *vty) +int vty_go_parent(struct vty *vty) { switch (vty->node) { case AUTH_NODE: @@ -3319,7 +3319,7 @@ void host_config_set(const char *filename) host.config = talloc_strdup(tall_vty_cmd_ctx, filename); } -void install_default(enum node_type node) +void install_default(int node) { install_element(node, &config_help_cmd); install_element(node, &config_list_cmd); @@ -3331,7 +3331,7 @@ void install_default(enum node_type node) install_element(node, &show_running_config_cmd); } -void vty_install_default(enum node_type node) +void vty_install_default(int node) { install_default(node); -- 2.3.5

1 0

[PATCH 1/3] use non-vararg functions if possible
by Max 30 Jul '15

30 Jul '15

Signed-off-by: Max <max.suraev(a)fairwaves.co> --- openbsc/src/libmsc/db.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openbsc/src/libmsc/db.c b/openbsc/src/libmsc/db.c index 428f99b..035202d 100644 --- a/openbsc/src/libmsc/db.c +++ b/openbsc/src/libmsc/db.c @@ -301,7 +301,7 @@ static int update_db_revision_3(void) dbi_result_free(result); /* Cycle through old messages and convert them to the new format */ - result = dbi_conn_queryf(conn, "SELECT * FROM SMS_3"); + result = dbi_conn_query(conn, "SELECT * FROM SMS_3"); if (!result) { LOGP(DDB, LOGL_ERROR, "Failed fetch messages from the old SMS table (upgrade from rev 3).\n"); @@ -1095,8 +1095,8 @@ int db_subscriber_list_active(void (*cb)(struct gsm_subscriber*,void*), void *cl { dbi_result result; - result = dbi_conn_queryf(conn, - "SELECT * from Subscriber WHERE LAC != 0 AND authorized = 1"); + result = dbi_conn_query(conn, + "SELECT * from Subscriber WHERE LAC != 0 AND authorized = 1"); if (!result) { LOGP(DDB, LOGL_ERROR, "Failed to list active subscribers\n"); return -1; -- 2.1.4

3 4

[PATCH openbsc] osmux: add option to pad the circuit with dummy messages
by pablo＠gnumonks.org 21 Jul '15

21 Jul '15

From: Pablo Neira Ayuso <pablo(a)soleta.eu> Iridium is a satellite network which operates a GPRS-like that allows you to get speeds up to 128kbit/s. However, it takes from 5 to 6 secs to get the bandwidth allocated, so the conversation is garbled during the time. This patch uses the new dummy padding support in libosmo-netif that is controlled through the osmux osmux_xfrm_input_open_circuit(). This includes a new VTY option for osmux. --- openbsc/include/openbsc/mgcp.h | 4 ++++ openbsc/src/libmgcp/mgcp_osmux.c | 7 +++++++ openbsc/src/libmgcp/mgcp_vty.c | 16 ++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/openbsc/include/openbsc/mgcp.h b/openbsc/include/openbsc/mgcp.h index f334ac8..1f63803 100644 --- a/openbsc/include/openbsc/mgcp.h +++ b/openbsc/include/openbsc/mgcp.h @@ -224,6 +224,10 @@ struct mgcp_config { int osmux_batch_size; /* osmux port */ uint16_t osmux_port; + /* Pad circuit with dummy messages until we see the first voice + * message. + */ + uint16_t osmux_dummy; }; /* config management */ diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index 7f61173..90b7368 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -462,6 +462,12 @@ int osmux_enable_endpoint(struct mgcp_endpoint *endp, int role, LOGP(DMGCP, LOGL_ERROR, "Cannot allocate input osmux handle\n"); return -1; } + if (!osmux_xfrm_input_open_circuit(endp->osmux.in, endp->osmux.cid, + endp->cfg->osmux_dummy)) { + LOGP(DMGCP, LOGL_ERROR, "Cannot open osmux circuit %u\n", + endp->osmux.cid); + return -1; + } switch (endp->cfg->role) { case MGCP_BSC_NAT: @@ -480,6 +486,7 @@ void osmux_disable_endpoint(struct mgcp_endpoint *endp) { LOGP(DMGCP, LOGL_INFO, "Releasing endpoint %u using Osmux CID %u\n", ENDPOINT_NUMBER(endp), endp->osmux.cid); + osmux_xfrm_input_close_circuit(endp->osmux.in, endp->osmux.cid); endp->osmux.state = OSMUX_STATE_DISABLED; endp->osmux.cid = -1; osmux_handle_put(endp->osmux.in); diff --git a/openbsc/src/libmgcp/mgcp_vty.c b/openbsc/src/libmgcp/mgcp_vty.c index dd21a15..8f6b10a 100644 --- a/openbsc/src/libmgcp/mgcp_vty.c +++ b/openbsc/src/libmgcp/mgcp_vty.c @@ -144,6 +144,8 @@ static int config_write_mgcp(struct vty *vty) g_cfg->osmux_batch_size, VTY_NEWLINE); vty_out(vty, " osmux port %u%s", g_cfg->osmux_port, VTY_NEWLINE); + vty_out(vty, " osmux dummy %s%s", + g_cfg->osmux_dummy ? "on" : "off", VTY_NEWLINE); } return CMD_SUCCESS; } @@ -1245,6 +1247,19 @@ DEFUN(cfg_mgcp_osmux_port, return CMD_SUCCESS; } +DEFUN(cfg_mgcp_osmux_dummy, + cfg_mgcp_osmux_dummy_cmd, + "osmux dummy (on|off)", + OSMUX_STR "Enable dummy padding\n" "Disable dummy padding\n") +{ + if (strcmp(argv[0], "on") == 0) + g_cfg->osmux_dummy = 1; + else if (strcmp(argv[0], "off") == 0) + g_cfg->osmux_dummy = 0; + + return CMD_SUCCESS; +} + int mgcp_vty_init(void) { install_element_ve(&show_mgcp_cmd); @@ -1304,6 +1319,7 @@ int mgcp_vty_init(void) install_element(MGCP_NODE, &cfg_mgcp_osmux_batch_factor_cmd); install_element(MGCP_NODE, &cfg_mgcp_osmux_batch_size_cmd); install_element(MGCP_NODE, &cfg_mgcp_osmux_port_cmd); + install_element(MGCP_NODE, &cfg_mgcp_osmux_dummy_cmd); install_element(MGCP_NODE, &cfg_mgcp_allow_transcoding_cmd); install_element(MGCP_NODE, &cfg_mgcp_no_allow_transcoding_cmd); -- 1.7.10.4

1 0

[PATCH 1/1] openbsc: Rename core_ncc to core_mnc
by Mike McTernan (wavemobile) 13 Jul '15

13 Jul '15

Hi Folks, Struct osmo_msc_data contains int core_ncc, which is actually the MNC part of the PLMN, not to be confused with the Network Colour Code. The following patch renames this field for clarity and consistency with the standards. Please consider it for inclusion. Signed-off-by: Michael McTernan <Michael.McTernan(a)wavemobile.com> diff -Nrup openbsc.orig/openbsc/include/openbsc/osmo_msc_data.h openbsc/openbsc/include/openbsc/osmo_msc_data.h --- openbsc.orig/openbsc/include/openbsc/osmo_msc_data.h 2015-06-02 12:45:13.682136307 +0100 +++ openbsc/openbsc/include/openbsc/osmo_msc_data.h 2015-06-02 12:45:28.661356866 +0100 @@ -65,7 +65,7 @@ struct osmo_msc_data { struct osmo_timer_list pong_timer; int advanced_ping; struct bsc_msc_connection *msc_con; - int core_ncc; + int core_mnc; int core_mcc; int core_lac; int core_ci; diff -Nrup openbsc.orig/openbsc/src/osmo-bsc/osmo_bsc_api.c openbsc/openbsc/src/osmo-bsc/osmo_bsc_api.c --- openbsc.orig/openbsc/src/osmo-bsc/osmo_bsc_api.c 2015-06-02 12:45:13.679136263 +0100 +++ openbsc/openbsc/src/osmo-bsc/osmo_bsc_api.c 2015-06-02 12:45:28.664356910 +0100 @@ -53,8 +53,8 @@ static int complete_layer3(struct gsm_su static uint16_t get_network_code_for_msc(struct osmo_msc_data *msc) { - if (msc->core_ncc != -1) - return msc->core_ncc; + if (msc->core_mnc != -1) + return msc->core_mnc; return msc->network->network_code; } diff -Nrup openbsc.orig/openbsc/src/osmo-bsc/osmo_bsc_filter.c openbsc/openbsc/src/osmo-bsc/osmo_bsc_filter.c --- openbsc.orig/openbsc/src/osmo-bsc/osmo_bsc_filter.c 2015-06-02 12:45:13.679136263 +0100 +++ openbsc/openbsc/src/osmo-bsc/osmo_bsc_filter.c 2015-06-02 12:46:00.653828021 +0100 @@ -313,7 +313,7 @@ static int bsc_patch_mm_info(struct gsm_ static int has_core_identity(struct osmo_msc_data *msc) { - if (msc->core_ncc != -1) + if (msc->core_mnc != -1) return 1; if (msc->core_mcc != -1) return 1; diff -Nrup openbsc.orig/openbsc/src/osmo-bsc/osmo_bsc_msc.c openbsc/openbsc/src/osmo-bsc/osmo_bsc_msc.c --- openbsc.orig/openbsc/src/osmo-bsc/osmo_bsc_msc.c 2015-06-02 12:45:13.679136263 +0100 +++ openbsc/openbsc/src/osmo-bsc/osmo_bsc_msc.c 2015-06-02 12:45:28.664356910 +0100 @@ -522,7 +522,7 @@ struct osmo_msc_data *osmo_msc_data_allo INIT_LLIST_HEAD(&msc_data->dests); msc_data->ping_timeout = 20; msc_data->pong_timeout = 5; - msc_data->core_ncc = -1; + msc_data->core_mnc = -1; msc_data->core_mcc = -1; msc_data->core_ci = -1; msc_data->core_lac = -1; diff -Nrup openbsc.orig/openbsc/src/osmo-bsc/osmo_bsc_vty.c openbsc/openbsc/src/osmo-bsc/osmo_bsc_vty.c --- openbsc.orig/openbsc/src/osmo-bsc/osmo_bsc_vty.c 2015-06-02 12:45:13.679136263 +0100 +++ openbsc/openbsc/src/osmo-bsc/osmo_bsc_vty.c 2015-06-02 12:45:28.664356910 +0100 @@ -107,9 +107,9 @@ static void write_msc(struct vty *vty, s vty_out(vty, "msc %d%s", msc->nr, VTY_NEWLINE); if (msc->bsc_token) vty_out(vty, " token %s%s", msc->bsc_token, VTY_NEWLINE); - if (msc->core_ncc != -1) + if (msc->core_mnc != -1) vty_out(vty, " core-mobile-network-code %d%s", - msc->core_ncc, VTY_NEWLINE); + msc->core_mnc, VTY_NEWLINE); if (msc->core_mcc != -1) vty_out(vty, " core-mobile-country-code %d%s", msc->core_mcc, VTY_NEWLINE); @@ -234,10 +234,10 @@ DEFUN(cfg_net_bsc_token, DEFUN(cfg_net_bsc_ncc, cfg_net_bsc_ncc_cmd, "core-mobile-network-code <1-999>", - "Use this network code for the core network\n" "NCC value\n") + "Use this network code for the core network\n" "MNC value\n") { struct osmo_msc_data *data = osmo_msc_data(vty); - data->core_ncc = atoi(argv[0]); + data->core_mnc = atoi(argv[0]); return CMD_SUCCESS; } The same patch is attached, md5sum 2082d6b4b174236fcf3b84e548dcf2ad (in case it gets mangled by the mailer). Kind Regards, Mike

2 1

GSM A-Bis Measurement Equipment
by Miguel Elias 11 Jul '15

11 Jul '15

Hi there, I'm cleaning up my cellar and I found a EGM 35 GSM A-Bis field test equipment. Manufacture: GN Nettest ELMI Typ: EGM 35 It is meant to tap in a E1 line and decode messages and also the voice streams between BSC and BS. Comes with headset :) If any body has interest, I am happy to send pictures off-list. Regards Miguel

1 0

Supplementary Services
by ☎ 09 Jul '15

09 Jul '15

Hi. I've just sent 4 patches to ML - that's cosmetic adaptation of work by Tobias Engel (tobias/supplementary_services branch) from few years back to current master. Not sure if I should put sign-off in the commits but I certainly don't claim to be author of the code. Anyway, I'd like to see this pushed forward cause I think it's useful functionality better suited for master branch - would be shame to let it bitrot :) Comments and suggestions are appreciated as usual. -- best regards, Max, http://fairwaves.co

1 0

[PATCH 1/4] Supplementary Services (de)activation and interrogation
by Max 09 Jul '15

09 Jul '15

Signed-off-by: Max <max.suraev(a)fairwaves.co> --- openbsc/include/openbsc/Makefile.am | 2 +- openbsc/include/openbsc/db.h | 4 + openbsc/include/openbsc/gsm_04_80.h | 36 ++++++-- openbsc/include/openbsc/ss.h | 10 +++ openbsc/include/openbsc/ussd.h | 10 --- openbsc/src/libmsc/Makefile.am | 2 +- openbsc/src/libmsc/db.c | 89 +++++++++++++++++++ openbsc/src/libmsc/gsm_04_08.c | 4 +- openbsc/src/libmsc/gsm_04_80.c | 65 ++++++++------ openbsc/src/libmsc/ss.c | 173 ++++++++++++++++++++++++++++++++++++ openbsc/src/libmsc/ussd.c | 87 ------------------ 11 files changed, 349 insertions(+), 133 deletions(-) create mode 100644 openbsc/include/openbsc/ss.h delete mode 100644 openbsc/include/openbsc/ussd.h create mode 100644 openbsc/src/libmsc/ss.c delete mode 100644 openbsc/src/libmsc/ussd.c diff --git a/openbsc/include/openbsc/Makefile.am b/openbsc/include/openbsc/Makefile.am index 254f43d..b19c413 100644 --- a/openbsc/include/openbsc/Makefile.am +++ b/openbsc/include/openbsc/Makefile.am @@ -2,7 +2,7 @@ noinst_HEADERS = abis_nm.h abis_rsl.h db.h gsm_04_08.h gsm_data.h \ gsm_subscriber.h gsm_04_11.h debug.h signal.h \ misdn.h chan_alloc.h paging.h ctrl.h \ trau_mux.h rs232.h openbscdefines.h rtp_proxy.h \ - bsc_rll.h mncc.h transaction.h ussd.h gsm_04_80.h \ + bsc_rll.h mncc.h transaction.h ss.h gsm_04_80.h \ silent_call.h mgcp.h meas_rep.h rest_octets.h \ system_information.h handover.h mgcp_internal.h \ vty.h socket.h e1_config.h trau_upqueue.h token_auth.h \ diff --git a/openbsc/include/openbsc/db.h b/openbsc/include/openbsc/db.h index 6699a86..73c061b 100644 --- a/openbsc/include/openbsc/db.h +++ b/openbsc/include/openbsc/db.h @@ -79,4 +79,8 @@ int db_store_counter(struct osmo_counter *ctr); struct rate_ctr_group; int db_store_rate_ctr_group(struct rate_ctr_group *ctrg); +/* Supplementary Services */ +int db_ss_interrogate_status(struct gsm_subscriber *subscr, uint8_t ss_code, uint8_t bs_code, uint8_t *ss_status); +int db_ss_set_status(struct gsm_subscriber *subscr, uint8_t ss_code, uint8_t bs_code, uint8_t ss_status); + #endif /* _DB_H */ diff --git a/openbsc/include/openbsc/gsm_04_80.h b/openbsc/include/openbsc/gsm_04_80.h index 0a60652..7139f95 100644 --- a/openbsc/include/openbsc/gsm_04_80.h +++ b/openbsc/include/openbsc/gsm_04_80.h @@ -3,16 +3,42 @@ #include <osmocom/core/msgb.h> #include <osmocom/gsm/protocol/gsm_04_80.h> +#include <osmocom/gsm/protocol/gsm_09_02.h> #include <osmocom/gsm/gsm0480.h> struct gsm_subscriber_connection; +/* FIXME: replace with libosmocore functions */ +static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) +{ + uint8_t *data = msgb_push(msgb, 2); + + data[0] = tag; + data[1] = msgb->len - 2; + return data; +} + +static inline unsigned char *msgb_push_TLV1(struct msgb *msgb, uint8_t tag, + uint8_t value) +{ + uint8_t *data = msgb_push(msgb, 3); + + data[0] = tag; + data[1] = 1; + data[2] = value; + return data; +} + int gsm0480_send_ussd_response(struct gsm_subscriber_connection *conn, - const struct msgb *in_msg, const char* response_text, - const struct ussd_request *req); -int gsm0480_send_ussd_reject(struct gsm_subscriber_connection *conn, - const struct msgb *msg, - const struct ussd_request *request); + const char* response_text, + const struct ss_request *req); +int gsm0480_send_ss_return_result(struct gsm_subscriber_connection *conn, + const struct ss_request *req, + struct msgb *msg); +int gsm0480_send_ss_reject(struct gsm_subscriber_connection *conn, + const struct ss_request *request, + uint8_t problem_category, + uint8_t problem_code); int gsm0480_send_ussdNotify(struct gsm_subscriber_connection *conn, int level, const char *text); int gsm0480_send_releaseComplete(struct gsm_subscriber_connection *conn); diff --git a/openbsc/include/openbsc/ss.h b/openbsc/include/openbsc/ss.h new file mode 100644 index 0000000..92ce913 --- /dev/null +++ b/openbsc/include/openbsc/ss.h @@ -0,0 +1,10 @@ +#ifndef _SS_H +#define _SS_H + +/* Handler function for mobile-originated SS messages */ + +#include <osmocom/core/msgb.h> + +int handle_rcv_ss(struct gsm_subscriber_connection *conn, struct msgb *msg); + +#endif diff --git a/openbsc/include/openbsc/ussd.h b/openbsc/include/openbsc/ussd.h deleted file mode 100644 index 2665468..0000000 --- a/openbsc/include/openbsc/ussd.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef _USSD_H -#define _USSD_H - -/* Handler function for mobile-originated USSD messages */ - -#include <osmocom/core/msgb.h> - -int handle_rcv_ussd(struct gsm_subscriber_connection *conn, struct msgb *msg); - -#endif diff --git a/openbsc/src/libmsc/Makefile.am b/openbsc/src/libmsc/Makefile.am index aa7d8ae..de0ce66 100644 --- a/openbsc/src/libmsc/Makefile.am +++ b/openbsc/src/libmsc/Makefile.am @@ -16,7 +16,7 @@ libmsc_a_SOURCES = auth.c \ silent_call.c \ sms_queue.c \ token_auth.c \ - ussd.c \ + ss.c \ vty_interface_layer3.c \ transaction.c \ osmo_msc.c ctrl_commands.c meas_feed.c diff --git a/openbsc/src/libmsc/db.c b/openbsc/src/libmsc/db.c index 428f99b..25dd00e 100644 --- a/openbsc/src/libmsc/db.c +++ b/openbsc/src/libmsc/db.c @@ -41,6 +41,8 @@ /* Semi-Private-Interface (SPI) for the subscriber code */ void subscr_direct_free(struct gsm_subscriber *subscr); +#include <osmocom/gsm/protocol/gsm_09_02.h> + static char *db_basename = NULL; static char *db_dirname = NULL; static dbi_conn conn; @@ -174,6 +176,15 @@ static const char *create_stmts[] = { "sres BLOB NOT NULL, " "kc BLOB NOT NULL " ")", + "CREATE TABLE IF NOT EXISTS SS_Status (" + "id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " + "subscriber INTEGER NOT NULL, " + "ss_code TINYINT UNSIGNED NOT NULL, " + "bs_code TINYINT UNSIGNED, " + "ss_status TINYINT UNSIGNED NOT NULL, " + "UNIQUE(subscriber, ss_code, bs_code), " + "FOREIGN KEY(subscriber) REFERENCES Subscriber (id) ON DELETE CASCADE ON UPDATE CASCADE " + ")", }; void db_error_func(dbi_conn conn, void *data) @@ -1724,3 +1735,81 @@ int db_store_rate_ctr_group(struct rate_ctr_group *ctrg) return 0; } + +int db_ss_interrogate_status(struct gsm_subscriber *subscr, uint8_t ss_code, uint8_t bs_code, uint8_t *ss_status) +{ + char buf[32]; + dbi_result result; + + /* Copy the id to a string as queryf with %llu is failing */ + sprintf(buf, "%llu", subscr->id); + result = dbi_conn_queryf(conn, + "SELECT ss_status FROM SS_Status " + "WHERE subscriber = %s " + "AND ss_code = %i AND bs_code = %i", + buf, ss_code, bs_code); + + if (!result) { + LOGP(DDB, + LOGL_ERROR, + "Failed to query ss_status for subscriber %llu, " + "ss code 0x%02X, bs code 0x%02X\n", + subscr->id, ss_code, bs_code); + return -EIO; + } + if (!dbi_result_next_row(result)) { + DEBUGP(DDB, + "Failed to find ss_status for subscriber %llu, " + "ss code 0x%02X, bs code 0x%02X\n", + subscr->id, ss_code, bs_code); + dbi_result_free(result); + return -ENOENT; + } + + *ss_status = dbi_result_get_uint(result, "ss_status"); + DEBUGP(DDB, + "Found ss_status for subscriber %llu, " + "ss code 0x%02X, bs code 0x%02X: P:%d R:%d A:%d Q:%d\n", + subscr->id, ss_code, bs_code, + (*ss_status & GSM0902_SS_STATUS_P_BIT) && 1, + (*ss_status & GSM0902_SS_STATUS_R_BIT) && 1, + (*ss_status & GSM0902_SS_STATUS_A_BIT) && 1, + (*ss_status & GSM0902_SS_STATUS_Q_BIT) && 1); + + dbi_result_free(result); + return 0; +} + +int db_ss_set_status(struct gsm_subscriber *subscr, uint8_t ss_code, uint8_t bs_code, uint8_t ss_status) +{ + char buf[32]; + dbi_result result; + + /* Copy the id to a string as queryf with %llu is failing */ + sprintf(buf, "%llu", subscr->id); + + result = dbi_conn_queryf(conn, + "UPDATE SS_Status SET ss_status = %i " + "WHERE subscriber = %s AND " + "ss_code = %i AND bs_code = %i", + ss_status, buf, ss_code, bs_code); + + if (!result) { + LOGP(DDB, LOGL_ERROR, + "Failed to set ss_status for subscriber %llu\n", + subscr->id); + return -EIO; + } + + DEBUGP(DDB, + "Set ss_status for subscriber %llu, " + "ss code 0x%02X, bs code 0x%02X: P:%d R:%d A:%d Q:%d\n", + subscr->id, ss_code, bs_code, + (ss_status & GSM0902_SS_STATUS_P_BIT) && 1, + (ss_status & GSM0902_SS_STATUS_R_BIT) && 1, + (ss_status & GSM0902_SS_STATUS_A_BIT) && 1, + (ss_status & GSM0902_SS_STATUS_Q_BIT) && 1); + + dbi_result_free(result); + return 0; +} diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index 29ab2ba..01f8f32 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -47,7 +47,7 @@ #include <openbsc/trau_mux.h> #include <openbsc/rtp_proxy.h> #include <openbsc/transaction.h> -#include <openbsc/ussd.h> +#include <openbsc/ss.h> #include <openbsc/silent_call.h> #include <openbsc/bsc_api.h> #include <openbsc/osmo_msc.h> @@ -3340,7 +3340,7 @@ int gsm0408_dispatch(struct gsm_subscriber_connection *conn, struct msgb *msg) break; case GSM48_PDISC_NC_SS: release_anchor(conn); - rc = handle_rcv_ussd(conn, msg); + rc = handle_rcv_ss(conn, msg); break; default: LOGP(DRLL, LOGL_NOTICE, "Unknown " diff --git a/openbsc/src/libmsc/gsm_04_80.c b/openbsc/src/libmsc/gsm_04_80.c index b30f9ee..b20521a 100644 --- a/openbsc/src/libmsc/gsm_04_80.c +++ b/openbsc/src/libmsc/gsm_04_80.c @@ -39,31 +39,11 @@ #include <osmocom/core/msgb.h> #include <osmocom/gsm/tlv.h> -static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) -{ - uint8_t *data = msgb_push(msgb, 2); - - data[0] = tag; - data[1] = msgb->len - 2; - return data; -} - -static inline unsigned char *msgb_push_TLV1(struct msgb *msgb, uint8_t tag, - uint8_t value) -{ - uint8_t *data = msgb_push(msgb, 3); - - data[0] = tag; - data[1] = 1; - data[2] = value; - return data; -} - /* Send response to a mobile-originated ProcessUnstructuredSS-Request */ int gsm0480_send_ussd_response(struct gsm_subscriber_connection *conn, - const struct msgb *in_msg, const char *response_text, - const struct ussd_request *req) + const char *response_text, + const struct ss_request *req) { struct msgb *msg = gsm48_msgb_alloc(); struct gsm48_hdr *gh; @@ -109,16 +89,47 @@ int gsm0480_send_ussd_response(struct gsm_subscriber_connection *conn, return gsm0808_submit_dtap(conn, msg, 0, 0); } -int gsm0480_send_ussd_reject(struct gsm_subscriber_connection *conn, - const struct msgb *in_msg, - const struct ussd_request *req) +/* Send response to a mobile-originated Invoke */ +int gsm0480_send_ss_return_result(struct gsm_subscriber_connection *conn, + const struct ss_request *req, + struct msgb *msg) +{ + struct gsm48_hdr *gh; + + /* Pre-pend the operation code */ + msgb_push_TLV1(msg, GSM0480_OPERATION_CODE, req->opcode); + + /* Wrap the contents as a sequence */ + msgb_wrap_with_TL(msg, GSM_0480_SEQUENCE_TAG); + + /* Pre-pend the invoke ID */ + msgb_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, req->invoke_id); + + /* Wrap this up as a Return Result component */ + msgb_wrap_with_TL(msg, GSM0480_CTYPE_RETURN_RESULT); + + /* Wrap the component in a Facility message */ + msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); + + /* And finally pre-pend the L3 header */ + gh = (struct gsm48_hdr *) msgb_push(msg, sizeof(*gh)); + gh->proto_discr = GSM48_PDISC_NC_SS | req->transaction_id + | (1<<7); /* TI direction = 1 */ + gh->msg_type = GSM0480_MTYPE_RELEASE_COMPLETE; + + return gsm0808_submit_dtap(conn, msg, 0, 0); +} + +int gsm0480_send_ss_reject(struct gsm_subscriber_connection *conn, + const struct ss_request *req, + uint8_t problem_category, + uint8_t problem_code) { struct msgb *msg = gsm48_msgb_alloc(); struct gsm48_hdr *gh; /* First insert the problem code */ - msgb_push_TLV1(msg, GSM_0480_PROBLEM_CODE_TAG_GENERAL, - GSM_0480_GEN_PROB_CODE_UNRECOGNISED); + msgb_push_TLV1(msg, problem_category, problem_code); /* Before it insert the invoke ID */ msgb_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, req->invoke_id); diff --git a/openbsc/src/libmsc/ss.c b/openbsc/src/libmsc/ss.c new file mode 100644 index 0000000..44a01ec --- /dev/null +++ b/openbsc/src/libmsc/ss.c @@ -0,0 +1,173 @@ +/* Network-specific handling of mobile-originated SSs. */ + +/* (C) 2008-2009 by Harald Welte <laforge(a)gnumonks.org> + * (C) 2008, 2009 by Holger Hans Peter Freyther <zecke(a)selfish.org> + * (C) 2009 by Mike Haben <michael.haben(a)btinternet.com> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +/* This module defines the network-specific handling of mobile-originated + SS messages. */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <errno.h> + +#include <openbsc/db.h> +#include <openbsc/gsm_04_80.h> +#include <openbsc/gsm_subscriber.h> +#include <openbsc/debug.h> +#include <openbsc/osmo_msc.h> + +/* Declarations of USSD strings to be recognised */ +const char USSD_TEXT_OWN_NUMBER[] = "*#100#"; + +/* Forward declarations of network-specific handler functions */ +static int send_own_number(struct gsm_subscriber_connection *conn, const struct msgb *msg, const struct ss_request *req); +static int change_ss_activation(struct gsm_subscriber_connection *conn, uint8_t activate, const struct ss_request *req); +static int interrogate_ss(struct gsm_subscriber_connection *conn, const struct ss_request *req); + +/* Entrypoint - handler function common to all mobile-originated SS */ +int handle_rcv_ss(struct gsm_subscriber_connection *conn, struct msgb *msg) +{ + int rc; + struct ss_request req; + struct gsm48_hdr *gh; + uint8_t activate; + + memset(&req, 0, sizeof(req)); + gh = msgb_l3(msg); + rc = gsm0480_decode_ss_request(gh, msgb_l3len(msg), &req); + + if (rc == 1) { + + switch (req.opcode) { + case GSM0480_OP_CODE_PROCESS_USS_REQ: + + if (req.ussd_text[0] == 0xFF) /* Release-Complete */ + return 0; + + if (!strcmp(USSD_TEXT_OWN_NUMBER, + (const char *)req.ussd_text)) { + DEBUGP(DMM, "USSD: Own number requested\n"); + rc = send_own_number(conn, msg, &req); + } else { + DEBUGP(DMM, "Unhandled USSD %s\n", req.ussd_text); + rc = gsm0480_send_ss_reject(conn, &req, + GSM_0480_PROBLEM_CODE_TAG_INVOKE, + GSM_0480_INVOKE_PROB_CODE_UNRECOGNISED_OPERATION); + } + + break; + + case GSM0480_OP_CODE_ACTIVATE_SS: + case GSM0480_OP_CODE_DEACTIVATE_SS: + activate = (req.opcode == GSM0480_OP_CODE_ACTIVATE_SS); + rc = change_ss_activation(conn, activate, &req); + break; + case GSM0480_OP_CODE_INTERROGATE_SS: + rc = interrogate_ss(conn, &req); + break; + default: + DEBUGP(DMM, "Unhandled SS opcode %d\n", req.opcode); + rc = gsm0480_send_ss_reject(conn, &req, + GSM_0480_PROBLEM_CODE_TAG_GENERAL, + GSM_0480_GEN_PROB_CODE_UNRECOGNISED); + break; + } + + } else { + rc = gsm0480_send_ss_reject(conn, &req, + GSM_0480_PROBLEM_CODE_TAG_GENERAL, + GSM_0480_GEN_PROB_CODE_BAD_STRUCTURE); + } + + /* check if we can release it */ + msc_release_connection(conn); + return rc; +} + +/* A network-specific handler function */ +static int send_own_number(struct gsm_subscriber_connection *conn, const struct msgb *msg, const struct ss_request *req) +{ + char *own_number = conn->subscr->extension; + char response_string[GSM_EXTENSION_LENGTH + 20]; + + /* Need trailing CR as EOT character */ + snprintf(response_string, sizeof(response_string), "Your extension is %s\r", own_number); + return gsm0480_send_ussd_response(conn, response_string, req); +} + +static int change_ss_activation(struct gsm_subscriber_connection *conn, uint8_t activate, const struct ss_request *req) +{ + struct msgb *msg; + uint8_t ss_status; + int rc = db_ss_interrogate_status(conn->subscr, + req->ss_code, + GSM0902_TS_CODE_TELEPHONY, + &ss_status); + + if(rc < 0 || !(ss_status & GSM0902_SS_STATUS_P_BIT)) { + DEBUGP(DMM, "SS 0x%02X not provisioned\n", req->ss_code); + return gsm0480_send_ss_reject(conn, req, + GSM_0480_PROBLEM_CODE_TAG_INVOKE, + GSM_0480_INVOKE_PROB_CODE_UNRECOGNISED_OPERATION); + } + + ss_status &= ~GSM0902_SS_STATUS_A_BIT; + ss_status |= (activate ? GSM0902_SS_STATUS_A_BIT : 0); + + rc = db_ss_set_status(conn->subscr, req->ss_code, + GSM0902_TS_CODE_TELEPHONY, ss_status); + if(rc < 0) + return gsm0480_send_ss_reject(conn, req, + GSM_0480_PROBLEM_CODE_TAG_INVOKE, + GSM_0480_INVOKE_PROB_CODE_RESOURCE_LIMITATION); + + msg = gsm48_msgb_alloc(); + /* First put the payload into the message */ + msgb_push_TLV1(msg, GSM0902_SS_DATA_SS_STATUS_TAG, ss_status); + /* Then wrap it as a Sequence of type SS-Data */ + msgb_wrap_with_TL(msg, GSM0902_SS_INFO_SS_DATA_TAG); + + return gsm0480_send_ss_return_result(conn, req, msg); +} + +static int interrogate_ss(struct gsm_subscriber_connection *conn, const struct ss_request *req) +{ + struct msgb *msg; + uint8_t ss_status; + int rc = db_ss_interrogate_status(conn->subscr, + req->ss_code, + GSM0902_TS_CODE_TELEPHONY, + &ss_status); + + if(rc < 0 || !(ss_status & GSM0902_SS_STATUS_P_BIT)) { + DEBUGP(DMM, "SS 0x%02X not provisioned\n", req->ss_code); + return gsm0480_send_ss_reject(conn, req, + GSM_0480_PROBLEM_CODE_TAG_INVOKE, + GSM_0480_INVOKE_PROB_CODE_UNRECOGNISED_OPERATION); + } + + msg = gsm48_msgb_alloc(); + /* Put the payload into the message */ + msgb_push_TLV1(msg, GSM0902_SS_INTERR_SS_RES_SS_STATUS_TAG, ss_status); + + return gsm0480_send_ss_return_result(conn, req, msg); +} diff --git a/openbsc/src/libmsc/ussd.c b/openbsc/src/libmsc/ussd.c deleted file mode 100644 index 7f01eae..0000000 --- a/openbsc/src/libmsc/ussd.c +++ /dev/null @@ -1,87 +0,0 @@ -/* Network-specific handling of mobile-originated USSDs. */ - -/* (C) 2008-2009 by Harald Welte <laforge(a)gnumonks.org> - * (C) 2008, 2009 by Holger Hans Peter Freyther <zecke(a)selfish.org> - * (C) 2009 by Mike Haben <michael.haben(a)btinternet.com> - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ - -/* This module defines the network-specific handling of mobile-originated - USSD messages. */ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <errno.h> - -#include <openbsc/gsm_04_80.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/debug.h> -#include <openbsc/osmo_msc.h> - -/* Declarations of USSD strings to be recognised */ -const char USSD_TEXT_OWN_NUMBER[] = "*#100#"; - -/* Forward declarations of network-specific handler functions */ -static int send_own_number(struct gsm_subscriber_connection *conn, const struct msgb *msg, const struct ussd_request *req); - - -/* Entrypoint - handler function common to all mobile-originated USSDs */ -int handle_rcv_ussd(struct gsm_subscriber_connection *conn, struct msgb *msg) -{ - int rc; - struct ussd_request req; - struct gsm48_hdr *gh; - - memset(&req, 0, sizeof(req)); - gh = msgb_l3(msg); - rc = gsm0480_decode_ussd_request(gh, msgb_l3len(msg), &req); - if (!rc) { - DEBUGP(DMM, "Unhandled SS\n"); - rc = gsm0480_send_ussd_reject(conn, msg, &req); - msc_release_connection(conn); - return rc; - } - - /* Release-Complete */ - if (req.text[0] == '\0') - return 0; - - if (!strcmp(USSD_TEXT_OWN_NUMBER, (const char *)req.text)) { - DEBUGP(DMM, "USSD: Own number requested\n"); - rc = send_own_number(conn, msg, &req); - } else { - DEBUGP(DMM, "Unhandled USSD %s\n", req.text); - rc = gsm0480_send_ussd_reject(conn, msg, &req); - } - - /* check if we can release it */ - msc_release_connection(conn); - return rc; -} - -/* A network-specific handler function */ -static int send_own_number(struct gsm_subscriber_connection *conn, const struct msgb *msg, const struct ussd_request *req) -{ - char *own_number = conn->subscr->extension; - char response_string[GSM_EXTENSION_LENGTH + 20]; - - /* Need trailing CR as EOT character */ - snprintf(response_string, sizeof(response_string), "Your extension is %s\r", own_number); - return gsm0480_send_ussd_response(conn, msg, response_string, req); -} -- 2.1.4

1 3

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC