March 2011 - OpenBSC - lists.osmocom.org

by jason mercury

I have some questions: 1) When I start bsc_hack bsc_init.c first establishes OML link and initializes the bts then it establishes RSL link and bts starts broadcasting. However, it takes so much time to start the bts. Instead of this I want to do the following: it establishes OML link at the beginning and only once, then when i want to start broadcasting it establishes just the RSL link and bts will start faster since i don't have to wait for OML link. What should be done for this? 2) If i send one or two word messages from telnet interface it is okay. But if i send a longer message the phone could't receive the end of the message correctly(last words may be incomplete). Did any one encounter with this problem? What is wrong with me? 3) Could I send SMS in which extension of the sender is text not integer. For example, i want to send an information SMS that this is a test network. For this purpose i want to send an SMS from 'OpenBSC'. I set the extension of the first subscriber in database as text and tried to send the SMS but SMS wasn't delivered. What should i do? 4) Can i add SMS externally to SMS table of database? Thanks. Jason

11 years, 4 months

4
3
0 0

sms bugfix

by Dennis Wehrle

Hello Our goal was to send status sms via the vty interface. But all of our sms were cropped. In contrast sms from one MS to another MS are displayed correctly (despite the fact, that the text at the database contains several '@' at the end / the user_data contains several zero-octets). Therefore i have inspect the code and found several bugs. The main problem is that the "user_data_len" is not correctly used. As per GSM 03.40, 9.2.3.16 TP‑User‑Data‑Length (TP‑UDL): "If the TP‑User‑Data is coded using the GSM 7 bit default alphabet, the TP‑User‑Data‑Length field gives an integer representation of the number of septets within the TP‑User‑Data field to follow." Currently the "user_data_len" contains the number of octets (returned from gsm_7bit_encode(...) at gsm_utils.c (libosmocore)). The big problem here is that this information is not unique, e.g.: 1.) 46 non-extension characters + 1 extension character => (46 * 7 bit + (1 * (2 * 7 bit))) / 8 bit = 42 octets 2.) 47 non-extension characters => (47 * 7 bit) / 8 bit = 41,125 = 42 octets 3.) 48 non-extension characters => (48 * 7 bit) / 8 bit = 42 octects But the MS has to know the correct "user_data_len" to decode the correct number of characters. For this reason i updated the gsm_7bit_encode() function to return the correct number of septets. However sometimes it is needed to know the correct number of octets (e.g. at gsm_04_11.c: gsm340_gen_tpdu(...)) => i added a function to gsm_utils.c named: uint8_t get_octet_len(const uint8_t sept_len) I have also fixed the problem, that the sms are wrongly stored / displayed on the database. But the solution on the function *sms_from_result(...) (at db.c) is not really "beautiful". This is because there exists no "user_data_len" field at the database. To store the right value for "user_data_len" (which is further needed) i have to get the length from the "text" field. Unfortunately this is not enough. If the text contains extension characters like {[]} etc. then the "user_data_len" has to be bigger because these characters needs two septets. Therefore i use a switch statement so search for these characters. A better solution for that is to store the right "user_data_len" to the database (on the encoding / decoding procedure). But i don't know if this is a suitable solution for all of you (because you have to change your database structure etc.). Best Regards Dennis Wehrle

12 years, 9 months

6
24
0 0

wireshark: update of RSL dissector

by pablo＠gnumonks.org

From: Pablo Neira Ayuso <pablo(a)gnumonks.org> This patch includes some updates for the wireshark RSL dissector. See patch for details. This changes are available in the pablo/wireshark-rsl branch of openBSC. Please, merge it. Pablo Neira Ayuso (1): wireshark: update extension of RSL dissector with ip.access nanoBTS support wireshark/0004-rsl-ipaccess.patch | 228 ++++++++++++++++++++++--------------- 1 files changed, 134 insertions(+), 94 deletions(-) -- 1.7.2.3

13 years

4
5
0 0

RTP-Proxy without MNCC-BuildIn no running

by meckel＠netzing.de

Hi List I want to use OpenBSC with Asterisk and LCR. After a lot of reading I found out that openbsc must start with the Paramters "-m" and "-P". But i got a lot error messages like: <0006> gsm_04_08.c:2960 receive message GSM_TCH_FRAME <0006> gsm_04_08.c:2992 TCH frame to lchan without RTP connection So i tried a lot and start only with -P and the RTP-Proxy started. But LCR and Asterisk sure not involved because the missing "-m". So i need "-m". It is a bug or a feature that "-P" will be ignored if I set "-m"? I´m sitting over the bsc code but until this moment I didnt found something so I hope somebody here can help. Ulrich Meckel

13 years

4
3
0 0

Problem with RTP-Proxy

by Luca Bertoncello

Hi, list! We are trying to connect OpenBSC and Asterisk together (through LCR), but we have many problems. We start OpenBSC with the parameters -P -m --debug=DRLL:DCC:DMM:DRR:DRSL:DMNCC:DMSC:DNM:DLCH:DMUX:DHO Now, if we try to call a mobile phone from another one, we get many errors: <0006> gsm_04_08.c:2960 receive message GSM_TCH_FRAME <0006> gsm_04_08.c:2992 TCH frame to lchan without RTP connection Now, if I understand what mncc_tx_to_cc does, I can just think, that the RTP-Proxy is NOT active, but a part of OpenBSC thinks that it IS active. Another interesting problem is, that, although we start OpenBSC to debug the CC, we do NOT get a message like: Setting up TCH map between ... (gsm_04_08.c line 1606) Could someone confirm me my idea? And, maybe, give me a suggestion to fix our problem? We use OpenBSC in the version 0.9.11.375-ca8f. Thanks a lot in advance for your help Luca Bertoncello -- _______________________________________________________________________ Luca Bertoncello Entwicklung Mail: bertoncello(a)netzing.de NETZING Solutions AG Tel.: 0351/41381 - 23 Fröbelstr. 57, 01159 Dresden Fax: 0351/41381 - 12 _______________________________________________________________________ Impressum: NETZING Solutions AG - Fröbelstraße 57 - 01159 Dresden Sitz der Gesellschaft Amtsgericht Dresden HRB 18926 Vorstand Dieter Schneider - Aufsichtsratsvorsitzender Volker Kanitz USt.Id DE211326547 Mail: netzing.ag(a)netzing.de

13 years

1
0
0 0

[PATCH 0/4] libosmocore: several cleanups

by pablo＠gnumonks.org

From: Pablo Neira Ayuso <pablo(a)gnumonks.org> This patchset includes several cleanups previous to another patchset that will contain the namespace pollution fix (to appear soon). They're available in the branch pablo/cleanups in libosmocore. Please merge it. Pablo Neira Ayuso (4): bitvec: add bitvec_find_first_bit_pos() from gsm/rxlev_stat.c write_queue: use full path of includes in osmocom/core/write_queue.h vty: move vty_out_rate_ctr_group prototype to osmocom/vty/misc.h utils: move OSMO_SNPRINT_RET() macro definition to osmocom/core/utils.h include/osmocom/core/bitvec.h | 2 ++ include/osmocom/core/rate_ctr.h | 3 --- include/osmocom/core/utils.h | 9 +++++++++ include/osmocom/core/write_queue.h | 4 ++-- include/osmocom/vty/Makefile.am | 2 +- include/osmocom/vty/misc.h | 10 ++++++++++ src/bitvec.c | 14 ++++++++++++++ src/gsm/rxlev_stat.c | 12 ------------ src/logging.c | 26 ++++++++------------------ 9 files changed, 46 insertions(+), 36 deletions(-) create mode 100644 include/osmocom/vty/misc.h -- 1.7.2.3

13 years

2
1
0 0

[PATCH] [RFC] src: add prefix osmocom_ to all functions in libosmocore

by pablo＠gnumonks.org

From: Pablo Neira Ayuso <pablo(a)gnumonks.org> This patch is a RFC, I can add the prefix osmocom_ to all functions in libosmocore to fix with the existing namespace pollution. This task was proposed by Harald. Let me know if you are OK with this approach and I'll send a patchset along this week. --- include/osmocom/core/backtrace.h | 2 +- src/backtrace.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/osmocom/core/backtrace.h b/include/osmocom/core/backtrace.h index bbbb2c2..7c248aa 100644 --- a/include/osmocom/core/backtrace.h +++ b/include/osmocom/core/backtrace.h @@ -1,6 +1,6 @@ #ifndef _OSMO_BACKTRACE_H_ #define _OSMO_BACKTRACE_H_ -void generate_backtrace(); +void osmocom_generate_backtrace(); #endif diff --git a/src/backtrace.c b/src/backtrace.c index ecd6b9c..5c609bb 100644 --- a/src/backtrace.c +++ b/src/backtrace.c @@ -29,7 +29,7 @@ #ifdef HAVE_EXECINFO_H #include <execinfo.h> -void generate_backtrace() +void osmocom_generate_backtrace() { int i, nptrs; void *buffer[100]; -- 1.7.2.3

13 years

4
6
0 0

[PATCH] openBSC: include new file osmocom/vty/misc.h in several daemons

by pablo＠gnumonks.org

From: Pablo Neira Ayuso <pablo(a)gnumonks.org> Minor change in openBSC due to new osmocom/vty/misc.h file that was added in the patchset entitled: libosmocore: several cleanups It's available in pablo/cleanups branch in openbsc git tree. Please, merge it. Pablo Neira Ayuso (1): src: include new file osmocom/vty/misc.h for vty_out_rate_ctr_group() openbsc/src/gprs/sgsn_vty.c | 1 + openbsc/src/libgb/gprs_bssgp_vty.c | 1 + openbsc/src/libgb/gprs_ns_vty.c | 1 + openbsc/src/osmo-bsc_nat/bsc_nat_vty.c | 1 + 4 files changed, 4 insertions(+), 0 deletions(-) -- 1.7.2.3

13 years

1
1
0 0

[PATCH 1/4] bitvec: add bitvec_find_first_bit_pos() from gsm/rxlev_stat.c

by pablo＠gnumonks.org

From: Pablo Neira Ayuso <pablo(a)gnumonks.org> This patch adds bitvec_find_bit_pos() to bitvec.c where it really belongs to. Before this patch used to be part of gsm/rxlev_stat.c --- include/osmocom/core/bitvec.h | 2 ++ src/bitvec.c | 14 ++++++++++++++ src/gsm/rxlev_stat.c | 12 ------------ 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/include/osmocom/core/bitvec.h b/include/osmocom/core/bitvec.h index 42977fb..bbe1641 100644 --- a/include/osmocom/core/bitvec.h +++ b/include/osmocom/core/bitvec.h @@ -68,6 +68,8 @@ int bitvec_set_uint(struct bitvec *bv, unsigned int in, int count); /* get multiple bits (based on numeric value) from current pos */ int bitvec_get_uint(struct bitvec *bv, int num_bits); +/* find the first bit set in bit vector */ +int bitvec_find_bit_pos(const struct bitvec *bv, unsigned int n, enum bit_value val); /* Pad the bit vector up to a certain bit position */ int bitvec_spare_padding(struct bitvec *bv, unsigned int up_to_bit); diff --git a/src/bitvec.c b/src/bitvec.c index 4984af2..4fd3834 100644 --- a/src/bitvec.c +++ b/src/bitvec.c @@ -217,3 +217,17 @@ int bitvec_spare_padding(struct bitvec *bv, unsigned int up_to_bit) return 0; } + +/* find first bit set in bit vector */ +int bitvec_find_bit_pos(const struct bitvec *bv, unsigned int n, + enum bit_value val) +{ + unsigned int i; + + for (i = n; i < bv->data_len*8; i++) { + if (bitvec_get_bit_pos(bv, i) == val) + return i; + } + + return -1; +} diff --git a/src/gsm/rxlev_stat.c b/src/gsm/rxlev_stat.c index 626aaff..d226861 100644 --- a/src/gsm/rxlev_stat.c +++ b/src/gsm/rxlev_stat.c @@ -30,18 +30,6 @@ #include <osmocom/core/bitvec.h> #include <osmocom/gsm/rxlev_stat.h> -int bitvec_find_bit_pos(const struct bitvec *bv, unsigned int n, enum bit_value val) -{ - unsigned int i; - - for (i = n; i < bv->data_len*8; i++) { - if (bitvec_get_bit_pos(bv, i) == val) - return i; - } - - return -1; -} - void rxlev_stat_input(struct rxlev_stats *st, uint16_t arfcn, uint8_t rxlev) { struct bitvec bv; -- 1.7.2.3

13 years

1
3
0 0

[PATCH] ipaccess-proxy: fix segfault in handle_dead_socket

by pablo＠gnumonks.org

From: Pablo Neira Ayuso <pablo(a)gnumonks.org> This patch fixes a segfault if we or one BTS start a TCP connection and close it before any IPAC_MSGT_ID_RESP message is sent. --- openbsc/src/ipaccess/ipaccess-proxy.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/openbsc/src/ipaccess/ipaccess-proxy.c b/openbsc/src/ipaccess/ipaccess-proxy.c index 56fe160..d98eb54 100644 --- a/openbsc/src/ipaccess/ipaccess-proxy.c +++ b/openbsc/src/ipaccess/ipaccess-proxy.c @@ -806,6 +806,11 @@ static void handle_dead_socket(struct bsc_fd *bfd) switch (bfd->priv_nr & 0xff) { case OML_FROM_BTS: /* incoming OML data from BTS, forward to BSC OML */ + /* The BTS started a connection with us but we got no + * IPAC_MSGT_ID_RESP message yet, in that scenario we did not + * allocate the ipa_bts_conn structure. */ + if (ipbc == NULL) + break; ipbc->oml_conn = NULL; bsc_conn = ipbc->bsc_oml_conn; /* close the connection to the BSC */ -- 1.7.2.3

13 years

2
1
0 0

switchin from multidrop to star

by kobayashi_maru＠onlinehome.de

hello i tried to switch back one of my bs-11 from multidrop to star ("./bs11_config bport0-star" after disconnecting) but i always get a NACK. whats wrong there? T.

13 years

1
0
0 0

trx1 not found/not existing trx1

by kobayashi_maru＠onlinehome.de

hello, as you know, my 2nd bs-11(bts1) in multidrop konfig is bootstrapped as bts/trx(1/1) although only trx0 is used on bts1, and the 2nd bs-11 isnt seen by any handy. the debugp message says "abis_nm.c: 518 OC=Radio-Carrier(02) INST=(00,01,ff) STATE CHG: TRX 1 does not exist unknown object class" of course does trx1 not exist, since there are only trx0s, bts0 uses trx0 and bts1 as well (its trx0, of course) what does that mean? T.

13 years

1
0
0 0

[PATCH] tests: fix bsc-nat test

by pablo＠gnumonks.org

From: Pablo Neira Ayuso <pablo(a)gnumonks.org> In 136f453dd2492b95004461a33c90b11732f33bd8, I forgot to update the new header path in the test/bsc-nat files (this happened to me because I forgot to configured openBSC without --enable-nat). --- openbsc/tests/bsc-nat/Makefile.am | 4 ++-- openbsc/tests/bsc-nat/bsc_nat_test.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openbsc/tests/bsc-nat/Makefile.am b/openbsc/tests/bsc-nat/Makefile.am index 04bdb97..4785098 100644 --- a/openbsc/tests/bsc-nat/Makefile.am +++ b/openbsc/tests/bsc-nat/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(COVERAGE_CFLAGS) +AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(COVERAGE_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) EXTRA_DIST = bsc_data.c @@ -16,4 +16,4 @@ bsc_nat_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \ $(top_srcdir)/src/libabis/libabis.a \ $(top_srcdir)/src/libtrau/libtrau.a \ $(top_srcdir)/src/libcommon/libcommon.a \ - $(LIBOSMOCORE_LIBS) -lrt $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -lrt $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) diff --git a/openbsc/tests/bsc-nat/bsc_nat_test.c b/openbsc/tests/bsc-nat/bsc_nat_test.c index 504b691..f5de953 100644 --- a/openbsc/tests/bsc-nat/bsc_nat_test.c +++ b/openbsc/tests/bsc-nat/bsc_nat_test.c @@ -27,10 +27,10 @@ #include <openbsc/bsc_nat.h> #include <openbsc/bsc_nat_sccp.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <osmocom/sccp/sccp.h> -#include <osmocore/protocol/gsm_08_08.h> +#include <osmocom/gsm/protocol/gsm_08_08.h> #include <stdio.h> -- 1.7.2.3

13 years

2
1
0 0

[ADM] New commitlog mailing list

by Harald Welte

Hi all! We haven't had a functioning commit log mailinglist since mid-2009, when the revision control system of openbsc was converted from svn to git. Especially today, with the large number of separate git repositories on http://cgit.osmocom.org/, it is very easy to loose track of what other developers are doing. The new mailing list 'osmocom-commitlog' (renamed from openbsc-commits) will receive updates from all repositories on git.osmocom.org. Feel free to subscribe at http://lists.osmocom.org/mailman/listinfo/osmocom-commitlog Cheers, Harald -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

13 years

2
2
0 0

[ADM] Problems with osmocom git server

by Harald Welte

Hi all! We're sorry to report that there are some problems with our git repositories at the moment, resulting in 'early EOF / index-pack failed' messages when users are attempting to clone one of our repositories. The problem has been thoroughly analyzed, but even after many hours of analysis, no solution has been found yet. Your best chance is to keep re-trying the clone, in 5-10% of the cases it will succeed. More technical details are available at this posting to the git mailing list: http://article.gmane.org/gmane.comp.version-control.git/169909 Sorry for the inconvenience. -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

13 years

2
2
0 0

[PATCH 0/2] [v2] reorganization of GSM-specific stuff and header files

by pablo＠gnumonks.org

From: Pablo Neira Ayuso <pablo(a)gnumonks.org> This is the second version of this patchset, which includes: * The creation of the libosmogsm library which is distributed in libosmocore. * The new GSM-specific header directory under include/osmocom/gsm. * The new core header directory under include/osmocom/core. Once this changes have been applied, the directory include/osmocore vanishes from the tree. Please, apply! Pablo Neira Ayuso (2): src: move GSM-specific functions to libosmogsm library include: reorganize headers file to include/osmocom/[gsm|core] Makefile.am | 2 +- configure.in | 7 ++- include/Makefile.am | 2 +- include/osmocom/Makefile.am | 4 +- include/osmocom/core/Makefile.am | 12 +++++ include/osmocom/core/backtrace.h | 6 ++ include/{osmocore => osmocom/core}/bits.h | 0 include/{osmocore => osmocom/core}/bitvec.h | 0 include/{osmocore => osmocom/core}/crc16.h | 0 include/{osmocore => osmocom/core}/gsmtap.h | 0 include/{osmocore => osmocom/core}/gsmtap_util.h | 0 include/{osmocore => osmocom/core}/linuxlist.h | 0 include/{osmocore => osmocom/core}/logging.h | 2 +- include/{osmocore => osmocom/core}/msgb.h | 6 +- include/{osmocore => osmocom/core}/msgfile.h | 0 include/{osmocore => osmocom/core}/panic.h | 0 include/{osmocore => osmocom/core}/plugin.h | 0 include/{osmocore => osmocom/core}/process.h | 0 include/{osmocore => osmocom/core}/rate_ctr.h | 2 +- include/{osmocore => osmocom/core}/select.h | 2 +- include/{osmocore => osmocom/core}/signal.h | 0 include/{osmocore => osmocom/core}/statistics.h | 0 include/{osmocore => osmocom/core}/talloc.h | 0 include/{osmocore => osmocom/core}/timer.h | 2 +- include/{osmocore => osmocom/core}/utils.h | 0 include/{osmocore => osmocom/core}/write_queue.h | 0 include/osmocom/crypt/gprs_cipher.h | 2 +- include/osmocom/gsm/Makefile.am | 6 ++ include/{osmocore => osmocom/gsm}/comp128.h | 0 include/{osmocore => osmocom/gsm}/gsm0480.h | 6 +- include/{osmocore => osmocom/gsm}/gsm0808.h | 0 include/{osmocore => osmocom/gsm}/gsm48.h | 6 +- include/{osmocore => osmocom/gsm}/gsm48_ie.h | 8 ++-- include/{osmocore => osmocom/gsm}/gsm_utils.h | 1 - include/{osmocore => osmocom/gsm}/mncc.h | 0 include/osmocom/gsm/protocol/Makefile.am | 6 ++ .../{osmocore => osmocom/gsm}/protocol/gsm_03_41.h | 0 .../{osmocore => osmocom/gsm}/protocol/gsm_04_08.h | 0 .../{osmocore => osmocom/gsm}/protocol/gsm_04_11.h | 0 .../{osmocore => osmocom/gsm}/protocol/gsm_04_12.h | 0 .../{osmocore => osmocom/gsm}/protocol/gsm_04_80.h | 0 .../{osmocore => osmocom/gsm}/protocol/gsm_08_08.h | 0 .../{osmocore => osmocom/gsm}/protocol/gsm_08_58.h | 0 .../{osmocore => osmocom/gsm}/protocol/gsm_12_21.h | 2 +- include/{osmocore => osmocom/gsm}/rsl.h | 4 +- include/{osmocore => osmocom/gsm}/rxlev_stat.h | 0 include/{osmocore => osmocom/gsm}/tlv.h | 2 +- include/osmocom/vty/telnet_interface.h | 4 +- include/osmocore/Makefile.am | 13 ----- include/osmocore/protocol/Makefile.am | 6 -- libosmogsm.pc.in | 11 ++++ src/Makefile.am | 14 +++--- src/backtrace.c | 50 ++++++++++++++++++++ src/bits.c | 2 +- src/bitvec.c | 2 +- src/crc16.c | 2 +- src/gsm/Makefile.am | 13 +++++ src/{ => gsm}/comp128.c | 0 src/{ => gsm}/gprs_cipher_core.c | 6 +- src/{ => gsm}/gsm0480.c | 10 ++-- src/{ => gsm}/gsm0808.c | 6 +- src/{ => gsm}/gsm48.c | 8 ++-- src/{ => gsm}/gsm48_ie.c | 12 ++-- src/{ => gsm}/gsm_utils.c | 29 +---------- src/{ => gsm}/rsl.c | 4 +- src/{ => gsm}/rxlev_stat.c | 4 +- src/{ => gsm}/tlv_parser.c | 4 +- src/gsmtap_util.c | 14 +++--- src/logging.c | 6 +- src/logging_syslog.c | 6 +- src/msgb.c | 4 +- src/msgfile.c | 4 +- src/panic.c | 5 +- src/plugin.c | 2 +- src/rate_ctr.c | 10 ++-- src/select.c | 6 +- src/signal.c | 6 +- src/statistics.c | 6 +- src/talloc.c | 2 +- src/timer.c | 2 +- src/utils.c | 2 +- src/vty/buffer.c | 2 +- src/vty/command.c | 2 +- src/vty/logging_vty.c | 6 +- src/vty/telnet_interface.c | 6 +- src/vty/utils.c | 8 ++-- src/vty/vector.c | 2 +- src/vty/vty.c | 2 +- src/write_queue.c | 2 +- tests/msgfile/msgfile_test.c | 2 +- tests/sms/Makefile.am | 2 +- tests/sms/sms_test.c | 6 +- tests/smscb/Makefile.am | 2 +- tests/smscb/smscb_test.c | 2 +- tests/timer/timer_test.c | 4 +- tests/ussd/Makefile.am | 2 +- tests/ussd/ussd_test.c | 2 +- 97 files changed, 241 insertions(+), 176 deletions(-) create mode 100644 include/osmocom/core/Makefile.am create mode 100644 include/osmocom/core/backtrace.h rename include/{osmocore => osmocom/core}/bits.h (100%) rename include/{osmocore => osmocom/core}/bitvec.h (100%) rename include/{osmocore => osmocom/core}/crc16.h (100%) rename include/{osmocore => osmocom/core}/gsmtap.h (100%) rename include/{osmocore => osmocom/core}/gsmtap_util.h (100%) rename include/{osmocore => osmocom/core}/linuxlist.h (100%) rename include/{osmocore => osmocom/core}/logging.h (99%) rename include/{osmocore => osmocom/core}/msgb.h (98%) rename include/{osmocore => osmocom/core}/msgfile.h (100%) rename include/{osmocore => osmocom/core}/panic.h (100%) rename include/{osmocore => osmocom/core}/plugin.h (100%) rename include/{osmocore => osmocom/core}/process.h (100%) rename include/{osmocore => osmocom/core}/rate_ctr.h (98%) rename include/{osmocore => osmocom/core}/select.h (92%) rename include/{osmocore => osmocom/core}/signal.h (100%) rename include/{osmocore => osmocom/core}/statistics.h (100%) rename include/{osmocore => osmocom/core}/talloc.h (100%) rename include/{osmocore => osmocom/core}/timer.h (98%) rename include/{osmocore => osmocom/core}/utils.h (100%) rename include/{osmocore => osmocom/core}/write_queue.h (100%) create mode 100644 include/osmocom/gsm/Makefile.am rename include/{osmocore => osmocom/gsm}/comp128.h (100%) rename include/{osmocore => osmocom/gsm}/gsm0480.h (84%) rename include/{osmocore => osmocom/gsm}/gsm0808.h (100%) rename include/{osmocore => osmocom/gsm}/gsm48.h (90%) rename include/{osmocore => osmocom/gsm}/gsm48_ie.h (96%) rename include/{osmocore => osmocom/gsm}/gsm_utils.h (99%) rename include/{osmocore => osmocom/gsm}/mncc.h (100%) create mode 100644 include/osmocom/gsm/protocol/Makefile.am rename include/{osmocore => osmocom/gsm}/protocol/gsm_03_41.h (100%) rename include/{osmocore => osmocom/gsm}/protocol/gsm_04_08.h (100%) rename include/{osmocore => osmocom/gsm}/protocol/gsm_04_11.h (100%) rename include/{osmocore => osmocom/gsm}/protocol/gsm_04_12.h (100%) rename include/{osmocore => osmocom/gsm}/protocol/gsm_04_80.h (100%) rename include/{osmocore => osmocom/gsm}/protocol/gsm_08_08.h (100%) rename include/{osmocore => osmocom/gsm}/protocol/gsm_08_58.h (100%) rename include/{osmocore => osmocom/gsm}/protocol/gsm_12_21.h (99%) rename include/{osmocore => osmocom/gsm}/rsl.h (94%) rename include/{osmocore => osmocom/gsm}/rxlev_stat.h (100%) rename include/{osmocore => osmocom/gsm}/tlv.h (99%) delete mode 100644 include/osmocore/Makefile.am delete mode 100644 include/osmocore/protocol/Makefile.am create mode 100644 libosmogsm.pc.in create mode 100644 src/backtrace.c create mode 100644 src/gsm/Makefile.am rename src/{ => gsm}/comp128.c (100%) rename src/{ => gsm}/gprs_cipher_core.c (96%) rename src/{ => gsm}/gsm0480.c (98%) rename src/{ => gsm}/gsm0808.c (98%) rename src/{ => gsm}/gsm48.c (98%) rename src/{ => gsm}/gsm48_ie.c (99%) rename src/{ => gsm}/gsm_utils.c (95%) rename src/{ => gsm}/rsl.c (99%) rename src/{ => gsm}/rxlev_stat.c (96%) rename src/{ => gsm}/tlv_parser.c (98%) -- 1.7.2.3

