- OpenBSC - lists.osmocom.org

OpenBSC relating IMSI/IMEI
by robert 26 Apr '16

26 Apr '16

Hi, I’m currently facing a strange issue where the number of entries in the subscriber table is different from the number of entries in the equipment table, therefore I cannot consistently relate each IMSI to its correct IMEI. I also had another issue where I have the same number of entries but the ID’s of the rows are different as shown below: Subscriber table Equipment table ID IMSI ID IMEI 1 XXXX 1 XXXX 2 XXXX 2 XXXX 4 XXXX 14 XXXX Does anyone know why this is happening, and how can I correctly relate each IMSI to its corresponding IMEI ? Best regards, Robert,

2 1

[PATCH 1/2] LC15: refactor code to simplify understanding
by msuraev＠sysmocom.de 26 Apr '16

26 Apr '16

From: Max <msuraev(a)sysmocom.de> Use bool type for boolean values. Move common code out of if.. else. --- src/osmo-bts-litecell15/l1_if.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c index 6a60b3f..3e60726 100644 --- a/src/osmo-bts-litecell15/l1_if.c +++ b/src/osmo-bts-litecell15/l1_if.c @@ -28,7 +28,7 @@ #include <unistd.h> #include <errno.h> #include <fcntl.h> - +#include <stdbool.h> #include <sys/types.h> #include <sys/stat.h> @@ -96,7 +96,7 @@ static void l1if_req_timeout(void *data) } static int _l1if_req_compl(struct lc15l1_hdl *fl1h, struct msgb *msg, - int is_system_prim, l1if_compl_cb *cb, void *data) + bool is_system_prim, l1if_compl_cb *cb, void *data) { struct wait_l1_conf *wlc; struct osmo_wqueue *wqueue; @@ -108,7 +108,7 @@ static int _l1if_req_compl(struct lc15l1_hdl *fl1h, struct msgb *msg, wlc->cb_data = data; /* Make sure we actually have received a REQUEST type primitive */ - if (is_system_prim == 0) { + if (!is_system_prim) { GsmL1_Prim_t *l1p = msgb_l1prim(msg); LOGP(DL1P, LOGL_INFO, "Tx L1 prim %s\n", @@ -123,7 +123,6 @@ static int _l1if_req_compl(struct lc15l1_hdl *fl1h, struct msgb *msg, wlc->is_sys_prim = 0; wlc->conf_prim_id = lc15bts_get_l1prim_conf(l1p->id); wqueue = &fl1h->write_q[MQ_L1_WRITE]; - timeout_secs = 30; } else { Litecell15_Prim_t *sysp = msgb_sysprim(msg); @@ -139,9 +138,10 @@ static int _l1if_req_compl(struct lc15l1_hdl *fl1h, struct msgb *msg, wlc->is_sys_prim = 1; wlc->conf_prim_id = lc15bts_get_sysprim_conf(sysp->id); wqueue = &fl1h->write_q[MQ_SYS_WRITE]; - timeout_secs = 30; } + timeout_secs = 30; + /* enqueue the message in the queue and add wsc to list */ if (osmo_wqueue_enqueue(wqueue, msg) != 0) { /* So we will get a timeout but the log message might help */ @@ -163,13 +163,13 @@ static int _l1if_req_compl(struct lc15l1_hdl *fl1h, struct msgb *msg, int l1if_req_compl(struct lc15l1_hdl *fl1h, struct msgb *msg, l1if_compl_cb *cb, void *data) { - return _l1if_req_compl(fl1h, msg, 1, cb, data); + return _l1if_req_compl(fl1h, msg, true, cb, data); } int l1if_gsm_req_compl(struct lc15l1_hdl *fl1h, struct msgb *msg, l1if_compl_cb *cb, void *data) { - return _l1if_req_compl(fl1h, msg, 0, cb, data); + return _l1if_req_compl(fl1h, msg, false, cb, data); } /* allocate a msgb containing a GsmL1_Prim_t */ -- 2.8.1

3 3

[PATCH] Deprecate comp128
by msuraev＠sysmocom.de 26 Apr '16

26 Apr '16

From: Max <msuraev(a)sysmocom.de> Mark function as deprecated to discourage its usage: people should use generic API in osmocom/crypt/auth.h --- include/osmocom/gsm/comp128.h | 8 ++++++-- src/gsm/auth_comp128v1.c | 2 +- src/gsm/comp128.c | 7 ++++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/include/osmocom/gsm/comp128.h b/include/osmocom/gsm/comp128.h index 33b997a..8ff76b1 100644 --- a/include/osmocom/gsm/comp128.h +++ b/include/osmocom/gsm/comp128.h @@ -8,11 +8,15 @@ #include <stdint.h> +#include <osmocom/core/defs.h> + /* - * Performs the COMP128 algorithm (used as A3/A8) + * Performs the COMP128v1 algorithm (used as A3/A8) * ki : uint8_t [16] * srand : uint8_t [16] * sres : uint8_t [4] * kc : uint8_t [8] */ -void comp128(const uint8_t *ki, const uint8_t *srand, uint8_t *sres, uint8_t *kc); +void comp128v1(const uint8_t *ki, const uint8_t *srand, uint8_t *sres, uint8_t *kc); + +void comp128(const uint8_t *ki, const uint8_t *srand, uint8_t *sres, uint8_t *kc) OSMO_DEPRECATED("Use generic API from osmocom/crypt/auth.h instead"); diff --git a/src/gsm/auth_comp128v1.c b/src/gsm/auth_comp128v1.c index 41aef71..c40027e 100644 --- a/src/gsm/auth_comp128v1.c +++ b/src/gsm/auth_comp128v1.c @@ -28,7 +28,7 @@ static int c128v1_gen_vec(struct osmo_auth_vector *vec, struct osmo_sub_auth_data *aud, const uint8_t *_rand) { - comp128(aud->u.gsm.ki, _rand, vec->sres, vec->kc); + comp128v1(aud->u.gsm.ki, _rand, vec->sres, vec->kc); vec->auth_types = OSMO_AUTH_TYPE_GSM; return 0; diff --git a/src/gsm/comp128.c b/src/gsm/comp128.c index b7a2382..abb4917 100644 --- a/src/gsm/comp128.c +++ b/src/gsm/comp128.c @@ -185,7 +185,7 @@ _comp128_permutation(uint8_t *x, uint8_t *bits) } void -comp128(const uint8_t *ki, const uint8_t *rand, uint8_t *sres, uint8_t *kc) +comp128v1(const uint8_t *ki, const uint8_t *rand, uint8_t *sres, uint8_t *kc) { int i; uint8_t x[32], bits[128]; @@ -228,3 +228,8 @@ comp128(const uint8_t *ki, const uint8_t *rand, uint8_t *sres, uint8_t *kc) kc[7] = 0; } +void +comp128(const uint8_t *ki, const uint8_t *rand, uint8_t *sres, uint8_t *kc) +{ + comp128v1(ki, rand, sres, kc); +} -- 2.8.1

2 1

[PATCH] Refactor MNCC code
by msuraev＠sysmocom.de 25 Apr '16

25 Apr '16

From: Max <msuraev(a)sysmocom.de> * Explicitly use gsm_chan_t enum when checking for full rate channels. * Consistently use enums instead of (u)int, char etc. Note: because actual enum representation is up to compiler this might change the size of gsm_mncc struct so the MNCC protocol version is bumped. --- openbsc/include/openbsc/bsc_api.h | 6 +++- openbsc/include/openbsc/gsm_04_08.h | 2 +- openbsc/include/openbsc/mncc.h | 8 ++++-- openbsc/include/openbsc/mncc_int.h | 5 +++- openbsc/src/libbsc/bsc_api.c | 53 ++++++++++++++++++----------------- openbsc/src/libbsc/gsm_04_08_utils.c | 2 +- openbsc/src/libmsc/gsm_04_08.c | 5 ++-- openbsc/src/libmsc/mncc_builtin.c | 7 +++-- openbsc/src/osmo-bsc/osmo_bsc_bssap.c | 10 ++++--- 9 files changed, 56 insertions(+), 42 deletions(-) diff --git a/openbsc/include/openbsc/bsc_api.h b/openbsc/include/openbsc/bsc_api.h index a3d12f2..b2fc1ed 100644 --- a/openbsc/include/openbsc/bsc_api.h +++ b/openbsc/include/openbsc/bsc_api.h @@ -3,6 +3,8 @@ #ifndef OPENBSC_BSC_API_H #define OPENBSC_BSC_API_H +#include <osmocom/gsm/gsm_utils.h> + #include "gsm_data.h" #define BSC_API_CONN_POL_ACCEPT 0 @@ -45,7 +47,9 @@ struct bsc_api { int bsc_api_init(struct gsm_network *network, struct bsc_api *api); int gsm0808_submit_dtap(struct gsm_subscriber_connection *conn, struct msgb *msg, int link_id, int allow_sacch); -int gsm0808_assign_req(struct gsm_subscriber_connection *conn, int chan_mode, int full_rate); +int gsm0808_assign_req(struct gsm_subscriber_connection *conn, + enum gsm48_chan_mode chan_mode, + enum gsm_chan_t chan); int gsm0808_cipher_mode(struct gsm_subscriber_connection *conn, int cipher, const uint8_t *key, int len, int include_imeisv); int gsm0808_page(struct gsm_bts *bts, unsigned int page_group, diff --git a/openbsc/include/openbsc/gsm_04_08.h b/openbsc/include/openbsc/gsm_04_08.h index fd0b89d..d333e13 100644 --- a/openbsc/include/openbsc/gsm_04_08.h +++ b/openbsc/include/openbsc/gsm_04_08.h @@ -79,7 +79,7 @@ int gsm48_extract_mi(uint8_t *classmark2, int length, char *mi_string, uint8_t * int gsm48_paging_extract_mi(struct gsm48_pag_resp *pag, int length, char *mi_string, uint8_t *mi_type); int gsm48_handle_paging_resp(struct gsm_subscriber_connection *conn, struct msgb *msg, struct gsm_subscriber *subscr); -int gsm48_lchan_modify(struct gsm_lchan *lchan, uint8_t lchan_mode); +int gsm48_lchan_modify(struct gsm_lchan *lchan, enum gsm48_chan_mode lchan_mode); int gsm48_rx_rr_modif_ack(struct msgb *msg); int gsm48_parse_meas_rep(struct gsm_meas_rep *rep, struct msgb *msg); diff --git a/openbsc/include/openbsc/mncc.h b/openbsc/include/openbsc/mncc.h index 49f0c8b..70866fe 100644 --- a/openbsc/include/openbsc/mncc.h +++ b/openbsc/include/openbsc/mncc.h @@ -26,6 +26,8 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/gsm/mncc.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> #include <stdint.h> @@ -156,8 +158,8 @@ struct gsm_mncc { int emergency; char imsi[16]; - unsigned char lchan_type; - unsigned char lchan_mode; + enum gsm_chan_t lchan_type; + enum gsm48_chan_mode lchan_mode; }; struct gsm_data_frame { @@ -166,7 +168,7 @@ struct gsm_data_frame { unsigned char data[0]; }; -#define MNCC_SOCK_VERSION 5 +#define MNCC_SOCK_VERSION 6 struct gsm_mncc_hello { uint32_t msg_type; uint32_t version; diff --git a/openbsc/include/openbsc/mncc_int.h b/openbsc/include/openbsc/mncc_int.h index 213ce14..dafef25 100644 --- a/openbsc/include/openbsc/mncc_int.h +++ b/openbsc/include/openbsc/mncc_int.h @@ -3,12 +3,15 @@ #include <stdint.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> + struct mncc_int { uint8_t def_codec[2]; }; extern struct mncc_int mncc_int; -uint8_t mncc_codec_for_mode(int lchan_type); +enum gsm48_chan_mode mncc_codec_for_mode(enum gsm_chan_t lchan_type); #endif diff --git a/openbsc/src/libbsc/bsc_api.c b/openbsc/src/libbsc/bsc_api.c index b8b5967..2608504 100644 --- a/openbsc/src/libbsc/bsc_api.c +++ b/openbsc/src/libbsc/bsc_api.c @@ -34,8 +34,9 @@ #include <openbsc/trau_mux.h> #include <osmocom/gsm/protocol/gsm_08_08.h> - +#include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/core/talloc.h> +#include <osmocom/gsm/gsm_utils.h> #define GSM0808_T10_VALUE 6, 0 @@ -155,7 +156,7 @@ static void assignment_t10_timeout(void *_conn) * Handle the multirate config */ static void handle_mr_config(struct gsm_subscriber_connection *conn, - struct gsm_lchan *lchan, int full_rate) + struct gsm_lchan *lchan, enum gsm_chan_t chan) { struct bsc_api *api; api = conn->bts->network->bsc_api; @@ -163,12 +164,13 @@ static void handle_mr_config(struct gsm_subscriber_connection *conn, struct gsm48_multi_rate_conf *mr_conf; if (api->mr_config) - return api->mr_config(conn, lchan, full_rate); + return api->mr_config(conn, lchan, + (GSM_LCHAN_TCH_H == chan) ? 0 : 1); - if (full_rate) - mr = &lchan->ts->trx->bts->mr_full; - else + if (GSM_LCHAN_TCH_H == chan) mr = &lchan->ts->trx->bts->mr_half; + else + mr = &lchan->ts->trx->bts->mr_full; mr_conf = (struct gsm48_multi_rate_conf *) mr->gsm48_ie; mr_conf->ver = 1; @@ -197,12 +199,11 @@ static void handle_mr_config(struct gsm_subscriber_connection *conn, * -> Assignment Complete/Assignment Failure * 5.) Release the SDCCH, continue signalling on the new link */ -static int handle_new_assignment(struct gsm_subscriber_connection *conn, int chan_mode, int full_rate) +static int handle_new_assignment(struct gsm_subscriber_connection *conn, + enum gsm48_chan_mode chan_mode, + enum gsm_chan_t chan_type) { struct gsm_lchan *new_lchan; - int chan_type; - - chan_type = full_rate ? GSM_LCHAN_TCH_F : GSM_LCHAN_TCH_H; new_lchan = lchan_alloc(conn->bts, chan_type, 0); @@ -223,7 +224,7 @@ static int handle_new_assignment(struct gsm_subscriber_connection *conn, int cha /* handle AMR correctly */ if (chan_mode == GSM48_CMODE_SPEECH_AMR) - handle_mr_config(conn, new_lchan, full_rate); + handle_mr_config(conn, new_lchan, chan_type); if (rsl_chan_activate_lchan(new_lchan, 0x1, 0) < 0) { LOGP(DHO, LOGL_ERROR, "could not activate channel\n"); @@ -337,7 +338,9 @@ int gsm0808_submit_dtap(struct gsm_subscriber_connection *conn, /* * \brief Check if the given channel is compatible with the mode/fullrate */ -static int chan_compat_with_mode(struct gsm_lchan *lchan, int chan_mode, int full_rate) +static int chan_compat_with_mode(struct gsm_lchan *lchan, + enum gsm48_chan_mode chan_mode, + enum gsm_chan_t chan) { switch (chan_mode) { case GSM48_CMODE_SIGN: @@ -348,16 +351,14 @@ static int chan_compat_with_mode(struct gsm_lchan *lchan, int chan_mode, int ful case GSM48_CMODE_DATA_3k6: case GSM48_CMODE_DATA_6k0: /* these services can all run on TCH/H, but we may have - * an explicit override by the 'full_rate' argument */ + * an explicit override by the explicit chan argument */ switch (lchan->type) { case GSM_LCHAN_TCH_F: return 1; case GSM_LCHAN_TCH_H: - if (full_rate) - return 0; - else + if (GSM_LCHAN_TCH_H == chan) return 1; - break; + return 0; default: return 0; } @@ -368,9 +369,7 @@ static int chan_compat_with_mode(struct gsm_lchan *lchan, int chan_mode, int ful /* these services all explicitly require a TCH/F */ if (lchan->type == GSM_LCHAN_TCH_F) return 1; - else - return 0; - break; + return 0; } return 0; @@ -382,19 +381,21 @@ static int chan_compat_with_mode(struct gsm_lchan *lchan, int chan_mode, int ful * this is for audio handling only. In case the current channel does not allow * the selected mode a new one will be allocated. * + * If chan is not GSM_LCHAN_TCH_H than full rate is assumed. + * * TODO: Add multirate configuration, make it work for more than audio. */ -int gsm0808_assign_req(struct gsm_subscriber_connection *conn, int chan_mode, int full_rate) +int gsm0808_assign_req(struct gsm_subscriber_connection *conn, + enum gsm48_chan_mode chan_mode, enum gsm_chan_t chan) { - struct bsc_api *api; - api = conn->bts->network->bsc_api; + struct bsc_api *api = conn->bts->network->bsc_api; - if (!chan_compat_with_mode(conn->lchan, chan_mode, full_rate)) { - if (handle_new_assignment(conn, chan_mode, full_rate) != 0) + if (!chan_compat_with_mode(conn->lchan, chan_mode, chan)) { + if (handle_new_assignment(conn, chan_mode, chan) != 0) goto error; } else { if (chan_mode == GSM48_CMODE_SPEECH_AMR) - handle_mr_config(conn, conn->lchan, full_rate); + handle_mr_config(conn, conn->lchan, chan); LOGP(DMSC, LOGL_NOTICE, "Sending ChanModify for speech: %s on channel %s\n", diff --git a/openbsc/src/libbsc/gsm_04_08_utils.c b/openbsc/src/libbsc/gsm_04_08_utils.c index 635665a..327cff1 100644 --- a/openbsc/src/libbsc/gsm_04_08_utils.c +++ b/openbsc/src/libbsc/gsm_04_08_utils.c @@ -488,7 +488,7 @@ int gsm48_send_rr_ass_cmd(struct gsm_lchan *dest_lchan, struct gsm_lchan *lchan, } /* 9.1.5 Channel mode modify: Modify the mode on the MS side */ -int gsm48_lchan_modify(struct gsm_lchan *lchan, uint8_t mode) +int gsm48_lchan_modify(struct gsm_lchan *lchan, enum gsm48_chan_mode mode) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CHN MOD"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index 7b78d48..4de3477 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -2939,7 +2939,7 @@ static int _gsm48_lchan_modify(struct gsm_trans *trans, void *arg) return 0; return gsm0808_assign_req(trans->conn, mode->lchan_mode, - trans->conn->lchan->type != GSM_LCHAN_TCH_H); + trans->conn->lchan->type); } static void mncc_recv_rtp(struct gsm_network *net, uint32_t callref, @@ -3048,8 +3048,7 @@ static int tch_rtp_create(struct gsm_network *net, uint32_t callref) LOGP(DMNCC, LOGL_DEBUG, "RTP create: codec=%s, chan_type=%s\n", get_value_string(gsm48_chan_mode_names, m), get_value_string(gsm_chan_t_names, lchan->type)); - return gsm0808_assign_req(trans->conn, m, - lchan->type != GSM_LCHAN_TCH_H); + return gsm0808_assign_req(trans->conn, m, lchan->type); } mncc_recv_rtp_sock(trans->net, trans, MNCC_RTP_CREATE); diff --git a/openbsc/src/libmsc/mncc_builtin.c b/openbsc/src/libmsc/mncc_builtin.c index ee98d2d..b879756 100644 --- a/openbsc/src/libmsc/mncc_builtin.c +++ b/openbsc/src/libmsc/mncc_builtin.c @@ -27,6 +27,9 @@ #include <string.h> #include <errno.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> + #include <openbsc/gsm_04_08.h> #include <openbsc/debug.h> #include <openbsc/mncc.h> @@ -65,7 +68,7 @@ static struct gsm_call *get_call_ref(uint32_t callref) return NULL; } -uint8_t mncc_codec_for_mode(int lchan_type) +enum gsm48_chan_mode mncc_codec_for_mode(enum gsm_chan_t lchan_type) { /* FIXME: check codec capabilities of the phone */ @@ -75,7 +78,7 @@ uint8_t mncc_codec_for_mode(int lchan_type) return mncc_int.def_codec[1]; } -static uint8_t determine_lchan_mode(struct gsm_mncc *setup) +static enum gsm48_chan_mode determine_lchan_mode(struct gsm_mncc *setup) { return mncc_codec_for_mode(setup->lchan_type); } diff --git a/openbsc/src/osmo-bsc/osmo_bsc_bssap.c b/openbsc/src/osmo-bsc/osmo_bsc_bssap.c index a60940d..01105a8 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_bssap.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_bssap.c @@ -28,6 +28,7 @@ #include <osmocom/gsm/protocol/gsm_08_08.h> #include <osmocom/gsm/gsm0808.h> +#include <osmocom/gsm/gsm_utils.h> /* * helpers for the assignment command @@ -292,7 +293,8 @@ static int bssmap_handle_assignm_req(struct osmo_bsc_sccp_con *conn, uint8_t timeslot; uint8_t multiplex; enum gsm48_chan_mode chan_mode = GSM48_CMODE_SIGN; - int i, supported, port, full_rate = -1; + enum gsm_chan_t chan = GSM_LCHAN_TCH_H; + int i, supported, port; if (!conn->conn) { LOGP(DMSC, LOGL_ERROR, "No lchan/msc_data in cipher mode command.\n"); @@ -344,7 +346,6 @@ static int bssmap_handle_assignm_req(struct osmo_bsc_sccp_con *conn, * inner loop. The outer loop will exit due chan_mode having * the correct value. */ - full_rate = 0; msc = conn->msc; for (supported = 0; chan_mode == GSM48_CMODE_SIGN && supported < msc->audio_length; @@ -354,7 +355,8 @@ static int bssmap_handle_assignm_req(struct osmo_bsc_sccp_con *conn, for (i = 2; i < TLVP_LEN(&tp, GSM0808_IE_CHANNEL_TYPE); ++i) { if ((data[i] & 0x7f) == perm_val) { chan_mode = gsm88_to_chan_mode(perm_val); - full_rate = (data[i] & 0x4) == 0; + if (0 == (data[i] & 0x4)) + chan = GSM_LCHAN_TCH_F; break; } else if ((data[i] & 0x80) == 0x00) { break; @@ -371,7 +373,7 @@ static int bssmap_handle_assignm_req(struct osmo_bsc_sccp_con *conn, port = mgcp_timeslot_to_endpoint(multiplex, timeslot); conn->rtp_port = rtp_calculate_port(port, msc->rtp_base); - return gsm0808_assign_req(conn->conn, chan_mode, full_rate); + return gsm0808_assign_req(conn->conn, chan_mode, chan); reject: resp = gsm0808_create_assignment_failure(GSM0808_CAUSE_NO_RADIO_RESOURCE_AVAILABLE, NULL); -- 2.8.1