13 years, 1 month

4
6
0 0

bts/trx(0/0) and (1/1)

by Thomas Ansorg

hello my 2 bs-11 are now recognised (bootstrapped) by the program, but somethings strange: bts 0, the pc-side bts, is recognised as bts/trx(0/0), but the 2nd one is bts/trx(1/1). strange, because on the 2nd bs-11, trx 0 is activated, not 1. the screenshot says this too (hope its been attached) whats wrong here? T. -- Wer Rechtschreibfehler findet, darf sie behalten!

13 years, 1 month

1
0
0 0

Re: Fwd: [PATCH] bsc: change bsc_vty_init to take logging categories as parameter

by Harald Welte

Hi Pablo, On Wed, Mar 23, 2011 at 01:03:42AM +0100, Pablo Neira Ayuso wrote: > openbsc$ git pull > remote: Counting objects: 197, done. > remote: Compressing objects: 100% (79/79), done. > remote: Total 164 (delta 132), reused 104 (delta 85) > fatal: The remote end hung up unexpectedly > fatal: early EOF > fatal: index-pack failed > > Could you check what's wrong with this? I've wasted about half a day on this yesterday, without any solution. It seems like it is a race condition in the git server. If you retry your pull something like 5-10 times, it will succeed once. I've tried with latest git.git on the server. I've tried strace and ltrace on git-daemon, which only got me as far as the daemon trying an fstat() after a close() on fd 1, which will obviosuly fail with -EBADF. I'm really at a loss here... Regards, Harald -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

13 years, 1 month

2
2
0 0

[PATCH] src: fix use of logging_vty_add_cmds() without log_info parameter

by pablo＠gnumonks.org

From: Pablo Neira Ayuso <pablo(a)gnumonks.org> This patch fixes: CC gb_proxy_main.o gb_proxy_main.c: In function ‘main’: gb_proxy_main.c:224: warning: implicit declaration of function ‘logging_vty_add_cmds’ And a similar problem in osmo-bsc_nat. This was introduced in by myself in patch: "bsc: change bsc_vty_init to take logging categories as parameter" Signed-off-by: Pablo Neira Ayuso <pablo(a)gnumonks.org> --- openbsc/src/gprs/gb_proxy_main.c | 3 ++- openbsc/src/gprs/sgsn_main.c | 3 ++- openbsc/src/osmo-bsc_nat/bsc_nat.c | 3 ++- openbsc/src/osmo-bsc_nat/bsc_nat_vty.c | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/openbsc/src/gprs/gb_proxy_main.c b/openbsc/src/gprs/gb_proxy_main.c index b53e985..58b6a76 100644 --- a/openbsc/src/gprs/gb_proxy_main.c +++ b/openbsc/src/gprs/gb_proxy_main.c @@ -47,6 +47,7 @@ #include <osmocom/vty/command.h> #include <osmocom/vty/telnet_interface.h> +#include <osmocom/vty/logging.h> #include "../../bscconfig.h" @@ -221,7 +222,7 @@ int main(int argc, char **argv) vty_info.copyright = openbsc_copyright; vty_init(&vty_info); - logging_vty_add_cmds(); + logging_vty_add_cmds(&log_info); gbproxy_vty_init(); handle_options(argc, argv); diff --git a/openbsc/src/gprs/sgsn_main.c b/openbsc/src/gprs/sgsn_main.c index c59265f..53494c1 100644 --- a/openbsc/src/gprs/sgsn_main.c +++ b/openbsc/src/gprs/sgsn_main.c @@ -40,6 +40,7 @@ #include <osmocore/process.h> #include <osmocom/vty/telnet_interface.h> +#include <osmocom/vty/logging.h> #include <openbsc/signal.h> #include <openbsc/debug.h> @@ -220,7 +221,7 @@ int main(int argc, char **argv) vty_info.copyright = openbsc_copyright; vty_init(&vty_info); - logging_vty_add_cmds(); + logging_vty_add_cmds(&log_info); sgsn_vty_init(); handle_options(argc, argv); diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index 643b3c4..f513933 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -52,6 +52,7 @@ #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/vty.h> +#include <osmocom/vty/logging.h> #include <osmocom/sccp/sccp.h> @@ -1286,7 +1287,7 @@ int main(int argc, char **argv) vty_info.copyright = openbsc_copyright; vty_init(&vty_info); - logging_vty_add_cmds(); + logging_vty_add_cmds(&log_info); bsc_nat_vty_init(nat); diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c index 786db2d..6ec8525 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c @@ -782,7 +782,7 @@ int bsc_nat_vty_init(struct bsc_nat *nat) /* called by the telnet interface... we have our own init above */ -int bsc_vty_init(void) +int bsc_vty_init(const struct log_info *cat) { return 0; } -- 1.7.2.3

13 years, 1 month

2
1
0 0

AW: impedance of cable to connect bs-11

by Andreas.Eversberg

> what impedance should a pair of cable for multidrop have? i used 10m of I have 50 meters and it works. be sure to have both ends terminated with 120 ohms. i think you need to terminate the receiving end only. this is because the receiver is high impedance.

13 years, 1 month

1
0
0 0

impedance of cable to connect bs-11

by Thomas Ansorg

hi list, what impedance should a pair of cable for multidrop have? i used 10m of cat4, with the result that the 2nd bs-11 wasnt bootstrapped. now i reduced the length to 3m, and it works. the oszi tells me there are still some reflections, but finally my 2nd bs-11 is recognised. so whats the correct cable, when i plan to use more than 3m? T. -- Wer Rechtschreibfehler findet, darf sie behalten!

13 years, 1 month

2
1
0 0

nanoBTS to buy !!!

by amed et

Dear all, I'm looking forward to buy one or two nanoBTS (165 or 135 whatever available), is there any body who wants to sell his nanoBTS (in Europe) ? ? ? As i am starting my development on opnebsc, i need it asap :) looking forward for any offer . regards,

13 years, 1 month

2
1
0 0

[PATCH OSMOCOM-BB] src: use new libosmogsm and include/osmocom/[gsm|core] path to headers

by pablo＠gnumonks.org

From: Pablo Neira Ayuso <pablo(a)gnumonks.org> This patch also renames hexdump in osmocon.c and osmoload.c to avoid clashing with hexdump defined in libosmocore. This is a workaround, it's planned to fix the namespace pollution of the library soon. This patch has been compiled tested. Signed-off-by: Pablo Neira Ayuso <pablo(a)gnumonks.org> --- include/osmocore/rsl.h | 4 ++-- src/Makefile | 4 +++- src/host/layer23/include/osmocom/bb/common/l1ctl.h | 2 +- src/host/layer23/include/osmocom/bb/common/lapdm.h | 4 ++-- .../layer23/include/osmocom/bb/common/logging.h | 2 +- .../include/osmocom/bb/common/osmocom_data.h | 6 +++--- .../layer23/include/osmocom/bb/common/sysinfo.h | 2 +- src/host/layer23/include/osmocom/bb/misc/layer3.h | 2 +- .../layer23/include/osmocom/bb/mobile/gsm48_rr.h | 2 +- src/host/layer23/include/osmocom/bb/mobile/mncc.h | 4 ++-- .../include/osmocom/bb/mobile/transaction.h | 2 +- src/host/layer23/src/common/Makefile.am | 2 +- src/host/layer23/src/common/gps.c | 2 +- src/host/layer23/src/common/l1ctl.c | 20 ++++++++++---------- src/host/layer23/src/common/l1l2_interface.c | 2 +- src/host/layer23/src/common/lapdm.c | 16 ++++++++-------- src/host/layer23/src/common/logging.c | 4 ++-- src/host/layer23/src/common/main.c | 12 ++++++------ src/host/layer23/src/common/sap_interface.c | 2 +- src/host/layer23/src/common/sim.c | 4 ++-- src/host/layer23/src/common/sysinfo.c | 2 +- src/host/layer23/src/misc/Makefile.am | 4 ++-- src/host/layer23/src/misc/app_bcch_scan.c | 8 ++++---- src/host/layer23/src/misc/app_cbch_sniff.c | 10 +++++----- src/host/layer23/src/misc/app_ccch_scan.c | 14 +++++++------- src/host/layer23/src/misc/app_cell_log.c | 4 ++-- src/host/layer23/src/misc/app_echo_test.c | 6 +++--- src/host/layer23/src/misc/bcch_scan.c | 20 ++++++++++---------- src/host/layer23/src/misc/cell_log.c | 14 +++++++------- src/host/layer23/src/misc/rslms.c | 8 ++++---- src/host/layer23/src/mobile/app_mobile.c | 8 ++++---- src/host/layer23/src/mobile/gsm322.c | 10 +++++----- src/host/layer23/src/mobile/gsm48_cc.c | 8 ++++---- src/host/layer23/src/mobile/gsm48_mm.c | 8 ++++---- src/host/layer23/src/mobile/gsm48_rr.c | 10 +++++----- src/host/layer23/src/mobile/main.c | 8 ++++---- src/host/layer23/src/mobile/mnccms.c | 2 +- src/host/layer23/src/mobile/settings.c | 2 +- src/host/layer23/src/mobile/subscriber.c | 4 ++-- src/host/layer23/src/mobile/transaction.c | 6 +++--- src/host/layer23/src/mobile/vty_interface.c | 8 ++++---- src/host/osmocon/osmocon.c | 16 ++++++++-------- src/host/osmocon/osmoload.c | 18 +++++++++--------- src/host/osmocon/tpu_debug.c | 2 +- 44 files changed, 150 insertions(+), 148 deletions(-) diff --git a/include/osmocore/rsl.h b/include/osmocore/rsl.h index 3a2b04d..c9375a7 100644 --- a/include/osmocore/rsl.h +++ b/include/osmocore/rsl.h @@ -2,8 +2,8 @@ #define _OSMOCORE_RSL_H #include <stdint.h> -#include <osmocore/utils.h> -#include <osmocore/protocol/gsm_08_58.h> +#include <osmocom/core/utils.h> +#include <osmocom/gsm/protocol/gsm_08_58.h> void rsl_init_rll_hdr(struct abis_rsl_rll_hdr *dh, uint8_t msg_type); diff --git a/src/Makefile b/src/Makefile index b3594c1..1b67e83 100644 --- a/src/Makefile +++ b/src/Makefile @@ -9,8 +9,10 @@ CROSS_TOOL_PREFIX=arm-elf- TOPDIR=$(shell pwd) OSMOCORE_CONFIGURE_ENV= LIBOSMOCORE_LIBS=$(TOPDIR)/shared/libosmocore/build-host/src/.libs/libosmocore.a \ LIBOSMOVTY_LIBS=$(TOPDIR)/shared/libosmocore/build-host/src/vty/.libs/libosmovty.a \ + LIBOSMOGSM_LIBS=$(TOPDIR)/shared/libosmogsm/build-host/src/gsm/.libs/libosmogsm.a \ LIBOSMOCORE_CFLAGS=-I$(TOPDIR)/shared/libosmocore/include \ - LIBOSMOVTY_CFLAGS=-I$(TOPDIR)/shared/libosmocore/include + LIBOSMOVTY_CFLAGS=-I$(TOPDIR)/shared/libosmocore/include \ + LIBOSMOGSM_CFLAGS=-I$(TOPDIR)/shared/libosmogsm/include all: libosmocore-target nofirmware firmware nofirmware: libosmocore-host layer23 osmocon gsmmap diff --git a/src/host/layer23/include/osmocom/bb/common/l1ctl.h b/src/host/layer23/include/osmocom/bb/common/l1ctl.h index 64abf9c..7eb0c8c 100644 --- a/src/host/layer23/include/osmocom/bb/common/l1ctl.h +++ b/src/host/layer23/include/osmocom/bb/common/l1ctl.h @@ -1,7 +1,7 @@ #ifndef osmocom_l1ctl_h #define osmocom_l1ctl_h -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <osmocom/bb/common/osmocom_data.h> struct osmocom_ms; diff --git a/src/host/layer23/include/osmocom/bb/common/lapdm.h b/src/host/layer23/include/osmocom/bb/common/lapdm.h index de954fb..2d0e2fd 100644 --- a/src/host/layer23/include/osmocom/bb/common/lapdm.h +++ b/src/host/layer23/include/osmocom/bb/common/lapdm.h @@ -3,8 +3,8 @@ #include <stdint.h> -#include <osmocore/timer.h> -#include <osmocore/msgb.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/msgb.h> #include <l1ctl_proto.h> diff --git a/src/host/layer23/include/osmocom/bb/common/logging.h b/src/host/layer23/include/osmocom/bb/common/logging.h index eb9f482..9205fec 100644 --- a/src/host/layer23/include/osmocom/bb/common/logging.h +++ b/src/host/layer23/include/osmocom/bb/common/logging.h @@ -2,7 +2,7 @@ #define _LOGGING_H #define DEBUG -#include <osmocore/logging.h> +#include <osmocom/core/logging.h> enum { DRSL, diff --git a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h index 749c144..9d8a030 100644 --- a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h +++ b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h @@ -1,9 +1,9 @@ #ifndef osmocom_data_h #define osmocom_data_h -#include <osmocore/select.h> -#include <osmocore/gsm_utils.h> -#include <osmocore/write_queue.h> +#include <osmocom/core/select.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/core/write_queue.h> struct osmocom_ms; diff --git a/src/host/layer23/include/osmocom/bb/common/sysinfo.h b/src/host/layer23/include/osmocom/bb/common/sysinfo.h index 07daafa..e5db54f 100644 --- a/src/host/layer23/include/osmocom/bb/common/sysinfo.h +++ b/src/host/layer23/include/osmocom/bb/common/sysinfo.h @@ -1,7 +1,7 @@ #ifndef _SYSINFO_H #define _SYSINFO_H -#include <osmocore/gsm48_ie.h> +#include <osmocom/gsm/gsm48_ie.h> /* collection of system information of the current cell */ diff --git a/src/host/layer23/include/osmocom/bb/misc/layer3.h b/src/host/layer23/include/osmocom/bb/misc/layer3.h index 7d364e7..bbf242d 100644 --- a/src/host/layer23/include/osmocom/bb/misc/layer3.h +++ b/src/host/layer23/include/osmocom/bb/misc/layer3.h @@ -1,7 +1,7 @@ #ifndef _OSMOCOM_L3_H #define _OSMOCOM_L3_H -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <osmocom/bb/common/osmocom_data.h> int gsm48_rx_ccch(struct msgb *msg, struct osmocom_ms *ms); diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h index 830c8cf..b140c18 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h +++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h @@ -1,7 +1,7 @@ #ifndef _GSM48_RR_H #define _GSM48_RR_H -#include "osmocore/protocol/gsm_04_08.h" +#include <osmocom/gsm/protocol/gsm_04_08.h> #define GSM_TA_CM 55385 diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc.h b/src/host/layer23/include/osmocom/bb/mobile/mncc.h index 151f0b4..e378ecc 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/mncc.h +++ b/src/host/layer23/include/osmocom/bb/mobile/mncc.h @@ -26,8 +26,8 @@ #ifndef _MNCC_H #define _MNCC_H -#include <osmocore/linuxlist.h> -#include <osmocore/mncc.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/gsm/mncc.h> struct gsm_call { struct llist_head entry; diff --git a/src/host/layer23/include/osmocom/bb/mobile/transaction.h b/src/host/layer23/include/osmocom/bb/mobile/transaction.h index 4be82c1..6cbc25b 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/transaction.h +++ b/src/host/layer23/include/osmocom/bb/mobile/transaction.h @@ -1,7 +1,7 @@ #ifndef _TRANSACT_H #define _TRANSACT_H -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> /* One transaction */ struct gsm_trans { diff --git a/src/host/layer23/src/common/Makefile.am b/src/host/layer23/src/common/Makefile.am index 4e2686c..f6e3f83 100644 --- a/src/host/layer23/src/common/Makefile.am +++ b/src/host/layer23/src/common/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) noinst_LIBRARIES = liblayer23.a liblayer23_a_SOURCES = l1ctl.c l1l2_interface.c sap_interface.c lapdm.c \ diff --git a/src/host/layer23/src/common/gps.c b/src/host/layer23/src/common/gps.c index 55dd239..9e76793 100644 --- a/src/host/layer23/src/common/gps.c +++ b/src/host/layer23/src/common/gps.c @@ -31,7 +31,7 @@ #include <gps.h> #endif -#include <osmocore/utils.h> +#include <osmocom/core/utils.h> #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/common/logging.h> diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index d47275a..f2714e6 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -30,16 +30,16 @@ #include <l1ctl_proto.h> -#include <osmocore/signal.h> -#include <osmocore/logging.h> -#include <osmocore/timer.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/gsm_utils.h> -#include <osmocore/gsmtap_util.h> -#include <osmocore/protocol/gsm_04_08.h> -#include <osmocore/protocol/gsm_08_58.h> -#include <osmocore/rsl.h> +#include <osmocom/core/signal.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/core/gsmtap_util.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> +#include <osmocom/gsm/protocol/gsm_08_58.h> +#include <osmocom/gsm/rsl.h> #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/osmocom_data.h> diff --git a/src/host/layer23/src/common/l1l2_interface.c b/src/host/layer23/src/common/l1l2_interface.c index 74c8875..23e1ef2 100644 --- a/src/host/layer23/src/common/l1l2_interface.c +++ b/src/host/layer23/src/common/l1l2_interface.c @@ -26,7 +26,7 @@ #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/l1l2_interface.h> -#include <osmocore/utils.h> +#include <osmocom/core/utils.h> #include <sys/socket.h> #include <sys/un.h> diff --git a/src/host/layer23/src/common/lapdm.c b/src/host/layer23/src/common/lapdm.c index dc9c916..61e2287 100644 --- a/src/host/layer23/src/common/lapdm.c +++ b/src/host/layer23/src/common/lapdm.c @@ -56,14 +56,14 @@ #include <errno.h> #include <arpa/inet.h> -#include <osmocore/logging.h> -#include <osmocore/timer.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/utils.h> -#include <osmocore/rsl.h> -#include <osmocore/protocol/gsm_04_08.h> -#include <osmocore/protocol/gsm_08_58.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/core/utils.h> +#include <osmocom/gsm/rsl.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> +#include <osmocom/gsm/protocol/gsm_08_58.h> #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/common/l1ctl.h> diff --git a/src/host/layer23/src/common/logging.c b/src/host/layer23/src/common/logging.c index c2e4a5e..5283935 100644 --- a/src/host/layer23/src/common/logging.c +++ b/src/host/layer23/src/common/logging.c @@ -21,8 +21,8 @@ */ -#include <osmocore/utils.h> -#include <osmocore/logging.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/logging.h> #include <osmocom/bb/common/logging.h> static const struct log_info_cat default_categories[] = { diff --git a/src/host/layer23/src/common/main.c b/src/host/layer23/src/common/main.c index cb9564a..61513ea 100644 --- a/src/host/layer23/src/common/main.c +++ b/src/host/layer23/src/common/main.c @@ -30,12 +30,12 @@ #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/l23_app.h> -#include <osmocore/msgb.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/linuxlist.h> -#include <osmocore/gsmtap_util.h> -#include <osmocore/utils.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/gsmtap_util.h> +#include <osmocom/core/utils.h> #include <arpa/inet.h> diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index d384c9e..54aa635 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -26,7 +26,7 @@ #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/sap_interface.h> -#include <osmocore/utils.h> +#include <osmocom/core/utils.h> #include <sys/socket.h> #include <sys/un.h> diff --git a/src/host/layer23/src/common/sim.c b/src/host/layer23/src/common/sim.c index 3ef3cf8..b76de5c 100644 --- a/src/host/layer23/src/common/sim.c +++ b/src/host/layer23/src/common/sim.c @@ -22,8 +22,8 @@ #include <stdint.h> #include <errno.h> #include <arpa/inet.h> -#include <osmocore/talloc.h> -#include <osmocore/utils.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> diff --git a/src/host/layer23/src/common/sysinfo.c b/src/host/layer23/src/common/sysinfo.c index 8f6b1b5..5827d75 100644 --- a/src/host/layer23/src/common/sysinfo.c +++ b/src/host/layer23/src/common/sysinfo.c @@ -24,7 +24,7 @@ #include <string.h> #include <arpa/inet.h> -#include <osmocore/bitvec.h> +#include <osmocom/core/bitvec.h> #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/common/networks.h> diff --git a/src/host/layer23/src/misc/Makefile.am b/src/host/layer23/src/misc/Makefile.am index 8428511..15d46a8 100644 --- a/src/host/layer23/src/misc/Makefile.am +++ b/src/host/layer23/src/misc/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) -LDADD = ../common/liblayer23.a $(LIBOSMOCORE_LIBS) +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) +LDADD = ../common/liblayer23.a $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) bin_PROGRAMS = bcch_scan ccch_scan echo_test cell_log cbch_sniff diff --git a/src/host/layer23/src/misc/app_bcch_scan.c b/src/host/layer23/src/misc/app_bcch_scan.c index cce22b3..9a01694 100644 --- a/src/host/layer23/src/misc/app_bcch_scan.c +++ b/src/host/layer23/src/misc/app_bcch_scan.c @@ -28,10 +28,10 @@ #include <osmocom/bb/common/l23_app.h> #include <osmocom/bb/misc/layer3.h> -#include <osmocore/msgb.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/signal.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/signal.h> static int signal_cb(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data) diff --git a/src/host/layer23/src/misc/app_cbch_sniff.c b/src/host/layer23/src/misc/app_cbch_sniff.c index 9e2d1a9..77427fa 100644 --- a/src/host/layer23/src/misc/app_cbch_sniff.c +++ b/src/host/layer23/src/misc/app_cbch_sniff.c @@ -29,11 +29,11 @@ #include <osmocom/bb/common/l23_app.h> #include <osmocom/bb/misc/layer3.h> -#include <osmocore/msgb.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/signal.h> -#include <osmocore/rsl.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/signal.h> +#include <osmocom/gsm/rsl.h> struct osmocom_ms *g_ms; struct gsm48_sysinfo g_sysinfo = {}; diff --git a/src/host/layer23/src/misc/app_ccch_scan.c b/src/host/layer23/src/misc/app_ccch_scan.c index 4e45a42..913ceca 100644 --- a/src/host/layer23/src/misc/app_ccch_scan.c +++ b/src/host/layer23/src/misc/app_ccch_scan.c @@ -24,13 +24,13 @@ #include <errno.h> #include <stdio.h> -#include <osmocore/msgb.h> -#include <osmocore/rsl.h> -#include <osmocore/tlv.h> -#include <osmocore/gsm48_ie.h> -#include <osmocore/gsm48.h> -#include <osmocore/signal.h> -#include <osmocore/protocol/gsm_04_08.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/rsl.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/gsm/gsm48_ie.h> +#include <osmocom/gsm/gsm48.h> +#include <osmocom/core/signal.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/lapdm.h> diff --git a/src/host/layer23/src/misc/app_cell_log.c b/src/host/layer23/src/misc/app_cell_log.c index 7a2c67a..dfc3c4b 100644 --- a/src/host/layer23/src/misc/app_cell_log.c +++ b/src/host/layer23/src/misc/app_cell_log.c @@ -32,8 +32,8 @@ #include <osmocom/bb/common/gps.h> #include <osmocom/bb/misc/cell_log.h> -#include <osmocore/talloc.h> -#include <osmocore/utils.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> extern struct log_target *stderr_target; extern void *l23_ctx; diff --git a/src/host/layer23/src/misc/app_echo_test.c b/src/host/layer23/src/misc/app_echo_test.c index c9b1895..0adab7f 100644 --- a/src/host/layer23/src/misc/app_echo_test.c +++ b/src/host/layer23/src/misc/app_echo_test.c @@ -28,9 +28,9 @@ #include <osmocom/bb/common/l23_app.h> #include <osmocom/bb/misc/layer3.h> -#include <osmocore/msgb.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> static struct { diff --git a/src/host/layer23/src/misc/bcch_scan.c b/src/host/layer23/src/misc/bcch_scan.c index dff4dc9..351da52 100644 --- a/src/host/layer23/src/misc/bcch_scan.c +++ b/src/host/layer23/src/misc/bcch_scan.c @@ -27,16 +27,16 @@ #include <l1ctl_proto.h> -#include <osmocore/logging.h> -#include <osmocore/talloc.h> -#include <osmocore/signal.h> -#include <osmocore/timer.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/gsm_utils.h> -#include <osmocore/protocol/gsm_04_08.h> -#include <osmocore/protocol/gsm_08_58.h> -#include <osmocore/rsl.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/signal.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> +#include <osmocom/gsm/protocol/gsm_08_58.h> +#include <osmocom/gsm/rsl.h> #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/osmocom_data.h> diff --git a/src/host/layer23/src/misc/cell_log.c b/src/host/layer23/src/misc/cell_log.c index a0f9769..86ab88d 100644 --- a/src/host/layer23/src/misc/cell_log.c +++ b/src/host/layer23/src/misc/cell_log.c @@ -29,13 +29,13 @@ #include <l1ctl_proto.h> -#include <osmocore/logging.h> -#include <osmocore/timer.h> -#include <osmocore/signal.h> -#include <osmocore/msgb.h> -#include <osmocore/gsm_utils.h> -#include <osmocore/protocol/gsm_04_08.h> -#include <osmocore/rsl.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/signal.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> +#include <osmocom/gsm/rsl.h> #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/osmocom_data.h> diff --git a/src/host/layer23/src/misc/rslms.c b/src/host/layer23/src/misc/rslms.c index b2e0047..93d22fd 100644 --- a/src/host/layer23/src/misc/rslms.c +++ b/src/host/layer23/src/misc/rslms.c @@ -24,10 +24,10 @@ #include <errno.h> #include <stdio.h> -#include <osmocore/msgb.h> -#include <osmocore/rsl.h> -#include <osmocore/tlv.h> -#include <osmocore/protocol/gsm_04_08.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/rsl.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/lapdm.h> diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index a1b4731..33fdde6 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -37,10 +37,10 @@ #include <osmocom/bb/mobile/mncc.h> #include <osmocom/vty/telnet_interface.h> -#include <osmocore/msgb.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/signal.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/signal.h> extern void *l23_ctx; extern struct llist_head ms_list; diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c index 1996f93..c05469d 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -26,11 +26,11 @@ #include <stdlib.h> #include <limits.h> -#include <osmocore/msgb.h> -#include <osmocore/talloc.h> -#include <osmocore/utils.h> -#include <osmocore/gsm48.h> -#include <osmocore/signal.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> +#include <osmocom/gsm/gsm48.h> +#include <osmocom/core/signal.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/l1ctl.h> diff --git a/src/host/layer23/src/mobile/gsm48_cc.c b/src/host/layer23/src/mobile/gsm48_cc.c index d8976eb..b881205 100644 --- a/src/host/layer23/src/mobile/gsm48_cc.c +++ b/src/host/layer23/src/mobile/gsm48_cc.c @@ -25,10 +25,10 @@ #include <string.h> #include <stdlib.h> -#include <osmocore/msgb.h> -#include <osmocore/utils.h> -#include <osmocore/gsm48.h> -#include <osmocore/talloc.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/utils.h> +#include <osmocom/gsm/gsm48.h> +#include <osmocom/core/talloc.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 15bbd27..bf5bbc2 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -26,10 +26,10 @@ #include <stdlib.h> #include <arpa/inet.h> -#include <osmocore/msgb.h> -#include <osmocore/utils.h> -#include <osmocore/gsm48.h> -#include <osmocore/talloc.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/utils.h> +#include <osmocom/gsm/gsm48.h> +#include <osmocom/core/talloc.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index dc2226a..b2ab2e1 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -66,11 +66,11 @@ #include <stdlib.h> #include <arpa/inet.h> -#include <osmocore/msgb.h> -#include <osmocore/utils.h> -#include <osmocore/rsl.h> -#include <osmocore/gsm48.h> -#include <osmocore/bitvec.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/utils.h> +#include <osmocom/gsm/rsl.h> +#include <osmocom/gsm/gsm48.h> +#include <osmocom/core/bitvec.h> #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/common/l1l2_interface.h> diff --git a/src/host/layer23/src/mobile/main.c b/src/host/layer23/src/mobile/main.c index cd72d13..4765995 100644 --- a/src/host/layer23/src/mobile/main.c +++ b/src/host/layer23/src/mobile/main.c @@ -25,10 +25,10 @@ #include <osmocom/bb/common/logging.h> #include <osmocom/bb/mobile/app_mobile.h> -#include <osmocore/talloc.h> -#include <osmocore/linuxlist.h> -#include <osmocore/gsmtap_util.h> -#include <osmocore/signal.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/gsmtap_util.h> +#include <osmocom/core/signal.h> #include <arpa/inet.h> diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c index 6997993..4d47be4 100644 --- a/src/host/layer23/src/mobile/mnccms.c +++ b/src/host/layer23/src/mobile/mnccms.c @@ -25,7 +25,7 @@ #include <string.h> #include <stdlib.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/mobile/settings.c index a5a91ce..db22fd9 100644 --- a/src/host/layer23/src/mobile/settings.c +++ b/src/host/layer23/src/mobile/settings.c @@ -22,7 +22,7 @@ #include <stdint.h> #include <errno.h> #include <string.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/mobile/subscriber.c index 3ba78f3..549345c 100644 --- a/src/host/layer23/src/mobile/subscriber.c +++ b/src/host/layer23/src/mobile/subscriber.c @@ -23,8 +23,8 @@ #include <errno.h> #include <string.h> #include <arpa/inet.h> -#include <osmocore/talloc.h> -#include <osmocore/comp128.h> +#include <osmocom/core/talloc.h> +#include <osmocom/gsm/comp128.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> diff --git a/src/host/layer23/src/mobile/transaction.c b/src/host/layer23/src/mobile/transaction.c index abd3c2d..4b66050 100644 --- a/src/host/layer23/src/mobile/transaction.c +++ b/src/host/layer23/src/mobile/transaction.c @@ -21,9 +21,9 @@ #include <stdint.h> -#include <osmocore/talloc.h> -#include <osmocore/timer.h> -#include <osmocore/msgb.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/msgb.h> #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/common/logging.h> diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 7888f01..4f9acf4 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -25,10 +25,10 @@ #include <unistd.h> #include <sys/types.h> -#include <osmocore/utils.h> -#include <osmocore/gsm48.h> -#include <osmocore/talloc.h> -#include <osmocore/signal.h> +#include <osmocom/core/utils.h> +#include <osmocom/gsm/gsm48.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/signal.h> #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/common/networks.h> diff --git a/src/host/osmocon/osmocon.c b/src/host/osmocon/osmocon.c index 6f6f566..2c42799 100644 --- a/src/host/osmocon/osmocon.c +++ b/src/host/osmocon/osmocon.c @@ -39,10 +39,10 @@ #include <sercomm.h> -#include <osmocore/linuxlist.h> -#include <osmocore/select.h> -#include <osmocore/talloc.h> -#include <osmocore/timer.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/select.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/timer.h> #include <arpa/inet.h> @@ -447,7 +447,7 @@ int read_file(const char *filename) return 0; } -static void hexdump(const uint8_t *data, unsigned int len) +static void osmocon_hexdump(const uint8_t *data, unsigned int len) { int n; @@ -754,7 +754,7 @@ static void hdlc_send_to_phone(uint8_t dlci, uint8_t *data, int len) if(dnload.dump_tx) { printf("hdlc_send(dlci=%u): ", dlci); - hexdump(data, len); + osmocon_hexdump(data, len); } if (len > 512) { @@ -792,7 +792,7 @@ static void hdlc_tool_cb(uint8_t dlci, struct msgb *msg) if(dnload.dump_rx) { printf("hdlc_recv(dlci=%u): ", dlci); - hexdump(msg->data, msg->len); + osmocon_hexdump(msg->data, msg->len); } if(srv) { @@ -832,7 +832,7 @@ static int handle_buffer(int buf_used_len) if (!dnload.expect_hdlc) { printf("got %i bytes from modem, ", nbytes); printf("data looks like: "); - hexdump(bufptr, nbytes); + osmocon_hexdump(bufptr, nbytes); } else { for (i = 0; i < nbytes; ++i) if (sercomm_drv_rx_char(bufptr[i]) == 0) diff --git a/src/host/osmocon/osmoload.c b/src/host/osmocon/osmoload.c index b075463..6663a1e 100644 --- a/src/host/osmocon/osmoload.c +++ b/src/host/osmocon/osmoload.c @@ -35,10 +35,10 @@ #include <sys/socket.h> #include <sys/un.h> -#include <osmocore/msgb.h> -#include <osmocore/select.h> -#include <osmocore/timer.h> -#include <osmocore/crc16.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/select.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/crc16.h> #include <loader/protocol.h> @@ -146,7 +146,7 @@ static int version(const char *name) exit(2); } -static void hexdump(const uint8_t *data, unsigned int len) +static void osmoload_hexdump(const uint8_t *data, unsigned int len) { const uint8_t *bufptr = data; const uint8_t const *endptr = bufptr + len; @@ -190,7 +190,7 @@ loader_send_request(struct msgb *msg) { if(osmoload.print_requests) { printf("Sending %d bytes:\n", msg->len); - hexdump(msg->data, msg->len); + osmoload_hexdump(msg->data, msg->len); } rc = write(connection.fd, &len, sizeof(len)); @@ -277,7 +277,7 @@ static void loader_handle_reply(struct msgb *msg) { if(osmoload.print_replies) { printf("Received %d bytes:\n", msg->len); - hexdump(msg->data, msg->len); + osmoload_hexdump(msg->data, msg->len); } uint8_t cmd = msgb_get_u8(msg); @@ -338,7 +338,7 @@ loader_handle_reply(struct msgb *msg) { break; default: printf("Received unknown reply %d:\n", cmd); - hexdump(msg->data, msg->len); + osmoload_hexdump(msg->data, msg->len); osmoload.quit = 1; return; } @@ -364,7 +364,7 @@ loader_handle_reply(struct msgb *msg) { break; case LOADER_MEM_READ: printf("Received memory dump of %d bytes at 0x%x:\n", length, address); - hexdump(data, length); + osmoload_hexdump(data, length); break; case LOADER_MEM_WRITE: printf("Confirmed memory write of %d bytes at 0x%x.\n", length, address); diff --git a/src/host/osmocon/tpu_debug.c b/src/host/osmocon/tpu_debug.c index f54bd40..c9dac90 100644 --- a/src/host/osmocon/tpu_debug.c +++ b/src/host/osmocon/tpu_debug.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <stdio.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> /* TPU disassembler begin */ -- 1.7.2.3

13 years, 1 month

1
0
0 0

[PATCH OPENBSC] [v2] src: use new library libosmogsm and new path to headers in libosmocore

by pablo＠gnumonks.org

From: Pablo Neira Ayuso <pablo(a)gnumonks.org> libosmogsm is a new library that is distributed in the libosmocore. Now, openbsc depends on it. This patch gets openbsc with this change. This patch also rewrites all include path to the new osmocom/[gsm|core] Signed-off-by: Pablo Neira Ayuso <pablo(a)gnumonks.org> --- openbsc/configure.in | 1 + openbsc/include/openbsc/abis_nm.h | 4 ++-- openbsc/include/openbsc/abis_rsl.h | 4 ++-- openbsc/include/openbsc/bsc_msc.h | 4 ++-- openbsc/include/openbsc/bsc_nat.h | 16 ++++++++-------- openbsc/include/openbsc/debug.h | 4 ++-- openbsc/include/openbsc/e1_input.h | 6 +++--- openbsc/include/openbsc/gb_proxy.h | 2 +- openbsc/include/openbsc/gprs_bssgp.h | 2 +- openbsc/include/openbsc/gprs_gmm.h | 2 +- openbsc/include/openbsc/gprs_ns.h | 8 ++++---- openbsc/include/openbsc/gprs_sgsn.h | 2 +- openbsc/include/openbsc/gsm_04_08.h | 4 ++-- openbsc/include/openbsc/gsm_04_08_gprs.h | 2 +- openbsc/include/openbsc/gsm_04_11.h | 2 +- openbsc/include/openbsc/gsm_04_80.h | 6 +++--- openbsc/include/openbsc/gsm_data.h | 16 ++++++++-------- openbsc/include/openbsc/gsm_subscriber.h | 2 +- openbsc/include/openbsc/ipaccess.h | 2 +- openbsc/include/openbsc/mgcp.h | 4 ++-- openbsc/include/openbsc/mgcp_internal.h | 2 +- openbsc/include/openbsc/mncc.h | 4 ++-- openbsc/include/openbsc/osmo_bsc_rf.h | 4 ++-- openbsc/include/openbsc/osmo_msc_data.h | 2 +- openbsc/include/openbsc/paging.h | 4 ++-- openbsc/include/openbsc/rtp_proxy.h | 4 ++-- openbsc/include/openbsc/sgsn.h | 2 +- openbsc/include/openbsc/signal.h | 2 +- openbsc/include/openbsc/socket.h | 2 +- openbsc/include/openbsc/subchan_demux.h | 2 +- openbsc/include/openbsc/system_information.h | 2 +- openbsc/include/openbsc/transaction.h | 2 +- openbsc/include/openbsc/ussd.h | 2 +- openbsc/src/Makefile.am | 4 ++-- openbsc/src/gprs/Makefile.am | 4 ++-- openbsc/src/gprs/gb_proxy.c | 4 ++-- openbsc/src/gprs/gb_proxy_main.c | 8 ++++---- openbsc/src/gprs/gb_proxy_vty.c | 2 +- openbsc/src/gprs/gprs_gmm.c | 12 ++++++------ openbsc/src/gprs/gprs_llc.c | 8 ++++---- openbsc/src/gprs/gprs_llc_vty.c | 10 +++++----- openbsc/src/gprs/gprs_sgsn.c | 8 ++++---- openbsc/src/gprs/gprs_sndcp.c | 8 ++++---- openbsc/src/gprs/gprs_sndcp_vty.c | 10 +++++----- openbsc/src/gprs/sgsn_libgtp.c | 6 +++--- openbsc/src/gprs/sgsn_main.c | 10 +++++----- openbsc/src/gprs/sgsn_vty.c | 6 +++--- openbsc/src/ipaccess/Makefile.am | 4 ++-- openbsc/src/ipaccess/ipaccess-config.c | 6 +++--- openbsc/src/ipaccess/ipaccess-find.c | 4 ++-- openbsc/src/ipaccess/ipaccess-firmware.c | 2 +- openbsc/src/ipaccess/ipaccess-proxy.c | 8 ++++---- openbsc/src/ipaccess/network_listen.c | 8 ++++---- openbsc/src/libabis/Makefile.am | 4 ++-- openbsc/src/libabis/e1_input.c | 8 ++++---- openbsc/src/libabis/e1_input_vty.c | 8 ++++---- openbsc/src/libabis/input/dahdi.c | 6 +++--- openbsc/src/libabis/input/hsl.c | 8 ++++---- openbsc/src/libabis/input/ipaccess.c | 8 ++++---- openbsc/src/libabis/input/lapd.c | 8 ++++---- openbsc/src/libabis/input/lapd.h | 2 +- openbsc/src/libabis/input/misdn.c | 6 +++--- openbsc/src/libbsc/Makefile.am | 4 ++-- openbsc/src/libbsc/abis_nm.c | 6 +++--- openbsc/src/libbsc/abis_nm_vty.c | 6 +++--- openbsc/src/libbsc/abis_om2000.c | 8 ++++---- openbsc/src/libbsc/abis_om2000_vty.c | 6 +++--- openbsc/src/libbsc/abis_rsl.c | 8 ++++---- openbsc/src/libbsc/bsc_api.c | 4 ++-- openbsc/src/libbsc/bsc_init.c | 4 ++-- openbsc/src/libbsc/bsc_msc.c | 4 ++-- openbsc/src/libbsc/bsc_rll.c | 6 +++--- openbsc/src/libbsc/bsc_vty.c | 8 ++++---- openbsc/src/libbsc/bts_ericsson_rbs2000.c | 2 +- openbsc/src/libbsc/bts_hsl_femtocell.c | 2 +- openbsc/src/libbsc/bts_ipaccess_nanobts.c | 2 +- openbsc/src/libbsc/bts_siemens_bs11.c | 2 +- openbsc/src/libbsc/bts_unknown.c | 2 +- openbsc/src/libbsc/chan_alloc.c | 2 +- openbsc/src/libbsc/e1_config.c | 2 +- openbsc/src/libbsc/gsm_04_08_utils.c | 4 ++-- openbsc/src/libbsc/gsm_subscriber_base.c | 2 +- openbsc/src/libbsc/handover_decision.c | 6 +++--- openbsc/src/libbsc/handover_logic.c | 6 +++--- openbsc/src/libbsc/meas_proc.c | 4 ++-- openbsc/src/libbsc/paging.c | 2 +- openbsc/src/libbsc/rest_octets.c | 2 +- openbsc/src/libbsc/system_information.c | 4 ++-- openbsc/src/libbsc/transaction.c | 2 +- openbsc/src/libcommon/Makefile.am | 4 ++-- openbsc/src/libcommon/common_vty.c | 2 +- openbsc/src/libcommon/debug.c | 6 +++--- openbsc/src/libcommon/gsm_data.c | 8 ++++---- openbsc/src/libcommon/socket.c | 8 ++++---- openbsc/src/libcommon/talloc_ctx.c | 2 +- openbsc/src/libgb/Makefile.am | 2 +- openbsc/src/libgb/gprs_bssgp.c | 8 ++++---- openbsc/src/libgb/gprs_bssgp_util.c | 6 +++--- openbsc/src/libgb/gprs_bssgp_vty.c | 10 +++++----- openbsc/src/libgb/gprs_ns.c | 10 +++++----- openbsc/src/libgb/gprs_ns_frgre.c | 6 +++--- openbsc/src/libgb/gprs_ns_vty.c | 10 +++++----- openbsc/src/libmgcp/Makefile.am | 2 +- openbsc/src/libmgcp/mgcp_network.c | 4 ++-- openbsc/src/libmgcp/mgcp_protocol.c | 6 +++--- openbsc/src/libmgcp/mgcp_vty.c | 2 +- openbsc/src/libmsc/Makefile.am | 2 +- openbsc/src/libmsc/auth.c | 2 +- openbsc/src/libmsc/db.c | 6 +++--- openbsc/src/libmsc/gsm_04_08.c | 14 +++++++------- openbsc/src/libmsc/gsm_04_11.c | 8 ++++---- openbsc/src/libmsc/gsm_04_80.c | 8 ++++---- openbsc/src/libmsc/gsm_subscriber.c | 2 +- openbsc/src/libmsc/mncc.c | 2 +- openbsc/src/libmsc/mncc_builtin.c | 2 +- openbsc/src/libmsc/mncc_sock.c | 6 +++--- openbsc/src/libmsc/silent_call.c | 2 +- openbsc/src/libmsc/sms_queue.c | 2 +- openbsc/src/libmsc/token_auth.c | 2 +- openbsc/src/libmsc/vty_interface_layer3.c | 8 ++++---- openbsc/src/libtrau/Makefile.am | 2 +- openbsc/src/libtrau/rtp_proxy.c | 6 +++--- openbsc/src/libtrau/subchan_demux.c | 2 +- openbsc/src/libtrau/trau_mux.c | 2 +- openbsc/src/osmo-bsc/Makefile.am | 4 ++-- openbsc/src/osmo-bsc/osmo_bsc_api.c | 4 ++-- openbsc/src/osmo-bsc/osmo_bsc_bssap.c | 4 ++-- openbsc/src/osmo-bsc/osmo_bsc_main.c | 4 ++-- openbsc/src/osmo-bsc/osmo_bsc_msc.c | 2 +- openbsc/src/osmo-bsc/osmo_bsc_rf.c | 4 ++-- openbsc/src/osmo-bsc/osmo_bsc_sccp.c | 6 +++--- openbsc/src/osmo-bsc/osmo_bsc_vty.c | 2 +- openbsc/src/osmo-bsc_mgcp/Makefile.am | 4 ++-- openbsc/src/osmo-bsc_mgcp/mgcp_main.c | 8 ++++---- openbsc/src/osmo-bsc_nat/Makefile.am | 4 ++-- openbsc/src/osmo-bsc_nat/bsc_filter.c | 4 ++-- openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c | 6 +++--- openbsc/src/osmo-bsc_nat/bsc_nat.c | 8 ++++---- openbsc/src/osmo-bsc_nat/bsc_nat_utils.c | 8 ++++---- openbsc/src/osmo-bsc_nat/bsc_nat_vty.c | 6 +++--- openbsc/src/osmo-bsc_nat/bsc_sccp.c | 2 +- openbsc/src/osmo-bsc_nat/bsc_ussd.c | 8 ++++---- openbsc/src/osmo-nitb/Makefile.am | 6 +++--- openbsc/src/osmo-nitb/bsc_hack.c | 6 +++--- openbsc/src/utils/Makefile.am | 4 ++-- openbsc/src/utils/bs11_config.c | 6 +++--- openbsc/src/utils/rs232.c | 4 ++-- openbsc/tests/channel/Makefile.am | 4 ++-- openbsc/tests/channel/channel_test.c | 2 +- openbsc/tests/db/Makefile.am | 4 ++-- openbsc/tests/gsm0408/Makefile.am | 4 ++-- openbsc/tests/mgcp/mgcp_test.c | 2 +- 152 files changed, 366 insertions(+), 365 deletions(-) diff --git a/openbsc/configure.in b/openbsc/configure.in index 4cd1952..38af661 100644 --- a/openbsc/configure.in +++ b/openbsc/configure.in @@ -45,6 +45,7 @@ AM_CONDITIONAL(BUILD_BSC, test "x$osmo_ac_build_bsc" = "xyes") PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.1.30) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.1.28) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.1.30) dnl checks for header files AC_HEADER_STDC diff --git a/openbsc/include/openbsc/abis_nm.h b/openbsc/include/openbsc/abis_nm.h index c93db58..ebe20d2 100644 --- a/openbsc/include/openbsc/abis_nm.h +++ b/openbsc/include/openbsc/abis_nm.h @@ -23,8 +23,8 @@ #define _NM_H #include <sys/types.h> -#include <osmocore/tlv.h> -#include <osmocore/protocol/gsm_12_21.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/gsm/protocol/gsm_12_21.h> struct cell_global_id { u_int16_t mcc; diff --git a/openbsc/include/openbsc/abis_rsl.h b/openbsc/include/openbsc/abis_rsl.h index 295b01f..e5f38c9 100644 --- a/openbsc/include/openbsc/abis_rsl.h +++ b/openbsc/include/openbsc/abis_rsl.h @@ -22,9 +22,9 @@ #ifndef _RSL_H #define _RSL_H -#include <osmocore/protocol/gsm_08_58.h> +#include <osmocom/gsm/protocol/gsm_08_58.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> struct gsm_bts; struct gsm_lchan; diff --git a/openbsc/include/openbsc/bsc_msc.h b/openbsc/include/openbsc/bsc_msc.h index d06ae05..ddaad3b 100644 --- a/openbsc/include/openbsc/bsc_msc.h +++ b/openbsc/include/openbsc/bsc_msc.h @@ -22,8 +22,8 @@ #ifndef BSC_MSC_H #define BSC_MSC_H -#include <osmocore/write_queue.h> -#include <osmocore/timer.h> +#include <osmocom/core/write_queue.h> +#include <osmocom/core/timer.h> struct bsc_msc_connection { struct write_queue write_queue; diff --git a/openbsc/include/openbsc/bsc_nat.h b/openbsc/include/openbsc/bsc_nat.h index f74cae2..e628925 100644 --- a/openbsc/include/openbsc/bsc_nat.h +++ b/openbsc/include/openbsc/bsc_nat.h @@ -25,14 +25,14 @@ #include <sys/types.h> -#include <osmocore/select.h> -#include <osmocore/msgb.h> -#include <osmocore/msgfile.h> -#include <osmocore/timer.h> -#include <osmocore/write_queue.h> -#include <osmocore/rate_ctr.h> -#include <osmocore/statistics.h> -#include <osmocore/protocol/gsm_04_08.h> +#include <osmocom/core/select.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/msgfile.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/write_queue.h> +#include <osmocom/core/rate_ctr.h> +#include <osmocom/core/statistics.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> #include <regex.h> diff --git a/openbsc/include/openbsc/debug.h b/openbsc/include/openbsc/debug.h index eb290e4..ff4aec1 100644 --- a/openbsc/include/openbsc/debug.h +++ b/openbsc/include/openbsc/debug.h @@ -2,10 +2,10 @@ #define _DEBUG_H #include <stdio.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #define DEBUG -#include <osmocore/logging.h> +#include <osmocom/core/logging.h> /* Debug Areas of the code */ enum { diff --git a/openbsc/include/openbsc/e1_input.h b/openbsc/include/openbsc/e1_input.h index 3c8af38..40ceedf 100644 --- a/openbsc/include/openbsc/e1_input.h +++ b/openbsc/include/openbsc/e1_input.h @@ -4,10 +4,10 @@ #include <stdlib.h> #include <netinet/in.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #include <openbsc/gsm_data.h> -#include <osmocore/msgb.h> -#include <osmocore/select.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/select.h> #include <openbsc/subchan_demux.h> #define NUM_E1_TS 32 diff --git a/openbsc/include/openbsc/gb_proxy.h b/openbsc/include/openbsc/gb_proxy.h index 18ded22..8a7911c 100644 --- a/openbsc/include/openbsc/gb_proxy.h +++ b/openbsc/include/openbsc/gb_proxy.h @@ -3,7 +3,7 @@ #include <sys/types.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <openbsc/gprs_ns.h> #include <osmocom/vty/command.h> diff --git a/openbsc/include/openbsc/gprs_bssgp.h b/openbsc/include/openbsc/gprs_bssgp.h index e432cf7..cef4c30 100644 --- a/openbsc/include/openbsc/gprs_bssgp.h +++ b/openbsc/include/openbsc/gprs_bssgp.h @@ -182,7 +182,7 @@ struct bssgp_bvc_ctx *btsctx_by_raid_cid(const struct gprs_ra_id *raid, uint16_t /* Find a BTS context based on BVCI+NSEI tuple */ struct bssgp_bvc_ctx *btsctx_by_bvci_nsei(uint16_t bvci, uint16_t nsei); -#include <osmocore/tlv.h> +#include <osmocom/gsm/tlv.h> /* BSSGP-UL-UNITDATA.ind */ int gprs_bssgp_rcvmsg(struct msgb *msg); diff --git a/openbsc/include/openbsc/gprs_gmm.h b/openbsc/include/openbsc/gprs_gmm.h index bd129ae..f6b3e5e 100644 --- a/openbsc/include/openbsc/gprs_gmm.h +++ b/openbsc/include/openbsc/gprs_gmm.h @@ -1,7 +1,7 @@ #ifndef _GPRS_GMM_H #define _GPRS_GMM_H -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <openbsc/gprs_sgsn.h> int gsm48_tx_gsm_deact_pdp_req(struct sgsn_pdp_ctx *pdp, uint8_t sm_cause); diff --git a/openbsc/include/openbsc/gprs_ns.h b/openbsc/include/openbsc/gprs_ns.h index 953c364..0b50149 100644 --- a/openbsc/include/openbsc/gprs_ns.h +++ b/openbsc/include/openbsc/gprs_ns.h @@ -77,10 +77,10 @@ enum ns_cause { /* Our Implementation */ #include <netinet/in.h> -#include <osmocore/linuxlist.h> -#include <osmocore/msgb.h> -#include <osmocore/timer.h> -#include <osmocore/select.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/select.h> #define NS_TIMERS_COUNT 7 #define NS_TIMERS "(tns-block|tns-block-retries|tns-reset|tns-reset-retries|tns-test|tns-alive|tns-alive-retries)" diff --git a/openbsc/include/openbsc/gprs_sgsn.h b/openbsc/include/openbsc/gprs_sgsn.h index b470c53..bd60d4e 100644 --- a/openbsc/include/openbsc/gprs_sgsn.h +++ b/openbsc/include/openbsc/gprs_sgsn.h @@ -4,7 +4,7 @@ #include <stdint.h> #include <netinet/in.h> -#include <osmocore/gsm48.h> +#include <osmocom/gsm/gsm48.h> #include <osmocom/crypt/gprs_cipher.h> diff --git a/openbsc/include/openbsc/gsm_04_08.h b/openbsc/include/openbsc/gsm_04_08.h index 1c879ed..5e0a45b 100644 --- a/openbsc/include/openbsc/gsm_04_08.h +++ b/openbsc/include/openbsc/gsm_04_08.h @@ -3,8 +3,8 @@ #include <openbsc/meas_rep.h> -#include <osmocore/protocol/gsm_04_08.h> -#include <osmocore/gsm48.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> +#include <osmocom/gsm/gsm48.h> struct msgb; struct gsm_bts; diff --git a/openbsc/include/openbsc/gsm_04_08_gprs.h b/openbsc/include/openbsc/gsm_04_08_gprs.h index 8de6362..e5c3edd 100644 --- a/openbsc/include/openbsc/gsm_04_08_gprs.h +++ b/openbsc/include/openbsc/gsm_04_08_gprs.h @@ -2,7 +2,7 @@ #define _GSM48_GPRS_H #include <stdint.h> -#include <osmocore/protocol/gsm_04_08.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> /* Table 10.4 / 10.4a, GPRS Mobility Management (GMM) */ #define GSM48_MT_GMM_ATTACH_REQ 0x01 diff --git a/openbsc/include/openbsc/gsm_04_11.h b/openbsc/include/openbsc/gsm_04_11.h index 5969788..5f400ff 100644 --- a/openbsc/include/openbsc/gsm_04_11.h +++ b/openbsc/include/openbsc/gsm_04_11.h @@ -1,7 +1,7 @@ #ifndef _GSM_04_11_H #define _GSM_04_11_H -#include <osmocore/protocol/gsm_04_11.h> +#include <osmocom/gsm/protocol/gsm_04_11.h> #define UM_SAPI_SMS 3 /* See GSM 04.05/04.06 */ diff --git a/openbsc/include/openbsc/gsm_04_80.h b/openbsc/include/openbsc/gsm_04_80.h index 796a1c1..0a60652 100644 --- a/openbsc/include/openbsc/gsm_04_80.h +++ b/openbsc/include/openbsc/gsm_04_80.h @@ -1,9 +1,9 @@ #ifndef _GSM_04_80_H #define _GSM_04_80_H -#include <osmocore/msgb.h> -#include <osmocore/protocol/gsm_04_80.h> -#include <osmocore/gsm0480.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/protocol/gsm_04_80.h> +#include <osmocom/gsm/gsm0480.h> struct gsm_subscriber_connection; diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index 4d427be..4b3ec93 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -44,19 +44,19 @@ enum gsm_chreq_reason_t { GSM_CHREQ_REASON_OTHER, }; -#include <osmocore/timer.h> +#include <osmocom/core/timer.h> #include <openbsc/system_information.h> #include <openbsc/rest_octets.h> #include <openbsc/mncc.h> -#include <osmocore/tlv.h> -#include <osmocore/bitvec.h> -#include <osmocore/statistics.h> -#include <osmocore/gsm_utils.h> -#include <osmocore/utils.h> -#include <osmocore/rxlev_stat.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/core/bitvec.h> +#include <osmocom/core/statistics.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/core/utils.h> +#include <osmocom/gsm/rxlev_stat.h> -#include <osmocore/protocol/gsm_08_58.h> +#include <osmocom/gsm/protocol/gsm_08_58.h> #define TRX_NR_TS 8 diff --git a/openbsc/include/openbsc/gsm_subscriber.h b/openbsc/include/openbsc/gsm_subscriber.h index c365bc7..79476d3 100644 --- a/openbsc/include/openbsc/gsm_subscriber.h +++ b/openbsc/include/openbsc/gsm_subscriber.h @@ -3,7 +3,7 @@ #include <sys/types.h> #include "gsm_data.h" -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #define GSM_IMEI_LENGTH 17 #define GSM_IMSI_LENGTH 17 diff --git a/openbsc/include/openbsc/ipaccess.h b/openbsc/include/openbsc/ipaccess.h index 1d00d97..314ca90 100644 --- a/openbsc/include/openbsc/ipaccess.h +++ b/openbsc/include/openbsc/ipaccess.h @@ -3,7 +3,7 @@ #include "e1_input.h" #include "gsm_subscriber.h" -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #define IPA_TCP_PORT_OML 3002 #define IPA_TCP_PORT_RSL 3003 diff --git a/openbsc/include/openbsc/mgcp.h b/openbsc/include/openbsc/mgcp.h index 516b76e..3d8e711 100644 --- a/openbsc/include/openbsc/mgcp.h +++ b/openbsc/include/openbsc/mgcp.h @@ -23,8 +23,8 @@ #ifndef OPENBSC_MGCP_H #define OPENBSC_MGCP_H -#include <osmocore/msgb.h> -#include <osmocore/write_queue.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/write_queue.h> #include "debug.h" diff --git a/openbsc/include/openbsc/mgcp_internal.h b/openbsc/include/openbsc/mgcp_internal.h index 7c6bb54..0214318 100644 --- a/openbsc/include/openbsc/mgcp_internal.h +++ b/openbsc/include/openbsc/mgcp_internal.h @@ -23,7 +23,7 @@ #ifndef OPENBSC_MGCP_DATA_H #define OPENBSC_MGCP_DATA_H -#include <osmocore/select.h> +#include <osmocom/core/select.h> #define CI_UNUSED 0 diff --git a/openbsc/include/openbsc/mncc.h b/openbsc/include/openbsc/mncc.h index e514c19..ed1bfd6 100644 --- a/openbsc/include/openbsc/mncc.h +++ b/openbsc/include/openbsc/mncc.h @@ -24,8 +24,8 @@ #ifndef _MNCC_H #define _MNCC_H -#include <osmocore/linuxlist.h> -#include <osmocore/mncc.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/gsm/mncc.h> #include <stdint.h> diff --git a/openbsc/include/openbsc/osmo_bsc_rf.h b/openbsc/include/openbsc/osmo_bsc_rf.h index e43ae2e..7de9866 100644 --- a/openbsc/include/openbsc/osmo_bsc_rf.h +++ b/openbsc/include/openbsc/osmo_bsc_rf.h @@ -1,8 +1,8 @@ #ifndef OSMO_BSC_RF #define OSMO_BSC_RF -#include <osmocore/write_queue.h> -#include <osmocore/timer.h> +#include <osmocom/core/write_queue.h> +#include <osmocom/core/timer.h> struct gsm_network; diff --git a/openbsc/include/openbsc/osmo_msc_data.h b/openbsc/include/openbsc/osmo_msc_data.h index 8f9ca68..55b0a0f 100644 --- a/openbsc/include/openbsc/osmo_msc_data.h +++ b/openbsc/include/openbsc/osmo_msc_data.h @@ -25,7 +25,7 @@ #include "bsc_msc.h" -#include <osmocore/timer.h> +#include <osmocom/core/timer.h> struct osmo_bsc_rf; struct gsm_network; diff --git a/openbsc/include/openbsc/paging.h b/openbsc/include/openbsc/paging.h index f719199..13d611a 100644 --- a/openbsc/include/openbsc/paging.h +++ b/openbsc/include/openbsc/paging.h @@ -23,10 +23,10 @@ #include <stdlib.h> #include <string.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #include "gsm_data.h" #include "gsm_subscriber.h" -#include <osmocore/timer.h> +#include <osmocom/core/timer.h> /** * A pending paging request diff --git a/openbsc/include/openbsc/rtp_proxy.h b/openbsc/include/openbsc/rtp_proxy.h index 53b58b4..2e4f278 100644 --- a/openbsc/include/openbsc/rtp_proxy.h +++ b/openbsc/include/openbsc/rtp_proxy.h @@ -24,8 +24,8 @@ #include <netinet/in.h> -#include <osmocore/linuxlist.h> -#include <osmocore/select.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/select.h> #define RTP_PT_GSM_FULL 3 #define RTP_PT_GSM_HALF 96 diff --git a/openbsc/include/openbsc/sgsn.h b/openbsc/include/openbsc/sgsn.h index 84db87e..e3b2467 100644 --- a/openbsc/include/openbsc/sgsn.h +++ b/openbsc/include/openbsc/sgsn.h @@ -3,7 +3,7 @@ #include <sys/types.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <openbsc/gprs_ns.h> #include <openbsc/gprs_sgsn.h> diff --git a/openbsc/include/openbsc/signal.h b/openbsc/include/openbsc/signal.h index 5e2b7ae..ea76a40 100644 --- a/openbsc/include/openbsc/signal.h +++ b/openbsc/include/openbsc/signal.h @@ -27,7 +27,7 @@ #include <openbsc/gsm_data.h> -#include <osmocore/signal.h> +#include <osmocom/core/signal.h> /* * Signalling subsystems diff --git a/openbsc/include/openbsc/socket.h b/openbsc/include/openbsc/socket.h index 4d31611..faca764 100644 --- a/openbsc/include/openbsc/socket.h +++ b/openbsc/include/openbsc/socket.h @@ -2,7 +2,7 @@ #define _BSC_SOCKET_H #include <sys/types.h> -#include <osmocore/select.h> +#include <osmocom/core/select.h> #ifndef IPPROTO_GRE #define IPPROTO_GRE 47 diff --git a/openbsc/include/openbsc/subchan_demux.h b/openbsc/include/openbsc/subchan_demux.h index da2a7f3..f7f0fba 100644 --- a/openbsc/include/openbsc/subchan_demux.h +++ b/openbsc/include/openbsc/subchan_demux.h @@ -21,7 +21,7 @@ */ #include <sys/types.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #define NR_SUBCH 4 #define TRAU_FRAME_SIZE 40 diff --git a/openbsc/include/openbsc/system_information.h b/openbsc/include/openbsc/system_information.h index da662e9..5f183e0 100644 --- a/openbsc/include/openbsc/system_information.h +++ b/openbsc/include/openbsc/system_information.h @@ -1,7 +1,7 @@ #ifndef _SYSTEM_INFO_H #define _SYSTEM_INFO_H -#include <osmocore/utils.h> +#include <osmocom/core/utils.h> #define GSM_MACBLOCK_LEN 23 diff --git a/openbsc/include/openbsc/transaction.h b/openbsc/include/openbsc/transaction.h index e41d8ef..721630b 100644 --- a/openbsc/include/openbsc/transaction.h +++ b/openbsc/include/openbsc/transaction.h @@ -3,7 +3,7 @@ #include <openbsc/gsm_data.h> #include <openbsc/gsm_subscriber.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #include <openbsc/gsm_04_11.h> /* One transaction */ diff --git a/openbsc/include/openbsc/ussd.h b/openbsc/include/openbsc/ussd.h index 6f80d23..2665468 100644 --- a/openbsc/include/openbsc/ussd.h +++ b/openbsc/include/openbsc/ussd.h @@ -3,7 +3,7 @@ /* Handler function for mobile-originated USSD messages */ -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> int handle_rcv_ussd(struct gsm_subscriber_connection *conn, struct msgb *msg); diff --git a/openbsc/src/Makefile.am b/openbsc/src/Makefile.am index 1573563..df7b936 100644 --- a/openbsc/src/Makefile.am +++ b/openbsc/src/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS) +AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(COVERAGE_LDFLAGS) SUBDIRS = libcommon libabis libmgcp libbsc libmsc libtrau osmo-nitb osmo-bsc_mgcp utils ipaccess libgb gprs diff --git a/openbsc/src/gprs/Makefile.am b/openbsc/src/gprs/Makefile.am index 16c2200..b6eccee 100644 --- a/openbsc/src/gprs/Makefile.am +++ b/openbsc/src/gprs/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) +AM_CFLAGS=-Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) noinst_HEADERS = gprs_sndcp.h diff --git a/openbsc/src/gprs/gb_proxy.c b/openbsc/src/gprs/gb_proxy.c index 8df93a9..53282e2 100644 --- a/openbsc/src/gprs/gb_proxy.c +++ b/openbsc/src/gprs/gb_proxy.c @@ -30,8 +30,8 @@ #include <sys/types.h> #include <arpa/inet.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> #include <openbsc/signal.h> #include <openbsc/debug.h> diff --git a/openbsc/src/gprs/gb_proxy_main.c b/openbsc/src/gprs/gb_proxy_main.c index b53e985..12ff8e0 100644 --- a/openbsc/src/gprs/gb_proxy_main.c +++ b/openbsc/src/gprs/gb_proxy_main.c @@ -33,10 +33,10 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/rate_ctr.h> -#include <osmocore/process.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> +#include <osmocom/core/process.h> #include <openbsc/signal.h> #include <openbsc/debug.h> diff --git a/openbsc/src/gprs/gb_proxy_vty.c b/openbsc/src/gprs/gb_proxy_vty.c index 05f5b1e..67ed093 100644 --- a/openbsc/src/gprs/gb_proxy_vty.c +++ b/openbsc/src/gprs/gb_proxy_vty.c @@ -23,7 +23,7 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/debug.h> #include <openbsc/gb_proxy.h> diff --git a/openbsc/src/gprs/gprs_gmm.c b/openbsc/src/gprs/gprs_gmm.c index 949cd96..43aa212 100644 --- a/openbsc/src/gprs/gprs_gmm.c +++ b/openbsc/src/gprs/gprs_gmm.c @@ -31,12 +31,12 @@ #include <arpa/inet.h> #include <openbsc/db.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/gsm_utils.h> -#include <osmocore/signal.h> -#include <osmocore/talloc.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/tlv.h> +#include <osmocom/core/gsm_utils.h> +#include <osmocom/core/signal.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> diff --git a/openbsc/src/gprs/gprs_llc.c b/openbsc/src/gprs/gprs_llc.c index 7991f4c..f7408ef 100644 --- a/openbsc/src/gprs/gprs_llc.c +++ b/openbsc/src/gprs/gprs_llc.c @@ -22,10 +22,10 @@ #include <errno.h> #include <stdint.h> -#include <osmocore/msgb.h> -#include <osmocore/linuxlist.h> -#include <osmocore/timer.h> -#include <osmocore/talloc.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/talloc.h> #include <openbsc/gsm_data.h> #include <openbsc/debug.h> diff --git a/openbsc/src/gprs/gprs_llc_vty.c b/openbsc/src/gprs/gprs_llc_vty.c index d4f743b..050d024 100644 --- a/openbsc/src/gprs/gprs_llc_vty.c +++ b/openbsc/src/gprs/gprs_llc_vty.c @@ -27,11 +27,11 @@ #include <arpa/inet.h> #include <openbsc/gsm_data.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/tlv.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/debug.h> #include <openbsc/signal.h> #include <openbsc/gprs_llc.h> diff --git a/openbsc/src/gprs/gprs_sgsn.c b/openbsc/src/gprs/gprs_sgsn.c index 4436554..85f7105 100644 --- a/openbsc/src/gprs/gprs_sgsn.c +++ b/openbsc/src/gprs/gprs_sgsn.c @@ -21,10 +21,10 @@ #include <stdint.h> -#include <osmocore/linuxlist.h> -#include <osmocore/talloc.h> -#include <osmocore/timer.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/debug.h> #include <openbsc/gprs_sgsn.h> diff --git a/openbsc/src/gprs/gprs_sndcp.c b/openbsc/src/gprs/gprs_sndcp.c index 4f421e4..1307fe5 100644 --- a/openbsc/src/gprs/gprs_sndcp.c +++ b/openbsc/src/gprs/gprs_sndcp.c @@ -23,10 +23,10 @@ #include <errno.h> #include <stdint.h> -#include <osmocore/msgb.h> -#include <osmocore/linuxlist.h> -#include <osmocore/timer.h> -#include <osmocore/talloc.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/talloc.h> #include <openbsc/gsm_data.h> #include <openbsc/debug.h> diff --git a/openbsc/src/gprs/gprs_sndcp_vty.c b/openbsc/src/gprs/gprs_sndcp_vty.c index 5a755d5..a6c0bd3 100644 --- a/openbsc/src/gprs/gprs_sndcp_vty.c +++ b/openbsc/src/gprs/gprs_sndcp_vty.c @@ -27,11 +27,11 @@ #include <arpa/inet.h> #include <openbsc/gsm_data.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/tlv.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/debug.h> #include <openbsc/signal.h> #include <openbsc/gprs_llc.h> diff --git a/openbsc/src/gprs/sgsn_libgtp.c b/openbsc/src/gprs/sgsn_libgtp.c index 7b10a45..c2afc79 100644 --- a/openbsc/src/gprs/sgsn_libgtp.c +++ b/openbsc/src/gprs/sgsn_libgtp.c @@ -34,9 +34,9 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/gsm_04_08_gprs.h> #include <openbsc/signal.h> diff --git a/openbsc/src/gprs/sgsn_main.c b/openbsc/src/gprs/sgsn_main.c index c59265f..dd8cef1 100644 --- a/openbsc/src/gprs/sgsn_main.c +++ b/openbsc/src/gprs/sgsn_main.c @@ -33,11 +33,11 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/rate_ctr.h> -#include <osmocore/logging.h> -#include <osmocore/process.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/process.h> #include <osmocom/vty/telnet_interface.h> diff --git a/openbsc/src/gprs/sgsn_vty.c b/openbsc/src/gprs/sgsn_vty.c index 74669ff..7100b1f 100644 --- a/openbsc/src/gprs/sgsn_vty.c +++ b/openbsc/src/gprs/sgsn_vty.c @@ -23,9 +23,9 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <osmocore/talloc.h> -#include <osmocore/utils.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/debug.h> #include <openbsc/sgsn.h> diff --git a/openbsc/src/ipaccess/Makefile.am b/openbsc/src/ipaccess/Makefile.am index 144cca1..c997c29 100644 --- a/openbsc/src/ipaccess/Makefile.am +++ b/openbsc/src/ipaccess/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(COVERAGE_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS) +AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(COVERAGE_CFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(COVERAGE_LDFLAGS) bin_PROGRAMS = ipaccess-find ipaccess-config ipaccess-proxy diff --git a/openbsc/src/ipaccess/ipaccess-config.c b/openbsc/src/ipaccess/ipaccess-config.c index d02faea..5215538 100644 --- a/openbsc/src/ipaccess/ipaccess-config.c +++ b/openbsc/src/ipaccess/ipaccess-config.c @@ -35,8 +35,8 @@ #include <arpa/inet.h> -#include <osmocore/select.h> -#include <osmocore/timer.h> +#include <osmocom/core/select.h> +#include <osmocom/core/timer.h> #include <openbsc/ipaccess.h> #include <openbsc/gsm_data.h> #include <openbsc/e1_input.h> @@ -44,7 +44,7 @@ #include <openbsc/signal.h> #include <openbsc/debug.h> #include <openbsc/network_listen.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> static struct gsm_network *gsmnet; diff --git a/openbsc/src/ipaccess/ipaccess-find.c b/openbsc/src/ipaccess/ipaccess-find.c index bea4b77..6dc2f06 100644 --- a/openbsc/src/ipaccess/ipaccess-find.c +++ b/openbsc/src/ipaccess/ipaccess-find.c @@ -27,8 +27,8 @@ #include <arpa/inet.h> -#include <osmocore/select.h> -#include <osmocore/timer.h> +#include <osmocom/core/select.h> +#include <osmocom/core/timer.h> #include <openbsc/ipaccess.h> #include <openbsc/gsm_data.h> diff --git a/openbsc/src/ipaccess/ipaccess-firmware.c b/openbsc/src/ipaccess/ipaccess-firmware.c index 7fdd0f8..971db9d 100644 --- a/openbsc/src/ipaccess/ipaccess-firmware.c +++ b/openbsc/src/ipaccess/ipaccess-firmware.c @@ -20,7 +20,7 @@ #include <openbsc/debug.h> #include <openbsc/ipaccess.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <stdio.h> #include <stdlib.h> diff --git a/openbsc/src/ipaccess/ipaccess-proxy.c b/openbsc/src/ipaccess/ipaccess-proxy.c index 2dc1b2f..56fe160 100644 --- a/openbsc/src/ipaccess/ipaccess-proxy.c +++ b/openbsc/src/ipaccess/ipaccess-proxy.c @@ -39,12 +39,12 @@ #include <getopt.h> #include <openbsc/gsm_data.h> -#include <osmocore/select.h> -#include <osmocore/tlv.h> -#include <osmocore/msgb.h> +#include <osmocom/core/select.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/core/msgb.h> #include <openbsc/debug.h> #include <openbsc/ipaccess.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> static struct log_target *stderr_target; diff --git a/openbsc/src/ipaccess/network_listen.c b/openbsc/src/ipaccess/network_listen.c index aaf7c97..cf0a6dc 100644 --- a/openbsc/src/ipaccess/network_listen.c +++ b/openbsc/src/ipaccess/network_listen.c @@ -28,10 +28,10 @@ #include <arpa/inet.h> -#include <osmocore/talloc.h> -#include <osmocore/timer.h> -#include <osmocore/rxlev_stat.h> -#include <osmocore/gsm48_ie.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/timer.h> +#include <osmocom/gsm/rxlev_stat.h> +#include <osmocom/gsm/gsm48_ie.h> #include <openbsc/gsm_data.h> #include <openbsc/abis_nm.h> diff --git a/openbsc/src/libabis/Makefile.am b/openbsc/src/libabis/Makefile.am index 0df7b5a..ffaa201 100644 --- a/openbsc/src/libabis/Makefile.am +++ b/openbsc/src/libabis/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS) +AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(COVERAGE_LDFLAGS) noinst_LIBRARIES = libabis.a diff --git a/openbsc/src/libabis/e1_input.c b/openbsc/src/libabis/e1_input.c index 3b6644e..eea1abe 100644 --- a/openbsc/src/libabis/e1_input.c +++ b/openbsc/src/libabis/e1_input.c @@ -39,18 +39,18 @@ #define PF_ISDN AF_ISDN #endif -#include <osmocore/select.h> -#include <osmocore/msgb.h> +#include <osmocom/core/select.h> +#include <osmocom/core/msgb.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/e1_input.h> #include <openbsc/abis_nm.h> #include <openbsc/abis_rsl.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #include <openbsc/subchan_demux.h> #include <openbsc/trau_frame.h> #include <openbsc/trau_mux.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/signal.h> #include <openbsc/misdn.h> diff --git a/openbsc/src/libabis/e1_input_vty.c b/openbsc/src/libabis/e1_input_vty.c index 66bf655..8905501 100644 --- a/openbsc/src/libabis/e1_input_vty.c +++ b/openbsc/src/libabis/e1_input_vty.c @@ -27,12 +27,12 @@ #include <osmocom/vty/logging.h> #include <osmocom/vty/telnet_interface.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #include <openbsc/gsm_data.h> #include <openbsc/e1_input.h> -#include <osmocore/utils.h> -#include <osmocore/gsm_utils.h> -#include <osmocore/talloc.h> +#include <osmocom/core/utils.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/core/talloc.h> #include <openbsc/vty.h> #include <openbsc/debug.h> diff --git a/openbsc/src/libabis/input/dahdi.c b/openbsc/src/libabis/input/dahdi.c index 572bb5a..2754944 100644 --- a/openbsc/src/libabis/input/dahdi.c +++ b/openbsc/src/libabis/input/dahdi.c @@ -39,8 +39,8 @@ #include <arpa/inet.h> #include <dahdi/user.h> -#include <osmocore/select.h> -#include <osmocore/msgb.h> +#include <osmocom/core/select.h> +#include <osmocom/core/msgb.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/abis_nm.h> @@ -48,7 +48,7 @@ #include <openbsc/subchan_demux.h> #include <openbsc/e1_input.h> #include <openbsc/signal.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include "lapd.h" diff --git a/openbsc/src/libabis/input/hsl.c b/openbsc/src/libabis/input/hsl.c index 1afe82b..d8f284e 100644 --- a/openbsc/src/libabis/input/hsl.c +++ b/openbsc/src/libabis/input/hsl.c @@ -43,9 +43,9 @@ #include <sys/ioctl.h> #include <arpa/inet.h> -#include <osmocore/select.h> -#include <osmocore/tlv.h> -#include <osmocore/msgb.h> +#include <osmocom/core/select.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/core/msgb.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/abis_nm.h> @@ -55,7 +55,7 @@ #include <openbsc/ipaccess.h> #include <openbsc/socket.h> #include <openbsc/signal.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #define HSL_TCP_PORT 2500 #define HSL_PROTO_DEBUG 0xdd diff --git a/openbsc/src/libabis/input/ipaccess.c b/openbsc/src/libabis/input/ipaccess.c index dcf8d1a..f074616 100644 --- a/openbsc/src/libabis/input/ipaccess.c +++ b/openbsc/src/libabis/input/ipaccess.c @@ -33,10 +33,10 @@ #include <sys/ioctl.h> #include <arpa/inet.h> -#include <osmocore/select.h> -#include <osmocore/tlv.h> -#include <osmocore/msgb.h> -#include <osmocore/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/abis_nm.h> diff --git a/openbsc/src/libabis/input/lapd.c b/openbsc/src/libabis/input/lapd.c index 7bce6cc..2a4f60e 100644 --- a/openbsc/src/libabis/input/lapd.c +++ b/openbsc/src/libabis/input/lapd.c @@ -36,10 +36,10 @@ #include "lapd.h" -#include <osmocore/linuxlist.h> -#include <osmocore/talloc.h> -#include <osmocore/msgb.h> -#include <osmocore/timer.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/timer.h> #include <openbsc/debug.h> #define SABM_INTERVAL 0, 300000 diff --git a/openbsc/src/libabis/input/lapd.h b/openbsc/src/libabis/input/lapd.h index fd11eda..fb980d1 100644 --- a/openbsc/src/libabis/input/lapd.h +++ b/openbsc/src/libabis/input/lapd.h @@ -3,7 +3,7 @@ #include <stdint.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> typedef enum { LAPD_MPH_NONE = 0, diff --git a/openbsc/src/libabis/input/misdn.c b/openbsc/src/libabis/input/misdn.c index 4598879..e111c13 100644 --- a/openbsc/src/libabis/input/misdn.c +++ b/openbsc/src/libabis/input/misdn.c @@ -40,9 +40,9 @@ #define PF_ISDN AF_ISDN #endif -#include <osmocore/select.h> -#include <osmocore/msgb.h> -#include <osmocore/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/abis_nm.h> diff --git a/openbsc/src/libbsc/Makefile.am b/openbsc/src/libbsc/Makefile.am index de76929..39c2972 100644 --- a/openbsc/src/libbsc/Makefile.am +++ b/openbsc/src/libbsc/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS) +AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(COVERAGE_LDFLAGS) noinst_LIBRARIES = libbsc.a diff --git a/openbsc/src/libbsc/abis_nm.c b/openbsc/src/libbsc/abis_nm.c index 761dda1..1d86ffa 100644 --- a/openbsc/src/libbsc/abis_nm.c +++ b/openbsc/src/libbsc/abis_nm.c @@ -37,9 +37,9 @@ #include <openbsc/gsm_data.h> #include <openbsc/debug.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/talloc.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/core/talloc.h> #include <openbsc/abis_nm.h> #include <openbsc/misdn.h> #include <openbsc/signal.h> diff --git a/openbsc/src/libbsc/abis_nm_vty.c b/openbsc/src/libbsc/abis_nm_vty.c index 996a857..3a16b2b 100644 --- a/openbsc/src/libbsc/abis_nm_vty.c +++ b/openbsc/src/libbsc/abis_nm_vty.c @@ -27,9 +27,9 @@ #include <arpa/inet.h> #include <openbsc/gsm_data.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/talloc.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/core/talloc.h> #include <openbsc/debug.h> #include <openbsc/signal.h> #include <openbsc/abis_nm.h> diff --git a/openbsc/src/libbsc/abis_om2000.c b/openbsc/src/libbsc/abis_om2000.c index a5f5d4f..c1aef9f 100644 --- a/openbsc/src/libbsc/abis_om2000.c +++ b/openbsc/src/libbsc/abis_om2000.c @@ -30,10 +30,10 @@ #include <arpa/inet.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/talloc.h> -#include <osmocore/utils.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> #include <openbsc/gsm_data.h> #include <openbsc/debug.h> diff --git a/openbsc/src/libbsc/abis_om2000_vty.c b/openbsc/src/libbsc/abis_om2000_vty.c index cce4eb3..704f955 100644 --- a/openbsc/src/libbsc/abis_om2000_vty.c +++ b/openbsc/src/libbsc/abis_om2000_vty.c @@ -27,9 +27,9 @@ #include <arpa/inet.h> #include <openbsc/gsm_data.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/talloc.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/core/talloc.h> #include <openbsc/debug.h> #include <openbsc/signal.h> #include <openbsc/abis_om2000.h> diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c index 9a4dc5b..8cac832 100644 --- a/openbsc/src/libbsc/abis_rsl.c +++ b/openbsc/src/libbsc/abis_rsl.c @@ -29,19 +29,19 @@ #include <openbsc/gsm_data.h> #include <openbsc/gsm_04_08.h> -#include <osmocore/gsm_utils.h> +#include <osmocom/gsm/gsm_utils.h> #include <openbsc/abis_rsl.h> #include <openbsc/chan_alloc.h> #include <openbsc/bsc_rll.h> #include <openbsc/debug.h> -#include <osmocore/tlv.h> +#include <osmocom/gsm/tlv.h> #include <openbsc/paging.h> #include <openbsc/signal.h> #include <openbsc/meas_rep.h> #include <openbsc/rtp_proxy.h> -#include <osmocore/rsl.h> +#include <osmocom/gsm/rsl.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #define RSL_ALLOC_SIZE 1024 #define RSL_ALLOC_HEADROOM 128 diff --git a/openbsc/src/libbsc/bsc_api.c b/openbsc/src/libbsc/bsc_api.c index 0f09aec..bbd9b58 100644 --- a/openbsc/src/libbsc/bsc_api.c +++ b/openbsc/src/libbsc/bsc_api.c @@ -32,9 +32,9 @@ #include <openbsc/debug.h> #include <openbsc/gsm_04_08.h> -#include <osmocore/protocol/gsm_08_08.h> +#include <osmocom/gsm/protocol/gsm_08_08.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #define GSM0808_T10_VALUE 6, 0 diff --git a/openbsc/src/libbsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c index 0072bb6..127e9fb 100644 --- a/openbsc/src/libbsc/bsc_init.c +++ b/openbsc/src/libbsc/bsc_init.c @@ -20,7 +20,7 @@ */ #include <openbsc/gsm_data.h> -#include <osmocore/gsm_utils.h> +#include <osmocom/gsm/gsm_utils.h> #include <openbsc/gsm_04_08.h> #include <openbsc/abis_rsl.h> #include <openbsc/abis_nm.h> @@ -31,7 +31,7 @@ #include <openbsc/paging.h> #include <openbsc/signal.h> #include <openbsc/chan_alloc.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/ipaccess.h> /* global pointer to the gsm network data structure */ diff --git a/openbsc/src/libbsc/bsc_msc.c b/openbsc/src/libbsc/bsc_msc.c index 508697a..e9a5113 100644 --- a/openbsc/src/libbsc/bsc_msc.c +++ b/openbsc/src/libbsc/bsc_msc.c @@ -23,8 +23,8 @@ #include <openbsc/debug.h> #include <openbsc/ipaccess.h> -#include <osmocore/write_queue.h> -#include <osmocore/talloc.h> +#include <osmocom/core/write_queue.h> +#include <osmocom/core/talloc.h> #include <arpa/inet.h> #include <sys/socket.h> diff --git a/openbsc/src/libbsc/bsc_rll.c b/openbsc/src/libbsc/bsc_rll.c index 722f3fa..f3eef99 100644 --- a/openbsc/src/libbsc/bsc_rll.c +++ b/openbsc/src/libbsc/bsc_rll.c @@ -23,9 +23,9 @@ #include <errno.h> #include <openbsc/debug.h> -#include <osmocore/talloc.h> -#include <osmocore/timer.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/linuxlist.h> #include <openbsc/bsc_rll.h> #include <openbsc/gsm_data.h> #include <openbsc/chan_alloc.h> diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c index 1afaed3..dfa02bb 100644 --- a/openbsc/src/libbsc/bsc_vty.c +++ b/openbsc/src/libbsc/bsc_vty.c @@ -29,17 +29,17 @@ #include <arpa/inet.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #include <openbsc/gsm_data.h> #include <openbsc/e1_input.h> #include <openbsc/abis_nm.h> #include <openbsc/abis_om2000.h> -#include <osmocore/utils.h> -#include <osmocore/gsm_utils.h> +#include <osmocom/core/utils.h> +#include <osmocom/gsm/gsm_utils.h> #include <openbsc/chan_alloc.h> #include <openbsc/meas_rep.h> #include <openbsc/db.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/vty.h> #include <openbsc/gprs_ns.h> #include <openbsc/system_information.h> diff --git a/openbsc/src/libbsc/bts_ericsson_rbs2000.c b/openbsc/src/libbsc/bts_ericsson_rbs2000.c index 1b64b36..2d23d48 100644 --- a/openbsc/src/libbsc/bts_ericsson_rbs2000.c +++ b/openbsc/src/libbsc/bts_ericsson_rbs2000.c @@ -21,7 +21,7 @@ #include <sys/types.h> -#include <osmocore/tlv.h> +#include <osmocom/gsm/tlv.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> diff --git a/openbsc/src/libbsc/bts_hsl_femtocell.c b/openbsc/src/libbsc/bts_hsl_femtocell.c index 5e28ebf..67b9c75 100644 --- a/openbsc/src/libbsc/bts_hsl_femtocell.c +++ b/openbsc/src/libbsc/bts_hsl_femtocell.c @@ -24,7 +24,7 @@ #include <arpa/inet.h> -#include <osmocore/tlv.h> +#include <osmocom/gsm/tlv.h> #include <openbsc/gsm_data.h> #include <openbsc/abis_nm.h> #include <openbsc/abis_rsl.h> diff --git a/openbsc/src/libbsc/bts_ipaccess_nanobts.c b/openbsc/src/libbsc/bts_ipaccess_nanobts.c index 463e3a7..e4d9a04 100644 --- a/openbsc/src/libbsc/bts_ipaccess_nanobts.c +++ b/openbsc/src/libbsc/bts_ipaccess_nanobts.c @@ -22,7 +22,7 @@ #include <sys/types.h> #include <arpa/inet.h> -#include <osmocore/tlv.h> +#include <osmocom/gsm/tlv.h> #include <openbsc/gsm_data.h> #include <openbsc/signal.h> diff --git a/openbsc/src/libbsc/bts_siemens_bs11.c b/openbsc/src/libbsc/bts_siemens_bs11.c index 5a5f883..0ab42e8 100644 --- a/openbsc/src/libbsc/bts_siemens_bs11.c +++ b/openbsc/src/libbsc/bts_siemens_bs11.c @@ -21,7 +21,7 @@ #include <sys/types.h> -#include <osmocore/tlv.h> +#include <osmocom/gsm/tlv.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> diff --git a/openbsc/src/libbsc/bts_unknown.c b/openbsc/src/libbsc/bts_unknown.c index f954599..d8ccf0e 100644 --- a/openbsc/src/libbsc/bts_unknown.c +++ b/openbsc/src/libbsc/bts_unknown.c @@ -22,7 +22,7 @@ #include <sys/types.h> #include <openbsc/gsm_data.h> -#include <osmocore/tlv.h> +#include <osmocom/gsm/tlv.h> #include <openbsc/abis_nm.h> static struct gsm_bts_model model_unknown = { diff --git a/openbsc/src/libbsc/chan_alloc.c b/openbsc/src/libbsc/chan_alloc.c index 167381b..f12e21b 100644 --- a/openbsc/src/libbsc/chan_alloc.c +++ b/openbsc/src/libbsc/chan_alloc.c @@ -32,7 +32,7 @@ #include <openbsc/debug.h> #include <openbsc/signal.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> static int ts_is_usable(struct gsm_bts_trx_ts *ts) { diff --git a/openbsc/src/libbsc/e1_config.c b/openbsc/src/libbsc/e1_config.c index 958839d..bd6ebba 100644 --- a/openbsc/src/libbsc/e1_config.c +++ b/openbsc/src/libbsc/e1_config.c @@ -29,7 +29,7 @@ #include <openbsc/trau_mux.h> #include <openbsc/misdn.h> #include <openbsc/ipaccess.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/debug.h> #define SAPI_L2ML 0 diff --git a/openbsc/src/libbsc/gsm_04_08_utils.c b/openbsc/src/libbsc/gsm_04_08_utils.c index 6d12cc0..1aab2ee 100644 --- a/openbsc/src/libbsc/gsm_04_08_utils.c +++ b/openbsc/src/libbsc/gsm_04_08_utils.c @@ -27,8 +27,8 @@ #include <errno.h> #include <netinet/in.h> -#include <osmocore/msgb.h> -#include <osmocore/gsm48.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/gsm48.h> #include <openbsc/abis_rsl.h> #include <openbsc/debug.h> diff --git a/openbsc/src/libbsc/gsm_subscriber_base.c b/openbsc/src/libbsc/gsm_subscriber_base.c index caf84e7..11afb35 100644 --- a/openbsc/src/libbsc/gsm_subscriber_base.c +++ b/openbsc/src/libbsc/gsm_subscriber_base.c @@ -27,7 +27,7 @@ #include <string.h> #include <assert.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/debug.h> diff --git a/openbsc/src/libbsc/handover_decision.c b/openbsc/src/libbsc/handover_decision.c index d3f843a..3b81dde 100644 --- a/openbsc/src/libbsc/handover_decision.c +++ b/openbsc/src/libbsc/handover_decision.c @@ -24,14 +24,14 @@ #include <stdlib.h> #include <errno.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/meas_rep.h> #include <openbsc/signal.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/handover.h> -#include <osmocore/gsm_utils.h> +#include <osmocom/gsm/gsm_utils.h> /* issue handover to a cell identified by ARFCN and BSIC */ static int handover_to_arfcn_bsic(struct gsm_lchan *lchan, diff --git a/openbsc/src/libbsc/handover_logic.c b/openbsc/src/libbsc/handover_logic.c index c2e3f8c..ad79f8a 100644 --- a/openbsc/src/libbsc/handover_logic.c +++ b/openbsc/src/libbsc/handover_logic.c @@ -28,16 +28,16 @@ #include <time.h> #include <netinet/in.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> -#include <osmocore/gsm_utils.h> +#include <osmocom/gsm/gsm_utils.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/gsm_04_08.h> #include <openbsc/abis_rsl.h> #include <openbsc/chan_alloc.h> #include <openbsc/signal.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/transaction.h> #include <openbsc/rtp_proxy.h> diff --git a/openbsc/src/libbsc/meas_proc.c b/openbsc/src/libbsc/meas_proc.c index ade1f2e..5ca013d 100644 --- a/openbsc/src/libbsc/meas_proc.c +++ b/openbsc/src/libbsc/meas_proc.c @@ -22,8 +22,8 @@ #include <stdlib.h> #include <errno.h> -#include <osmocore/talloc.h> -#include <osmocore/msgb.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/msgb.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/meas_rep.h> diff --git a/openbsc/src/libbsc/paging.c b/openbsc/src/libbsc/paging.c index 6502545..c542544 100644 --- a/openbsc/src/libbsc/paging.c +++ b/openbsc/src/libbsc/paging.c @@ -39,7 +39,7 @@ #include <assert.h> #include <openbsc/paging.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/debug.h> #include <openbsc/signal.h> #include <openbsc/abis_rsl.h> diff --git a/openbsc/src/libbsc/rest_octets.c b/openbsc/src/libbsc/rest_octets.c index 084f144..c040d26 100644 --- a/openbsc/src/libbsc/rest_octets.c +++ b/openbsc/src/libbsc/rest_octets.c @@ -26,7 +26,7 @@ #include <errno.h> #include <openbsc/gsm_data.h> -#include <osmocore/bitvec.h> +#include <osmocom/core/bitvec.h> #include <openbsc/rest_octets.h> /* generate SI1 rest octets */ diff --git a/openbsc/src/libbsc/system_information.c b/openbsc/src/libbsc/system_information.c index dc71938..1cbbcc9 100644 --- a/openbsc/src/libbsc/system_information.c +++ b/openbsc/src/libbsc/system_information.c @@ -30,8 +30,8 @@ #include <openbsc/gsm_data.h> #include <openbsc/abis_rsl.h> #include <openbsc/rest_octets.h> -#include <osmocore/bitvec.h> -#include <osmocore/utils.h> +#include <osmocom/core/bitvec.h> +#include <osmocom/core/utils.h> #include <openbsc/debug.h> #define GSM48_CELL_CHAN_DESC_SIZE 16 diff --git a/openbsc/src/libbsc/transaction.c b/openbsc/src/libbsc/transaction.c index 9b4af1a..180f9f9 100644 --- a/openbsc/src/libbsc/transaction.c +++ b/openbsc/src/libbsc/transaction.c @@ -22,7 +22,7 @@ #include <openbsc/gsm_data.h> #include <openbsc/mncc.h> #include <openbsc/debug.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/gsm_04_08.h> #include <openbsc/mncc.h> diff --git a/openbsc/src/libcommon/Makefile.am b/openbsc/src/libcommon/Makefile.am index 2895452..ed74b44 100644 --- a/openbsc/src/libcommon/Makefile.am +++ b/openbsc/src/libcommon/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS) +AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(COVERAGE_LDFLAGS) noinst_LIBRARIES = libcommon.a diff --git a/openbsc/src/libcommon/common_vty.c b/openbsc/src/libcommon/common_vty.c index 84375a2..e974f2d 100644 --- a/openbsc/src/libcommon/common_vty.c +++ b/openbsc/src/libcommon/common_vty.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <string.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/vty.h> #include <openbsc/gsm_data.h> diff --git a/openbsc/src/libcommon/debug.c b/openbsc/src/libcommon/debug.c index ea5db49..1372150 100644 --- a/openbsc/src/libcommon/debug.c +++ b/openbsc/src/libcommon/debug.c @@ -27,9 +27,9 @@ #include <time.h> #include <errno.h> -#include <osmocore/talloc.h> -#include <osmocore/utils.h> -#include <osmocore/logging.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/logging.h> #include <openbsc/gsm_data.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/debug.h> diff --git a/openbsc/src/libcommon/gsm_data.c b/openbsc/src/libcommon/gsm_data.c index b2c52e4..cab1e4a 100644 --- a/openbsc/src/libcommon/gsm_data.c +++ b/openbsc/src/libcommon/gsm_data.c @@ -26,10 +26,10 @@ #include <netinet/in.h> -#include <osmocore/linuxlist.h> -#include <osmocore/talloc.h> -#include <osmocore/gsm_utils.h> -#include <osmocore/statistics.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/core/statistics.h> #include <openbsc/gsm_data.h> #include <openbsc/osmo_msc_data.h> diff --git a/openbsc/src/libcommon/socket.c b/openbsc/src/libcommon/socket.c index 47778e7..42d7b48 100644 --- a/openbsc/src/libcommon/socket.c +++ b/openbsc/src/libcommon/socket.c @@ -33,12 +33,12 @@ #include <sys/ioctl.h> #include <arpa/inet.h> -#include <osmocore/select.h> -#include <osmocore/tlv.h> -#include <osmocore/msgb.h> +#include <osmocom/core/select.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/core/msgb.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> int make_sock(struct bsc_fd *bfd, int proto, u_int32_t ip, u_int16_t port, int (*cb)(struct bsc_fd *fd, unsigned int what)) diff --git a/openbsc/src/libcommon/talloc_ctx.c b/openbsc/src/libcommon/talloc_ctx.c index 8e7ec23..ae6a156 100644 --- a/openbsc/src/libcommon/talloc_ctx.c +++ b/openbsc/src/libcommon/talloc_ctx.c @@ -1,4 +1,4 @@ -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/gsm_data.h> extern void *tall_msgb_ctx; diff --git a/openbsc/src/libgb/Makefile.am b/openbsc/src/libgb/Makefile.am index b48b177..8ec1006 100644 --- a/openbsc/src/libgb/Makefile.am +++ b/openbsc/src/libgb/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS=-Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOCORE_GSM) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) noinst_LIBRARIES = libgb.a diff --git a/openbsc/src/libgb/gprs_bssgp.c b/openbsc/src/libgb/gprs_bssgp.c index eca34b9..b74791c 100644 --- a/openbsc/src/libgb/gprs_bssgp.c +++ b/openbsc/src/libgb/gprs_bssgp.c @@ -27,10 +27,10 @@ #include <netinet/in.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/talloc.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> diff --git a/openbsc/src/libgb/gprs_bssgp_util.c b/openbsc/src/libgb/gprs_bssgp_util.c index f8e3b56..b539323 100644 --- a/openbsc/src/libgb/gprs_bssgp_util.c +++ b/openbsc/src/libgb/gprs_bssgp_util.c @@ -24,9 +24,9 @@ #include <netinet/in.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/talloc.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/core/talloc.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> diff --git a/openbsc/src/libgb/gprs_bssgp_vty.c b/openbsc/src/libgb/gprs_bssgp_vty.c index 9ebd090..720c221 100644 --- a/openbsc/src/libgb/gprs_bssgp_vty.c +++ b/openbsc/src/libgb/gprs_bssgp_vty.c @@ -27,11 +27,11 @@ #include <arpa/inet.h> #include <openbsc/gsm_data.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/debug.h> #include <openbsc/signal.h> #include <openbsc/gprs_ns.h> diff --git a/openbsc/src/libgb/gprs_ns.c b/openbsc/src/libgb/gprs_ns.c index 5a8e358..877a065 100644 --- a/openbsc/src/libgb/gprs_ns.c +++ b/openbsc/src/libgb/gprs_ns.c @@ -59,11 +59,11 @@ #include <arpa/inet.h> #include <openbsc/gsm_data.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/debug.h> #include <openbsc/signal.h> #include <openbsc/gprs_ns.h> diff --git a/openbsc/src/libgb/gprs_ns_frgre.c b/openbsc/src/libgb/gprs_ns_frgre.c index 106f410..98b1ad6 100644 --- a/openbsc/src/libgb/gprs_ns_frgre.c +++ b/openbsc/src/libgb/gprs_ns_frgre.c @@ -31,9 +31,9 @@ #include <netinet/ip.h> #include <arpa/inet.h> -#include <osmocore/select.h> -#include <osmocore/msgb.h> -#include <osmocore/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> #include <openbsc/socket.h> #include <openbsc/debug.h> diff --git a/openbsc/src/libgb/gprs_ns_vty.c b/openbsc/src/libgb/gprs_ns_vty.c index 39277fc..505dc3b 100644 --- a/openbsc/src/libgb/gprs_ns_vty.c +++ b/openbsc/src/libgb/gprs_ns_vty.c @@ -27,11 +27,11 @@ #include <arpa/inet.h> #include <openbsc/gsm_data.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/debug.h> #include <openbsc/signal.h> #include <openbsc/gprs_ns.h> diff --git a/openbsc/src/libmgcp/Makefile.am b/openbsc/src/libmgcp/Makefile.am index b1d1d15..6347eac 100644 --- a/openbsc/src/libmgcp/Makefile.am +++ b/openbsc/src/libmgcp/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(COVERAGE_LDFLAGS) noinst_LIBRARIES = libmgcp.a diff --git a/openbsc/src/libmgcp/mgcp_network.c b/openbsc/src/libmgcp/mgcp_network.c index b814d98..7167d58 100644 --- a/openbsc/src/libmgcp/mgcp_network.c +++ b/openbsc/src/libmgcp/mgcp_network.c @@ -29,8 +29,8 @@ #include <sys/socket.h> #include <arpa/inet.h> -#include <osmocore/msgb.h> -#include <osmocore/select.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/select.h> #include <openbsc/mgcp.h> #include <openbsc/mgcp_internal.h> diff --git a/openbsc/src/libmgcp/mgcp_protocol.c b/openbsc/src/libmgcp/mgcp_protocol.c index c9a9b7f..bca4b31 100644 --- a/openbsc/src/libmgcp/mgcp_protocol.c +++ b/openbsc/src/libmgcp/mgcp_protocol.c @@ -29,9 +29,9 @@ #include <limits.h> #include <unistd.h> -#include <osmocore/msgb.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> #include <openbsc/mgcp.h> #include <openbsc/mgcp_internal.h> diff --git a/openbsc/src/libmgcp/mgcp_vty.c b/openbsc/src/libmgcp/mgcp_vty.c index 2e695c8..be77b83 100644 --- a/openbsc/src/libmgcp/mgcp_vty.c +++ b/openbsc/src/libmgcp/mgcp_vty.c @@ -23,7 +23,7 @@ #include <sys/types.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/mgcp.h> #include <openbsc/mgcp_internal.h> diff --git a/openbsc/src/libmsc/Makefile.am b/openbsc/src/libmsc/Makefile.am index 7d895c3..17213ca 100644 --- a/openbsc/src/libmsc/Makefile.am +++ b/openbsc/src/libmsc/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_CFLAGS) $(COVERAGE_LDFLAGS) noinst_LIBRARIES = libmsc.a diff --git a/openbsc/src/libmsc/auth.c b/openbsc/src/libmsc/auth.c index e09bde5..1683a5f 100644 --- a/openbsc/src/libmsc/auth.c +++ b/openbsc/src/libmsc/auth.c @@ -25,7 +25,7 @@ #include <openbsc/auth.h> #include <openbsc/gsm_data.h> -#include <osmocore/comp128.h> +#include <osmocom/gsm/comp128.h> #include <stdlib.h> diff --git a/openbsc/src/libmsc/db.c b/openbsc/src/libmsc/db.c index 95a7d36..3de6830 100644 --- a/openbsc/src/libmsc/db.c +++ b/openbsc/src/libmsc/db.c @@ -34,9 +34,9 @@ #include <openbsc/db.h> #include <openbsc/debug.h> -#include <osmocore/talloc.h> -#include <osmocore/statistics.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/statistics.h> +#include <osmocom/core/rate_ctr.h> static char *db_basename = NULL; static char *db_dirname = NULL; diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index 2b61aa9..695f43d 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -49,14 +49,14 @@ #include <openbsc/silent_call.h> #include <openbsc/bsc_api.h> #include <openbsc/osmo_msc.h> -#include <osmocore/bitvec.h> - -#include <osmocore/gsm48.h> -#include <osmocore/gsm0480.h> -#include <osmocore/gsm_utils.h> -#include <osmocore/msgb.h> -#include <osmocore/talloc.h> -#include <osmocore/tlv.h> +#include <osmocom/core/bitvec.h> + +#include <osmocom/gsm/gsm48.h> +#include <osmocom/gsm/gsm0480.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> +#include <osmocom/gsm/tlv.h> void *tall_locop_ctx; void *tall_authciphop_ctx; diff --git a/openbsc/src/libmsc/gsm_04_11.c b/openbsc/src/libmsc/gsm_04_11.c index 812e758..0f8d7c2 100644 --- a/openbsc/src/libmsc/gsm_04_11.c +++ b/openbsc/src/libmsc/gsm_04_11.c @@ -32,19 +32,19 @@ #include <time.h> #include <netinet/in.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/tlv.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/db.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/gsm_04_11.h> #include <openbsc/gsm_04_08.h> -#include <osmocore/gsm_utils.h> +#include <osmocom/gsm/gsm_utils.h> #include <openbsc/abis_rsl.h> #include <openbsc/signal.h> #include <openbsc/db.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/transaction.h> #include <openbsc/paging.h> #include <openbsc/bsc_rll.h> diff --git a/openbsc/src/libmsc/gsm_04_80.c b/openbsc/src/libmsc/gsm_04_80.c index 494c319..240bfb3 100644 --- a/openbsc/src/libmsc/gsm_04_80.c +++ b/openbsc/src/libmsc/gsm_04_80.c @@ -34,10 +34,10 @@ #include <openbsc/gsm_04_80.h> #include <openbsc/bsc_api.h> -#include <osmocore/gsm0480.h> -#include <osmocore/gsm_utils.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> +#include <osmocom/gsm/gsm0480.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/tlv.h> static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, u_int8_t tag) { diff --git a/openbsc/src/libmsc/gsm_subscriber.c b/openbsc/src/libmsc/gsm_subscriber.c index db61f25..ff4a647 100644 --- a/openbsc/src/libmsc/gsm_subscriber.c +++ b/openbsc/src/libmsc/gsm_subscriber.c @@ -26,7 +26,7 @@ #include <string.h> #include <assert.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <osmocom/vty/vty.h> diff --git a/openbsc/src/libmsc/mncc.c b/openbsc/src/libmsc/mncc.c index 3630b91..1bed543 100644 --- a/openbsc/src/libmsc/mncc.c +++ b/openbsc/src/libmsc/mncc.c @@ -30,7 +30,7 @@ #include <openbsc/gsm_04_08.h> #include <openbsc/debug.h> #include <openbsc/mncc.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/gsm_data.h> #include <openbsc/transaction.h> #include <openbsc/rtp_proxy.h> diff --git a/openbsc/src/libmsc/mncc_builtin.c b/openbsc/src/libmsc/mncc_builtin.c index 0226b27..11355fb 100644 --- a/openbsc/src/libmsc/mncc_builtin.c +++ b/openbsc/src/libmsc/mncc_builtin.c @@ -31,7 +31,7 @@ #include <openbsc/gsm_04_08.h> #include <openbsc/debug.h> #include <openbsc/mncc.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/gsm_data.h> #include <openbsc/transaction.h> #include <openbsc/rtp_proxy.h> diff --git a/openbsc/src/libmsc/mncc_sock.c b/openbsc/src/libmsc/mncc_sock.c index 2eef7c8..576ed01 100644 --- a/openbsc/src/libmsc/mncc_sock.c +++ b/openbsc/src/libmsc/mncc_sock.c @@ -30,9 +30,9 @@ #include <sys/socket.h> #include <sys/un.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/protocol/gsm_04_08.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> #include <openbsc/debug.h> #include <openbsc/mncc.h> diff --git a/openbsc/src/libmsc/silent_call.c b/openbsc/src/libmsc/silent_call.c index 64ebdfd..83e27a9 100644 --- a/openbsc/src/libmsc/silent_call.c +++ b/openbsc/src/libmsc/silent_call.c @@ -24,7 +24,7 @@ #include <unistd.h> #include <errno.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <openbsc/signal.h> #include <openbsc/debug.h> #include <openbsc/paging.h> diff --git a/openbsc/src/libmsc/sms_queue.c b/openbsc/src/libmsc/sms_queue.c index 079755d..f0d3d37 100644 --- a/openbsc/src/libmsc/sms_queue.c +++ b/openbsc/src/libmsc/sms_queue.c @@ -37,7 +37,7 @@ #include <openbsc/gsm_subscriber.h> #include <openbsc/signal.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <osmocom/vty/vty.h> diff --git a/openbsc/src/libmsc/token_auth.c b/openbsc/src/libmsc/token_auth.c index 3404dd4..4a62e8d 100644 --- a/openbsc/src/libmsc/token_auth.c +++ b/openbsc/src/libmsc/token_auth.c @@ -20,7 +20,7 @@ */ #include <stdio.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/signal.h> #include <openbsc/gsm_data.h> #include <openbsc/gsm_04_11.h> diff --git a/openbsc/src/libmsc/vty_interface_layer3.c b/openbsc/src/libmsc/vty_interface_layer3.c index a38d15b..8d6109b 100644 --- a/openbsc/src/libmsc/vty_interface_layer3.c +++ b/openbsc/src/libmsc/vty_interface_layer3.c @@ -29,17 +29,17 @@ #include <arpa/inet.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #include <openbsc/gsm_data.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/silent_call.h> #include <openbsc/gsm_04_11.h> #include <openbsc/e1_input.h> #include <openbsc/abis_nm.h> -#include <osmocore/gsm_utils.h> -#include <osmocore/utils.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/core/utils.h> #include <openbsc/db.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/signal.h> #include <openbsc/debug.h> #include <openbsc/vty.h> diff --git a/openbsc/src/libtrau/Makefile.am b/openbsc/src/libtrau/Makefile.am index 01ed251..6b70a9a 100644 --- a/openbsc/src/libtrau/Makefile.am +++ b/openbsc/src/libtrau/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(COVERAGE_LDFLAGS) noinst_LIBRARIES = libtrau.a diff --git a/openbsc/src/libtrau/rtp_proxy.c b/openbsc/src/libtrau/rtp_proxy.c index eefc0e1..75f8256 100644 --- a/openbsc/src/libtrau/rtp_proxy.c +++ b/openbsc/src/libtrau/rtp_proxy.c @@ -28,10 +28,10 @@ #include <time.h> /* clock() */ #include <sys/utsname.h> /* uname() */ -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/gsm_data.h> -#include <osmocore/msgb.h> -#include <osmocore/select.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/select.h> #include <openbsc/debug.h> #include <openbsc/rtp_proxy.h> diff --git a/openbsc/src/libtrau/subchan_demux.c b/openbsc/src/libtrau/subchan_demux.c index 6bcf279..ee62d41 100644 --- a/openbsc/src/libtrau/subchan_demux.c +++ b/openbsc/src/libtrau/subchan_demux.c @@ -27,7 +27,7 @@ #include <openbsc/subchan_demux.h> #include <openbsc/trau_frame.h> #include <openbsc/debug.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/gsm_data.h> void *tall_tqe_ctx; diff --git a/openbsc/src/libtrau/trau_mux.c b/openbsc/src/libtrau/trau_mux.c index 712e22d..6451554 100644 --- a/openbsc/src/libtrau/trau_mux.c +++ b/openbsc/src/libtrau/trau_mux.c @@ -29,7 +29,7 @@ #include <openbsc/subchan_demux.h> #include <openbsc/e1_input.h> #include <openbsc/debug.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> u_int8_t gsm_fr_map[] = { 6, 6, 5, 5, 4, 4, 3, 3, diff --git a/openbsc/src/osmo-bsc/Makefile.am b/openbsc/src/osmo-bsc/Makefile.am index 95b9ef4..9a7619b 100644 --- a/openbsc/src/osmo-bsc/Makefile.am +++ b/openbsc/src/osmo-bsc/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(COVERAGE_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) +AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(COVERAGE_CFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) bin_PROGRAMS = osmo-bsc diff --git a/openbsc/src/osmo-bsc/osmo_bsc_api.c b/openbsc/src/osmo-bsc/osmo_bsc_api.c index b8cbcf2..aead4c8 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_api.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_api.c @@ -21,8 +21,8 @@ #include <openbsc/osmo_msc_data.h> #include <openbsc/debug.h> -#include <osmocore/protocol/gsm_08_08.h> -#include <osmocore/gsm0808.h> +#include <osmocom/core/protocol/gsm_08_08.h> +#include <osmocom/core/gsm0808.h> #define return_when_not_connected(conn) \ if (!conn->sccp_con) {\ diff --git a/openbsc/src/osmo-bsc/osmo_bsc_bssap.c b/openbsc/src/osmo-bsc/osmo_bsc_bssap.c index f871131..f9dc79a 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_bssap.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_bssap.c @@ -26,8 +26,8 @@ #include <openbsc/mgcp.h> #include <openbsc/paging.h> -#include <osmocore/gsm0808.h> -#include <osmocore/protocol/gsm_08_08.h> +#include <osmocom/core/gsm0808.h> +#include <osmocom/core/protocol/gsm_08_08.h> #include <arpa/inet.h> diff --git a/openbsc/src/osmo-bsc/osmo_bsc_main.c b/openbsc/src/osmo-bsc/osmo_bsc_main.c index b5f64ab..e1a5e31 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_main.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_main.c @@ -26,8 +26,8 @@ #include <openbsc/signal.h> #include <openbsc/vty.h> -#include <osmocore/talloc.h> -#include <osmocore/process.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/process.h> #include <osmocom/sccp/sccp.h> diff --git a/openbsc/src/osmo-bsc/osmo_bsc_msc.c b/openbsc/src/osmo-bsc/osmo_bsc_msc.c index 2e8cf05..530171e 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_msc.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_msc.c @@ -27,7 +27,7 @@ #include <openbsc/osmo_msc_data.h> #include <openbsc/signal.h> -#include <osmocore/gsm0808.h> +#include <osmocom/core/gsm0808.h> #include <osmocom/sccp/sccp.h> diff --git a/openbsc/src/osmo-bsc/osmo_bsc_rf.c b/openbsc/src/osmo-bsc/osmo_bsc_rf.c index 5652c9d..6be9625 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_rf.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_rf.c @@ -26,8 +26,8 @@ #include <openbsc/signal.h> #include <openbsc/osmo_msc_data.h> -#include <osmocore/talloc.h> -#include <osmocore/protocol/gsm_12_21.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/protocol/gsm_12_21.h> #include <sys/socket.h> #include <sys/un.h> diff --git a/openbsc/src/osmo-bsc/osmo_bsc_sccp.c b/openbsc/src/osmo-bsc/osmo_bsc_sccp.c index 1abb473..bbe4ea5 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_sccp.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_sccp.c @@ -27,9 +27,9 @@ #include <openbsc/ipaccess.h> #include <openbsc/signal.h> -#include <osmocore/gsm0808.h> -#include <osmocore/talloc.h> -#include <osmocore/protocol/gsm_08_08.h> +#include <osmocom/core/gsm0808.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/protocol/gsm_08_08.h> #include <osmocom/sccp/sccp.h> diff --git a/openbsc/src/osmo-bsc/osmo_bsc_vty.c b/openbsc/src/osmo-bsc/osmo_bsc_vty.c index 1667742..6e9507d 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_vty.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_vty.c @@ -22,7 +22,7 @@ #include <openbsc/osmo_msc_data.h> #include <openbsc/vty.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #define IPA_STR "IP.ACCESS specific\n" diff --git a/openbsc/src/osmo-bsc_mgcp/Makefile.am b/openbsc/src/osmo-bsc_mgcp/Makefile.am index 32cc813..e6aae42 100644 --- a/openbsc/src/osmo-bsc_mgcp/Makefile.am +++ b/openbsc/src/osmo-bsc_mgcp/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS) +AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(COVERAGE_LDFLAGS) bin_PROGRAMS = bsc_mgcp diff --git a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c index c8d9a62..ad82520 100644 --- a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c +++ b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c @@ -32,11 +32,11 @@ #include <sys/socket.h> #include <openbsc/debug.h> -#include <osmocore/msgb.h> -#include <osmocore/talloc.h> -#include <osmocore/process.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/process.h> #include <openbsc/gsm_data.h> -#include <osmocore/select.h> +#include <osmocom/core/select.h> #include <openbsc/mgcp.h> #include <openbsc/mgcp_internal.h> #include <osmocom/vty/telnet_interface.h> diff --git a/openbsc/src/osmo-bsc_nat/Makefile.am b/openbsc/src/osmo-bsc_nat/Makefile.am index 98a3431..03fe62b 100644 --- a/openbsc/src/osmo-bsc_nat/Makefile.am +++ b/openbsc/src/osmo-bsc_nat/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(COVERAGE_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) +AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(COVERAGE_CFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) bin_PROGRAMS = osmo-bsc_nat diff --git a/openbsc/src/osmo-bsc_nat/bsc_filter.c b/openbsc/src/osmo-bsc_nat/bsc_filter.c index 73e9878..5765a66 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_filter.c +++ b/openbsc/src/osmo-bsc_nat/bsc_filter.c @@ -25,8 +25,8 @@ #include <openbsc/ipaccess.h> #include <openbsc/debug.h> -#include <osmocore/talloc.h> -#include <osmocore/protocol/gsm_08_08.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/protocol/gsm_08_08.h> #include <osmocom/sccp/sccp.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c index 9eac00b..0c10d84 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c +++ b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c @@ -28,9 +28,9 @@ #include <osmocom/sccp/sccp.h> -#include <osmocore/talloc.h> -#include <osmocore/gsm0808.h> -#include <osmocore/protocol/gsm_08_08.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/gsm0808.h> +#include <osmocom/core/protocol/gsm_08_08.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index 643b3c4..21da1f8 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -44,11 +44,11 @@ #include <openbsc/socket.h> #include <openbsc/vty.h> -#include <osmocore/gsm0808.h> -#include <osmocore/talloc.h> -#include <osmocore/process.h> +#include <osmocom/core/gsm0808.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/process.h> -#include <osmocore/protocol/gsm_08_08.h> +#include <osmocom/core/protocol/gsm_08_08.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/vty.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c index cd294cc..6068333 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c @@ -29,11 +29,11 @@ #include <openbsc/ipaccess.h> #include <openbsc/vty.h> -#include <osmocore/linuxlist.h> -#include <osmocore/talloc.h> -#include <osmocore/gsm0808.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/gsm0808.h> -#include <osmocore/protocol/gsm_08_08.h> +#include <osmocom/core/protocol/gsm_08_08.h> #include <osmocom/sccp/sccp.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c index 786db2d..af6671c 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c @@ -26,9 +26,9 @@ #include <openbsc/mgcp.h> #include <openbsc/vty.h> -#include <osmocore/talloc.h> -#include <osmocore/rate_ctr.h> -#include <osmocore/utils.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/rate_ctr.h> +#include <osmocom/core/utils.h> #include <osmocom/sccp/sccp.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_sccp.c b/openbsc/src/osmo-bsc_nat/bsc_sccp.c index 72de112..f7d868a 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_sccp.c +++ b/openbsc/src/osmo-bsc_nat/bsc_sccp.c @@ -25,7 +25,7 @@ #include <osmocom/sccp/sccp.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <string.h> #include <time.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_ussd.c b/openbsc/src/osmo-bsc_nat/bsc_ussd.c index c121abe..8174336 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_ussd.c +++ b/openbsc/src/osmo-bsc_nat/bsc_ussd.c @@ -25,10 +25,10 @@ #include <openbsc/ipaccess.h> #include <openbsc/socket.h> -#include <osmocore/protocol/gsm_08_08.h> -#include <osmocore/gsm0480.h> -#include <osmocore/talloc.h> -#include <osmocore/tlv.h> +#include <osmocom/core/protocol/gsm_08_08.h> +#include <osmocom/core/gsm0480.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/tlv.h> #include <osmocom/sccp/sccp.h> diff --git a/openbsc/src/osmo-nitb/Makefile.am b/openbsc/src/osmo-nitb/Makefile.am index 44cb023..f067f43 100644 --- a/openbsc/src/osmo-nitb/Makefile.am +++ b/openbsc/src/osmo-nitb/Makefile.am @@ -1,11 +1,11 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS) +AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(COVERAGE_LDFLAGS) bin_PROGRAMS = osmo-nitb osmo_nitb_SOURCES = bsc_hack.c -osmo_nitb_LDADD = -ldl -ldbi $(LIBCRYPT) $(LIBOSMOVTY_LIBS) \ +osmo_nitb_LDADD = -ldl -ldbi $(LIBCRYPT) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libmsc/libmsc.a \ $(top_builddir)/src/libbsc/libbsc.a \ diff --git a/openbsc/src/osmo-nitb/bsc_hack.c b/openbsc/src/osmo-nitb/bsc_hack.c index 357ec7a..1d774eb 100644 --- a/openbsc/src/osmo-nitb/bsc_hack.c +++ b/openbsc/src/osmo-nitb/bsc_hack.c @@ -30,11 +30,11 @@ #include <getopt.h> #include <openbsc/db.h> -#include <osmocore/select.h> -#include <osmocore/process.h> +#include <osmocom/core/select.h> +#include <osmocom/core/process.h> #include <openbsc/debug.h> #include <openbsc/e1_input.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/signal.h> #include <openbsc/osmo_msc.h> #include <openbsc/sms_queue.h> diff --git a/openbsc/src/utils/Makefile.am b/openbsc/src/utils/Makefile.am index 2351f8a..c2d2085 100644 --- a/openbsc/src/utils/Makefile.am +++ b/openbsc/src/utils/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS) +AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(COVERAGE_LDFLAGS) bin_PROGRAMS = bs11_config isdnsync diff --git a/openbsc/src/utils/bs11_config.c b/openbsc/src/utils/bs11_config.c index eaed8b7..110d337 100644 --- a/openbsc/src/utils/bs11_config.c +++ b/openbsc/src/utils/bs11_config.c @@ -35,10 +35,10 @@ #include <openbsc/gsm_data.h> #include <openbsc/abis_nm.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/tlv.h> #include <openbsc/debug.h> -#include <osmocore/select.h> +#include <osmocom/core/select.h> #include <openbsc/rs232.h> /* state of our bs11_config application */ diff --git a/openbsc/src/utils/rs232.c b/openbsc/src/utils/rs232.c index 7550571..5c20531 100644 --- a/openbsc/src/utils/rs232.c +++ b/openbsc/src/utils/rs232.c @@ -27,8 +27,8 @@ #include <termios.h> #include <fcntl.h> -#include <osmocore/select.h> -#include <osmocore/msgb.h> +#include <osmocom/core/select.h> +#include <osmocom/core/msgb.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/rs232.h> diff --git a/openbsc/tests/channel/Makefile.am b/openbsc/tests/channel/Makefile.am index bf709ff..df98f68 100644 --- a/openbsc/tests/channel/Makefile.am +++ b/openbsc/tests/channel/Makefile.am @@ -1,10 +1,10 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) noinst_PROGRAMS = channel_test channel_test_SOURCES = channel_test.c -channel_test_LDADD = -ldl -ldbi $(LIBOSMOCORE_LIBS) \ +channel_test_LDADD = -ldl -ldbi $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libmsc/libmsc.a diff --git a/openbsc/tests/channel/channel_test.c b/openbsc/tests/channel/channel_test.c index 4f3c593..258938c 100644 --- a/openbsc/tests/channel/channel_test.c +++ b/openbsc/tests/channel/channel_test.c @@ -22,7 +22,7 @@ #include <assert.h> -#include <osmocore/select.h> +#include <osmocom/core/select.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/abis_rsl.h> diff --git a/openbsc/tests/db/Makefile.am b/openbsc/tests/db/Makefile.am index a4395ae..98fdccc 100644 --- a/openbsc/tests/db/Makefile.am +++ b/openbsc/tests/db/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(COVERAGE_CFLAGS) +AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(COVERAGE_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) noinst_PROGRAMS = db_test @@ -11,5 +11,5 @@ db_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libabis/libabis.a \ $(top_builddir)/src/libtrau/libtrau.a \ $(top_builddir)/src/libcommon/libcommon.a \ - $(LIBOSMOCORE_LIBS) -ldl -ldbi + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -ldl -ldbi diff --git a/openbsc/tests/gsm0408/Makefile.am b/openbsc/tests/gsm0408/Makefile.am index de6feb2..90ca05b 100644 --- a/openbsc/tests/gsm0408/Makefile.am +++ b/openbsc/tests/gsm0408/Makefile.am @@ -1,9 +1,9 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) noinst_PROGRAMS = gsm0408_test gsm0408_test_SOURCES = gsm0408_test.c gsm0408_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libmsc/libmsc.a \ $(top_builddir)/src/libbsc/libbsc.a \ - $(LIBOSMOCORE_LIBS) -ldbi + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -ldbi diff --git a/openbsc/tests/mgcp/mgcp_test.c b/openbsc/tests/mgcp/mgcp_test.c index 4052377..e2ed4e2 100644 --- a/openbsc/tests/mgcp/mgcp_test.c +++ b/openbsc/tests/mgcp/mgcp_test.c @@ -20,7 +20,7 @@ #include <openbsc/mgcp.h> #include <openbsc/mgcp_internal.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <string.h> static struct msgb *create_auep1() -- 1.7.2.3