3 2

[PATCH] Disconnect calls with incompatible channels
by msuraev＠sysmocom.de 25 Apr '16

25 Apr '16

From: Max <msuraev(a)sysmocom.de> In case both TCH/H and TCH/F are configured and internal MNCC handler is used we might end up in a situation where call legs with incompatible channel types or codecs would be connected resulting in a broken audio. Disconnect such calls with appropriate error message. Fixes: OS#1663 --- openbsc/src/libmsc/gsm_04_08.c | 46 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index 7b78d48..05cb886 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -1600,6 +1600,7 @@ static int tch_map(struct gsm_lchan *lchan, struct gsm_lchan *remote_lchan) struct gsm_bts *bts = lchan->ts->trx->bts; struct gsm_bts *remote_bts = remote_lchan->ts->trx->bts; enum gsm_chan_t lt = lchan->type, rt = remote_lchan->type; + enum gsm48_chan_mode lm = lchan->tch_mode, rm = remote_lchan->tch_mode; int rc; DEBUGP(DCC, "Setting up TCH map between (bts=%u,trx=%u,ts=%u,%s) and " @@ -1614,6 +1615,22 @@ static int tch_map(struct gsm_lchan *lchan, struct gsm_lchan *remote_lchan) return -EINVAL; } + if (lt != rt) { + LOGP(DCC, LOGL_ERROR, "Cannot patch through call with different" + " channel types: local = %s, remote = %s\n", + get_value_string(gsm_chan_t_names, lt), + get_value_string(gsm_chan_t_names, rt)); + return -EBADSLT; + } + + if (lm != rm) { + LOGP(DCC, LOGL_ERROR, "Cannot patch through call with different" + " channel modes: local = %s, remote = %s\n", + get_value_string(gsm48_chan_mode_names, lm), + get_value_string(gsm48_chan_mode_names, rm)); + return -EMEDIUMTYPE; + } + // todo: map between different bts types switch (bts->type) { case GSM_BTS_TYPE_NANOBTS: @@ -1851,6 +1868,30 @@ static void gsm48_cc_timeout(void *arg) } +/* disconnect both calls from the bridge */ +static inline void disconnect_bridge(struct gsm_network *net, + struct gsm_mncc_bridge *bridge, int err) +{ + struct gsm_trans *trans0 = trans_find_by_callref(net, bridge->callref[0]); + struct gsm_trans *trans1 = trans_find_by_callref(net, bridge->callref[1]); + struct gsm_mncc mx_rel; + if (!trans0 || !trans1) + return; + + DEBUGP(DCC, "Failed to bridge TCH for calls %x <-> %x :: %s \n", + trans0->callref, trans1->callref, strerror(err)); + + memset(&mx_rel, 0, sizeof(struct gsm_mncc)); + mncc_set_cause(&mx_rel, GSM48_CAUSE_LOC_INN_NET, + GSM48_CC_CAUSE_CHAN_UNACCEPT); + + mx_rel.callref = trans0->callref; + gsm48_cc_tx_disconnect(trans0, &mx_rel); + + mx_rel.callref = trans1->callref; + gsm48_cc_tx_disconnect(trans1, &mx_rel); +} + static void gsm48_start_cc_timer(struct gsm_trans *trans, int current, int sec, int micro) { @@ -3221,7 +3262,10 @@ int mncc_tx_to_cc(struct gsm_network *net, int msg_type, void *arg) /* handle special messages */ switch(msg_type) { case MNCC_BRIDGE: - return tch_bridge(net, arg); + rc = tch_bridge(net, arg); + if (rc < 0) + disconnect_bridge(net, arg, -rc); + return rc; case MNCC_FRAME_DROP: return tch_recv_mncc(net, data->callref, 0); case MNCC_FRAME_RECV: -- 2.8.1

1 0

[PATCH] queue_new(): if calloc fails, abort (CID #57918)
by Neels Hofmeyr 25 Apr '16

25 Apr '16

Coverity complains about a 'Dereference before null check' on *queue. So, push the NULL check further up, but also, instead of handling a calloc failure as error, rather abort the program. --- gtp/queue.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gtp/queue.c b/gtp/queue.c index 7c971b0..707b522 100644 --- a/gtp/queue.c +++ b/gtp/queue.c @@ -127,16 +127,15 @@ int queue_new(struct queue_t **queue) if (QUEUE_DEBUG) printf("queue_new\n"); *queue = calloc(1, sizeof(struct queue_t)); + if (!(*queue)) + abort(); (*queue)->next = 0; (*queue)->first = -1; (*queue)->last = -1; if (QUEUE_DEBUG) queue_print(*queue); - if (*queue) - return 0; - else - return EOF; + return 0; } /*! \brief Deallocates queue structure */ -- 2.1.4

3 4

[PATCH] queue_new(): fix NULL dereference on allocation failure
by Neels Hofmeyr 25 Apr '16

25 Apr '16

Coverity complains about a 'Dereference before null check' on *queue. So, push the NULL check further up. Though I doubt that 'return EOF' is the proper way to handle allocation failure, this patch is only about the NULL dereference. Fixes: CID#57918 --- gtp/queue.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gtp/queue.c b/gtp/queue.c index 7c971b0..5b4d849 100644 --- a/gtp/queue.c +++ b/gtp/queue.c @@ -127,16 +127,15 @@ int queue_new(struct queue_t **queue) if (QUEUE_DEBUG) printf("queue_new\n"); *queue = calloc(1, sizeof(struct queue_t)); + if (!(*queue)) + return EOF; (*queue)->next = 0; (*queue)->first = -1; (*queue)->last = -1; if (QUEUE_DEBUG) queue_print(*queue); - if (*queue) - return 0; - else - return EOF; + return 0; } /*! \brief Deallocates queue structure */ -- 2.1.4

1 0

[PATCH] Merge packaging changes from Debian
by msuraev＠sysmocom.de 24 Apr '16

24 Apr '16