13 years, 1 month

1
0
0 0

[PATCH 0/3] reorganization of GSM-specific stuff and header files

by Pablo Neira Ayuso

This patchset includes: * The creation of the libosmogsm library which is distributed in libosmocore. * The new GSM-specific header directory under include/osmocom/gsm. * The new core header directory under include/osmocom/core. Once this changes have been applied, the directory include/osmocore vanishes from the tree. Please, apply! --- Pablo Neira Ayuso (3): src: move GSM-specific functions to libosmogsm library include: move GSM-specific stuff to include/osmocom/gsm include: move include/osmocore/ to include/osmocom/core Makefile.am | 2 configure.in | 7 include/Makefile.am | 2 include/osmocom/Makefile.am | 4 include/osmocom/core/Makefile.am | 11 include/osmocom/core/backtrace.h | 6 include/osmocom/core/bits.h | 45 + include/osmocom/core/bitvec.h | 75 ++ include/osmocom/core/crc16.h | 34 + include/osmocom/core/gsmtap.h | 89 ++ include/osmocom/core/gsmtap_util.h | 21 include/osmocom/core/linuxlist.h | 360 +++++++++ include/osmocom/core/logging.h | 154 ++++ include/osmocom/core/msgb.h | 197 +++++ include/osmocom/core/msgfile.h | 49 + include/osmocom/core/panic.h | 11 include/osmocom/core/plugin.h | 6 include/osmocom/core/process.h | 6 include/osmocom/core/rate_ctr.h | 81 ++ include/osmocom/core/select.h | 22 + include/osmocom/core/signal.h | 15 include/osmocom/core/statistics.h | 31 + include/osmocom/core/talloc.h | 192 +++++ include/osmocom/core/timer.h | 72 ++ include/osmocom/core/utils.h | 30 + include/osmocom/core/write_queue.h | 46 + include/osmocom/crypt/gprs_cipher.h | 2 include/osmocom/gsm/Makefile.am | 6 include/osmocom/gsm/comp128.h | 22 + include/osmocom/gsm/gsm0480.h | 26 + include/osmocom/gsm/gsm0808.h | 46 + include/osmocom/gsm/gsm48.h | 36 + include/osmocom/gsm/gsm48_ie.h | 117 +++ include/osmocom/gsm/gsm_utils.h | 118 +++ include/osmocom/gsm/mncc.h | 71 ++ include/osmocom/gsm/protocol/Makefile.am | 6 include/osmocom/gsm/protocol/gsm_03_41.h | 51 + include/osmocom/gsm/protocol/gsm_04_08.h | 1262 ++++++++++++++++++++++++++++++ include/osmocom/gsm/protocol/gsm_04_11.h | 188 ++++ include/osmocom/gsm/protocol/gsm_04_12.h | 31 + include/osmocom/gsm/protocol/gsm_04_80.h | 126 +++ include/osmocom/gsm/protocol/gsm_08_08.h | 303 +++++++ include/osmocom/gsm/protocol/gsm_08_58.h | 546 +++++++++++++ include/osmocom/gsm/protocol/gsm_12_21.h | 713 +++++++++++++++++ include/osmocom/gsm/rsl.h | 41 + include/osmocom/gsm/rxlev_stat.h | 22 + include/osmocom/gsm/tlv.h | 260 ++++++ include/osmocom/vty/telnet_interface.h | 4 include/osmocore/Makefile.am | 13 include/osmocore/bits.h | 45 - include/osmocore/bitvec.h | 75 -- include/osmocore/comp128.h | 22 - include/osmocore/crc16.h | 34 - include/osmocore/gsm0480.h | 26 - include/osmocore/gsm0808.h | 46 - include/osmocore/gsm48.h | 36 - include/osmocore/gsm48_ie.h | 117 --- include/osmocore/gsm_utils.h | 118 --- include/osmocore/gsmtap.h | 89 -- include/osmocore/gsmtap_util.h | 21 include/osmocore/linuxlist.h | 360 --------- include/osmocore/logging.h | 154 ---- include/osmocore/mncc.h | 71 -- include/osmocore/msgb.h | 197 ----- include/osmocore/msgfile.h | 49 - include/osmocore/panic.h | 11 include/osmocore/plugin.h | 6 include/osmocore/process.h | 6 include/osmocore/protocol/Makefile.am | 6 include/osmocore/protocol/gsm_03_41.h | 51 - include/osmocore/protocol/gsm_04_08.h | 1262 ------------------------------ include/osmocore/protocol/gsm_04_11.h | 188 ---- include/osmocore/protocol/gsm_04_12.h | 31 - include/osmocore/protocol/gsm_04_80.h | 126 --- include/osmocore/protocol/gsm_08_08.h | 303 ------- include/osmocore/protocol/gsm_08_58.h | 546 ------------- include/osmocore/protocol/gsm_12_21.h | 713 ----------------- include/osmocore/rate_ctr.h | 81 -- include/osmocore/rsl.h | 41 - include/osmocore/rxlev_stat.h | 22 - include/osmocore/select.h | 22 - include/osmocore/signal.h | 15 include/osmocore/statistics.h | 31 - include/osmocore/talloc.h | 192 ----- include/osmocore/timer.h | 72 -- include/osmocore/tlv.h | 260 ------ include/osmocore/utils.h | 30 - include/osmocore/write_queue.h | 46 - libosmogsm.pc.in | 11 src/Makefile.am | 14 src/backtrace.c | 51 + src/bits.c | 2 src/bitvec.c | 2 src/comp128.c | 230 ----- src/crc16.c | 2 src/gprs_cipher_core.c | 99 -- src/gsm/Makefile.am | 12 src/gsm/comp128.c | 230 +++++ src/gsm/gprs_cipher_core.c | 99 ++ src/gsm/gsm0480.c | 461 +++++++++++ src/gsm/gsm0808.c | 369 +++++++++ src/gsm/gsm48.c | 415 ++++++++++ src/gsm/gsm48_ie.c | 1095 ++++++++++++++++++++++++++ src/gsm/gsm_utils.c | 465 +++++++++++ src/gsm/rsl.c | 371 +++++++++ src/gsm/rxlev_stat.c | 94 ++ src/gsm/tlv_parser.c | 179 ++++ src/gsm0480.c | 461 ----------- src/gsm0808.c | 369 --------- src/gsm48.c | 415 ---------- src/gsm48_ie.c | 1095 -------------------------- src/gsm_utils.c | 488 ------------ src/gsmtap_util.c | 14 src/logging.c | 6 src/logging_syslog.c | 6 src/msgb.c | 4 src/msgfile.c | 4 src/panic.c | 4 src/plugin.c | 2 src/rate_ctr.c | 10 src/rsl.c | 371 --------- src/rxlev_stat.c | 94 -- src/select.c | 6 src/signal.c | 6 src/statistics.c | 6 src/talloc.c | 2 src/timer.c | 2 src/tlv_parser.c | 179 ---- src/utils.c | 2 src/vty/buffer.c | 2 src/vty/command.c | 2 src/vty/logging_vty.c | 6 src/vty/telnet_interface.c | 6 src/vty/utils.c | 8 src/vty/vector.c | 2 src/vty/vty.c | 2 src/write_queue.c | 2 tests/msgfile/msgfile_test.c | 2 tests/sms/Makefile.am | 2 tests/sms/sms_test.c | 6 tests/smscb/Makefile.am | 2 tests/smscb/smscb_test.c | 2 tests/timer/timer_test.c | 4 tests/ussd/Makefile.am | 2 tests/ussd/ussd_test.c | 2 145 files changed, 9481 insertions(+), 9417 deletions(-) create mode 100644 include/osmocom/core/Makefile.am create mode 100644 include/osmocom/core/backtrace.h create mode 100644 include/osmocom/core/bits.h create mode 100644 include/osmocom/core/bitvec.h create mode 100644 include/osmocom/core/crc16.h create mode 100644 include/osmocom/core/gsmtap.h create mode 100644 include/osmocom/core/gsmtap_util.h create mode 100644 include/osmocom/core/linuxlist.h create mode 100644 include/osmocom/core/logging.h create mode 100644 include/osmocom/core/msgb.h create mode 100644 include/osmocom/core/msgfile.h create mode 100644 include/osmocom/core/panic.h create mode 100644 include/osmocom/core/plugin.h create mode 100644 include/osmocom/core/process.h create mode 100644 include/osmocom/core/rate_ctr.h create mode 100644 include/osmocom/core/select.h create mode 100644 include/osmocom/core/signal.h create mode 100644 include/osmocom/core/statistics.h create mode 100644 include/osmocom/core/talloc.h create mode 100644 include/osmocom/core/timer.h create mode 100644 include/osmocom/core/utils.h create mode 100644 include/osmocom/core/write_queue.h create mode 100644 include/osmocom/gsm/Makefile.am create mode 100644 include/osmocom/gsm/comp128.h create mode 100644 include/osmocom/gsm/gsm0480.h create mode 100644 include/osmocom/gsm/gsm0808.h create mode 100644 include/osmocom/gsm/gsm48.h create mode 100644 include/osmocom/gsm/gsm48_ie.h create mode 100644 include/osmocom/gsm/gsm_utils.h create mode 100644 include/osmocom/gsm/mncc.h create mode 100644 include/osmocom/gsm/protocol/Makefile.am create mode 100644 include/osmocom/gsm/protocol/gsm_03_41.h create mode 100644 include/osmocom/gsm/protocol/gsm_04_08.h create mode 100644 include/osmocom/gsm/protocol/gsm_04_11.h create mode 100644 include/osmocom/gsm/protocol/gsm_04_12.h create mode 100644 include/osmocom/gsm/protocol/gsm_04_80.h create mode 100644 include/osmocom/gsm/protocol/gsm_08_08.h create mode 100644 include/osmocom/gsm/protocol/gsm_08_58.h create mode 100644 include/osmocom/gsm/protocol/gsm_12_21.h create mode 100644 include/osmocom/gsm/rsl.h create mode 100644 include/osmocom/gsm/rxlev_stat.h create mode 100644 include/osmocom/gsm/tlv.h delete mode 100644 include/osmocore/Makefile.am delete mode 100644 include/osmocore/bits.h delete mode 100644 include/osmocore/bitvec.h delete mode 100644 include/osmocore/comp128.h delete mode 100644 include/osmocore/crc16.h delete mode 100644 include/osmocore/gsm0480.h delete mode 100644 include/osmocore/gsm0808.h delete mode 100644 include/osmocore/gsm48.h delete mode 100644 include/osmocore/gsm48_ie.h delete mode 100644 include/osmocore/gsm_utils.h delete mode 100644 include/osmocore/gsmtap.h delete mode 100644 include/osmocore/gsmtap_util.h delete mode 100644 include/osmocore/linuxlist.h delete mode 100644 include/osmocore/logging.h delete mode 100644 include/osmocore/mncc.h delete mode 100644 include/osmocore/msgb.h delete mode 100644 include/osmocore/msgfile.h delete mode 100644 include/osmocore/panic.h delete mode 100644 include/osmocore/plugin.h delete mode 100644 include/osmocore/process.h delete mode 100644 include/osmocore/protocol/Makefile.am delete mode 100644 include/osmocore/protocol/gsm_03_41.h delete mode 100644 include/osmocore/protocol/gsm_04_08.h delete mode 100644 include/osmocore/protocol/gsm_04_11.h delete mode 100644 include/osmocore/protocol/gsm_04_12.h delete mode 100644 include/osmocore/protocol/gsm_04_80.h delete mode 100644 include/osmocore/protocol/gsm_08_08.h delete mode 100644 include/osmocore/protocol/gsm_08_58.h delete mode 100644 include/osmocore/protocol/gsm_12_21.h delete mode 100644 include/osmocore/rate_ctr.h delete mode 100644 include/osmocore/rsl.h delete mode 100644 include/osmocore/rxlev_stat.h delete mode 100644 include/osmocore/select.h delete mode 100644 include/osmocore/signal.h delete mode 100644 include/osmocore/statistics.h delete mode 100644 include/osmocore/talloc.h delete mode 100644 include/osmocore/timer.h delete mode 100644 include/osmocore/tlv.h delete mode 100644 include/osmocore/utils.h delete mode 100644 include/osmocore/write_queue.h create mode 100644 libosmogsm.pc.in create mode 100644 src/backtrace.c delete mode 100644 src/comp128.c delete mode 100644 src/gprs_cipher_core.c create mode 100644 src/gsm/Makefile.am create mode 100644 src/gsm/comp128.c create mode 100644 src/gsm/gprs_cipher_core.c create mode 100644 src/gsm/gsm0480.c create mode 100644 src/gsm/gsm0808.c create mode 100644 src/gsm/gsm48.c create mode 100644 src/gsm/gsm48_ie.c create mode 100644 src/gsm/gsm_utils.c create mode 100644 src/gsm/rsl.c create mode 100644 src/gsm/rxlev_stat.c create mode 100644 src/gsm/tlv_parser.c delete mode 100644 src/gsm0480.c delete mode 100644 src/gsm0808.c delete mode 100644 src/gsm48.c delete mode 100644 src/gsm48_ie.c delete mode 100644 src/gsm_utils.c delete mode 100644 src/rsl.c delete mode 100644 src/rxlev_stat.c delete mode 100644 src/tlv_parser.c