From: Max <msuraev(a)sysmocom.de> This helps to get diff between upstream and distro significantly smaller. It also significantly reduces the number of warnings+errors reported by lintian from 42 to only 8. --- debian/control | 234 ++++++++++++++++++++++++++--- debian/copyright | 237 +++++++++++++++++++++++++----- debian/libosmocodec-doc.doc-base | 7 + debian/libosmocodec-doc.install | 1 + debian/libosmocodec-doc.lintian-overrides | 2 + debian/libosmocore-dev.install | 1 - debian/libosmocore-doc.doc-base | 7 + debian/libosmocore-doc.install | 1 + debian/libosmocore-doc.lintian-overrides | 2 + debian/libosmocore-utils.manpages | 1 + debian/libosmogsm-doc.doc-base | 7 + debian/libosmogsm-doc.install | 1 + debian/libosmogsm-doc.lintian-overrides | 2 + debian/libosmovty-doc.doc-base | 7 + debian/libosmovty-doc.install | 1 + debian/libosmovty-doc.lintian-overrides | 2 + debian/rules | 28 ++++ debian/watch | 2 + 18 files changed, 483 insertions(+), 60 deletions(-) create mode 100644 debian/libosmocodec-doc.doc-base create mode 100644 debian/libosmocodec-doc.install create mode 100644 debian/libosmocodec-doc.lintian-overrides create mode 100644 debian/libosmocore-doc.doc-base create mode 100644 debian/libosmocore-doc.install create mode 100644 debian/libosmocore-doc.lintian-overrides create mode 100644 debian/libosmocore-utils.manpages create mode 100644 debian/libosmogsm-doc.doc-base create mode 100644 debian/libosmogsm-doc.install create mode 100644 debian/libosmogsm-doc.lintian-overrides create mode 100644 debian/libosmovty-doc.doc-base create mode 100644 debian/libosmovty-doc.install create mode 100644 debian/libosmovty-doc.lintian-overrides create mode 100644 debian/watch diff --git a/debian/control b/debian/control index 459030b..f7138b5 100644 --- a/debian/control +++ b/debian/control @@ -1,86 +1,282 @@ Source: libosmocore +Maintainer: Harald Welte <laforge(a)gnumonks.org> +Uploaders: Ruben Undheim <ruben.undheim(a)gmail.com> Section: libs Priority: optional -Maintainer: Harald Welte <laforge(a)gnumonks.org> -Build-Depends: debhelper (>= 9), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, doxygen, libpcsclite-dev, pkg-config, libtalloc-dev -Standards-Version: 3.9.6 -Homepage: http://bb.osmocom.org/trac/wiki/libosmocore +Build-Depends: debhelper (>= 9), + autotools-dev, + dh-autoreconf, + doxygen, + txt2man, + libpcsclite-dev, + pkg-config, + autoconf, + automake, + libtool, + libdpkg-perl, + git, + libtalloc-dev +Standards-Version: 3.9.7 Vcs-Git: git://git.osmocom.org/libosmocore.git Vcs-Browser: http://git.osmocom.org/gitweb?p=libosmocore.git;a=summary +Homepage: http://bb.osmocom.org/trac/wiki/libosmocore Package: libosmocore Section: libs Architecture: any -Depends: libosmocodec0, libosmocore7, libosmogb4, libosmogsm5, libosmovty3, libosmoctrl0, ${misc:Depends} -Multi-Arch: foreign -Description: Open Source MObile COMmunications CORE library +Multi-Arch: same +Depends: libosmocodec0 (= ${binary:Version}), + libosmocore6 (= ${binary:Version}), + libosmogb4 (= ${binary:Version}), + libosmogsm5 (= ${binary:Version}), + libosmovty3 (= ${binary:Version}), + libosmoctrl0 (= ${binary:Version}), + libosmosim0 (= ${binary:Version}), + ${misc:Depends} +Description: Open Source MObile COMmunications CORE library (metapackage) + The libraries provided by this package contain various utility functions. + These were originally developed as part of the + OpenBSC project but are of a more generic nature and thus useful to (at + least) other programs that are developed in the sphere of Free Software / Open + Source mobile communication. Package: libosmocodec0 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} Multi-Arch: same +Depends: ${shlibs:Depends}, + ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} Description: Osmo codec library + This is part of the libosmocore "meta"-library. The libosmocore library + contains various utility functions that were originally developed as part of + the OpenBSC project, but which are of a more generic nature and thus useful to + (at least) other programs that are developed in the sphere of Free Software / + Open Source mobile communication. + . + The libosmocodec library in particular contains the implementation of multiple + GSM codecs: + . + - GSM 06.10 - GSM FR Codec + - GSM 06.20 - GSM HR Codec + - GSM 06.60 - GSM EFR Codec + - GSM 06.90 - GSM AMR Codec + +Package: libosmocodec-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, + libosmocodec0, + libjs-jquery +Description: Documentation for the osmo codec library + This is part of the libosmocore "meta"-library. The libosmocore library + contains various utility functions that were originally developed as part of + the OpenBSC project, but which are of a more generic nature and thus useful to + (at least) other programs that are developed in the sphere of Free Software / + Open Source mobile communication. + . + This package contains the documentation for the libosmocodec library. Package: libosmocore7 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} Multi-Arch: same +Depends: ${shlibs:Depends}, + ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} Description: Osmo Core library + This is part of the libosmocore "meta"-library. The libosmocore library + contains various utility functions that were originally developed as part of + the OpenBSC project, but which are of a more generic nature and thus useful to + (at least) other programs that are developed in the sphere of Free Software / + Open Source mobile communication. + . + The libosmocore6 library in particular is a collection of common code used in + various sub-projects inside the Osmocom family of projects. + +Package: libosmocore-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, + libosmocore6, + libjs-jquery, + libosmocodec-doc, + libosmogsm-doc, + libosmovty-doc +Description: Documentation for the Osmo Core library + This is part of the libosmocore "meta"-library. The libosmocore library + contains various utility functions that were originally developed as part of + the OpenBSC project, but which are of a more generic nature and thus useful to + (at least) other programs that are developed in the sphere of Free Software / + Open Source mobile communication. + . + This package contains the documentation for the libosmocore library. Package: libosmogb4 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} Multi-Arch: same +Depends: ${shlibs:Depends}, + ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} Description: Osmo GPRS GB library + This is part of the libosmocore "meta"-library. The libosmocore library + contains various utility functions that were originally developed as part of + the OpenBSC project, but which are of a more generic nature and thus useful to + (at least) other programs that are developed in the sphere of Free Software / + Open Source mobile communication. + . + The libosmogb library in particular contains a GPRS BSSGP protocol + implementation. Package: libosmogsm5 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} Multi-Arch: same +Depends: ${shlibs:Depends}, + ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} Description: Osmo GSM utility library + This is part of the libosmocore "meta"-library. The libosmocore library + contains various utility functions that were originally developed as part of + the OpenBSC project, but which are of a more generic nature and thus useful to + (at least) other programs that are developed in the sphere of Free Software / + Open Source mobile communication. + . + The libosmogsm library in particular is a collection of common code used in + various GSM related sub-projects inside the Osmocom family of projects. It + includes A5/1 and A5/2 ciphers, COMP128v1, a LAPDm implementation, a GSM TLV + parser, SMS utility routines as well as protocol definitions for a series of + protocols. + +Package: libosmogsm-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, + libosmogsm5, + libjs-jquery +Description: Documentation for the Osmo GSM utility library + This is part of the libosmocore "meta"-library. The libosmocore library + contains various utility functions that were originally developed as part of + the OpenBSC project, but which are of a more generic nature and thus useful to + (at least) other programs that are developed in the sphere of Free Software / + Open Source mobile communication. + . + This package contains the documentation for the libosmogsm library. Package: libosmovty3 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} Multi-Arch: same +Depends: ${shlibs:Depends}, + ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} Description: Osmo VTY library + This is part of the libosmocore "meta"-library. The libosmocore library + contains various utility functions that were originally developed as part of + the OpenBSC project, but which are of a more generic nature and thus useful to + (at least) other programs that are developed in the sphere of Free Software / + Open Source mobile communication. + . + The libosmovty library in particular implements the interactive command-line + on the VTY (Virtual TTY) as well as configuration file parsing. + +Package: libosmovty-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, + libosmovty3, + libjs-jquery +Description: Documentation for the Osmo VTY library + This is part of the libosmocore "meta"-library. The libosmocore library + contains various utility functions that were originally developed as part of + the OpenBSC project, but which are of a more generic nature and thus useful to + (at least) other programs that are developed in the sphere of Free Software / + Open Source mobile communication. + . + This package contains the documentation for the libosmovty library. Package: libosmoctrl0 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} Multi-Arch: same +Depends: ${shlibs:Depends}, + ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} Description: Osmo control library + This is part of the libosmocore "meta"-library. The libosmocore library + contains various utility functions that were originally developed as part of + the OpenBSC project, but which are of a more generic nature and thus useful to + (at least) other programs that are developed in the sphere of Free Software / + Open Source mobile communication. + . + The libosmoctrl library in particular contains an SNMP-like status interface. Package: libosmosim0 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} Multi-Arch: same +Depends: ${shlibs:Depends}, + ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} Description: Osmo SIM library + This is part of the libosmocore "meta"-library. The libosmocore library + contains various utility functions that were originally developed as part of + the OpenBSC project, but which are of a more generic nature and thus useful to + (at least) other programs that are developed in the sphere of Free Software / + Open Source mobile communication. + . + The libosmosim library in particular contains routines for SIM card access. Package: libosmocore-dev -Section: libdevel Architecture: any -Depends: ${misc:Depends}, libosmocore, libtalloc-dev Multi-Arch: same +Section: libdevel +Depends: libosmocodec0 (= ${binary:Version}), + libosmocore7 (= ${binary:Version}), + libosmogb4 (= ${binary:Version}), + libosmogsm5 (= ${binary:Version}), + libosmovty3 (= ${binary:Version}), + libosmoctrl0 (= ${binary:Version}), + libosmosim0 (= ${binary:Version}), + ${misc:Depends}, + libtalloc-dev Description: Development headers for Open Source MObile COMmunications CORE library + The header files provided by this package may be used to develop + with any of the libosmocore libraries. + . + Also static libraries are installed with this package. Package: libosmocore-utils Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libosmocore Multi-Arch: same +Section: utils +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libosmocore Description: Utilities for gsm + This package contains a program for frequency calculation for GSM called + 'osmo-arfcn' and a program called 'osmo-auc-gen' that is used for testing GSM + authentication. + . + They use the libosmocore library. The libosmocore library contain various + utility functions that were originally developed as part of the OpenBSC + project, but which are of a more generic nature and thus useful to (at least) + other programs that are developed in the sphere of Free Software / Open Source + mobile communication. Package: libosmocore-dbg Architecture: any +Multi-Arch: same Section: debug Priority: extra -Depends: libosmocore (= ${binary:Version}), ${misc:Depends} -Multi-Arch: same +Depends: libosmocore (= ${binary:Version}), + ${misc:Depends} Description: Debug symbols for Open Source MObile COMmunications CORE library + This proackage contains debug symbols for all the libraries that are part of + libosmocore. + . + The libosmocore library contain various utility functions that + were originally developed as part of the OpenBSC project, but which are of a + more generic nature and thus useful to (at least) other programs that are + developed in the sphere of Free Software / Open Source mobile communication. diff --git a/debian/copyright b/debian/copyright index c450be5..2991c85 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,54 +1,211 @@ -This work was packaged for Debian by: +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: libosmocore +Source: git://git.osmocom.org/libosmocore.git - Harald Welte <laforge(a)gnumonks.org> on Tue, 24 Aug 2010 10:55:04 +0200 +Files: * +Copyright: 2008 Daniel Willmann <daniel(a)totalueberwachung.de> + 2008-2010 Harald Welte <laforge(a)gnumonks.org> + 2008-2010 Holger Hans Peter Freyther <zecke(a)selfish.org> + 2009-2010 Sylvain Munaut <tnt(a)246tNt.com> + 2009-2010 On-Waves + 2010 Nico Golde <nico(a)ngolde.de> +License: GPL-2+ -It was downloaded from: +Files: src/talloc.c include/osmocom/core/talloc.h +Copyright: 2004 Andrew Tridgell + 2006 Stefan Metzmacher +License: LGPL-3+ - git://git.osmocom.org/libosmocore.git +Files: include/osmocom/core/loggingrb.h + include/osmocom/core/strrb.h + src/strrb.c + src/loggingrb.c +Copyright: 2012-2013 Katerina Barone-Adesi <kat.obsc(a)gmail.com> +License: GPL-2+ -Upstream Author(s): +Files: include/osmocom/core/linuxrbtree.h + src/rbtree.c +Copyright: 1999 Andrea Arcangeli <andrea(a)suse.de> + 2002 David Woodhouse <dwmw2(a)infradead.org> +License: GPL-2+ - Harald Welte <laforge(a)gnumonks.org> - Holger Hans Peter Freyther <zecke(a)selfish.org> - Sylvain Munaut <tnt(a)246tNt.com> - Daniel Willmann <daniel(a)totalueberwachung.de> - Golde <nico(a)ngolde.de> - For src/talloc.c and include/osmocore/talloc.h: - Andrew Tridgell - Stefan Metzmacher - For src/vty/* and include/osmocom/vty/* - Kunihiro Ishiguro +Files: include/osmocom/core/crc16.h +Copyright: 2005 Ben Gardner <bgardner(a)wabtec.com> +License: GPL-2+ -Copyright: +Files: src/utils.c +Copyright: 2011 Harald Welte <laforge(a)gnumonks.org> + 2011 Sylvain Munaut <tnt(a)246tNt.com> + 2014 Nils O. Selåsdal <noselasd(a)fiane.dyndns.org> +License: GPL-2+ - Copyright (C) 2008-2010 Harald Welte <laforge(a)gnumonks.org> - Copyright (C) 2008-2010 Holger Hans Peter Freyther <zecke(a)selfish.org> - Copyright (C) 2009-2010 Sylvain Munaut <tnt(a)246tNt.com> - Copyright (C) 2009-2010 On-Waves - Copyright (C) 2008 Daniel Willmann <daniel(a)totalueberwachung.de> - Copyright (C) 2010 Nico Golde <nico(a)ngolde.de> - For src/talloc.c and include/osmocore/talloc.h: - Copyright (C) 2004 Andrew Tridgell - Copyright (C) 2006 Stefan Metzmacher - For src/vty/* and include/osmocom/vty/* - Copyright (C) 1998 Kunihiro Ishiguro +Files: src/gsm/gsm48_ie.c + src/gsm/lapd_core.c + src/gsm/lapdm.c +Copyright: 2008,2010-2011 Harald Welte <laforge(a)gnumonks.org> + 2009-2011 Andreas Eversberg <jolly(a)eversberg.eu> +License: GPL-2+ -License: +Files: src/gsm/gsm0411_smc.c + src/gsm/gsm0411_smr.c + src/gsm/gsm0411_utils.c +Copyright: 2008 Daniel Willmann <daniel(a)totalueberwachung.de> + 2009 Harald Welte <laforge(a)gnumonks.org> + 2010-2013 Holger Hans Peter Freyther <zecke(a)selfish.org> + 2010 On-Waves + 2011 Andreas Eversberg <jolly(a)eversberg.eu> +License: GPL-2+ - GNU General Public License, Version 2 or later +Files: src/gsm/gsm0480.c +Copyright: 2009 Mike Haben <michael.haben(a)btinternet.com> + 2010 Holger Hans Peter Freyther <zecke(a)selfish.org> +License: GPL-2+ -The Debian packaging is: +Files: src/gsm/milenage/aes-internal.c + src/gsm/milenage/aes-encblock.c + src/gsm/milenage/aes.h + src/gsm/milenage/milenage.c + src/gsm/milenage/aes_wrap.h + src/gsm/milenage/aes-internal-enc.c + src/gsm/milenage/aes_i.h +Copyright: 2003-2007 Jouni Malinen <j(a)w1.fi> +License: GPL-2 +Comment: Most of the file aes-internal.c is public_domain - Copyright (C) 2010 Harald Welte <laforge(a)gnumonks.org> +Files: include/osmocom/core/bitXXgen.h.tpl + src/gsm/kasumi.c +Copyright: 2013-2014 Max <max.suraev(a)fairwaves.co> +License: GPL-2+ -# Please chose a license for your packaging work. If the program you package -# uses a mainstream license, using the same license is the safest choice. -# Please avoid to pick license terms that are more restrictive than the -# packaged work, as it may make Debian's contributions unacceptable upstream. -# If you just want it to be GPL version 3, leave the following lines in. +Files: src/gsm/auth_comp128v23.c +Copyright: 2010-2011 Harald Welte <laforge(a)gnumonks.org> + 2013 Kévin Redon <kevredon(a)mail.tsaitgaist.info> +License: GPL-2+ -and is licensed under the GPL version 3, -see "/usr/share/common-licenses/GPL-3". +Files: src/gsm/comp128v23.c +Copyright: 2013 Kévin Redon <kevredon(a)mail.tsaitgaist.info> +License: GPL-2+ -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. +Files: tests/fr/fr_test.c + tests/logging/logging_test.c + tests/loggingrb/loggingrb_test.c +Copyright: 2008,2009,2012 Holger Hans Peter Freyther <zecke(a)selfish.org> + 2012-2013 Katerina Barone-Adesi <kat.obsc(a)gmail.com> +License: AGPL-3+ + +Files: tests/strrb/strrb_test.c + tests/vty/vty_test.c +Copyright: 2012-2013 Katerina Barone-Adesi <kat.obsc(a)gmail.com> + 2013 Jacob Erlbeck <jerlbeck(a)sysmocom.de> +License: GPL-3+ + +Files: src/vty/* include/osmocom/vty/* +Copyright: 1997,1998 Kunihiro Ishiguro +License: GPL-2+ + +Files: include/osmocom/core/stats.h + src/stat_item.c + src/stats.c + src/vty/stats_vty.c + tests/stats/stats_test.c +Copyright: 2009-2010 by Harald Welte <laforge(a)gnumonks.org> + 2009-2014 by Holger Hans Peter Freyther + 2015 Sysmocom s.f.m.c. GmbH +License: GPL-2+ + +Files: tests/gb/gprs_ns_test.c + tests/gb/gprs_bssgp_test.c +Copyright: 2013-2014 sysmocom s.f.m.c. GmbH +License: GPL-2+ +Comment: No license is listed in these files, but it is assumed that + the project specific license GPL-2+ applies since contributions by + sysmocom people to other files in this package are GPL licensed. + +Files: debian/* +Copyright: 2010-2015 Harald Welte <laforge(a)gnumonks.org> + 2014-2015 Ruben Undheim <ruben.undheim(a)gmail.com> +License: GPL-3+ + + +License: GPL-2+ + This package is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 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 General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +License: GPL-2 + This package is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, version 2 of the License. + . + 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 General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +License: GPL-3+ + This package is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". + + +License: LGPL-3+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + . + This library 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 + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, see <http://www.gnu.org/licenses/>. + . + On Debian systems, the complete text of the GNU Lesser General + Public License version 3 can be found in "/usr/share/common-licenses/LGPL-3". + + +License: AGPL-3+ + 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 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/>. diff --git a/debian/libosmocodec-doc.doc-base b/debian/libosmocodec-doc.doc-base new file mode 100644 index 0000000..8480c73 --- /dev/null +++ b/debian/libosmocodec-doc.doc-base @@ -0,0 +1,7 @@ +Document: libosmocodec-doc +Title: Documentation for the libosmocodec library +Section: Programming + +Format: HTML +Index: /usr/share/doc/libosmocore/codec/html/index.html +Files: /usr/share/doc/libosmocore/codec/html/*.html diff --git a/debian/libosmocodec-doc.install b/debian/libosmocodec-doc.install new file mode 100644 index 0000000..be0255b --- /dev/null +++ b/debian/libosmocodec-doc.install @@ -0,0 +1 @@ +usr/share/doc/libosmocore/codec/ diff --git a/debian/libosmocodec-doc.lintian-overrides b/debian/libosmocodec-doc.lintian-overrides new file mode 100644 index 0000000..526d4f9 --- /dev/null +++ b/debian/libosmocodec-doc.lintian-overrides @@ -0,0 +1,2 @@ +# jquery.js is generated by doxygen. See http://bugs.debian.org/736360 +libosmocodec-doc binary: embedded-javascript-library usr/share/doc/libosmocore/codec/html/jquery.js please use libjs-jquery diff --git a/debian/libosmocore-dev.install b/debian/libosmocore-dev.install index 7c5a789..465f933 100644 --- a/debian/libosmocore-dev.install +++ b/debian/libosmocore-dev.install @@ -3,4 +3,3 @@ usr/lib/*/lib*.a usr/lib/*/lib*.so usr/lib/*/lib*.la usr/lib/*/pkgconfig/* -usr/share/doc/libosmocore/* diff --git a/debian/libosmocore-doc.doc-base b/debian/libosmocore-doc.doc-base new file mode 100644 index 0000000..b13b82d --- /dev/null +++ b/debian/libosmocore-doc.doc-base @@ -0,0 +1,7 @@ +Document: libosmocore-doc +Title: Documentation for the libosmocore library +Section: Programming + +Format: HTML +Index: /usr/share/doc/libosmocore/core/html/index.html +Files: /usr/share/doc/libosmocore/core/html/*.html diff --git a/debian/libosmocore-doc.install b/debian/libosmocore-doc.install new file mode 100644 index 0000000..fe4cb26 --- /dev/null +++ b/debian/libosmocore-doc.install @@ -0,0 +1 @@ +usr/share/doc/libosmocore/core/ diff --git a/debian/libosmocore-doc.lintian-overrides b/debian/libosmocore-doc.lintian-overrides new file mode 100644 index 0000000..345e48d --- /dev/null +++ b/debian/libosmocore-doc.lintian-overrides @@ -0,0 +1,2 @@ +# jquery.js is generated by doxygen. See http://bugs.debian.org/736360 +libosmocore-doc binary: embedded-javascript-library usr/share/doc/libosmocore/core/html/jquery.js please use libjs-jquery diff --git a/debian/libosmocore-utils.manpages b/debian/libosmocore-utils.manpages new file mode 100644 index 0000000..13cdaf4 --- /dev/null +++ b/debian/libosmocore-utils.manpages @@ -0,0 +1 @@ +debian/man/*.1 diff --git a/debian/libosmogsm-doc.doc-base b/debian/libosmogsm-doc.doc-base new file mode 100644 index 0000000..6318c1d --- /dev/null +++ b/debian/libosmogsm-doc.doc-base @@ -0,0 +1,7 @@ +Document: libosmogsm-doc +Title: Documentation for the libosmogsm library +Section: Programming + +Format: HTML +Index: /usr/share/doc/libosmocore/gsm/html/index.html +Files: /usr/share/doc/libosmocore/gsm/html/*.html diff --git a/debian/libosmogsm-doc.install b/debian/libosmogsm-doc.install new file mode 100644 index 0000000..a4300bc --- /dev/null +++ b/debian/libosmogsm-doc.install @@ -0,0 +1 @@ +usr/share/doc/libosmocore/gsm/ diff --git a/debian/libosmogsm-doc.lintian-overrides b/debian/libosmogsm-doc.lintian-overrides new file mode 100644 index 0000000..2db0404 --- /dev/null +++ b/debian/libosmogsm-doc.lintian-overrides @@ -0,0 +1,2 @@ +# jquery.js is generated by doxygen. See http://bugs.debian.org/736360 +libosmogsm-doc binary: embedded-javascript-library usr/share/doc/libosmocore/gsm/html/jquery.js please use libjs-jquery diff --git a/debian/libosmovty-doc.doc-base b/debian/libosmovty-doc.doc-base new file mode 100644 index 0000000..dde189c --- /dev/null +++ b/debian/libosmovty-doc.doc-base @@ -0,0 +1,7 @@ +Document: libosmovty-doc +Title: Documentation for the libosmovty library +Section: Programming + +Format: HTML +Index: /usr/share/doc/libosmocore/vty/html/index.html +Files: /usr/share/doc/libosmocore/vty/html/*.html diff --git a/debian/libosmovty-doc.install b/debian/libosmovty-doc.install new file mode 100644 index 0000000..634ba41 --- /dev/null +++ b/debian/libosmovty-doc.install @@ -0,0 +1 @@ +usr/share/doc/libosmocore/vty/ diff --git a/debian/libosmovty-doc.lintian-overrides b/debian/libosmovty-doc.lintian-overrides new file mode 100644 index 0000000..c10975e --- /dev/null +++ b/debian/libosmovty-doc.lintian-overrides @@ -0,0 +1,2 @@ +# jquery.js is generated by doxygen. See http://bugs.debian.org/736360 +libosmovty-doc binary: embedded-javascript-library usr/share/doc/libosmocore/vty/html/jquery.js please use libjs-jquery diff --git a/debian/rules b/debian/rules index 3cce05e..42222b2 100755 --- a/debian/rules +++ b/debian/rules @@ -12,6 +12,10 @@ DEBIAN := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2) DEBVERS := $(shell echo '$(DEBIAN)' | cut -d- -f1) VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g') +CHANGELOG_DATE := $(shell LC_ALL=C date -u -d "`dpkg-parsechangelog --show-field Date`" +"%d %B %Y") + +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +export DEB_BUILD_MAINT_OPTIONS = hardening=+all # Our tests want to override symbols, make it possible on Ubuntu export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS | sed -e 's/-Wl,-Bsymbolic-functions//') @@ -38,3 +42,27 @@ override_dh_autoreconf: override_dh_auto_configure: dh_auto_configure -- --enable-static + +override_dh_clean: + dh_clean + $(RM) .version + $(RM) debian/man/osmo-arfcn.1 + $(RM) debian/man/osmo-auc-gen.1 + $(RM) include/osmocom/core/bit16gen.h + $(RM) include/osmocom/core/bit32gen.h + $(RM) include/osmocom/core/bit64gen.h + $(RM) include/osmocom/core/crc16gen.h + $(RM) include/osmocom/core/crc32gen.h + $(RM) include/osmocom/core/crc64gen.h + $(RM) include/osmocom/core/crc8gen.h + $(RM) src/crc16gen.c + $(RM) src/crc32gen.c + $(RM) src/crc64gen.c + $(RM) src/crc8gen.c + $(RM) tests/package.m4 + $(RM) tests/testsuite + $(RM) -r doc/codec/ + $(RM) -r doc/core/ + $(RM) -r doc/gsm/ + $(RM) -r doc/vty/html/ + $(RM) -r doc/vty/latex/ diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..efce4b8 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://github.com/osmocom/libosmocore/releases /osmocom/libosmocore/archive/(\d\S+)\.tar\.(?:bz2|gz|xz) -- 2.8.1

3 3

[PATCH 1/2] Doxygen: Enable client-based search engine
by Sylvain Munaut 24 Apr '16

24 Apr '16

From: Sylvain Munaut <tnt(a)246tNt.com> Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> --- Doxyfile.codec.in | 2 +- Doxyfile.core.in | 2 +- Doxyfile.gsm.in | 2 +- Doxyfile.vty.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Doxyfile.codec.in b/Doxyfile.codec.in index 4f539c7..00ab43a 100644 --- a/Doxyfile.codec.in +++ b/Doxyfile.codec.in @@ -1141,7 +1141,7 @@ MATHJAX_RELPATH = http://www.mathjax.org/mathjax # typically be disabled. For large projects the javascript based search engine # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. -SEARCHENGINE = NO +SEARCHENGINE = YES # When the SERVER_BASED_SEARCH tag is enabled the search engine will be # implemented using a PHP enabled web server instead of at the web client diff --git a/Doxyfile.core.in b/Doxyfile.core.in index 71843cc..045402f 100644 --- a/Doxyfile.core.in +++ b/Doxyfile.core.in @@ -1141,7 +1141,7 @@ MATHJAX_RELPATH = http://www.mathjax.org/mathjax # typically be disabled. For large projects the javascript based search engine # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. -SEARCHENGINE = NO +SEARCHENGINE = YES # When the SERVER_BASED_SEARCH tag is enabled the search engine will be # implemented using a PHP enabled web server instead of at the web client diff --git a/Doxyfile.gsm.in b/Doxyfile.gsm.in index c4a837f..76c8f81 100644 --- a/Doxyfile.gsm.in +++ b/Doxyfile.gsm.in @@ -1141,7 +1141,7 @@ MATHJAX_RELPATH = http://www.mathjax.org/mathjax # typically be disabled. For large projects the javascript based search engine # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. -SEARCHENGINE = NO +SEARCHENGINE = YES # When the SERVER_BASED_SEARCH tag is enabled the search engine will be # implemented using a PHP enabled web server instead of at the web client diff --git a/Doxyfile.vty.in b/Doxyfile.vty.in index 5f7a158..2763823 100644 --- a/Doxyfile.vty.in +++ b/Doxyfile.vty.in @@ -1141,7 +1141,7 @@ MATHJAX_RELPATH = http://www.mathjax.org/mathjax # typically be disabled. For large projects the javascript based search engine # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. -SEARCHENGINE = NO +SEARCHENGINE = YES # When the SERVER_BASED_SEARCH tag is enabled the search engine will be # implemented using a PHP enabled web server instead of at the web client -- 2.7.3

1 1

[PATCH] Add static lib to -dev .deb package
by msuraev＠sysmocom.de 24 Apr '16

24 Apr '16

From: Max <msuraev(a)sysmocom.de> According to https://www.debian.org/doc/debian-policy/ch-sharedlibs.html and http://packaging.ubuntu.com/html/libraries.html that's where it belongs. --- debian/libosmocore-dev.install | 1 + debian/rules | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/libosmocore-dev.install b/debian/libosmocore-dev.install index 7a62c6f..7c5a789 100644 --- a/debian/libosmocore-dev.install +++ b/debian/libosmocore-dev.install @@ -1,4 +1,5 @@ usr/include/* +usr/lib/*/lib*.a usr/lib/*/lib*.so usr/lib/*/lib*.la usr/lib/*/pkgconfig/* diff --git a/debian/rules b/debian/rules index a6a2cfc..3cce05e 100755 --- a/debian/rules +++ b/debian/rules @@ -35,3 +35,6 @@ override_dh_auto_test: override_dh_autoreconf: echo $(VERSION) > .tarball-version dh_autoreconf + +override_dh_auto_configure: + dh_auto_configure -- --enable-static -- 2.8.1

1 0