13 years, 1 month

2
3
0 0

[PATCH 0/2] use libosmogsm and new header file paths

by Pablo Neira Ayuso

With this patchset, openbsc uses the new libosmogsm library and the new header file paths for GSM and core features available in libosmocore. --- Pablo Neira Ayuso (2): src: add new library dependency libosmogsm src: include osmocom/core/* instead of osmocore/* openbsc/configure.in | 1 + openbsc/include/openbsc/abis_nm.h | 4 ++-- openbsc/include/openbsc/abis_rsl.h | 4 ++-- openbsc/include/openbsc/bsc_msc.h | 4 ++-- openbsc/include/openbsc/bsc_nat.h | 16 ++++++++-------- openbsc/include/openbsc/debug.h | 4 ++-- openbsc/include/openbsc/e1_input.h | 6 +++--- openbsc/include/openbsc/gb_proxy.h | 2 +- openbsc/include/openbsc/gprs_bssgp.h | 2 +- openbsc/include/openbsc/gprs_gmm.h | 2 +- openbsc/include/openbsc/gprs_ns.h | 8 ++++---- openbsc/include/openbsc/gprs_sgsn.h | 2 +- openbsc/include/openbsc/gsm_04_08.h | 4 ++-- openbsc/include/openbsc/gsm_04_08_gprs.h | 2 +- openbsc/include/openbsc/gsm_04_11.h | 2 +- openbsc/include/openbsc/gsm_04_80.h | 6 +++--- openbsc/include/openbsc/gsm_data.h | 16 ++++++++-------- openbsc/include/openbsc/gsm_subscriber.h | 2 +- openbsc/include/openbsc/ipaccess.h | 2 +- openbsc/include/openbsc/mgcp.h | 4 ++-- openbsc/include/openbsc/mgcp_internal.h | 2 +- openbsc/include/openbsc/mncc.h | 4 ++-- openbsc/include/openbsc/osmo_bsc_rf.h | 4 ++-- openbsc/include/openbsc/osmo_msc_data.h | 2 +- openbsc/include/openbsc/paging.h | 4 ++-- openbsc/include/openbsc/rtp_proxy.h | 4 ++-- openbsc/include/openbsc/sgsn.h | 2 +- openbsc/include/openbsc/signal.h | 2 +- openbsc/include/openbsc/socket.h | 2 +- openbsc/include/openbsc/subchan_demux.h | 2 +- openbsc/include/openbsc/system_information.h | 2 +- openbsc/include/openbsc/transaction.h | 2 +- openbsc/include/openbsc/ussd.h | 2 +- openbsc/src/Makefile.am | 4 ++-- openbsc/src/gprs/Makefile.am | 4 ++-- openbsc/src/gprs/gb_proxy.c | 4 ++-- openbsc/src/gprs/gb_proxy_main.c | 8 ++++---- openbsc/src/gprs/gb_proxy_vty.c | 2 +- openbsc/src/gprs/gprs_gmm.c | 12 ++++++------ openbsc/src/gprs/gprs_llc.c | 8 ++++---- openbsc/src/gprs/gprs_llc_vty.c | 10 +++++----- openbsc/src/gprs/gprs_sgsn.c | 8 ++++---- openbsc/src/gprs/gprs_sndcp.c | 8 ++++---- openbsc/src/gprs/gprs_sndcp_vty.c | 10 +++++----- openbsc/src/gprs/sgsn_libgtp.c | 6 +++--- openbsc/src/gprs/sgsn_main.c | 10 +++++----- openbsc/src/gprs/sgsn_vty.c | 6 +++--- openbsc/src/ipaccess/Makefile.am | 4 ++-- openbsc/src/ipaccess/ipaccess-config.c | 6 +++--- openbsc/src/ipaccess/ipaccess-find.c | 4 ++-- openbsc/src/ipaccess/ipaccess-firmware.c | 2 +- openbsc/src/ipaccess/ipaccess-proxy.c | 8 ++++---- openbsc/src/ipaccess/network_listen.c | 8 ++++---- openbsc/src/libabis/Makefile.am | 4 ++-- openbsc/src/libabis/e1_input.c | 8 ++++---- openbsc/src/libabis/e1_input_vty.c | 8 ++++---- openbsc/src/libabis/input/dahdi.c | 6 +++--- openbsc/src/libabis/input/hsl.c | 8 ++++---- openbsc/src/libabis/input/ipaccess.c | 8 ++++---- openbsc/src/libabis/input/lapd.c | 8 ++++---- openbsc/src/libabis/input/lapd.h | 2 +- openbsc/src/libabis/input/misdn.c | 6 +++--- openbsc/src/libbsc/Makefile.am | 4 ++-- openbsc/src/libbsc/abis_nm.c | 6 +++--- openbsc/src/libbsc/abis_nm_vty.c | 6 +++--- openbsc/src/libbsc/abis_om2000.c | 8 ++++---- openbsc/src/libbsc/abis_om2000_vty.c | 6 +++--- openbsc/src/libbsc/abis_rsl.c | 8 ++++---- openbsc/src/libbsc/bsc_api.c | 4 ++-- openbsc/src/libbsc/bsc_init.c | 4 ++-- openbsc/src/libbsc/bsc_msc.c | 4 ++-- openbsc/src/libbsc/bsc_rll.c | 6 +++--- openbsc/src/libbsc/bsc_vty.c | 8 ++++---- openbsc/src/libbsc/bts_ericsson_rbs2000.c | 2 +- openbsc/src/libbsc/bts_hsl_femtocell.c | 2 +- openbsc/src/libbsc/bts_ipaccess_nanobts.c | 2 +- openbsc/src/libbsc/bts_siemens_bs11.c | 2 +- openbsc/src/libbsc/bts_unknown.c | 2 +- openbsc/src/libbsc/chan_alloc.c | 2 +- openbsc/src/libbsc/e1_config.c | 2 +- openbsc/src/libbsc/gsm_04_08_utils.c | 4 ++-- openbsc/src/libbsc/gsm_subscriber_base.c | 2 +- openbsc/src/libbsc/handover_decision.c | 6 +++--- openbsc/src/libbsc/handover_logic.c | 6 +++--- openbsc/src/libbsc/meas_proc.c | 4 ++-- openbsc/src/libbsc/paging.c | 2 +- openbsc/src/libbsc/rest_octets.c | 2 +- openbsc/src/libbsc/system_information.c | 4 ++-- openbsc/src/libbsc/transaction.c | 2 +- openbsc/src/libcommon/Makefile.am | 4 ++-- openbsc/src/libcommon/common_vty.c | 2 +- openbsc/src/libcommon/debug.c | 6 +++--- openbsc/src/libcommon/gsm_data.c | 8 ++++---- openbsc/src/libcommon/socket.c | 8 ++++---- openbsc/src/libcommon/talloc_ctx.c | 2 +- openbsc/src/libgb/Makefile.am | 2 +- openbsc/src/libgb/gprs_bssgp.c | 8 ++++---- openbsc/src/libgb/gprs_bssgp_util.c | 6 +++--- openbsc/src/libgb/gprs_bssgp_vty.c | 10 +++++----- openbsc/src/libgb/gprs_ns.c | 10 +++++----- openbsc/src/libgb/gprs_ns_frgre.c | 6 +++--- openbsc/src/libgb/gprs_ns_vty.c | 10 +++++----- openbsc/src/libmgcp/Makefile.am | 2 +- openbsc/src/libmgcp/mgcp_network.c | 4 ++-- openbsc/src/libmgcp/mgcp_protocol.c | 6 +++--- openbsc/src/libmgcp/mgcp_vty.c | 2 +- openbsc/src/libmsc/Makefile.am | 2 +- openbsc/src/libmsc/auth.c | 2 +- openbsc/src/libmsc/db.c | 6 +++--- openbsc/src/libmsc/gsm_04_08.c | 16 ++++++++-------- openbsc/src/libmsc/gsm_04_11.c | 8 ++++---- openbsc/src/libmsc/gsm_04_80.c | 8 ++++---- openbsc/src/libmsc/gsm_subscriber.c | 2 +- openbsc/src/libmsc/mncc.c | 2 +- openbsc/src/libmsc/mncc_builtin.c | 2 +- openbsc/src/libmsc/mncc_sock.c | 6 +++--- openbsc/src/libmsc/silent_call.c | 2 +- openbsc/src/libmsc/sms_queue.c | 2 +- openbsc/src/libmsc/token_auth.c | 2 +- openbsc/src/libmsc/vty_interface_layer3.c | 8 ++++---- openbsc/src/libtrau/Makefile.am | 2 +- openbsc/src/libtrau/rtp_proxy.c | 6 +++--- openbsc/src/libtrau/subchan_demux.c | 2 +- openbsc/src/libtrau/trau_mux.c | 2 +- openbsc/src/osmo-bsc/Makefile.am | 4 ++-- openbsc/src/osmo-bsc/osmo_bsc_api.c | 4 ++-- openbsc/src/osmo-bsc/osmo_bsc_bssap.c | 4 ++-- openbsc/src/osmo-bsc/osmo_bsc_main.c | 4 ++-- openbsc/src/osmo-bsc/osmo_bsc_msc.c | 2 +- openbsc/src/osmo-bsc/osmo_bsc_rf.c | 4 ++-- openbsc/src/osmo-bsc/osmo_bsc_sccp.c | 6 +++--- openbsc/src/osmo-bsc/osmo_bsc_vty.c | 2 +- openbsc/src/osmo-bsc_mgcp/Makefile.am | 4 ++-- openbsc/src/osmo-bsc_mgcp/mgcp_main.c | 8 ++++---- openbsc/src/osmo-bsc_nat/Makefile.am | 4 ++-- openbsc/src/osmo-bsc_nat/bsc_filter.c | 4 ++-- openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c | 6 +++--- openbsc/src/osmo-bsc_nat/bsc_nat.c | 8 ++++---- openbsc/src/osmo-bsc_nat/bsc_nat_utils.c | 8 ++++---- openbsc/src/osmo-bsc_nat/bsc_nat_vty.c | 6 +++--- openbsc/src/osmo-bsc_nat/bsc_sccp.c | 2 +- openbsc/src/osmo-bsc_nat/bsc_ussd.c | 8 ++++---- openbsc/src/osmo-nitb/Makefile.am | 6 +++--- openbsc/src/osmo-nitb/bsc_hack.c | 6 +++--- openbsc/src/utils/Makefile.am | 4 ++-- openbsc/src/utils/bs11_config.c | 6 +++--- openbsc/src/utils/rs232.c | 4 ++-- openbsc/tests/channel/Makefile.am | 4 ++-- openbsc/tests/channel/channel_test.c | 2 +- openbsc/tests/db/Makefile.am | 4 ++-- openbsc/tests/gsm0408/Makefile.am | 4 ++-- openbsc/tests/mgcp/mgcp_test.c | 2 +- 152 files changed, 367 insertions(+), 366 deletions(-) -- Signature

13 years, 1 month

1
2
0 0

Re: phone not getting attached after authorize command..

by Ravi Shankar

Please help me out... After authorization command through hlr,whenever I try sending sms or call through command line it says Subscriber not attached. how to come over it. Thanks.

13 years, 1 month

3
2
0 0

cid, lac, bsic and the -P parameter

by Thomas Ansorg

hello my multidrop setup doesnt find my 2nd bs-11 in the chain, although bootstrapping works, except the strange thing with trx 1, see other mail. maybe the reason is an error in the cid, lac or bsic settings. i have: cell identity 1 location area 1 bsic 63 in the bts 0 section and location area 2 bsic 63 in the bts 1 section evrything ok so far? the -P parameter makes trouble: altho neccessary for handover, no data is transmitted when i use it on my 2 bs-11 multidrop config. i can make calls, the handy rings, but i don't hear anything on any handy. omitting the -P, i can talk. is this normal? T. -- Wer Rechtschreibfehler findet, darf sie behalten!

13 years, 1 month

2
1
0 0

[PATCH 0/2] split libosmocore library (to create libosmo-gsm)

by Pablo Neira Ayuso

Hi! The following patches split libosmocore in two libraries, the new libosmo-gsm, which contains GSM-specific functions, and libosmocore, which contains generic functions (like talloc, msgb, select, logging, ...). In case that you're OK with them, you have to apply them in the following way: 1) First, make a copy of libosmocore.git to libosmo-gsm.git. This is done to avoid losing the history in the new libosmo-gsm.git library. $ cp -r libosmocore.git libosmo-gsm.git 2) Apply the patch that removes the GSM-specific features to libosmocore.git (see [PATCH 1/2]) 2) Apply the patch that removes the non-GSM features to libosmo-gsm.git (see [PATCH 2/2]) After these patches, I'll send two patches for openbsc and osmocore-bb to make them use the new libosmo-gsm. Let me know what you think with this proposal.

13 years, 1 month

3
5
0 0

whats up with my multidrop?

by kobayashi_maru＠onlinehome.de

hello list please the the entire mail thoroughly before answering. it's a neverending story with the bs-11 f***ing multidrop: i have bts0 that works perfect as single, and so does bts1, but only bts0 is bootstrapped lets start from the beginning: misdn is configured port 0 has ts1 as d-channel and 2-15 as b-channels, port 1 has ts17 as d-channel and 18-31 as b-channels. that says bs11_config for bts0, that is connected to pc: SITE MANAGER ATTRIBUTES: E1 Channel: Port=0 Timeslot=1 (Full Slot) TEI: 25 BS11 Line Interface ATTRIBUTES: PLL Mode: Standalone BS11 CCLK ATTRIBUTES: CCLK Accuracy: High (1) CCLK Type=0 BS11 Power Amplifier 0 ATTRIBUTES: TRX Power: 30mW (GSM) BPORT0 ATTRIBUTES: Line Configuration: Multi-Drop (1) BPORT1 ATTRIBUTES: Line Configuration: Multi-Drop (1) and that is bts1: SITE MANAGER ATTRIBUTES: E1 Channel: Port=1 Timeslot=17 (Full Slot) TEI: 26 BS11 Line Interface ATTRIBUTES: PLL Mode: Standalone BS11 CCLK ATTRIBUTES: CCLK Accuracy: High (1) CCLK Type=0 BS11 Power Amplifier 0 ATTRIBUTES: TRX Power: 30mW (GSM) BPORT0 ATTRIBUTES: Line Configuration: Star (0) BPORT1 GET ATTR NACK LMT LOGOFF: ACK as you can see, the d-channels match with the bts-setting. each bs-11 have a working trx0 and a high clock accuracy. here we go with cfg: ! ! OpenBSC configuration saved from vty ! ! password foo ! line vty no login ! network network country code 262 mobile network code 10 short name Y-Phone long name Yodaphone handover 1 bts 0 type bs11 band GSM900 cell_identity 1 location_area_code 1 training_sequence_code 7 base_station_id_code 63 oml e1 line 0 timeslot 1 sub-slot full oml e1 tei 25 trx 0 arfcn 121 max_power_red 0 rsl e1 line 0 timeslot 1 sub-slot full rsl e1 tei 1 timeslot 0 phys_chan_config CCCH+SDCCH4 e1 line 0 timeslot 1 sub-slot full timeslot 1 phys_chan_config TCH/F e1 line 0 timeslot 2 sub-slot 1 timeslot 2 phys_chan_config TCH/F e1 line 0 timeslot 2 sub-slot 2 timeslot 3 phys_chan_config TCH/F e1 line 0 timeslot 2 sub-slot 3 timeslot 4 phys_chan_config TCH/F e1 line 0 timeslot 3 sub-slot 0 timeslot 5 phys_chan_config TCH/F e1 line 0 timeslot 3 sub-slot 1 timeslot 6 phys_chan_config TCH/F e1 line 0 timeslot 3 sub-slot 2 timeslot 7 phys_chan_config TCH/F e1 line 0 timeslot 3 sub-slot 3 bts 1 type bs11 band GSM900 location_area_code 2 training_sequence_code 7 base_station_id_code 63 oml e1 line 1 timeslot 17 sub-slot full oml e1 tei 26 trx 0 arfcn 1 max_power_red 0 rsl e1 line 1 timeslot 17 sub-slot full rsl e1 tei 2 timeslot 0 phys_chan_config CCCH+SDCCH4 e1 line 1 timeslot 17 sub-slot full timeslot 1 phys_chan_config SDCCH8 e1 line 1 timeslot 18 sub-slot 1 timeslot 2 phys_chan_config TCH/F e1 line 1 timeslot 18 sub-slot 2 timeslot 3 phys_chan_config TCH/F e1 line 1 timeslot 18 sub-slot 3 timeslot 4 phys_chan_config TCH/F e1 line 1 timeslot 19 sub-slot 0 timeslot 5 phys_chan_config TCH/F e1 line 1 timeslot 19 sub-slot 1 timeslot 6 phys_chan_config TCH/F e1 line 1 timeslot 19 sub-slot 2 timeslot 7 phys_chan_config TCH/F e1 line 1 timeslot 19 sub-slot 3 both bs-11 works as single with the corresponding section (bts 0 or 1) of the cfg file. i have differents teis for all lapd connection. i use cat4 cable for the bs-11 connection (10 m between the bs-11s) maybe the screenshot attached unveils the problem. any help/hint is very welcome. T.

13 years, 1 month

1
0
0 0

Re: [PATCH 1/2] libosmocore: remove GSM-specific functions (they now belong to libosmo-gsm)

by Sylvain Munaut

Hi, > I forgot to say that VTY code still remains in libosmocore, I'll study > if it can be interesting in a new library (I can do this later, once > this patches are applied, of course). gsmtap is a misnomer, but we now use it for TETRA as well ... crc16 possibly common as well (altough not sure). In general, if we have functions that are common to several protocols but are not really 'system' stuff like select/timer or stuff like that, where should we put them ? Keep them in libosmocore ? (like a include/osmocom/utils or also in 'core' ?) Also, for future enhancement (future patches, just mentioning it here since it's kinda related to the whole library cleanup), Harald mentionned to replace the include/osmocore by include/osmocom/core (like it was done for vty / code / ...) Cheers, Sylvain

13 years, 1 month

3
2
0 0

AW: Connecting more OpenBSC together

by Andreas.Eversberg

> I know the tutorial. I made some corrections, too... :D > Unfortunately, I couldn't get my Ubuntu Hardy working with mISDN loop > without any ISDN card... you should load mISDN like this: modprobe mISDN_core modprobe mISDN_dsp modprobe mISDN_l1loop pri=1 misdn_info Found 2 ports Port 0 'mISDN_l1loop.1': TE/NT-mode PRI E1 (for phone lines & E1 devices) 2 B-channels: 1-2 B-protocols: RAW HDLC X75slp L2:DSP L2:DSPHDLC -------- Port 1 'mISDN_l1loop.2': TE/NT-mode PRI E1 (for phone lines & E1 devices) 2 B-channels: 1-2 B-protocols: RAW HDLC X75slp L2:DSP L2:DSPHDLC if you use the latest lcr and openbsc git, you should have two processes that communicate via socket interface, rather than compiling them together.

13 years, 1 month

1
0
0 0

[PATCH] osmocom-bb: build: use new libosmo-gsm library

by Pablo Neira Ayuso

This patch requires the appropriate git-subtree magic to include the new proposed libosmo-gsm into osmocom-bb (as it happens with libosmocore).

13 years, 1 month

1
0
0 0

[PATCH] openbsc: build: add new library dependency libosmo-gsm

by Pablo Neira Ayuso

13 years, 1 month

1
0
0 0

Re: Connecting more OpenBSC together

by Chris Rankine

With a nanoBTS, you don't need a real ISDN card. You can use mISDN modules which are typically compiled in as modules in Linux. My lab has a few 900 and 1800 nanoBTS units, all running over Ethernet/IP, with openBSC, Asterisk, and LCR running on VMs with no ISDN cards, no special hardware. There is a tutorial on how to set this up here, http://openbsc.osmocom.org/trac/wiki/OpenBSC_LCR . I also found a mailing list post that fills in some blanks, http://www.mail-archive.com/openbsc@lists.gnumonks.org/msg00352.html . I would suggest trying to follow the mailing list post to the letter to set this up, and once it is working make a snapshot then try to update the source of the packages installed. Chris Rankine 2011/3/17 Luca Bertoncello <bertoncello(a)netzing.de>: > Am Thu, 17 Mar 2011 11:10:17 -0400 > schrieb Chris Rankine <cr3(a)cr3.us>: > >> Which BTS are you using? > > nanoBTS from ip.access. > > Greetings > -- > _______________________________________________________________________ > Luca Bertoncello > Entwicklung Mail: bertoncello(a)netzing.de > > > NETZING Solutions AG Tel.: 0351/41381 - 23 > Fröbelstr. 57, 01159 Dresden Fax: 0351/41381 - 12 > _______________________________________________________________________ > > Impressum: > NETZING Solutions AG - Fröbelstraße 57 - 01159 Dresden > Sitz der Gesellschaft Amtsgericht Dresden HRB 18926 > Vorstand Dieter Schneider - Aufsichtsratsvorsitzender Volker Kanitz > USt.Id DE211326547 Mail: netzing.ag(a)netzing.de >

13 years, 1 month

2
1
0 0

AW: Connecting more OpenBSC together

by Andreas.Eversberg

> I have more OpenBSC running on different IPs and using different > configurations, and I need to connect them together, so that it is > possible to have, for example, two mobile phones connected to two > different OpenBSCs and able to make calls with each other. you can run openbsc with lcr at each location. two lcrs can be connected with E1 link. this link must not be physical, mISDN provides a l1oip driver (E1 or S/T over IP). andreas

13 years, 1 month

1
0
0 0

Connecting more OpenBSC together

by Luca Bertoncello

Hi, list! I have more OpenBSC running on different IPs and using different configurations, and I need to connect them together, so that it is possible to have, for example, two mobile phones connected to two different OpenBSCs and able to make calls with each other. Is it possible? Can you suggest me an HowTo? Thanks a lot! -- _______________________________________________________________________ Luca Bertoncello Entwicklung Mail: bertoncello(a)netzing.de NETZING Solutions AG Tel.: 0351/41381 - 23 Fröbelstr. 57, 01159 Dresden Fax: 0351/41381 - 12 _______________________________________________________________________ Impressum: NETZING Solutions AG - Fröbelstraße 57 - 01159 Dresden Sitz der Gesellschaft Amtsgericht Dresden HRB 18926 Vorstand Dieter Schneider - Aufsichtsratsvorsitzender Volker Kanitz USt.Id DE211326547 Mail: netzing.ag(a)netzing.de

13 years, 1 month

2
2
0 0

oml and RSL - 2nd try

by Thomas Ansorg

hello ok, lets try it again: do the oml and rsl settings have to be identical? for example: one bts is set to port 0, ts 1, tei 25. the cfg entry would be "oml e1 line 0 timeslot 1 sub-slot full" and "rsl e1 line 0 timeslot 1 sub-slot full", right? the cited link is useless, i kno it already, doesnt answer my question. what i wanted to know is why we have 2 types of settings (oml and rsl) which are identical, cause that told the openbsc.cfg. why do we need 2 settings that configure the same? or was the assumption above wrong? T. -- Wer Rechtschreibfehler findet, darf sie behalten!

13 years, 1 month

2
1
0 0

oml and rsl settings

by kobayashi_maru＠onlinehome.de

hello do the oml and rsl settings have to be identical? for example: one bts is set to port 0, ts 1, tei 25. the cfg entry would be "oml e1 line 0 timeslot 1 sub-slot full" and "rsl e1 line 0 timeslot 1 sub-slot full", right? T. http://openbsc.osmocom.org/trac/wiki/bsc_hack_VTY#rsle1lineE1_LINEtimeslot1…

13 years, 1 month

2
1
0 0

[Patch] Using MySQL as database for OpenBSC

by Luca Bertoncello

Hi, list! I need to use MySQL as database for OpenBSC due to the limitations of SQLite (I need concurrent access to the database). I wrote a little patch to allow it and I send it as attachment. With this patch the database is **ONLY** MySQL. Maybe in the future, if I'll have time, I'll write another patch to allow the user to choose the preferred database (SQLite3 or MySQL). Regards -- _______________________________________________________________________ Luca Bertoncello Entwicklung Mail: bertoncello(a)netzing.de NETZING Solutions AG Tel.: 0351/41381 - 23 Fröbelstr. 57, 01159 Dresden Fax: 0351/41381 - 12 _______________________________________________________________________ Impressum: NETZING Solutions AG - Fröbelstraße 57 - 01159 Dresden Sitz der Gesellschaft Amtsgericht Dresden HRB 18926 Vorstand Dieter Schneider - Aufsichtsratsvorsitzender Volker Kanitz USt.Id DE211326547 Mail: netzing.ag(a)netzing.de

13 years, 1 month

1
0
0 0

AW: BS-11 multidrop not working

by Andreas.Eversberg

hi, how did you load hfcmulti driver of mISDN? (check misdn_portinfo for layout) how did you configure your bts 1? did you configure TS 17/18/19 instead of TS 1/2/3? andreas -----Ursprüngliche Nachricht----- Von: openbsc-bounces(a)lists.osmocom.org [mailto:openbsc-bounces@lists.osmocom.org] Im Auftrag von Thomas Ansorg Gesendet: Montag, 14. März 2011 16:55 An: openBSC-Mailingliste Betreff: BS-11 multidrop not working hello list, may someone tell me, why my 2 bs-11 refuse to work as multidrop? i start with this config file: ! ! OpenBSC configuration saved from vty ! ! password foo ! line vty no login ! network network country code 262 mobile network code 10 short name Y-Phone long name Yodaphone handover 1 handover window rxlev averaging 10 handover window rxqual averaging 1 handover power budget interval 6 handover power budget hysteresis 4 bts 0 type bs11 band GSM900 cell_identity 1 location_area_code 1 training_sequence_code 7 base_station_id_code 63 oml e1 line 0 timeslot 1 sub-slot full oml e1 tei 25 trx 0 arfcn 121 max_power_red 0 rsl e1 line 0 timeslot 1 sub-slot full rsl e1 tei 1 timeslot 0 phys_chan_config CCCH+SDCCH4 e1 line 0 timeslot 1 sub-slot full timeslot 1 phys_chan_config SDCCH8 e1 line 0 timeslot 2 sub-slot 1 timeslot 2 phys_chan_config TCH/F e1 line 0 timeslot 2 sub-slot 2 timeslot 3 phys_chan_config TCH/F e1 line 0 timeslot 2 sub-slot 3 timeslot 4 phys_chan_config TCH/F e1 line 0 timeslot 3 sub-slot 0 timeslot 5 phys_chan_config TCH/F e1 line 0 timeslot 3 sub-slot 1 timeslot 6 phys_chan_config TCH/F e1 line 0 timeslot 3 sub-slot 2 timeslot 7 phys_chan_config TCH/F e1 line 0 timeslot 3 sub-slot 3 bts 1 type bs11 band GSM900 location_area_code 2 training_sequence_code 7 base_station_id_code 63 oml e1 line 1 timeslot 17 sub-slot full oml e1 tei 25 trx 0 arfcn 1 max_power_red 0 rsl e1 line 1 timeslot 17 sub-slot full rsl e1 tei 2 timeslot 0 phys_chan_config CCCH+SDCCH4 e1 line 1 timeslot 17 sub-slot full timeslot 1 phys_chan_config SDCCH8 e1 line 1 timeslot 18 sub-slot 1 timeslot 2 phys_chan_config TCH/F e1 line 1 timeslot 18 sub-slot 2 timeslot 3 phys_chan_config TCH/F e1 line 1 timeslot 18 sub-slot 3 timeslot 4 phys_chan_config TCH/F e1 line 1 timeslot 19 sub-slot 0 timeslot 5 phys_chan_config TCH/F e1 line 1 timeslot 19 sub-slot 1 timeslot 6 phys_chan_config TCH/F e1 line 1 timeslot 19 sub-slot 2 timeslot 7 phys_chan_config TCH/F e1 line 1 timeslot 19 sub-slot 3 each bs-11 works as single without problems. on both is trx0 activated. bts0 which is connected to pc is in multidrop config, the following bts1 in line config. but only bts0 is bootstrapped. where could the problem(s) be? T. -- Wer Rechtschreibfehler findet, darf sie behalten!

13 years, 1 month

1
0
0 0

BS-11 multidrop not working

by Thomas Ansorg

hello list, may someone tell me, why my 2 bs-11 refuse to work as multidrop? i start with this config file: ! ! OpenBSC configuration saved from vty ! ! password foo ! line vty no login ! network network country code 262 mobile network code 10 short name Y-Phone long name Yodaphone handover 1 handover window rxlev averaging 10 handover window rxqual averaging 1 handover power budget interval 6 handover power budget hysteresis 4 bts 0 type bs11 band GSM900 cell_identity 1 location_area_code 1 training_sequence_code 7 base_station_id_code 63 oml e1 line 0 timeslot 1 sub-slot full oml e1 tei 25 trx 0 arfcn 121 max_power_red 0 rsl e1 line 0 timeslot 1 sub-slot full rsl e1 tei 1 timeslot 0 phys_chan_config CCCH+SDCCH4 e1 line 0 timeslot 1 sub-slot full timeslot 1 phys_chan_config SDCCH8 e1 line 0 timeslot 2 sub-slot 1 timeslot 2 phys_chan_config TCH/F e1 line 0 timeslot 2 sub-slot 2 timeslot 3 phys_chan_config TCH/F e1 line 0 timeslot 2 sub-slot 3 timeslot 4 phys_chan_config TCH/F e1 line 0 timeslot 3 sub-slot 0 timeslot 5 phys_chan_config TCH/F e1 line 0 timeslot 3 sub-slot 1 timeslot 6 phys_chan_config TCH/F e1 line 0 timeslot 3 sub-slot 2 timeslot 7 phys_chan_config TCH/F e1 line 0 timeslot 3 sub-slot 3 bts 1 type bs11 band GSM900 location_area_code 2 training_sequence_code 7 base_station_id_code 63 oml e1 line 1 timeslot 17 sub-slot full oml e1 tei 25 trx 0 arfcn 1 max_power_red 0 rsl e1 line 1 timeslot 17 sub-slot full rsl e1 tei 2 timeslot 0 phys_chan_config CCCH+SDCCH4 e1 line 1 timeslot 17 sub-slot full timeslot 1 phys_chan_config SDCCH8 e1 line 1 timeslot 18 sub-slot 1 timeslot 2 phys_chan_config TCH/F e1 line 1 timeslot 18 sub-slot 2 timeslot 3 phys_chan_config TCH/F e1 line 1 timeslot 18 sub-slot 3 timeslot 4 phys_chan_config TCH/F e1 line 1 timeslot 19 sub-slot 0 timeslot 5 phys_chan_config TCH/F e1 line 1 timeslot 19 sub-slot 1 timeslot 6 phys_chan_config TCH/F e1 line 1 timeslot 19 sub-slot 2 timeslot 7 phys_chan_config TCH/F e1 line 1 timeslot 19 sub-slot 3 each bs-11 works as single without problems. on both is trx0 activated. bts0 which is connected to pc is in multidrop config, the following bts1 in line config. but only bts0 is bootstrapped. where could the problem(s) be? T. -- Wer Rechtschreibfehler findet, darf sie behalten!

13 years, 1 month

1
0
0 0

connecting + openBSC initializing problem with nanoBTS 139

by Daniel Brune

Hi there, I'm experiencing a strange problem since a few days - and I already did some resets (with the "dongle") of my nanoBTS 139U DSC1800, running firmware 120a. I cannot connect to the nanoBTS anymore with openBSC. There is an OML-link established quite fast, but then the BTS "disappears" with a socket error. It worked perfectly before, and I did not changed anything in my system so far. When I'm running the ./ipaccess-config 192.168.10.27 (the IP of the nanoBTS) is shows me a lot of information (all fine), but after the last message, the nanoBTS restarts automatically... so connection gets lost and the ipaccess-config program terminates as well. I cannot PING the nanoBTS also after that message. After 30-40s it re-appears of course, same process starts again. ipaccess-find works fine as long as the nanoBTS is in the initializing sequence. Here the content of the message: "<0005> abis_nm.c: 537 0C:BASBAND-TRANSCEIVER(04) INSI=(00,00,ff) Failure Event Report Type=processing failure Severity=warning level failure Probable cause= 03 00 01 Additional Text=835:WARN:OAM_RES:res_trx_status.c#209:TRX is not responding - reinitializing th" Directly after this one, the program terminates with a memory mapping error message back to the console. Any idea? For me it does not sound good... something like a hardware defect - which I really don't want to have now :-/ Best regards from Cologne! Daniel

13 years, 1 month

2
1
0 0

Re: TRX is not responding error message

by Daniel Brune

Hi Peter! Seems to me that I have the same problem like you with one of my nanoBTS. Did you solved it in anyway? Or real hardware problem? When did it appeared the first time? Daniel

13 years, 1 month

2
1
0 0

libosmocore lost commit

by Sylvain Munaut

Hi, I think we lost a commit with the 0.1.28 tag SNAFU. Unfortunately all I have left of it is the short log title "vty: Fix a memory leak in the vty description command" So if someone remember writing it, it'd be nice to re-commit it ... Cheers, Sylvain

13 years, 1 month

2
1
0 0

Re: [PATCH] bsc: change bsc_vty_init to take logging categories as parameter

by Pablo Neira Ayuso

On 09/03/11 13:05, Pablo Neira Ayuso wrote: > From: Pablo Neira Ayuso <pablo(a)gnumonks.org> > > This change is required to finish the integration of the VTY and > the per-application logging categories that provides: > > "vty: integration with logging framework" > > in libosmocore. > > It has been tested with osmo-nitb. The other just compiled tested. Sorry for this dup, I sent this patch with the @netfilter.org account, for that reason the ML blocked it. Then I decided to resend with @gnumonks.org. Both patches are the same.

13 years, 1 month

1
0
0 0

Re: [PATCH] bsc: vty: fix segfault if rf_ctl is not set

by Holger Hans Peter Freyther

On 03/08/2011 01:35 PM, Pablo Neira Ayuso wrote: > This is the case of osmo-nitb, since it does not call > osmo_bsc_rf_create(). > oh, I thought I create the msc_data conditionally. My bad (will apply your patch).

13 years, 1 month

1
0
0 0

cannot set static IP adress for a nanoBTS

by Daniel Brune

Hi there, using ipaccess-config -i 192.168.10.110/24 -r 192.168.10.101 is just not working as expected. The device reboots, but still asks the DHCP server for the IP address. Hardware is a nanoBTS 1800 version 139_029_35. By the way, are there known problems with specific firmwares? I'm running 120a002_v200b16d0. Is this a firmware known as working flawless? Best, Daniel

13 years, 1 month

3
2
0 0

[PATCH] wireshark: gsm-abis-oml: convert C99 structure initialization to ANSI C

by Pablo Neira Ayuso

Hi! This patch applies on top of the wireshark/0001-abis_oml.patch. It converts the C99 structure initialization which is not accepted by the wireshark developers (Harald told me that they need it to compile with non-gcc compilers which don't always support C99). I have tested it here with four pcap files that Harald passed to me. It works fine. BTW, *with* and *without* this patch, wireshark with dissector spots warnings like: 18:14:15 Warn Dissector bug, protocol A-bis OML, in packet 13: packet-gsm_abis_oml.c:940: failed assertion "DISSECTOR_ASSERT_NOT_REACHED" It seems that some TLVs that appear in the body of packets are unknown. I'll debug which are the complaining tags and get back you.

13 years, 1 month

4
14
0 0

New repository for BTS code

by Harald Welte

Hi! I've created a new git repository (osmo-bts.git) for the BTS-side code. You can browse it at http://cgit.osmocom.org/cgit/osmo-bts/ So far it only contains an import of Andreas' osmocom-bb.git jolly/bts branch, and some minimal modifications like include path changes. However, the code does not build yet. The TODO items are as follows: * de-couple the LAPDm code in OsmocomBB from references to osmcom_ms and other OsmocomBB specific data structures * put the LAPDm code into a shared library * link that library from both layer23 and osmo-bts * merge all common code and definitions/structures for RSL, OML and RTP together with the openbsc/src/lib{abis,trau} Regards, Harald -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

13 years, 1 month

3
3
0 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC March 2011