From daniel.brune.so at web.de  Sun Mar 13 16:27:39 2011
From: daniel.brune.so at web.de (Daniel Brune)
Date: Sun, 13 Mar 2011 17:27:39 +0100
Subject: TRX is not responding error message
Message-ID: <000401cbe19b$925e38a0$b71aa9e0$@web.de>

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






From peter.hasse at fokus.fraunhofer.de  Sun Mar 13 19:43:56 2011
From: peter.hasse at fokus.fraunhofer.de (Peter Hasse)
Date: Sun, 13 Mar 2011 20:43:56 +0100
Subject: TRX is not responding error message
In-Reply-To: <000401cbe19b$925e38a0$b71aa9e0$@web.de>
References: <000401cbe19b$925e38a0$b71aa9e0$@web.de>
Message-ID: <4D7D1E7C.3040400@fokus.fraunhofer.de>

Am 13.03.2011 17:27, schrieb Daniel Brune:
> Hi Peter!
Hi Daniel
> 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?
>
I'm in contact with ipaccess but up to now there where no usefull result.
I'll post here if there are any usefull information.
> Daniel
>
Peter
>
>




From laforge at gnumonks.org  Thu Mar  3 21:55:03 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Thu, 3 Mar 2011 22:55:03 +0100
Subject: spec download
In-Reply-To: <AANLkTim9=raE=Gmhg29KB-HKfi6_uVOmiaODrpRqNY1E@mail.gmail.com>
References: <AANLkTim9=raE=Gmhg29KB-HKfi6_uVOmiaODrpRqNY1E@mail.gmail.com>
Message-ID: <20110303215503.GW8117@prithivi.gnumonks.org>

Hi Joe,

On Mon, Feb 28, 2011 at 05:13:59PM -0500, Joe Eggleston wrote:

> Maybe I'm missing something, but I haven't found an easy way to
> download pdf versions of all the 3gpp specs. Why would you want to do
> that? Well, dealing with MS-Word format is a pain. And, there's no
> online full-text search of all the specs.

indeed.

> So, I threw together a quick web scraper to pull down the latest
> version of all the 3GPP specs from the ETSI web site in pdf format.

Interesting.  I once had a poor (student) employee do that manually and create
symlinks for them.  I'm sure I can distribute a tar of the symlinks (so you can
open 04.08.pdf),  but I of course am not allowed to distribute the actual PDF
files for copyright reasons.

> Thought it might be useful to others -
> http://monkey.org/~joe/files/fetch_3gpp.py

Definitely, I think that may be very useful for others...

Thanks for sharing it.

-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From matthew.harper73 at gmail.com  Tue Mar  1 11:21:18 2011
From: matthew.harper73 at gmail.com (Matthew Harper)
Date: Tue, 01 Mar 2011 11:21:18 +0000
Subject: libosmovty and OpenBSC Build Issues
Message-ID: <4D6CD6AE.6010305@gmail.com>

Hello All,

I have just tried to compile the latest version of OpenBSC as cloned
from git. When running the configure script I run into problems with
libosmovty, I receive the error.

Requested 'libosmovty >= 0.1.28' but version of Osmocom VTY Interface
Library is 0.1.27.45-de79.

I built libosmocore from the latest git clone.

Can anyone please offer any guidance on how I can resolve this issue or
how I can go about installing the latest libosmovty library.

Many Thanks

Matty Harper



From holger at freyther.de  Tue Mar  1 11:50:59 2011
From: holger at freyther.de (Holger Hans Peter Freyther)
Date: Tue, 01 Mar 2011 12:50:59 +0100
Subject: libosmovty and OpenBSC Build Issues
In-Reply-To: <4D6CD6AE.6010305@gmail.com>
References: <4D6CD6AE.6010305@gmail.com>
Message-ID: <4D6CDDA3.7020902@freyther.de>

On 03/01/2011 12:21 PM, Matthew Harper wrote:
> Hello All,
> 

> 
> Can anyone please offer any guidance on how I can resolve this issue or
> how I can go about installing the latest libosmovty library.

You will need to invoke autoreconf --install --force in the copy of
libosmocore. This will make it 'regenerate' the version. Of course this should
be followed by a make install.



From screaming-pain at libero.it  Thu Mar  3 17:48:17 2011
From: screaming-pain at libero.it (screaming-pain at libero.it)
Date: Thu, 3 Mar 2011 18:48:17 +0100 (CET)
Subject: [GSM Receiver] using OpenBSC as a GSM Receiver
Message-ID: <33486026.2910441299174497840.JavaMail.root@wmail45>

hi

I am new to the list, I am a phd student in the area of verification of 
security protocol, so not exactly a hacker or tech guru.
Anyway, I am interested in using the OpenBSC to analyze GSM protocol 
messages. 
I don't want to decode them or do anything fancy, I am mainly interested in 
what it is sent in clear.
Is it possible to use the OpenBSC architecture to capture GSM messages and 
later analyze them using wireshark?
I know this is possible using the USRP, but I would like to use OpenBSC. 
Anyway is there any particular reason why you are not supporting the USRP? 

Thanks 




From laforge at gnumonks.org  Thu Mar  3 21:56:44 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Thu, 3 Mar 2011 22:56:44 +0100
Subject: [GSM Receiver] using OpenBSC as a GSM Receiver
In-Reply-To: <33486026.2910441299174497840.JavaMail.root@wmail45>
References: <33486026.2910441299174497840.JavaMail.root@wmail45>
Message-ID: <20110303215644.GX8117@prithivi.gnumonks.org>


On Thu, Mar 03, 2011 at 06:48:17PM +0100, screaming-pain at libero.it wrote:

> I don't want to decode them or do anything fancy, I am mainly interested in 
> what it is sent in clear.
> Is it possible to use the OpenBSC architecture to capture GSM messages and 
> later analyze them using wireshark?

No. You can only capture messages on the Abis interface between your own BTS
and BSC, but not sniff stuff off the air.  That's what you can do with
Airprobe and OsmocomBB.

-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From pablo at gnumonks.org  Thu Mar  3 18:01:49 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Thu, 03 Mar 2011 19:01:49 +0100
Subject: [PATCH] wireshark: gsm-abis-oml: convert C99 structure initialization
	to ANSI C
Message-ID: <4D6FD78D.9070804@gnumonks.org>

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.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-01-ansic89-struct-initialization.patch
Type: text/x-patch
Size: 18930 bytes
Desc: not available
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110303/0f579da5/attachment.bin>

From 246tnt at gmail.com  Thu Mar  3 18:35:27 2011
From: 246tnt at gmail.com (Sylvain Munaut)
Date: Thu, 3 Mar 2011 19:35:27 +0100
Subject: [PATCH] wireshark: gsm-abis-oml: convert C99 structure
	initialization to ANSI C
In-Reply-To: <4D6FD78D.9070804@gnumonks.org>
References: <4D6FD78D.9070804@gnumonks.org>
Message-ID: <AANLkTik+Yk71BXU6QamKtZch2M9gJGwE5+DwQpiC8c83@mail.gmail.com>

Hi,


> 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.

Mmm, OML has a bunch of 'vendor-specific' extensions so it would not
surprise me if that's what you're hitting.


Cheers,

    Sylvain



From laforge at gnumonks.org  Thu Mar  3 22:00:02 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Thu, 3 Mar 2011 23:00:02 +0100
Subject: [PATCH] wireshark: gsm-abis-oml: convert C99 structure
	initialization to ANSI C
In-Reply-To: <4D6FD78D.9070804@gnumonks.org>
References: <4D6FD78D.9070804@gnumonks.org>
Message-ID: <20110303220002.GY8117@prithivi.gnumonks.org>

Hi pablo,

On Thu, Mar 03, 2011 at 07:01:49PM +0100, Pablo Neira Ayuso wrote:
 
> 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).

It's a very elegant solution to do the initialization at startup time,
I like that (and didn't think of it any earlier...).  

Let's hope the wireshark guys think similar!

> 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.

Did you enable the 'use ip.access nanoBTS' flag in the protocol preferences
for the OML dissector?  If you don't it will try to use the Siemens definitions
on an ip.access protocol trace (which will break).

I will apply your patch right now...

Regards,
	Harald.
-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From pablo at gnumonks.org  Sun Mar  6 13:16:43 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Sun, 06 Mar 2011 14:16:43 +0100
Subject: [PATCH] wireshark: gsm-abis-oml: convert C99 structure
	initialization to ANSI C
In-Reply-To: <20110303220002.GY8117@prithivi.gnumonks.org>
References: <4D6FD78D.9070804@gnumonks.org>
	<20110303220002.GY8117@prithivi.gnumonks.org>
Message-ID: <4D73893B.4080704@gnumonks.org>

On 03/03/11 23:00, Harald Welte wrote:
> On Thu, Mar 03, 2011 at 07:01:49PM +0100, Pablo Neira Ayuso wrote:
>> 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.
> 
> Did you enable the 'use ip.access nanoBTS' flag in the protocol preferences
> for the OML dissector?  If you don't it will try to use the Siemens definitions
> on an ip.access protocol trace (which will break).

Yes, the nanoBTS mode is enabled.

I've been debugging this a bit. The problem seems to be related with
"Activate Software" and "Activate Software ACK" messages. They contain
an attribute whose tag is 0x42 which the dissector does not know how to
interpret.

Any clue on this?



From laforge at gnumonks.org  Thu Mar 24 19:17:35 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Thu, 24 Mar 2011 20:17:35 +0100
Subject: [PATCH] wireshark: gsm-abis-oml: convert C99 structure
	initialization to ANSI C
In-Reply-To: <4D73893B.4080704@gnumonks.org>
References: <4D6FD78D.9070804@gnumonks.org>
	<20110303220002.GY8117@prithivi.gnumonks.org>
	<4D73893B.4080704@gnumonks.org>
Message-ID: <20110324191734.GB7589@prithivi.gnumonks.org>

Hi Pablo,

I've now submitted the 0001-abis_oml.patch (after removing some dead code)
to wireshark, see https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5784
for details (I suggest you add yourself to Cc).

On Sun, Mar 06, 2011 at 02:16:43PM +0100, Pablo Neira Ayuso wrote:

> >> 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.
> > 
> > Did you enable the 'use ip.access nanoBTS' flag in the protocol preferences
> > for the OML dissector?  If you don't it will try to use the Siemens definitions
> > on an ip.access protocol trace (which will break).
> 
> Yes, the nanoBTS mode is enabled.
> 
> I've been debugging this a bit. The problem seems to be related with
> "Activate Software" and "Activate Software ACK" messages. They contain
> an attribute whose tag is 0x42 which the dissector does not know how to
> interpret.
> 
> Any clue on this?

I don't know yet, but I think it is not a blocker for submitting it.  I really
want to get it included.  We can always fix those kind of minor bugs later.

I think the next should be 0004-rsl_ipaccess.c, but maybe make it a (default:
on) preference whether or not to enable ip.access support.  It has the same
C99 array initializer problems.

-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From pablo at gnumonks.org  Mon Mar 28 23:14:05 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Tue, 29 Mar 2011 01:14:05 +0200
Subject: [PATCH] wireshark: gsm-abis-oml: convert C99 structure
	initialization to ANSI C
In-Reply-To: <20110324191734.GB7589@prithivi.gnumonks.org>
References: <4D6FD78D.9070804@gnumonks.org>
	<20110303220002.GY8117@prithivi.gnumonks.org>
	<4D73893B.4080704@gnumonks.org>
	<20110324191734.GB7589@prithivi.gnumonks.org>
Message-ID: <4D91163D.9090705@gnumonks.org>

On 24/03/11 20:17, Harald Welte wrote:
> I think the next should be 0004-rsl_ipaccess.c, but maybe make it a (default:
> on) preference whether or not to enable ip.access support.  It has the same
> C99 array initializer problems.

working on it. Expect one patch for this soon.



From laforge at gnumonks.org  Thu Mar  3 22:03:28 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Thu, 3 Mar 2011 23:03:28 +0100
Subject: [PATCH] wireshark: gsm-abis-oml: convert C99 structure
	initialization to ANSI C
In-Reply-To: <4D6FD78D.9070804@gnumonks.org>
References: <4D6FD78D.9070804@gnumonks.org>
Message-ID: <20110303220328.GZ8117@prithivi.gnumonks.org>

Pablo,

I just tried to commit it, but it is of course an incremental patch.

I think it's best to update the patch in git, i.e. apply it using quilt,
then 'quilt refresh' the patch and commit the result to our git tree.

In short: I would like to see something that I can simply apply with 'git am'
to our openbsc.git repository.

Thanks.
-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From pablo at gnumonks.org  Sun Mar  6 12:21:08 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Sun, 06 Mar 2011 13:21:08 +0100
Subject: [PATCH] wireshark: gsm-abis-oml: convert C99 structure
	initialization to ANSI C
In-Reply-To: <20110303220328.GZ8117@prithivi.gnumonks.org>
References: <4D6FD78D.9070804@gnumonks.org>
	<20110303220328.GZ8117@prithivi.gnumonks.org>
Message-ID: <4D737C34.4030504@gnumonks.org>

On 03/03/11 23:03, Harald Welte wrote:
> Pablo,
> 
> I just tried to commit it, but it is of course an incremental patch.
> 
> I think it's best to update the patch in git, i.e. apply it using quilt,
> then 'quilt refresh' the patch and commit the result to our git tree.
> 
> In short: I would like to see something that I can simply apply with 'git am'
> to our openbsc.git repository.

Please, find it attached.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ansi-c-structure-init-for-0001-abis_oml.patch
Type: text/x-patch
Size: 22066 bytes
Desc: not available
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110306/422375bd/attachment.bin>

From holger at freyther.de  Sun Mar  6 12:26:39 2011
From: holger at freyther.de (Holger Hans Peter Freyther)
Date: Sun, 06 Mar 2011 13:26:39 +0100
Subject: [PATCH] wireshark: gsm-abis-oml: convert C99
	structure	initialization to ANSI C
In-Reply-To: <4D737C34.4030504@gnumonks.org>
References: <4D6FD78D.9070804@gnumonks.org>	<20110303220328.GZ8117@prithivi.gnumonks.org>
	<4D737C34.4030504@gnumonks.org>
Message-ID: <4D737D7F.3040902@freyther.de>

On 03/06/2011 01:21 PM, Pablo Neira Ayuso wrote:

> 
> Please, find it attached.

Are you using svn diff to create the diff in wireshark?



From pablo at gnumonks.org  Sun Mar  6 12:41:36 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Sun, 06 Mar 2011 13:41:36 +0100
Subject: [PATCH] wireshark: gsm-abis-oml: convert
	C99	structure	initialization to ANSI C
In-Reply-To: <4D737D7F.3040902@freyther.de>
References: <4D6FD78D.9070804@gnumonks.org>	<20110303220328.GZ8117@prithivi.gnumonks.org>	<4D737C34.4030504@gnumonks.org>
	<4D737D7F.3040902@freyther.de>
Message-ID: <4D738100.4020409@gnumonks.org>

Hi Holger,

On 06/03/11 13:26, Holger Hans Peter Freyther wrote:
> On 03/06/2011 01:21 PM, Pablo Neira Ayuso wrote:
> 
>>
>> Please, find it attached.
> 
> Are you using svn diff to create the diff in wireshark?

Yes, that's why those:

-diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
-index a22406c..0b09335 100644
---- a/epan/CMakeLists.txt
-+++ b/epan/CMakeLists.txt
-@@ -586,6 +586,7 @@ set(DISSECTOR_SRC
+Index: wireshark/epan/CMakeLists.txt
+===================================================================
+--- wireshark.orig/epan/CMakeLists.txt 2011-03-03 14:01:07.000000000 +0100
++++ wireshark/epan/CMakeLists.txt      2011-03-03 14:01:20.000000000 +0100
+@@ -589,6 +589,7 @@ set(DISSECTOR_SRC

are showing up. If those disturb I can regenerate with git-svn (my
initial checkout of wireshark was using svn directly, sorry).



From holger at freyther.de  Sun Mar  6 12:53:30 2011
From: holger at freyther.de (Holger Hans Peter Freyther)
Date: Sun, 06 Mar 2011 13:53:30 +0100
Subject: [PATCH] wireshark: gsm-abis-oml:
	convert	C99	structure	initialization to ANSI C
In-Reply-To: <4D738100.4020409@gnumonks.org>
References: <4D6FD78D.9070804@gnumonks.org>	<20110303220328.GZ8117@prithivi.gnumonks.org>	<4D737C34.4030504@gnumonks.org>	<4D737D7F.3040902@freyther.de>
	<4D738100.4020409@gnumonks.org>
Message-ID: <4D7383CA.1020205@freyther.de>

On 03/06/2011 01:41 PM, Pablo Neira Ayuso wrote:

> 
> are showing up. If those disturb I can regenerate with git-svn (my
> initial checkout of wireshark was using svn directly, sorry).

I assume with your help we will get this merged soon, so don't bother for this
patch. The reason to have the output of git format-patch is that one could use
git am -3 in the future.



From pablo at gnumonks.org  Sun Mar  6 13:20:03 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Sun, 06 Mar 2011 14:20:03 +0100
Subject: [PATCH] wireshark:
	gsm-abis-oml:	convert	C99	structure	initialization to ANSI C
In-Reply-To: <4D7383CA.1020205@freyther.de>
References: <4D6FD78D.9070804@gnumonks.org>	<20110303220328.GZ8117@prithivi.gnumonks.org>	<4D737C34.4030504@gnumonks.org>	<4D737D7F.3040902@freyther.de>	<4D738100.4020409@gnumonks.org>
	<4D7383CA.1020205@freyther.de>
Message-ID: <4D738A03.8040305@gnumonks.org>

On 06/03/11 13:53, Holger Hans Peter Freyther wrote:
> On 03/06/2011 01:41 PM, Pablo Neira Ayuso wrote:
> 
>>
>> are showing up. If those disturb I can regenerate with git-svn (my
>> initial checkout of wireshark was using svn directly, sorry).
> 
> I assume with your help we will get this merged soon, so don't bother for this
> patch. The reason to have the output of git format-patch is that one could use
> git am -3 in the future.

Indeed, after all this I wanted to ask you if you're OK if I proceed
with the submission to wireshark ;-).

Still, I think that I've got issue with a warning that spots a dissector
bug.

BTW, the output of the patch is in git format, so I think that you can
apply it with git am. It's the inner patch (which is contained inside
this patch) that it's in svn format 8-).



From holger at freyther.de  Sun Mar  6 13:45:33 2011
From: holger at freyther.de (Holger Hans Peter Freyther)
Date: Sun, 06 Mar 2011 14:45:33 +0100
Subject: [PATCH]
	wireshark:	gsm-abis-oml:	convert	C99	structure	initialization
	to ANSI C
In-Reply-To: <4D738A03.8040305@gnumonks.org>
References: <4D6FD78D.9070804@gnumonks.org>	<20110303220328.GZ8117@prithivi.gnumonks.org>	<4D737C34.4030504@gnumonks.org>	<4D737D7F.3040902@freyther.de>	<4D738100.4020409@gnumonks.org>	<4D7383CA.1020205@freyther.de>
	<4D738A03.8040305@gnumonks.org>
Message-ID: <4D738FFD.4000803@freyther.de>

On 03/06/2011 02:20 PM, Pablo Neira Ayuso wrote:

> 
> Still, I think that I've got issue with a warning that spots a dissector
> bug.

Yes, I think this was there before as well and on top of this I have never
tried the randpkt to fuzz the dissector as mentioned in doc/README.developer.


From pablo at gnumonks.org  Sun Mar  6 13:52:20 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Sun, 06 Mar 2011 14:52:20 +0100
Subject: [PATCH]	wireshark:	gsm-abis-oml:	convert	C99	structure	initialization
	to ANSI C
In-Reply-To: <4D738FFD.4000803@freyther.de>
References: <4D6FD78D.9070804@gnumonks.org>	<20110303220328.GZ8117@prithivi.gnumonks.org>	<4D737C34.4030504@gnumonks.org>	<4D737D7F.3040902@freyther.de>	<4D738100.4020409@gnumonks.org>	<4D7383CA.1020205@freyther.de>	<4D738A03.8040305@gnumonks.org>
	<4D738FFD.4000803@freyther.de>
Message-ID: <4D739194.4060603@gnumonks.org>

On 06/03/11 14:45, Holger Hans Peter Freyther wrote:
> On 03/06/2011 02:20 PM, Pablo Neira Ayuso wrote:
> 
>>
>> Still, I think that I've got issue with a warning that spots a dissector
>> bug.
> 
> Yes, I think this was there before as well and on top of this I have never
> tried the randpkt to fuzz the dissector as mentioned in doc/README.developer.

I didn't know about this, I'll check it.

> From a quick look at GSM 12.21, a trace I have, it looks like NM_ATT_SW_DESCR
> is not in the TLV table and this explains why we end up here. It might be a
> good opportunity to see what else we are missing.

I'll investigate this, thanks for the clue!

>>
>> BTW, the output of the patch is in git format, so I think that you can
>> apply it with git am. It's the inner patch (which is contained inside
>> this patch) that it's in svn format 8-).
> 
> Yes, I am talking about git am -3 for the inner part as this (wireshark svn)
> is the place where having a three way merge is going to be the most useful
> thing to do. :)

Oh, I see, I didn't get it, sorry!



From laforge at gnumonks.org  Sun Mar  6 15:50:22 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Sun, 6 Mar 2011 16:50:22 +0100
Subject: [PATCH] wireshark: gsm-abis-oml: convert C99 structure
	initialization to ANSI C
In-Reply-To: <4D737C34.4030504@gnumonks.org>
References: <4D6FD78D.9070804@gnumonks.org>
	<20110303220328.GZ8117@prithivi.gnumonks.org>
	<4D737C34.4030504@gnumonks.org>
Message-ID: <20110306155022.GB31436@prithivi.gnumonks.org>

Thanks, applied.

I think you can try to submit the patch now to the wireshark bugzilla and take
care of any comments that the wireshark developers may have.

Onci this patch is submitted, feel free to continue on the other patches
(cleanup, C99-removal and submission), like:
0002-ericsson_rbs2409.patch
0003-lucent-hnb.patch
0004-rsl-ipaccess.patch

the other patches are still quite in a bit of flux, so we will probably delay
them.

Regards,
	Harald
-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From laforge at gnumonks.org  Thu Mar  3 22:59:11 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Thu, 3 Mar 2011 23:59:11 +0100
Subject: Proposal: Code + directory restructuring
Message-ID: <20110303225911.GB8117@prithivi.gnumonks.org>

Hi all!

I've been thinking a bit about what kind of code (and directory / library)
structure we should be having in order to build the various executables
from the functional blocks that we have.

The idea is to prepare for the upcoming / intended new projects while
reusing the functional blocks / modules whenver possible.

The graphical structure is at:
http://openbsc.osmocom.org/trac/wiki/NewCodeStructure

And the first steps in reorganizing directories and makefiles is
available at
http://cgit.osmocom.org/cgit/openbsc/log/?h=laforge/new_structure

The new directory structure now has

* directories that contain each one library
	openbsc/src/{abis,bsc,common,gb,mgcp,msc,trau}
* directories that contain code for our daemons (BSC, etc.)
	openbsc/src/{gprs,osmo-bsc,osmo-bsc_mgcp,osmo-bsc_nat,osmo-nitb}
* directories that contain code for utilities
	openbsc/src/{ipaccess,utils}

There are still some additional/bogus dependencies between the libraries,
but I want to fix that and make sure the TRAU directory really only contains
code related to the TRAU and RTP frame processing.  Some of the generic OML/RSL
parsing code should be moved from 'bsc' into the 'abis' directory, etc.

What do you generally think of this?  If there is no big complaint, I
intend to import Andreas' osmocom-bb.git/jolly/bts code into the openbsc
repository (openbsc/src/bts) and start to merge the RTP code into src/trau
and the generic bits of RSL+OML into src/abis.

Some random ideas:
* prefix the library directories with 'lib', i.e. 'libbsc', 'libmsc' to
  clearly state this is not a program but just library code
* rename the openbsc repository to smething more generic. but what?
  I don't think we want to create multiple repositories but keep
  everything in a single repo - at least until one of the sub-libraries
  is self-contained enough.
* should we keep bsc_hack instead of osmo-nitb? (network-in-the-box)?
  or should it rather be called osmo-niab (network-in-a-box)?

Regards,
	Harald
-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From 246tnt at gmail.com  Fri Mar  4 07:22:38 2011
From: 246tnt at gmail.com (Sylvain Munaut)
Date: Fri, 4 Mar 2011 08:22:38 +0100
Subject: Proposal: Code + directory restructuring
In-Reply-To: <20110303225911.GB8117@prithivi.gnumonks.org>
References: <20110303225911.GB8117@prithivi.gnumonks.org>
Message-ID: <AANLkTikaW_HPHiWcW8ObpauWjxD2DA7BAizVzCnMaayi@mail.gmail.com>

Hi,


> And the first steps in reorganizing directories and makefiles is
> available at
> http://cgit.osmocom.org/cgit/openbsc/log/?h=laforge/new_structure

Mmm, you remove the unused a3a8 code and you re-add it when doing all
the git-mv one commit later.
I assume it's a manip slip-up.


> What do you generally think of this?

Well, IMHO all clean up is good and the structure you laid out makes
sense to me.


> If there is no big complaint, I
> intend to import Andreas' osmocom-bb.git/jolly/bts code into the openbsc
> repository (openbsc/src/bts) and start to merge the RTP code into src/trau
> and the generic bits of RSL+OML into src/abis.

Why import the BTS code ?
Since it's new code, doesn't it make sense to make it directly
separate and "well behaved".

It eventually will host the code for:
 Virtual BTS
 New BTS
 BB-BTS (part of it at least, not sure how to split properly)
 "True" BTS (same issue, not sure how to handle the split)

So that'll be pretty big all by itself.


> Some random ideas:
> * prefix the library directories with 'lib', i.e. 'libbsc', 'libmsc' to
> ?clearly state this is not a program but just library code

Yes definitly. They already generate libmsc.a and libbsc.a if I'm not
mistaken, so it would only be logical to name the directories as such.


> * rename the openbsc repository to smething more generic. but what?
> ?I don't think we want to create multiple repositories but keep
> ?everything in a single repo - at least until one of the sub-libraries
> ?is self-contained enough.

osmo-gsm-net (or corenet) ? This seems to be all all the 'network side' stuff.


> * should we keep bsc_hack instead of osmo-nitb? (network-in-the-box)?
> ?or should it rather be called osmo-niab (network-in-a-box)?

Nah, a rename shouldn't be much of an issue IMHO.

As for nitb vs niab, in a google fight "in-the-box" wins vs
"in-a-box". I also find the nitb acronym to sound better.


Cheers,

    Sylvain



From laforge at gnumonks.org  Fri Mar  4 08:31:50 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Fri, 4 Mar 2011 09:31:50 +0100
Subject: Proposal: Code + directory restructuring
In-Reply-To: <AANLkTikaW_HPHiWcW8ObpauWjxD2DA7BAizVzCnMaayi@mail.gmail.com>
References: <20110303225911.GB8117@prithivi.gnumonks.org>
	<AANLkTikaW_HPHiWcW8ObpauWjxD2DA7BAizVzCnMaayi@mail.gmail.com>
Message-ID: <20110304083150.GC8117@prithivi.gnumonks.org>

Sylvain,

thanks for your feedback.

On Fri, Mar 04, 2011 at 08:22:38AM +0100, Sylvain Munaut wrote:
> > And the first steps in reorganizing directories and makefiles is
> > available at
> > http://cgit.osmocom.org/cgit/openbsc/log/?h=laforge/new_structure
> 
> Mmm, you remove the unused a3a8 code and you re-add it when doing all
> the git-mv one commit later.  I assume it's a manip slip-up.

good spot, I've re-deleted it.

> > What do you generally think of this?
> 
> Well, IMHO all clean up is good and the structure you laid out makes
> sense to me.

good.

> Why import the BTS code ?
> Since it's new code, doesn't it make sense to make it directly
> separate and "well behaved".

My idea was to import it as there is some shared code on the Abis side for
RSL and OML message construction (as well as TLV parser definitions) and
RTP / TRAU handling.  Furthermore, once we'll later start to do GPRS in the
BTS, the Gb protocol stack from src/gb/ will also be used in the BTS itself.

But we could just as well use those reasons to make a real 'libosmo-abis.so'
either from within openbsc.git or yet another repository.  The BTS code could
then stay independent and simply link against that library.

> So that'll be pretty big all by itself.

Yes, I tend to agree.  Keep that seperate and link against abis/trau/gb
libraries.
 
> > Some random ideas:
> > * prefix the library directories with 'lib', i.e. 'libbsc', 'libmsc' to
> > ?clearly state this is not a program but just library code
> 
> Yes definitly. They already generate libmsc.a and libbsc.a if I'm not
> mistaken, so it would only be logical to name the directories as such.

ok, will do that.

> > * rename the openbsc repository to smething more generic. but what?
> > ?I don't think we want to create multiple repositories but keep
> > ?everything in a single repo - at least until one of the sub-libraries
> > ?is self-contained enough.
> 
> osmo-gsm-net (or corenet) ? This seems to be all all the 'network side' stuff.

'core network' in GSM means MSC/HLR/VLR/AuC/SMSC but explicitly not the BSC,
which is part of the 'radio access netowrk'.  So osmo-corenet would be another
mis-nomer.  osmo-gsm-net may make sense, though.

> > * should we keep bsc_hack instead of osmo-nitb? (network-in-the-box)?
> > ?or should it rather be called osmo-niab (network-in-a-box)?
> 
> Nah, a rename shouldn't be much of an issue IMHO.

ok.  I just think the _hack suffix is no longer really appropriate and might
deter/confuse some users who are not as adventurous as we are ;)

-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From screaming-pain at libero.it  Thu Mar  3 23:36:48 2011
From: screaming-pain at libero.it (screaming-pain at libero.it)
Date: Fri, 4 Mar 2011 00:36:48 +0100 (CET)
Subject: R: Re: [GSM Receiver] using OpenBSC as a GSM Receiver
Message-ID: <5838643.3767011299195408918.JavaMail.root@wmail6.libero.it>


Thanks Harald,

>
>No. You can only capture messages on the Abis interface between your own BTS
>and BSC, but not sniff stuff off the air.

I see this means I can only see the traffic that the BTS pass to the BSC but 
not all the on the air traffic.

>  That's what you can do with
>Airprobe and OsmocomBB.
>

I know about the possibility to use OsmocomBB to sniff over the air, 
but I will need to transmit as well, I mean to replay some of the sniffed 
traffic, 
can this be done in anyway with OsmocomBB? or I will I have to use both 
OsmocomBB  to sniff and OpenBTS to replay?

Thanks again for the clarification, and sorry for the newbie questions
but it's a bit difficult to figure out how things work without actually 
playing with them.

Loretta

>-- 
>- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
>============================================================================
>"Privacy in residential applications is a desirable marketing option."
>                                                  (ETSI EN 300 175-7 Ch. A6)
>
>





From laforge at gnumonks.org  Fri Mar  4 13:49:55 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Fri, 4 Mar 2011 14:49:55 +0100
Subject: New repository for BTS code
Message-ID: <20110304134954.GK8117@prithivi.gnumonks.org>

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 at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From holger at freyther.de  Sat Mar  5 07:55:16 2011
From: holger at freyther.de (Holger Hans Peter Freyther)
Date: Sat, 05 Mar 2011 08:55:16 +0100
Subject: New repository for BTS code
In-Reply-To: <20110304134954.GK8117@prithivi.gnumonks.org>
References: <20110304134954.GK8117@prithivi.gnumonks.org>
Message-ID: <4D71EC64.3090905@freyther.de>

On 03/04/2011 02:49 PM, Harald Welte wrote:

> * 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}

do you need a hand with any of this?



From laforge at gnumonks.org  Sun Mar  6 09:33:27 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Sun, 6 Mar 2011 10:33:27 +0100
Subject: New repository for BTS code
In-Reply-To: <4D71EC64.3090905@freyther.de>
References: <20110304134954.GK8117@prithivi.gnumonks.org>
	<4D71EC64.3090905@freyther.de>
Message-ID: <20110306093327.GA31055@prithivi.gnumonks.org>

On Sat, Mar 05, 2011 at 08:55:16AM +0100, Holger Hans Peter Freyther wrote:
> On 03/04/2011 02:49 PM, Harald Welte wrote:
> 
> > * 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}
> 
> do you need a hand with any of this?

I don't really have time for it now, so any help would be appreciated!

-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From f.koliqi at gmail.com  Sat Mar  5 08:01:37 2011
From: f.koliqi at gmail.com (Fadil Berisha)
Date: Sat, 5 Mar 2011 03:01:37 -0500
Subject: New repository for BTS code
In-Reply-To: <20110304134954.GK8117@prithivi.gnumonks.org>
References: <20110304134954.GK8117@prithivi.gnumonks.org>
Message-ID: <AANLkTi=BA=wV=daOLgVwp4vrkWQrUQDqp50yWxjrnqa0@mail.gmail.com>

Hi Harald,

> 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.

Some code for BTS side already exist. I have made open source softBTS
, This code build and if you run it,  you can get 1st impressions for
virtual BTS:

git clone git at github.com:softBTS/softBTS.git

Here is how to build and start software:

https://github.com/softBTS/softBTS#readme

Some members of this list already had chance to get code. Maybe can be
valuable to someone else too.

fadil



From daniel.brune.so at web.de  Sun Mar  6 13:02:49 2011
From: daniel.brune.so at web.de (Daniel Brune)
Date: Sun, 6 Mar 2011 14:02:49 +0100
Subject: cannot set static IP adress for a nanoBTS
Message-ID: <002201cbdbfe$cbb0d150$631273f0$@web.de>

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




From laforge at gnumonks.org  Sun Mar  6 17:31:10 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Sun, 6 Mar 2011 18:31:10 +0100
Subject: cannot set static IP adress for a nanoBTS
In-Reply-To: <002201cbdbfe$cbb0d150$631273f0$@web.de>
References: <002201cbdbfe$cbb0d150$631273f0$@web.de>
Message-ID: <20110306173110.GD31436@prithivi.gnumonks.org>

Hi Daniel,

> 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.

To be honest, I think this functionality may never have been tested before.

If you want to debug it, I suggest comparing protocol traces when using the
BTSinstaller of ip.access and our ipaccess-config tool.

Regards,
	Harald
-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From cr3 at cr3.us  Mon Mar  7 15:26:15 2011
From: cr3 at cr3.us (Chris Rankine)
Date: Mon, 7 Mar 2011 10:26:15 -0500
Subject: cannot set static IP adress for a nanoBTS
In-Reply-To: <20110306173110.GD31436@prithivi.gnumonks.org>
References: <002201cbdbfe$cbb0d150$631273f0$@web.de>
	<20110306173110.GD31436@prithivi.gnumonks.org>
Message-ID: <AANLkTikr669opCGqM+u+dd4OQ8nxJnnYyPpAs1vsXiTC@mail.gmail.com>

On Sun, Mar 6, 2011 at 12:31 PM, Harald Welte <laforge at gnumonks.org> wrote:

> Hi Daniel,
>
> > 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.
>
> To be honest, I think this functionality may never have been tested before.
>
> If you want to debug it, I suggest comparing protocol traces when using the
> BTSinstaller of ip.access and our ipaccess-config tool.
>
> Regards,
>        Harald
>
>

After a full memory reset, you first need to set certain NVRAM flags using
ipaccess-config to kill the DHCP.  The available flags don't seem to be
documented in the --help text or on the wiki, but you can find them by
digging through the source code (listed at the end of this email).  As for
turning off the DHCP and getting a static IP, try the following:

ipaccess-config -S static-ip -U dhcp-enabled -r [OLD IP]
.... wait for the unit to fully reboot, about 30 seconds with the 1800 model
...
ipaccess-config -i [NEW IP / NET] -r [OLD IP]

Chris Rankine



static const struct value_string ipa_nvflag_strs[] = {
        { 0x0001, "static-ip" },
        { 0x0002, "static-gw" },
        { 0x0004, "no-dhcp-vsi" },
        { 0x0008, "dhcp-enabled" },
        { 0x0040, "led-disabled" },
        { 0x0100, "secondary-oml-enabled" },
        { 0x0200, "diag-enabled" },
        { 0x0400, "cli-enabled" },
        { 0x0800, "http-enabled" },
        { 0x1000, "post-enabled" },
        { 0x2000, "snmp-enabled" },
        { 0, NULL }
};
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110307/a40d53f3/attachment.htm>

From holger at freyther.de  Tue Mar  8 14:34:29 2011
From: holger at freyther.de (Holger Hans Peter Freyther)
Date: Tue, 08 Mar 2011 15:34:29 +0100
Subject: [PATCH] bsc: vty: fix segfault if rf_ctl is not set
In-Reply-To: <20110308123517.9538.2964.stgit@decadence>
References: <20110308123517.9538.2964.stgit@decadence>
Message-ID: <4D763E75.1090808@freyther.de>

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).



From pablo at gnumonks.org  Thu Mar 10 10:17:21 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Thu, 10 Mar 2011 11:17:21 +0100
Subject: [PATCH] bsc: change bsc_vty_init to take logging categories as
	parameter
In-Reply-To: <20110309120539.12802.18008.stgit@decadence>
References: <20110309120539.12802.18008.stgit@decadence>
Message-ID: <4D78A531.6050904@gnumonks.org>

On 09/03/11 13:05, Pablo Neira Ayuso wrote:
> From: Pablo Neira Ayuso <pablo at 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.



From 246tnt at gmail.com  Thu Mar 10 23:57:36 2011
From: 246tnt at gmail.com (Sylvain Munaut)
Date: Fri, 11 Mar 2011 00:57:36 +0100
Subject: libosmocore lost commit
Message-ID: <AANLkTi=feUS48bRwSF=nM1U8_bs_hr=PP3N-9Yn2gH9=@mail.gmail.com>

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



From holger at freyther.de  Fri Mar 11 12:07:10 2011
From: holger at freyther.de (Holger Hans Peter Freyther)
Date: Fri, 11 Mar 2011 13:07:10 +0100
Subject: libosmocore lost commit
In-Reply-To: <AANLkTi=feUS48bRwSF=nM1U8_bs_hr=PP3N-9Yn2gH9=@mail.gmail.com>
References: <AANLkTi=feUS48bRwSF=nM1U8_bs_hr=PP3N-9Yn2gH9=@mail.gmail.com>
Message-ID: <4D7A106E.3030607@freyther.de>

On 03/11/2011 12:57 AM, Sylvain Munaut wrote:
> 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

Thanks for noticing. I will cherry-pick it.



From daniel.brune.so at web.de  Sun Mar 13 15:51:35 2011
From: daniel.brune.so at web.de (Daniel Brune)
Date: Sun, 13 Mar 2011 16:51:35 +0100
Subject: connecting + openBSC initializing problem with nanoBTS 139
Message-ID: <000301cbe196$88705bc0$99511340$@web.de>

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







From holger at freyther.de  Mon Mar 14 07:59:03 2011
From: holger at freyther.de (Holger Hans Peter Freyther)
Date: Mon, 14 Mar 2011 08:59:03 +0100
Subject: connecting + openBSC initializing problem with nanoBTS 139
In-Reply-To: <000301cbe196$88705bc0$99511340$@web.de>
References: <000301cbe196$88705bc0$99511340$@web.de>
Message-ID: <4D7DCAC7.5020200@freyther.de>

On 03/13/2011 04:51 PM, Daniel Brune wrote:
> Hi there,

> 
> Directly after this one, the program terminates with a memory mapping error
> message back to the console.

could you send us a backtrace for that crash? Besides that use the
ipaccess-telnet application to get some logs from the nanoBTS.



From kobayashi_maru at onlinehome.de  Mon Mar 14 15:55:03 2011
From: kobayashi_maru at onlinehome.de (Thomas Ansorg)
Date: Mon, 14 Mar 2011 16:55:03 +0100
Subject: BS-11 multidrop not working
Message-ID: <1300118103.15801.8.camel@r-9djhc747gf8b40ha>

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!




From Andreas.Eversberg at versatel.de  Tue Mar 15 05:52:11 2011
From: Andreas.Eversberg at versatel.de (Andreas.Eversberg)
Date: Tue, 15 Mar 2011 06:52:11 +0100
Subject: AW: BS-11 multidrop not working
Message-ID: <B16317F2B1592B4492FC414114171CE60530246C@FLBVEXCH01.versatel.local>

 
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 at lists.osmocom.org [mailto:openbsc-bounces at 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!





From bertoncello at netzing.de  Tue Mar 15 12:59:27 2011
From: bertoncello at netzing.de (Luca Bertoncello)
Date: Tue, 15 Mar 2011 13:59:27 +0100
Subject: [Patch] Using MySQL as database for OpenBSC
Message-ID: <20110315135927.48b54142@Luca>

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 at 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 at netzing.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: mysql.patch
Type: text/x-patch
Size: 19462 bytes
Desc: not available
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110315/3fd72659/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110315/3fd72659/attachment-0001.bin>

From kobayashi_maru at onlinehome.de  Wed Mar 16 22:56:33 2011
From: kobayashi_maru at onlinehome.de (kobayashi_maru at onlinehome.de)
Date: Wed, 16 Mar 2011 23:56:33 +0100 (CET)
Subject: oml and rsl settings
Message-ID: <473646341.277896.1300316193792.JavaMail.tomcat55@mrmseu2.kundenserver.de>

An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110316/251805f8/attachment.htm>
-------------- next part --------------

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-31sub-slot0123full 



From laforge at gnumonks.org  Thu Mar 17 12:29:12 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Thu, 17 Mar 2011 13:29:12 +0100
Subject: oml and rsl settings
In-Reply-To: <473646341.277896.1300316193792.JavaMail.tomcat55@mrmseu2.kundenserver.de>
References: <473646341.277896.1300316193792.JavaMail.tomcat55@mrmseu2.kundenserver.de>
Message-ID: <20110317122912.GO18597@sunbeam.hmw-consulting.de>

On Wed, Mar 16, 2011 at 11:56:33PM +0100, kobayashi_maru at onlinehome.de wrote:
> 
> 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?

i don't think it is _required_ to run both on the same time-slot, but all you
would gain by separating them is to waste additional timeslots on A-bis.

I've never tested different TS for OML/RSL with the BS-11, though.
-- 
- Harald Welte <laforge at gnumonks.org>          	        http://gnumonks.org/
============================================================================
We all know Linux is great...it does infinite loops in 5 seconds. -- Linus



From kobayashi_maru at onlinehome.de  Thu Mar 17 12:20:47 2011
From: kobayashi_maru at onlinehome.de (Thomas Ansorg)
Date: Thu, 17 Mar 2011 13:20:47 +0100
Subject: oml and RSL - 2nd try
Message-ID: <1300364447.8137.3.camel@r-9djhc747gf8b40ha>

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!




From laforge at gnumonks.org  Thu Mar 17 12:31:21 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Thu, 17 Mar 2011 13:31:21 +0100
Subject: oml and RSL - 2nd try
In-Reply-To: <1300364447.8137.3.camel@r-9djhc747gf8b40ha>
References: <1300364447.8137.3.camel@r-9djhc747gf8b40ha>
Message-ID: <20110317123121.GP18597@sunbeam.hmw-consulting.de>

On Thu, Mar 17, 2011 at 01:20:47PM +0100, Thomas Ansorg wrote:
> 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?

why is it so difficult to understand that two different LAPD connections (on
different SAPI) can either co-incide on the same E1 timeslot or run on
different ones? Some BTSs support this (like Ericsson RBS2000), and OpenBSC
supports it, too.   Also, if you use A-bis concentrators, you might have even
more than two LAPD connections on the same timeslot.

-- 
- Harald Welte <laforge at gnumonks.org>          	        http://gnumonks.org/
============================================================================
We all know Linux is great...it does infinite loops in 5 seconds. -- Linus



From bertoncello at netzing.de  Thu Mar 17 14:41:20 2011
From: bertoncello at netzing.de (Luca Bertoncello)
Date: Thu, 17 Mar 2011 15:41:20 +0100
Subject: Connecting more OpenBSC together
Message-ID: <20110317154120.4d248c01@Luca>

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 at 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 at netzing.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110317/2c971957/attachment.bin>

From cr3 at cr3.us  Thu Mar 17 14:51:42 2011
From: cr3 at cr3.us (Chris Rankine)
Date: Thu, 17 Mar 2011 10:51:42 -0400
Subject: Connecting more OpenBSC together
In-Reply-To: <20110317154120.4d248c01@Luca>
References: <20110317154120.4d248c01@Luca>
Message-ID: <AANLkTi=bc=s_e6U4UJp7uc=OEXnCfMX2+bxfaYfdbAgy@mail.gmail.com>

If you setup both instances to do the LCR -> Asterisk method, you pair
up the Asterisk instances and setup rules that allow calls to go back
and forth.

Chris Rankine

On Thu, Mar 17, 2011 at 10:41 AM, Luca Bertoncello
<bertoncello at netzing.de> wrote:
> 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 at 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 at netzing.de
>



From bertoncello at netzing.de  Thu Mar 17 15:07:08 2011
From: bertoncello at netzing.de (Luca Bertoncello)
Date: Thu, 17 Mar 2011 16:07:08 +0100
Subject: Connecting more OpenBSC together
In-Reply-To: <AANLkTi=bc=s_e6U4UJp7uc=OEXnCfMX2+bxfaYfdbAgy@mail.gmail.com>
References: <20110317154120.4d248c01@Luca>
	<AANLkTi=bc=s_e6U4UJp7uc=OEXnCfMX2+bxfaYfdbAgy@mail.gmail.com>
Message-ID: <20110317160708.49007046@Luca>

Am Thu, 17 Mar 2011 10:51:42 -0400
schrieb Chris Rankine <cr3 at cr3.us>:

> If you setup both instances to do the LCR -> Asterisk method, you pair
> up the Asterisk instances and setup rules that allow calls to go back
> and forth.

It could be an idea, but in order to use LCR I need an ISDN-Card (at
least some months ago, as I tried), and I have no one... :(

Any other idea?

Thanks
-- 
_______________________________________________________________________
Luca Bertoncello
Entwicklung                               Mail:  bertoncello at 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 at netzing.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110317/246b44bc/attachment.bin>

From cr3 at cr3.us  Thu Mar 17 15:32:52 2011
From: cr3 at cr3.us (Chris Rankine)
Date: Thu, 17 Mar 2011 11:32:52 -0400
Subject: Connecting more OpenBSC together
In-Reply-To: <20110317161938.2b168fc9@Luca>
References: <20110317154120.4d248c01@Luca>
	<AANLkTi=bc=s_e6U4UJp7uc=OEXnCfMX2+bxfaYfdbAgy@mail.gmail.com>
	<20110317160708.49007046@Luca>
	<AANLkTimxUnMnggbcS5SdJj6EVxdPU7ONP05=mAz5=Jzk@mail.gmail.com>
	<20110317161938.2b168fc9@Luca>
Message-ID: <AANLkTi=-5c4ezcKUwPFRr5nBNs=dDP63e3UW=2wYy-A1@mail.gmail.com>

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 at 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 at netzing.de>:
> Am Thu, 17 Mar 2011 11:10:17 -0400
> schrieb Chris Rankine <cr3 at cr3.us>:
>
>> Which BTS are you using?
>
> nanoBTS from ip.access.
>
> Greetings
> --
> _______________________________________________________________________
> Luca Bertoncello
> Entwicklung ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? Mail: ?bertoncello at 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 at netzing.de
>



From bertoncello at netzing.de  Thu Mar 17 15:37:42 2011
From: bertoncello at netzing.de (Luca Bertoncello)
Date: Thu, 17 Mar 2011 16:37:42 +0100
Subject: Connecting more OpenBSC together
In-Reply-To: <AANLkTi=-5c4ezcKUwPFRr5nBNs=dDP63e3UW=2wYy-A1@mail.gmail.com>
References: <20110317154120.4d248c01@Luca>
	<AANLkTi=bc=s_e6U4UJp7uc=OEXnCfMX2+bxfaYfdbAgy@mail.gmail.com>
	<20110317160708.49007046@Luca>
	<AANLkTimxUnMnggbcS5SdJj6EVxdPU7ONP05=mAz5=Jzk@mail.gmail.com>
	<20110317161938.2b168fc9@Luca>
	<AANLkTi=-5c4ezcKUwPFRr5nBNs=dDP63e3UW=2wYy-A1@mail.gmail.com>
Message-ID: <20110317163742.053944fc@Luca>

Am Thu, 17 Mar 2011 11:32:52 -0400
schrieb Chris Rankine <cr3 at cr3.us>:

> 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 at 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.

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...

Thanks
Luca
-- 
_______________________________________________________________________
Luca Bertoncello
Entwicklung                               Mail:  bertoncello at 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 at netzing.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110317/b38ec6a0/attachment.bin>

From Andreas.Eversberg at versatel.de  Thu Mar 17 15:17:54 2011
From: Andreas.Eversberg at versatel.de (Andreas.Eversberg)
Date: Thu, 17 Mar 2011 16:17:54 +0100
Subject: AW: Connecting more OpenBSC together
Message-ID: <B16317F2B1592B4492FC414114171CE60537380F@FLBVEXCH01.versatel.local>

 

> 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



From Andreas.Eversberg at versatel.de  Fri Mar 18 08:06:09 2011
From: Andreas.Eversberg at versatel.de (Andreas.Eversberg)
Date: Fri, 18 Mar 2011 09:06:09 +0100
Subject: AW: Connecting more OpenBSC together
Message-ID: <B16317F2B1592B4492FC414114171CE605373953@FLBVEXCH01.versatel.local>

 
> 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.




From pablo at gnumonks.org  Thu Mar 17 20:58:18 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Thu, 17 Mar 2011 21:58:18 +0100
Subject: [PATCH 0/2] split libosmocore library (to create libosmo-gsm)
Message-ID: <4D8275EA.9060004@gnumonks.org>

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.



From 246tnt at gmail.com  Thu Mar 17 21:08:47 2011
From: 246tnt at gmail.com (Sylvain Munaut)
Date: Thu, 17 Mar 2011 22:08:47 +0100
Subject: [PATCH 0/2] split libosmocore library (to create libosmo-gsm)
In-Reply-To: <4D8275EA.9060004@gnumonks.org>
References: <4D8275EA.9060004@gnumonks.org>
Message-ID: <AANLkTi=sSyX-=T6_74RM2TJQzmj4A35aKvfq67eUkWhh@mail.gmail.com>

Hi,


> 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.

Can't this be made with git filter-branch somehow ?

Just create a new tree that only has the history of all the gsm stuff
and nothing of the rest.


> After these patches, I'll send two patches for openbsc and osmocore-bb
> to make them use the new libosmo-gsm.

I guess we'll need to use git-submodule for this as well in osmocom-bb.


Cheers,

    Sylvain


PS: Haven't looked at the actual patches yet, just preliminary comments.



From pablo at gnumonks.org  Thu Mar 17 21:57:50 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Thu, 17 Mar 2011 22:57:50 +0100
Subject: [PATCH 0/2] split libosmocore library (to create libosmo-gsm)
In-Reply-To: <AANLkTi=sSyX-=T6_74RM2TJQzmj4A35aKvfq67eUkWhh@mail.gmail.com>
References: <4D8275EA.9060004@gnumonks.org>
	<AANLkTi=sSyX-=T6_74RM2TJQzmj4A35aKvfq67eUkWhh@mail.gmail.com>
Message-ID: <4D8283DE.8080500@gnumonks.org>

On 17/03/11 22:08, Sylvain Munaut wrote:
>> 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.
> 
> Can't this be made with git filter-branch somehow ?
> 
> Just create a new tree that only has the history of all the gsm stuff
> and nothing of the rest.

I'm not a git master, I'll check the docs to see if this is possible.

>> After these patches, I'll send two patches for openbsc and osmocore-bb
>> to make them use the new libosmo-gsm.
> 
> I guess we'll need to use git-submodule for this as well in osmocom-bb.

Yes, AFAICS we'll have to use git-subtree like with libosmocore.

> PS: Haven't looked at the actual patches yet, just preliminary comments.

Thanks for this preliminary review!



From laforge at gnumonks.org  Fri Mar 18 11:58:59 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Fri, 18 Mar 2011 12:58:59 +0100
Subject: [PATCH 0/2] split libosmocore library (to create libosmo-gsm)
In-Reply-To: <AANLkTi=sSyX-=T6_74RM2TJQzmj4A35aKvfq67eUkWhh@mail.gmail.com>
References: <4D8275EA.9060004@gnumonks.org>
	<AANLkTi=sSyX-=T6_74RM2TJQzmj4A35aKvfq67eUkWhh@mail.gmail.com>
Message-ID: <20110318115858.GA18597@sunbeam.hmw-consulting.de>

On Thu, Mar 17, 2011 at 10:08:47PM +0100, Sylvain Munaut wrote:
> Hi,
> 
> 
> > 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.
> 
> Can't this be made with git filter-branch somehow ?

I think we might just build libosmo-gsm as part of the libosmocore.git
repository, similar to what we do for libosmovty.  But this may be
a matter of personal taste ;)

What do others  think about it?  I think splitting the include paths
and the .so file names makes users (i.e. the application programs)
aware that it is two libraries.

Splitting the git repositories doesn'nt really buy us anything apart
from yet another git checkout/update/configure/make/... that needs to be
executed.

If at some future point we want to split the repositories, it will not
incur any changes to the application programs like openbsc, as they
already check for two different pkgconfig etc.
-- 
- Harald Welte <laforge at gnumonks.org>          	        http://gnumonks.org/
============================================================================
We all know Linux is great...it does infinite loops in 5 seconds. -- Linus



From pablo at gnumonks.org  Sat Mar 19 19:44:29 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Sat, 19 Mar 2011 20:44:29 +0100
Subject: [PATCH 0/2] split libosmocore library (to create libosmo-gsm)
In-Reply-To: <20110318115858.GA18597@sunbeam.hmw-consulting.de>
References: <4D8275EA.9060004@gnumonks.org>
	<AANLkTi=sSyX-=T6_74RM2TJQzmj4A35aKvfq67eUkWhh@mail.gmail.com>
	<20110318115858.GA18597@sunbeam.hmw-consulting.de>
Message-ID: <4D85079D.3080908@gnumonks.org>

Hi Harald,

On 18/03/11 12:58, Harald Welte wrote:
> On Thu, Mar 17, 2011 at 10:08:47PM +0100, Sylvain Munaut wrote:
>>> 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.
>>
>> Can't this be made with git filter-branch somehow ?
> 
> I think we might just build libosmo-gsm as part of the libosmocore.git
> repository, similar to what we do for libosmovty.  But this may be
> a matter of personal taste ;)
> 
> What do others  think about it?  I think splitting the include paths
> and the .so file names makes users (i.e. the application programs)
> aware that it is two libraries.
> 
> Splitting the git repositories doesn'nt really buy us anything apart
> from yet another git checkout/update/configure/make/... that needs to be
> executed.

The only compelling argument that I can find to support the split are
releases. You can make release of the two libraries independently, in
case that this is one critical bug in one of the part.

However, I agree that we can do this in the future.

> If at some future point we want to split the repositories, it will not
> incur any changes to the application programs like openbsc, as they
> already check for two different pkgconfig etc.

I'll resend the patches with this new approach, putting all GSM-specific
stuff under a directory called libgsm inside libosmocore.

I can send patches to rename vty to libvty, and codec to libcodec (for
consistency with the naming approach in openbsc) if you like the idea.



From laforge at gnumonks.org  Sat Mar 19 20:25:14 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Sat, 19 Mar 2011 21:25:14 +0100
Subject: [PATCH 0/2] split libosmocore library (to create libosmo-gsm)
In-Reply-To: <4D85079D.3080908@gnumonks.org>
References: <4D8275EA.9060004@gnumonks.org>
	<AANLkTi=sSyX-=T6_74RM2TJQzmj4A35aKvfq67eUkWhh@mail.gmail.com>
	<20110318115858.GA18597@sunbeam.hmw-consulting.de>
	<4D85079D.3080908@gnumonks.org>
Message-ID: <20110319202513.GE14686@sunbeam.hmw-consulting.de>

Hi Pablo,

On Sat, Mar 19, 2011 at 08:44:29PM +0100, Pablo Neira Ayuso wrote:
> > If at some future point we want to split the repositories, it will not
> > incur any changes to the application programs like openbsc, as they
> > already check for two different pkgconfig etc.
> 
> I'll resend the patches with this new approach, putting all GSM-specific
> stuff under a directory called libgsm inside libosmocore.
ok, thanks

> I can send patches to rename vty to libvty, and codec to libcodec (for
> consistency with the naming approach in openbsc) if you like the idea.

I think the subdirectory-naming doesn't really matter that much in libosmocore,
in OpenBSC I made it simply to distinguish between 'libbsc' and
'osmo-bsc' which both have BSC in the name.

Thanks in advance,
	Haradl
-- 
- Harald Welte <laforge at gnumonks.org>          	        http://gnumonks.org/
============================================================================
We all know Linux is great...it does infinite loops in 5 seconds. -- Linus



From pablo at gnumonks.org  Thu Mar 17 21:08:48 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Thu, 17 Mar 2011 22:08:48 +0100
Subject: [PATCH] openbsc: build: add new library dependency libosmo-gsm
Message-ID: <4D827860.4010304@gnumonks.org>

A non-text attachment was scrubbed...
Name: openbsc-uses-libosmogsm.patch
Type: text/x-patch
Size: 13357 bytes
Desc: not available
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110317/c525ef0b/attachment.bin>

From 246tnt at gmail.com  Thu Mar 17 21:15:25 2011
From: 246tnt at gmail.com (Sylvain Munaut)
Date: Thu, 17 Mar 2011 22:15:25 +0100
Subject: [PATCH 1/2] libosmocore: remove GSM-specific functions (they now
	belong to libosmo-gsm)
In-Reply-To: <4D8276A8.8060007@gnumonks.org>
References: <4D8276A8.8060007@gnumonks.org>
Message-ID: <AANLkTi=QOL6TddpW_OJdQ-swwktCW4TFcSPnrdhM62et@mail.gmail.com>

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



From pablo at gnumonks.org  Thu Mar 17 21:29:23 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Thu, 17 Mar 2011 22:29:23 +0100
Subject: [PATCH 1/2] libosmocore: remove GSM-specific functions (they
	now belong to libosmo-gsm)
In-Reply-To: <AANLkTi=QOL6TddpW_OJdQ-swwktCW4TFcSPnrdhM62et@mail.gmail.com>
References: <4D8276A8.8060007@gnumonks.org>
	<AANLkTi=QOL6TddpW_OJdQ-swwktCW4TFcSPnrdhM62et@mail.gmail.com>
Message-ID: <4D827D33.2080908@gnumonks.org>

Hi Sylvain,

On 17/03/11 22:15, Sylvain Munaut wrote:
> 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).

So you're proposing that this should go back to libosmocore, right?

> 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' ?)

I started with this split, but we can continue with more splits, of
course. We can put these into libosmo-utils (or libosmo-base), I don't
mind the name.

> 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 / ...)

Thanks, I'll make follow-up patches for that once these have been
applied (I'm trying not to mix things by splitting things in logical
changes, to make review easier).



From laforge at netfilter.org  Fri Mar 18 11:49:59 2011
From: laforge at netfilter.org (Harald Welte)
Date: Fri, 18 Mar 2011 12:49:59 +0100
Subject: [PATCH 1/2] libosmocore: remove GSM-specific functions (they
	now belong to libosmo-gsm)
In-Reply-To: <4D827D33.2080908@gnumonks.org>
References: <4D8276A8.8060007@gnumonks.org>
	<AANLkTi=QOL6TddpW_OJdQ-swwktCW4TFcSPnrdhM62et@mail.gmail.com>
	<4D827D33.2080908@gnumonks.org>
Message-ID: <20110318114959.GY18597@sunbeam.hmw-consulting.de>

Hi all,

On Thu, Mar 17, 2011 at 10:29:23PM +0100, Pablo Neira Ayuso wrote:
> > 
> > gsmtap is a misnomer, but we now use it for TETRA as well ...
> > crc16 possibly common as well (altough not sure).
> 
> So you're proposing that this should go back to libosmocore, right?

Yes, I think those two we can keep in libosmocore for now.

> > 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' ?)
> 
> I started with this split, but we can continue with more splits, of
> course. We can put these into libosmo-utils (or libosmo-base), I don't
> mind the name.

I think we should avoid having too much libraries, too.  A general split
of "this is really GSM/GPRS/EDGE/3G related" and "this is common system-level
code like select/timer/msgb handling" makes sense.  But going even further
is probably not worth it, otherwise we end up having too many libraries.

Also, building all of the libraries from a single source repository (like we
now build libosmovty as part of the libosmocore.git) may be the right approach.

Having to clone + update lots of different repositories just makes development
and compilation fort he users more difficult.

> > 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 / ...)
> 
> Thanks, I'll make follow-up patches for that once these have been
> applied (I'm trying not to mix things by splitting things in logical
> changes, to make review easier).

I agree to both:
* move include files from include/osmocore/8 to include/osmocom/...
* that it is good to do this in separate patches.  

-- 
- Harald Welte <laforge at netfilter.org>                 http://netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie



From pablo at gnumonks.org  Thu Mar 17 22:27:45 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Thu, 17 Mar 2011 23:27:45 +0100
Subject: [PATCH] osmocom-bb: build: use new libosmo-gsm library
Message-ID: <4D828AE1.3060900@gnumonks.org>

This patch requires the appropriate git-subtree magic to include the new
proposed libosmo-gsm into osmocom-bb (as it happens with libosmocore).
-------------- next part --------------
A non-text attachment was scrubbed...
Name: osmocom-bb-uses-libosmogsm.patch
Type: text/x-patch
Size: 5308 bytes
Desc: not available
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110317/ee47389d/attachment.bin>

From ravi.varun00 at gmail.com  Fri Mar 18 13:30:55 2011
From: ravi.varun00 at gmail.com (Ravi Shankar)
Date: Fri, 18 Mar 2011 19:00:55 +0530
Subject: phone not getting attached after authorize command..
Message-ID: <AANLkTinRVFX_bx7hB4aqsLEHZL4EC701t8fxSnHFWGAw@mail.gmail.com>

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.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110318/5ce8eb4f/attachment.htm>

From holger at freyther.de  Fri Mar 18 13:53:23 2011
From: holger at freyther.de (Holger Hans Peter Freyther)
Date: Fri, 18 Mar 2011 14:53:23 +0100
Subject: phone not getting attached after authorize command..
In-Reply-To: <AANLkTinRVFX_bx7hB4aqsLEHZL4EC701t8fxSnHFWGAw@mail.gmail.com>
References: <AANLkTinRVFX_bx7hB4aqsLEHZL4EC701t8fxSnHFWGAw@mail.gmail.com>
Message-ID: <4D8363D3.1030405@freyther.de>

On 03/18/2011 02:30 PM, Ravi Shankar wrote:
> Please help me out...

> Subscriber not attached.

attach the subscriber?



From laforge at gnumonks.org  Sun Mar 20 09:33:36 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Sun, 20 Mar 2011 10:33:36 +0100
Subject: phone not getting attached after authorize command..
In-Reply-To: <AANLkTinRVFX_bx7hB4aqsLEHZL4EC701t8fxSnHFWGAw@mail.gmail.com>
References: <AANLkTinRVFX_bx7hB4aqsLEHZL4EC701t8fxSnHFWGAw@mail.gmail.com>
Message-ID: <20110320093336.GH14686@sunbeam.hmw-consulting.de>

On Fri, Mar 18, 2011 at 07:00:55PM +0530, Ravi Shankar wrote:
> Please help me out...
> 
> After authorization command through hlr,whenever I try sending sms or call
> through command line it says
> 
> Subscriber not attached.

i.e. your subscriber did not perform a location update yet, and is thus
unknown in the network.

-- 
- Harald Welte <laforge at gnumonks.org>          	        http://gnumonks.org/
============================================================================
We all know Linux is great...it does infinite loops in 5 seconds. -- Linus



From openbsc at wehrle.it  Fri Mar 18 22:01:47 2011
From: openbsc at wehrle.it (Dennis Wehrle)
Date: Fri, 18 Mar 2011 23:01:47 +0100
Subject: sms bugfix
Message-ID: <4D83D64B.30500@wehrle.it>

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


-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: sms_openbsc.patch
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110318/2e3bdd2c/attachment.ksh>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: sms_lib.patch
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110318/2e3bdd2c/attachment-0001.ksh>

From holger at freyther.de  Sat Mar 19 00:54:58 2011
From: holger at freyther.de (Holger Hans Peter Freyther)
Date: Sat, 19 Mar 2011 01:54:58 +0100
Subject: sms bugfix
In-Reply-To: <4D83D64B.30500@wehrle.it>
References: <4D83D64B.30500@wehrle.it>
Message-ID: <4D83FEE2.3070703@freyther.de>

On 03/18/2011 11:01 PM, Dennis Wehrle wrote:
> Hello
> 

Hi Dennis,

thank you very much for your patch. There are some formal issues with the
patch and it would be nice if you could resolve them.


* In general we don't keep commented out code around, please remove it.
* We avoid the // comments.
* When introducing a new function that has known static linkage please
  use a namespace, e.g. not get_octlet_length but at least
  gsm_get_octet_length or put in 7bit as well.

Besides that your patch looks nice, but I do have two concerns. Your 160 char
limit assumes the default GSM alphabet? In the future we might be able to
encode and decode from different (e.g. chinese/unicode) alphabet. The same
concern is for the new code in db.c that handles things specially. It would be
nice if all of this could be hidden in libosmocore or such.

cheers
	holger



From openbsc at wehrle.it  Mon Mar 21 12:03:23 2011
From: openbsc at wehrle.it (Dennis Wehrle)
Date: Mon, 21 Mar 2011 13:03:23 +0100
Subject: sms bugfix
In-Reply-To: <4D83FEE2.3070703@freyther.de>
References: <4D83D64B.30500@wehrle.it> <4D83FEE2.3070703@freyther.de>
Message-ID: <4D873E8B.5050905@wehrle.it>

Hi Holger

On 19.03.2011 01:54, Holger Hans Peter Freyther wrote:
> On 03/18/2011 11:01 PM, Dennis Wehrle wrote:
>> Hello
>>
> Hi Dennis,
>
> thank you very much for your patch. There are some formal issues with the
> patch and it would be nice if you could resolve them.

sure ;-)

>
> * In general we don't keep commented out code around, please remove it.
> * We avoid the // comments.

Can you explain why? (just for my interest)

> * When introducing a new function that has known static linkage please
>    use a namespace, e.g. not get_octlet_length but at least
>    gsm_get_octet_length or put in 7bit as well.
>
> Besides that your patch looks nice, but I do have two concerns. Your 160 char
> limit assumes the default GSM alphabet? In the future we might be able to
> encode and decode from different (e.g. chinese/unicode) alphabet. The same
> concern is for the new code in db.c that handles things specially. It would be
> nice if all of this could be hidden in libosmocore or such.

I have moved the septet length lookup to the gsm_utils.c. This function 
looks for characters defined at the "GSM 7bit default alphabet extension 
table" (GSM 03.38 6.2.1.1) which needs two septets. These characters 
are: ^ | ? { } [ ] ~ \

> cheers
> 	holger
>

Best Regards
Dennis
-------------- next part --------------
A non-text attachment was scrubbed...
Name: sms_lib.patch
Type: text/x-patch
Size: 3163 bytes
Desc: not available
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110321/84670314/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: sms_openbsc.patch
Type: text/x-patch
Size: 3064 bytes
Desc: not available
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110321/84670314/attachment-0001.bin>

From pablo at gnumonks.org  Tue Mar 22 11:24:36 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Tue, 22 Mar 2011 12:24:36 +0100
Subject: sms bugfix
In-Reply-To: <4D873E8B.5050905@wehrle.it>
References: <4D83D64B.30500@wehrle.it> <4D83FEE2.3070703@freyther.de>
	<4D873E8B.5050905@wehrle.it>
Message-ID: <4D8886F4.1070600@gnumonks.org>

On 21/03/11 13:03, Dennis Wehrle wrote:
> Hi Holger
> 
> On 19.03.2011 01:54, Holger Hans Peter Freyther wrote:
>> On 03/18/2011 11:01 PM, Dennis Wehrle wrote:
>>> Hello
>>>
>> Hi Dennis,
>>
>> thank you very much for your patch. There are some formal issues with the
>> patch and it would be nice if you could resolve them.
> 
> sure ;-)
> 
>>
>> * In general we don't keep commented out code around, please remove it.
>> * We avoid the // comments.
> 
> Can you explain why? (just for my interest)

This is a bad practise. Leaving code that has been commented is not of
any help, it distracts the attention of the reader (who would wonder why
it's still there). On the other hand, if the intention is to track
changes, the SCM already does this for you, with it it's easy to see
what code was removed and added along time. If the intention to leave
that code commented to remark any special (or tricky) case, better add
some comment on that (my criteria usually is to document special cases
that I would even forget myself).

BTW, adding a short explanation to the patch also helps a lot to apply
them with git-am.



From openbsc at wehrle.it  Tue Mar 22 17:46:28 2011
From: openbsc at wehrle.it (Dennis Wehrle)
Date: Tue, 22 Mar 2011 18:46:28 +0100
Subject: sms bugfix
In-Reply-To: <4D8886F4.1070600@gnumonks.org>
References: <4D83D64B.30500@wehrle.it>
	<4D83FEE2.3070703@freyther.de>	<4D873E8B.5050905@wehrle.it>
	<4D8886F4.1070600@gnumonks.org>
Message-ID: <4D88E074.7090501@wehrle.it>

Hi Pablo

>>> * In general we don't keep commented out code around, please remove it.
>>> * We avoid the // comments.
>> Can you explain why? (just for my interest)
> This is a bad practise. Leaving code that has been commented is not of
> any help, it distracts the attention of the reader (who would wonder why
> it's still there). On the other hand, if the intention is to track
> changes, the SCM already does this for you, with it it's easy to see
> what code was removed and added along time. If the intention to leave
> that code commented to remark any special (or tricky) case, better add
> some comment on that (my criteria usually is to document special cases
> that I would even forget myself).

Sry for the misunderstanding question, but my question was why the "//" 
comments are not used.

> BTW, adding a short explanation to the patch also helps a lot to apply
> them with git-am.

Thx for this hint. The patches were created with the command "git diff 
HEAD > sms_openbsc.patch". But now i know that was not the correct way. 
Now i have created a branch, commited the changes (with a comment) and 
created the patch with "git format-patch master --stdout > 
sms_openbsc.patch".

Enclosed are the new patches.

Best Regards
Dennis
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: sms_openbsc.patch
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110322/c07d3998/attachment.ksh>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: sms_lib.patch
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110322/c07d3998/attachment-0001.ksh>

From 246tnt at gmail.com  Wed Mar 23 08:15:23 2011
From: 246tnt at gmail.com (Sylvain Munaut)
Date: Wed, 23 Mar 2011 09:15:23 +0100
Subject: sms bugfix
In-Reply-To: <4D88E074.7090501@wehrle.it>
References: <4D83D64B.30500@wehrle.it> <4D83FEE2.3070703@freyther.de>
	<4D873E8B.5050905@wehrle.it> <4D8886F4.1070600@gnumonks.org>
	<4D88E074.7090501@wehrle.it>
Message-ID: <AANLkTikyf=QiKs11JRah=6cchoJXXQn3Dsftv9gihL=-@mail.gmail.com>

Hi,

> Sry for the misunderstanding question, but my question was why the "//"
> comments are not used.

Consistency I guess.

We try to stick to the kernel coding style ( see
linux/Documentation/CodingStyle ), which states:

<quote>
Linux style for comments is the C89 "/* ... */" style.
Don't use C99-style "// ..." comments.
</quote>


Cheers,

    Sylvain



From holger at freyther.de  Thu Mar 31 11:04:19 2011
From: holger at freyther.de (Holger Hans Peter Freyther)
Date: Thu, 31 Mar 2011 13:04:19 +0200
Subject: sms bugfix
In-Reply-To: <4D88E074.7090501@wehrle.it>
References: <4D83D64B.30500@wehrle.it>	<4D83FEE2.3070703@freyther.de>	<4D873E8B.5050905@wehrle.it>	<4D8886F4.1070600@gnumonks.org>
	<4D88E074.7090501@wehrle.it>
Message-ID: <4D945FB3.5090905@freyther.de>

On 03/22/2011 06:46 PM, Dennis Wehrle wrote:

> 
> Enclosed are the new patches.

Hi Dennis,

sorry for the delay and thanks a lot for your patch. Do you feel like adding a
test case to the libosmocore/tests/sms/sms_test.c?

thanks a lot
	holger



From kobayashi_maru at onlinehome.de  Sat Mar 19 10:16:41 2011
From: kobayashi_maru at onlinehome.de (kobayashi_maru at onlinehome.de)
Date: Sat, 19 Mar 2011 11:16:41 +0100 (CET)
Subject: whats up with my multidrop?
Message-ID: <1533702597.523213.1300529801167.JavaMail.tomcat55@mrmseu1.kundenserver.de>

An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110319/a0dfe873/attachment.htm>
-------------- next part --------------
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.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: scr.jpg
Type: image/jpeg
Size: 233745 bytes
Desc: not available
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110319/a0dfe873/attachment.jpg>

From pablo at gnumonks.org  Tue Mar 22 11:11:23 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Tue, 22 Mar 2011 12:11:23 +0100
Subject: [PATCH 0/3] reorganization of GSM-specific stuff and header files
Message-ID: <20110322110705.25850.70579.stgit@decadence>

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




From pablo at gnumonks.org  Tue Mar 22 12:33:57 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Tue, 22 Mar 2011 13:33:57 +0100
Subject: [PATCH 0/3] reorganization of GSM-specific stuff and header files
In-Reply-To: <20110322110705.25850.70579.stgit@decadence>
References: <20110322110705.25850.70579.stgit@decadence>
Message-ID: <4D889735.6000605@gnumonks.org>

On 22/03/11 12:11, Pablo Neira Ayuso wrote:
> 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!

Apart from the stupid spam mark from my smtp server. I've found one
problem with these patchset, please hold on with these, I'll resend this
along today.



From holger at freyther.de  Tue Mar 22 13:18:31 2011
From: holger at freyther.de (Holger Hans Peter Freyther)
Date: Tue, 22 Mar 2011 14:18:31 +0100
Subject: [PATCH 0/3] reorganization of GSM-specific stuff and header files
In-Reply-To: <20110322110705.25850.70579.stgit@decadence>
References: <20110322110705.25850.70579.stgit@decadence>
Message-ID: <4D88A1A7.6080108@freyther.de>

On 03/22/2011 12:11 PM, Pablo Neira Ayuso wrote:
> This patchset includes:

> Please, apply!

Unrelated to the current patches (and no showstopper or such). If you use git
format-patch to create the patch set you could pass -M to detect renames, this
might or might not reduce the diff to the changes in the configure.ac and
Makefile.am file.

cheers
	holger



From pablo at gnumonks.org  Tue Mar 22 13:49:35 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Tue, 22 Mar 2011 14:49:35 +0100
Subject: [PATCH 0/3] reorganization of GSM-specific stuff and header files
In-Reply-To: <4D88A1A7.6080108@freyther.de>
References: <20110322110705.25850.70579.stgit@decadence>
	<4D88A1A7.6080108@freyther.de>
Message-ID: <4D88A8EF.2050009@gnumonks.org>

On 22/03/11 14:18, Holger Hans Peter Freyther wrote:
> On 03/22/2011 12:11 PM, Pablo Neira Ayuso wrote:
>> This patchset includes:
> 
>> Please, apply!
> 
> Unrelated to the current patches (and no showstopper or such). If you use git
> format-patch to create the patch set you could pass -M to detect renames, this
> might or might not reduce the diff to the changes in the configure.ac and
> Makefile.am file.

thanks, I didn't know this option. This will help to reduce the workload
on reviewing this indeed.



From pablo at gnumonks.org  Tue Mar 22 11:34:10 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Tue, 22 Mar 2011 12:34:10 +0100
Subject: [PATCH 0/2] use libosmogsm and new header file paths
Message-ID: <20110322113312.28117.73236.stgit@decadence>

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



From pablo at gnumonks.org  Tue Mar 22 11:34:32 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Tue, 22 Mar 2011 12:34:32 +0100
Subject: [PATCH 1/2] src: add new library dependency libosmogsm
In-Reply-To: <20110322113312.28117.73236.stgit@decadence>
References: <20110322113312.28117.73236.stgit@decadence>
Message-ID: <20110322113432.28117.69272.stgit@decadence>

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
osmocore/gsm/* location.

Signed-off-by: Pablo Neira Ayuso <pablo at gnumonks.org>
---
 openbsc/configure.in                      |    1 +
 openbsc/include/openbsc/abis_nm.h         |    4 ++--
 openbsc/include/openbsc/abis_rsl.h        |    2 +-
 openbsc/include/openbsc/bsc_nat.h         |    2 +-
 openbsc/include/openbsc/gprs_bssgp.h      |    2 +-
 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       |    4 ++--
 openbsc/include/openbsc/gsm_data.h        |    8 ++++----
 openbsc/include/openbsc/mncc.h            |    2 +-
 openbsc/src/Makefile.am                   |    4 ++--
 openbsc/src/gprs/Makefile.am              |    4 ++--
 openbsc/src/ipaccess/Makefile.am          |    4 ++--
 openbsc/src/ipaccess/ipaccess-proxy.c     |    2 +-
 openbsc/src/ipaccess/network_listen.c     |    4 ++--
 openbsc/src/libabis/Makefile.am           |    4 ++--
 openbsc/src/libabis/e1_input_vty.c        |    2 +-
 openbsc/src/libabis/input/hsl.c           |    2 +-
 openbsc/src/libabis/input/ipaccess.c      |    2 +-
 openbsc/src/libbsc/Makefile.am            |    4 ++--
 openbsc/src/libbsc/abis_nm.c              |    2 +-
 openbsc/src/libbsc/abis_nm_vty.c          |    2 +-
 openbsc/src/libbsc/abis_om2000.c          |    2 +-
 openbsc/src/libbsc/abis_om2000_vty.c      |    2 +-
 openbsc/src/libbsc/abis_rsl.c             |    6 +++---
 openbsc/src/libbsc/bsc_api.c              |    2 +-
 openbsc/src/libbsc/bsc_init.c             |    2 +-
 openbsc/src/libbsc/bsc_vty.c              |    2 +-
 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/gsm_04_08_utils.c      |    2 +-
 openbsc/src/libbsc/handover_decision.c    |    2 +-
 openbsc/src/libbsc/handover_logic.c       |    2 +-
 openbsc/src/libcommon/Makefile.am         |    4 ++--
 openbsc/src/libcommon/gsm_data.c          |    2 +-
 openbsc/src/libcommon/socket.c            |    2 +-
 openbsc/src/libgb/Makefile.am             |    2 +-
 openbsc/src/libgb/gprs_bssgp.c            |    2 +-
 openbsc/src/libgb/gprs_bssgp_util.c       |    2 +-
 openbsc/src/libgb/gprs_bssgp_vty.c        |    2 +-
 openbsc/src/libgb/gprs_ns.c               |    2 +-
 openbsc/src/libgb/gprs_ns_vty.c           |    2 +-
 openbsc/src/libmgcp/Makefile.am           |    2 +-
 openbsc/src/libmsc/Makefile.am            |    2 +-
 openbsc/src/libmsc/auth.c                 |    2 +-
 openbsc/src/libmsc/gsm_04_08.c            |    8 ++++----
 openbsc/src/libmsc/gsm_04_11.c            |    4 ++--
 openbsc/src/libmsc/gsm_04_80.c            |    6 +++---
 openbsc/src/libmsc/mncc_sock.c            |    2 +-
 openbsc/src/libmsc/vty_interface_layer3.c |    2 +-
 openbsc/src/libtrau/Makefile.am           |    2 +-
 openbsc/src/osmo-bsc/Makefile.am          |    4 ++--
 openbsc/src/osmo-bsc_mgcp/Makefile.am     |    4 ++--
 openbsc/src/osmo-bsc_nat/Makefile.am      |    4 ++--
 openbsc/src/osmo-nitb/Makefile.am         |    6 +++---
 openbsc/src/utils/Makefile.am             |    4 ++--
 openbsc/src/utils/bs11_config.c           |    2 +-
 openbsc/tests/channel/Makefile.am         |    4 ++--
 openbsc/tests/db/Makefile.am              |    4 ++--
 openbsc/tests/gsm0408/Makefile.am         |    4 ++--
 65 files changed, 95 insertions(+), 94 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..01a6f59 100644
--- a/openbsc/include/openbsc/abis_rsl.h
+++ b/openbsc/include/openbsc/abis_rsl.h
@@ -22,7 +22,7 @@
 #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>
 
diff --git a/openbsc/include/openbsc/bsc_nat.h b/openbsc/include/openbsc/bsc_nat.h
index f74cae2..cf57143 100644
--- a/openbsc/include/openbsc/bsc_nat.h
+++ b/openbsc/include/openbsc/bsc_nat.h
@@ -32,7 +32,7 @@
 #include <osmocore/write_queue.h>
 #include <osmocore/rate_ctr.h>
 #include <osmocore/statistics.h>
-#include <osmocore/protocol/gsm_04_08.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
 
 #include <regex.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_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..fadee2f 100644
--- a/openbsc/include/openbsc/gsm_04_80.h
+++ b/openbsc/include/openbsc/gsm_04_80.h
@@ -2,8 +2,8 @@
 #define _GSM_04_80_H
 
 #include <osmocore/msgb.h>
-#include <osmocore/protocol/gsm_04_80.h>
-#include <osmocore/gsm0480.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..a25a97f 100644
--- a/openbsc/include/openbsc/gsm_data.h
+++ b/openbsc/include/openbsc/gsm_data.h
@@ -49,14 +49,14 @@ enum gsm_chreq_reason_t {
 #include <openbsc/rest_octets.h>
 #include <openbsc/mncc.h>
 
-#include <osmocore/tlv.h>
+#include <osmocom/gsm/tlv.h>
 #include <osmocore/bitvec.h>
 #include <osmocore/statistics.h>
-#include <osmocore/gsm_utils.h>
+#include <osmocom/gsm/gsm_utils.h>
 #include <osmocore/utils.h>
-#include <osmocore/rxlev_stat.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/mncc.h b/openbsc/include/openbsc/mncc.h
index e514c19..d40385d 100644
--- a/openbsc/include/openbsc/mncc.h
+++ b/openbsc/include/openbsc/mncc.h
@@ -25,7 +25,7 @@
 #define _MNCC_H
 
 #include <osmocore/linuxlist.h>
-#include <osmocore/mncc.h>
+#include <osmocom/gsm/mncc.h>
 
 #include <stdint.h>
 
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/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-proxy.c b/openbsc/src/ipaccess/ipaccess-proxy.c
index 2dc1b2f..1dc6834 100644
--- a/openbsc/src/ipaccess/ipaccess-proxy.c
+++ b/openbsc/src/ipaccess/ipaccess-proxy.c
@@ -40,7 +40,7 @@
 
 #include <openbsc/gsm_data.h>
 #include <osmocore/select.h>
-#include <osmocore/tlv.h>
+#include <osmocom/gsm/tlv.h>
 #include <osmocore/msgb.h>
 #include <openbsc/debug.h>
 #include <openbsc/ipaccess.h>
diff --git a/openbsc/src/ipaccess/network_listen.c b/openbsc/src/ipaccess/network_listen.c
index aaf7c97..1253e2a 100644
--- a/openbsc/src/ipaccess/network_listen.c
+++ b/openbsc/src/ipaccess/network_listen.c
@@ -30,8 +30,8 @@
 
 #include <osmocore/talloc.h>
 #include <osmocore/timer.h>
-#include <osmocore/rxlev_stat.h>
-#include <osmocore/gsm48_ie.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_vty.c b/openbsc/src/libabis/e1_input_vty.c
index 66bf655..b051a88 100644
--- a/openbsc/src/libabis/e1_input_vty.c
+++ b/openbsc/src/libabis/e1_input_vty.c
@@ -31,7 +31,7 @@
 #include <openbsc/gsm_data.h>
 #include <openbsc/e1_input.h>
 #include <osmocore/utils.h>
-#include <osmocore/gsm_utils.h>
+#include <osmocom/gsm/gsm_utils.h>
 #include <osmocore/talloc.h>
 #include <openbsc/vty.h>
 #include <openbsc/debug.h>
diff --git a/openbsc/src/libabis/input/hsl.c b/openbsc/src/libabis/input/hsl.c
index 1afe82b..2fb97b5 100644
--- a/openbsc/src/libabis/input/hsl.c
+++ b/openbsc/src/libabis/input/hsl.c
@@ -44,7 +44,7 @@
 #include <arpa/inet.h>
 
 #include <osmocore/select.h>
-#include <osmocore/tlv.h>
+#include <osmocom/gsm/tlv.h>
 #include <osmocore/msgb.h>
 #include <openbsc/debug.h>
 #include <openbsc/gsm_data.h>
diff --git a/openbsc/src/libabis/input/ipaccess.c b/openbsc/src/libabis/input/ipaccess.c
index dcf8d1a..166d42b 100644
--- a/openbsc/src/libabis/input/ipaccess.c
+++ b/openbsc/src/libabis/input/ipaccess.c
@@ -34,7 +34,7 @@
 #include <arpa/inet.h>
 
 #include <osmocore/select.h>
-#include <osmocore/tlv.h>
+#include <osmocom/gsm/tlv.h>
 #include <osmocore/msgb.h>
 #include <osmocore/talloc.h>
 #include <openbsc/debug.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..cdb7409 100644
--- a/openbsc/src/libbsc/abis_nm.c
+++ b/openbsc/src/libbsc/abis_nm.c
@@ -38,7 +38,7 @@
 #include <openbsc/gsm_data.h>
 #include <openbsc/debug.h>
 #include <osmocore/msgb.h>
-#include <osmocore/tlv.h>
+#include <osmocom/gsm/tlv.h>
 #include <osmocore/talloc.h>
 #include <openbsc/abis_nm.h>
 #include <openbsc/misdn.h>
diff --git a/openbsc/src/libbsc/abis_nm_vty.c b/openbsc/src/libbsc/abis_nm_vty.c
index 996a857..867897b 100644
--- a/openbsc/src/libbsc/abis_nm_vty.c
+++ b/openbsc/src/libbsc/abis_nm_vty.c
@@ -28,7 +28,7 @@
 
 #include <openbsc/gsm_data.h>
 #include <osmocore/msgb.h>
-#include <osmocore/tlv.h>
+#include <osmocom/gsm/tlv.h>
 #include <osmocore/talloc.h>
 #include <openbsc/debug.h>
 #include <openbsc/signal.h>
diff --git a/openbsc/src/libbsc/abis_om2000.c b/openbsc/src/libbsc/abis_om2000.c
index a5f5d4f..786871f 100644
--- a/openbsc/src/libbsc/abis_om2000.c
+++ b/openbsc/src/libbsc/abis_om2000.c
@@ -31,7 +31,7 @@
 #include <arpa/inet.h>
 
 #include <osmocore/msgb.h>
-#include <osmocore/tlv.h>
+#include <osmocom/gsm/tlv.h>
 #include <osmocore/talloc.h>
 #include <osmocore/utils.h>
 
diff --git a/openbsc/src/libbsc/abis_om2000_vty.c b/openbsc/src/libbsc/abis_om2000_vty.c
index cce4eb3..aabfe5b 100644
--- a/openbsc/src/libbsc/abis_om2000_vty.c
+++ b/openbsc/src/libbsc/abis_om2000_vty.c
@@ -28,7 +28,7 @@
 
 #include <openbsc/gsm_data.h>
 #include <osmocore/msgb.h>
-#include <osmocore/tlv.h>
+#include <osmocom/gsm/tlv.h>
 #include <osmocore/talloc.h>
 #include <openbsc/debug.h>
 #include <openbsc/signal.h>
diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c
index 9a4dc5b..cdb8e51 100644
--- a/openbsc/src/libbsc/abis_rsl.c
+++ b/openbsc/src/libbsc/abis_rsl.c
@@ -29,17 +29,17 @@
 
 #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>
 
diff --git a/openbsc/src/libbsc/bsc_api.c b/openbsc/src/libbsc/bsc_api.c
index 0f09aec..273e775 100644
--- a/openbsc/src/libbsc/bsc_api.c
+++ b/openbsc/src/libbsc/bsc_api.c
@@ -32,7 +32,7 @@
 #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>
 
diff --git a/openbsc/src/libbsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c
index 0072bb6..ecdc8b9 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>
diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c
index 1afaed3..bba72f2 100644
--- a/openbsc/src/libbsc/bsc_vty.c
+++ b/openbsc/src/libbsc/bsc_vty.c
@@ -35,7 +35,7 @@
 #include <openbsc/abis_nm.h>
 #include <openbsc/abis_om2000.h>
 #include <osmocore/utils.h>
-#include <osmocore/gsm_utils.h>
+#include <osmocom/gsm/gsm_utils.h>
 #include <openbsc/chan_alloc.h>
 #include <openbsc/meas_rep.h>
 #include <openbsc/db.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/gsm_04_08_utils.c b/openbsc/src/libbsc/gsm_04_08_utils.c
index 6d12cc0..ac04825 100644
--- a/openbsc/src/libbsc/gsm_04_08_utils.c
+++ b/openbsc/src/libbsc/gsm_04_08_utils.c
@@ -28,7 +28,7 @@
 #include <netinet/in.h>
 
 #include <osmocore/msgb.h>
-#include <osmocore/gsm48.h>
+#include <osmocom/gsm/gsm48.h>
 
 #include <openbsc/abis_rsl.h>
 #include <openbsc/debug.h>
diff --git a/openbsc/src/libbsc/handover_decision.c b/openbsc/src/libbsc/handover_decision.c
index d3f843a..5154653 100644
--- a/openbsc/src/libbsc/handover_decision.c
+++ b/openbsc/src/libbsc/handover_decision.c
@@ -31,7 +31,7 @@
 #include <openbsc/signal.h>
 #include <osmocore/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..f23cf1a 100644
--- a/openbsc/src/libbsc/handover_logic.c
+++ b/openbsc/src/libbsc/handover_logic.c
@@ -31,7 +31,7 @@
 #include <osmocore/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>
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/gsm_data.c b/openbsc/src/libcommon/gsm_data.c
index b2c52e4..19f2c94 100644
--- a/openbsc/src/libcommon/gsm_data.c
+++ b/openbsc/src/libcommon/gsm_data.c
@@ -28,7 +28,7 @@
 
 #include <osmocore/linuxlist.h>
 #include <osmocore/talloc.h>
-#include <osmocore/gsm_utils.h>
+#include <osmocom/gsm/gsm_utils.h>
 #include <osmocore/statistics.h>
 
 #include <openbsc/gsm_data.h>
diff --git a/openbsc/src/libcommon/socket.c b/openbsc/src/libcommon/socket.c
index 47778e7..363c6fe 100644
--- a/openbsc/src/libcommon/socket.c
+++ b/openbsc/src/libcommon/socket.c
@@ -34,7 +34,7 @@
 #include <arpa/inet.h>
 
 #include <osmocore/select.h>
-#include <osmocore/tlv.h>
+#include <osmocom/gsm/tlv.h>
 #include <osmocore/msgb.h>
 #include <openbsc/debug.h>
 #include <openbsc/gsm_data.h>
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..91c5d22 100644
--- a/openbsc/src/libgb/gprs_bssgp.c
+++ b/openbsc/src/libgb/gprs_bssgp.c
@@ -28,7 +28,7 @@
 #include <netinet/in.h>
 
 #include <osmocore/msgb.h>
-#include <osmocore/tlv.h>
+#include <osmocom/gsm/tlv.h>
 #include <osmocore/talloc.h>
 #include <osmocore/rate_ctr.h>
 
diff --git a/openbsc/src/libgb/gprs_bssgp_util.c b/openbsc/src/libgb/gprs_bssgp_util.c
index f8e3b56..548117a 100644
--- a/openbsc/src/libgb/gprs_bssgp_util.c
+++ b/openbsc/src/libgb/gprs_bssgp_util.c
@@ -25,7 +25,7 @@
 #include <netinet/in.h>
 
 #include <osmocore/msgb.h>
-#include <osmocore/tlv.h>
+#include <osmocom/gsm/tlv.h>
 #include <osmocore/talloc.h>
 
 #include <openbsc/debug.h>
diff --git a/openbsc/src/libgb/gprs_bssgp_vty.c b/openbsc/src/libgb/gprs_bssgp_vty.c
index 9ebd090..07af92a 100644
--- a/openbsc/src/libgb/gprs_bssgp_vty.c
+++ b/openbsc/src/libgb/gprs_bssgp_vty.c
@@ -28,7 +28,7 @@
 
 #include <openbsc/gsm_data.h>
 #include <osmocore/msgb.h>
-#include <osmocore/tlv.h>
+#include <osmocom/gsm/tlv.h>
 #include <osmocore/talloc.h>
 #include <osmocore/select.h>
 #include <osmocore/rate_ctr.h>
diff --git a/openbsc/src/libgb/gprs_ns.c b/openbsc/src/libgb/gprs_ns.c
index 5a8e358..facba35 100644
--- a/openbsc/src/libgb/gprs_ns.c
+++ b/openbsc/src/libgb/gprs_ns.c
@@ -60,7 +60,7 @@
 
 #include <openbsc/gsm_data.h>
 #include <osmocore/msgb.h>
-#include <osmocore/tlv.h>
+#include <osmocom/gsm/tlv.h>
 #include <osmocore/talloc.h>
 #include <osmocore/select.h>
 #include <osmocore/rate_ctr.h>
diff --git a/openbsc/src/libgb/gprs_ns_vty.c b/openbsc/src/libgb/gprs_ns_vty.c
index 39277fc..c649127 100644
--- a/openbsc/src/libgb/gprs_ns_vty.c
+++ b/openbsc/src/libgb/gprs_ns_vty.c
@@ -28,7 +28,7 @@
 
 #include <openbsc/gsm_data.h>
 #include <osmocore/msgb.h>
-#include <osmocore/tlv.h>
+#include <osmocom/gsm/tlv.h>
 #include <osmocore/talloc.h>
 #include <osmocore/select.h>
 #include <osmocore/rate_ctr.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/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/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c
index 2b61aa9..aa8434c 100644
--- a/openbsc/src/libmsc/gsm_04_08.c
+++ b/openbsc/src/libmsc/gsm_04_08.c
@@ -51,12 +51,12 @@
 #include <openbsc/osmo_msc.h>
 #include <osmocore/bitvec.h>
 
-#include <osmocore/gsm48.h>
-#include <osmocore/gsm0480.h>
-#include <osmocore/gsm_utils.h>
+#include <osmocom/gsm/gsm48.h>
+#include <osmocom/gsm/gsm0480.h>
+#include <osmocom/gsm/gsm_utils.h>
 #include <osmocore/msgb.h>
 #include <osmocore/talloc.h>
-#include <osmocore/tlv.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..2475593 100644
--- a/openbsc/src/libmsc/gsm_04_11.c
+++ b/openbsc/src/libmsc/gsm_04_11.c
@@ -33,14 +33,14 @@
 #include <netinet/in.h>
 
 #include <osmocore/msgb.h>
-#include <osmocore/tlv.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>
diff --git a/openbsc/src/libmsc/gsm_04_80.c b/openbsc/src/libmsc/gsm_04_80.c
index 494c319..4841912 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 <osmocom/gsm/gsm0480.h>
+#include <osmocom/gsm/gsm_utils.h>
 #include <osmocore/msgb.h>
-#include <osmocore/tlv.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/mncc_sock.c b/openbsc/src/libmsc/mncc_sock.c
index 2eef7c8..43ad136 100644
--- a/openbsc/src/libmsc/mncc_sock.c
+++ b/openbsc/src/libmsc/mncc_sock.c
@@ -32,7 +32,7 @@
 
 #include <osmocore/talloc.h>
 #include <osmocore/select.h>
-#include <osmocore/protocol/gsm_04_08.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
 
 #include <openbsc/debug.h>
 #include <openbsc/mncc.h>
diff --git a/openbsc/src/libmsc/vty_interface_layer3.c b/openbsc/src/libmsc/vty_interface_layer3.c
index a38d15b..add5b05 100644
--- a/openbsc/src/libmsc/vty_interface_layer3.c
+++ b/openbsc/src/libmsc/vty_interface_layer3.c
@@ -36,7 +36,7 @@
 #include <openbsc/gsm_04_11.h>
 #include <openbsc/e1_input.h>
 #include <openbsc/abis_nm.h>
-#include <osmocore/gsm_utils.h>
+#include <osmocom/gsm/gsm_utils.h>
 #include <osmocore/utils.h>
 #include <openbsc/db.h>
 #include <osmocore/talloc.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/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_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_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-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/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..acfbd3c 100644
--- a/openbsc/src/utils/bs11_config.c
+++ b/openbsc/src/utils/bs11_config.c
@@ -36,7 +36,7 @@
 #include <openbsc/gsm_data.h>
 #include <openbsc/abis_nm.h>
 #include <osmocore/msgb.h>
-#include <osmocore/tlv.h>
+#include <osmocom/gsm/tlv.h>
 #include <openbsc/debug.h>
 #include <osmocore/select.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/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




From pablo at gnumonks.org  Tue Mar 22 11:34:54 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Tue, 22 Mar 2011 12:34:54 +0100
Subject: [PATCH 2/2] src: include osmocom/core/* instead of osmocore/*
In-Reply-To: <20110322113312.28117.73236.stgit@decadence>
References: <20110322113312.28117.73236.stgit@decadence>
Message-ID: <20110322113454.28117.97211.stgit@decadence>

This patch uses the new include path for core features in
libosmocore.

Signed-off-by: Pablo Neira Ayuso <pablo at gnumonks.org>
---
 openbsc/include/openbsc/abis_rsl.h           |    2 +-
 openbsc/include/openbsc/bsc_msc.h            |    4 ++--
 openbsc/include/openbsc/bsc_nat.h            |   14 +++++++-------
 openbsc/include/openbsc/debug.h              |    4 ++--
 openbsc/include/openbsc/e1_input.h           |    6 +++---
 openbsc/include/openbsc/gb_proxy.h           |    2 +-
 openbsc/include/openbsc/gprs_gmm.h           |    2 +-
 openbsc/include/openbsc/gprs_ns.h            |    8 ++++----
 openbsc/include/openbsc/gsm_04_80.h          |    2 +-
 openbsc/include/openbsc/gsm_data.h           |    8 ++++----
 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               |    2 +-
 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/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/ipaccess-config.c       |    6 +++---
 openbsc/src/ipaccess/ipaccess-find.c         |    4 ++--
 openbsc/src/ipaccess/ipaccess-firmware.c     |    2 +-
 openbsc/src/ipaccess/ipaccess-proxy.c        |    6 +++---
 openbsc/src/ipaccess/network_listen.c        |    4 ++--
 openbsc/src/libabis/e1_input.c               |    8 ++++----
 openbsc/src/libabis/e1_input_vty.c           |    6 +++---
 openbsc/src/libabis/input/dahdi.c            |    6 +++---
 openbsc/src/libabis/input/hsl.c              |    6 +++---
 openbsc/src/libabis/input/ipaccess.c         |    6 +++---
 openbsc/src/libabis/input/lapd.c             |    8 ++++----
 openbsc/src/libabis/input/lapd.h             |    2 +-
 openbsc/src/libabis/input/misdn.c            |    6 +++---
 openbsc/src/libbsc/abis_nm.c                 |    4 ++--
 openbsc/src/libbsc/abis_nm_vty.c             |    4 ++--
 openbsc/src/libbsc/abis_om2000.c             |    6 +++---
 openbsc/src/libbsc/abis_om2000_vty.c         |    4 ++--
 openbsc/src/libbsc/abis_rsl.c                |    2 +-
 openbsc/src/libbsc/bsc_api.c                 |    2 +-
 openbsc/src/libbsc/bsc_init.c                |    2 +-
 openbsc/src/libbsc/bsc_msc.c                 |    4 ++--
 openbsc/src/libbsc/bsc_rll.c                 |    6 +++---
 openbsc/src/libbsc/bsc_vty.c                 |    6 +++---
 openbsc/src/libbsc/chan_alloc.c              |    2 +-
 openbsc/src/libbsc/e1_config.c               |    2 +-
 openbsc/src/libbsc/gsm_04_08_utils.c         |    2 +-
 openbsc/src/libbsc/gsm_subscriber_base.c     |    2 +-
 openbsc/src/libbsc/handover_decision.c       |    4 ++--
 openbsc/src/libbsc/handover_logic.c          |    4 ++--
 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/common_vty.c           |    2 +-
 openbsc/src/libcommon/debug.c                |    6 +++---
 openbsc/src/libcommon/gsm_data.c             |    6 +++---
 openbsc/src/libcommon/socket.c               |    6 +++---
 openbsc/src/libcommon/talloc_ctx.c           |    2 +-
 openbsc/src/libgb/gprs_bssgp.c               |    6 +++---
 openbsc/src/libgb/gprs_bssgp_util.c          |    4 ++--
 openbsc/src/libgb/gprs_bssgp_vty.c           |    8 ++++----
 openbsc/src/libgb/gprs_ns.c                  |    8 ++++----
 openbsc/src/libgb/gprs_ns_frgre.c            |    6 +++---
 openbsc/src/libgb/gprs_ns_vty.c              |    8 ++++----
 openbsc/src/libmgcp/mgcp_network.c           |    4 ++--
 openbsc/src/libmgcp/mgcp_protocol.c          |    6 +++---
 openbsc/src/libmgcp/mgcp_vty.c               |    2 +-
 openbsc/src/libmsc/db.c                      |    6 +++---
 openbsc/src/libmsc/gsm_04_08.c               |    6 +++---
 openbsc/src/libmsc/gsm_04_11.c               |    4 ++--
 openbsc/src/libmsc/gsm_04_80.c               |    2 +-
 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               |    4 ++--
 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    |    6 +++---
 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/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/mgcp_main.c        |    8 ++++----
 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/bsc_hack.c             |    6 +++---
 openbsc/src/utils/bs11_config.c              |    4 ++--
 openbsc/src/utils/rs232.c                    |    4 ++--
 openbsc/tests/channel/channel_test.c         |    2 +-
 openbsc/tests/mgcp/mgcp_test.c               |    2 +-
 121 files changed, 271 insertions(+), 271 deletions(-)

diff --git a/openbsc/include/openbsc/abis_rsl.h b/openbsc/include/openbsc/abis_rsl.h
index 01a6f59..e5f38c9 100644
--- a/openbsc/include/openbsc/abis_rsl.h
+++ b/openbsc/include/openbsc/abis_rsl.h
@@ -24,7 +24,7 @@
 
 #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 cf57143..e628925 100644
--- a/openbsc/include/openbsc/bsc_nat.h
+++ b/openbsc/include/openbsc/bsc_nat.h
@@ -25,13 +25,13 @@
 
 #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 <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_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/gsm_04_80.h b/openbsc/include/openbsc/gsm_04_80.h
index fadee2f..0a60652 100644
--- a/openbsc/include/openbsc/gsm_04_80.h
+++ b/openbsc/include/openbsc/gsm_04_80.h
@@ -1,7 +1,7 @@
 #ifndef _GSM_04_80_H
 #define _GSM_04_80_H
 
-#include <osmocore/msgb.h>
+#include <osmocom/core/msgb.h>
 #include <osmocom/gsm/protocol/gsm_04_80.h>
 #include <osmocom/gsm/gsm0480.h>
 
diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h
index a25a97f..4b3ec93 100644
--- a/openbsc/include/openbsc/gsm_data.h
+++ b/openbsc/include/openbsc/gsm_data.h
@@ -44,16 +44,16 @@ 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 <osmocom/gsm/tlv.h>
-#include <osmocore/bitvec.h>
-#include <osmocore/statistics.h>
+#include <osmocom/core/bitvec.h>
+#include <osmocom/core/statistics.h>
 #include <osmocom/gsm/gsm_utils.h>
-#include <osmocore/utils.h>
+#include <osmocom/core/utils.h>
 #include <osmocom/gsm/rxlev_stat.h>
 
 #include <osmocom/gsm/protocol/gsm_08_58.h>
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 d40385d..ed1bfd6 100644
--- a/openbsc/include/openbsc/mncc.h
+++ b/openbsc/include/openbsc/mncc.h
@@ -24,7 +24,7 @@
 #ifndef _MNCC_H
 #define _MNCC_H
 
-#include <osmocore/linuxlist.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/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/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 1dc6834..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 <osmocom/core/select.h>
 #include <osmocom/gsm/tlv.h>
-#include <osmocore/msgb.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 1253e2a..cf0a6dc 100644
--- a/openbsc/src/ipaccess/network_listen.c
+++ b/openbsc/src/ipaccess/network_listen.c
@@ -28,8 +28,8 @@
 
 #include <arpa/inet.h>
 
-#include <osmocore/talloc.h>
-#include <osmocore/timer.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/timer.h>
 #include <osmocom/gsm/rxlev_stat.h>
 #include <osmocom/gsm/gsm48_ie.h>
 
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 b051a88..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 <osmocom/core/utils.h>
 #include <osmocom/gsm/gsm_utils.h>
-#include <osmocore/talloc.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 2fb97b5..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 <osmocom/core/select.h>
 #include <osmocom/gsm/tlv.h>
-#include <osmocore/msgb.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 166d42b..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 <osmocom/core/select.h>
 #include <osmocom/gsm/tlv.h>
-#include <osmocore/msgb.h>
-#include <osmocore/talloc.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/abis_nm.c b/openbsc/src/libbsc/abis_nm.c
index cdb7409..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 <osmocom/core/msgb.h>
 #include <osmocom/gsm/tlv.h>
-#include <osmocore/talloc.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 867897b..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 <osmocom/core/msgb.h>
 #include <osmocom/gsm/tlv.h>
-#include <osmocore/talloc.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 786871f..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 <osmocom/core/msgb.h>
 #include <osmocom/gsm/tlv.h>
-#include <osmocore/talloc.h>
-#include <osmocore/utils.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 aabfe5b..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 <osmocom/core/msgb.h>
 #include <osmocom/gsm/tlv.h>
-#include <osmocore/talloc.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 cdb8e51..8cac832 100644
--- a/openbsc/src/libbsc/abis_rsl.c
+++ b/openbsc/src/libbsc/abis_rsl.c
@@ -41,7 +41,7 @@
 #include <openbsc/rtp_proxy.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 273e775..bbd9b58 100644
--- a/openbsc/src/libbsc/bsc_api.c
+++ b/openbsc/src/libbsc/bsc_api.c
@@ -34,7 +34,7 @@
 
 #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 ecdc8b9..127e9fb 100644
--- a/openbsc/src/libbsc/bsc_init.c
+++ b/openbsc/src/libbsc/bsc_init.c
@@ -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 bba72f2..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 <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/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 ac04825..1aab2ee 100644
--- a/openbsc/src/libbsc/gsm_04_08_utils.c
+++ b/openbsc/src/libbsc/gsm_04_08_utils.c
@@ -27,7 +27,7 @@
 #include <errno.h>
 #include <netinet/in.h>
 
-#include <osmocore/msgb.h>
+#include <osmocom/core/msgb.h>
 #include <osmocom/gsm/gsm48.h>
 
 #include <openbsc/abis_rsl.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 5154653..3b81dde 100644
--- a/openbsc/src/libbsc/handover_decision.c
+++ b/openbsc/src/libbsc/handover_decision.c
@@ -24,12 +24,12 @@
 #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 <osmocom/gsm/gsm_utils.h>
 
diff --git a/openbsc/src/libbsc/handover_logic.c b/openbsc/src/libbsc/handover_logic.c
index f23cf1a..ad79f8a 100644
--- a/openbsc/src/libbsc/handover_logic.c
+++ b/openbsc/src/libbsc/handover_logic.c
@@ -28,7 +28,7 @@
 #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 <osmocom/gsm/gsm_utils.h>
@@ -37,7 +37,7 @@
 #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/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 19f2c94..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 <osmocom/core/linuxlist.h>
+#include <osmocom/core/talloc.h>
 #include <osmocom/gsm/gsm_utils.h>
-#include <osmocore/statistics.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 363c6fe..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 <osmocom/core/select.h>
 #include <osmocom/gsm/tlv.h>
-#include <osmocore/msgb.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/gprs_bssgp.c b/openbsc/src/libgb/gprs_bssgp.c
index 91c5d22..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 <osmocom/core/msgb.h>
 #include <osmocom/gsm/tlv.h>
-#include <osmocore/talloc.h>
-#include <osmocore/rate_ctr.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 548117a..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 <osmocom/core/msgb.h>
 #include <osmocom/gsm/tlv.h>
-#include <osmocore/talloc.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 07af92a..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 <osmocom/core/msgb.h>
 #include <osmocom/gsm/tlv.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/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 facba35..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 <osmocom/core/msgb.h>
 #include <osmocom/gsm/tlv.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/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 c649127..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 <osmocom/core/msgb.h>
 #include <osmocom/gsm/tlv.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/debug.h>
 #include <openbsc/signal.h>
 #include <openbsc/gprs_ns.h>
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/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 aa8434c..695f43d 100644
--- a/openbsc/src/libmsc/gsm_04_08.c
+++ b/openbsc/src/libmsc/gsm_04_08.c
@@ -49,13 +49,13 @@
 #include <openbsc/silent_call.h>
 #include <openbsc/bsc_api.h>
 #include <openbsc/osmo_msc.h>
-#include <osmocore/bitvec.h>
+#include <osmocom/core/bitvec.h>
 
 #include <osmocom/gsm/gsm48.h>
 #include <osmocom/gsm/gsm0480.h>
 #include <osmocom/gsm/gsm_utils.h>
-#include <osmocore/msgb.h>
-#include <osmocore/talloc.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/talloc.h>
 #include <osmocom/gsm/tlv.h>
 
 void *tall_locop_ctx;
diff --git a/openbsc/src/libmsc/gsm_04_11.c b/openbsc/src/libmsc/gsm_04_11.c
index 2475593..0f8d7c2 100644
--- a/openbsc/src/libmsc/gsm_04_11.c
+++ b/openbsc/src/libmsc/gsm_04_11.c
@@ -32,7 +32,7 @@
 #include <time.h>
 #include <netinet/in.h>
 
-#include <osmocore/msgb.h>
+#include <osmocom/core/msgb.h>
 #include <osmocom/gsm/tlv.h>
 #include <openbsc/debug.h>
 #include <openbsc/gsm_data.h>
@@ -44,7 +44,7 @@
 #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 4841912..240bfb3 100644
--- a/openbsc/src/libmsc/gsm_04_80.c
+++ b/openbsc/src/libmsc/gsm_04_80.c
@@ -36,7 +36,7 @@
 
 #include <osmocom/gsm/gsm0480.h>
 #include <osmocom/gsm/gsm_utils.h>
-#include <osmocore/msgb.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 43ad136..576ed01 100644
--- a/openbsc/src/libmsc/mncc_sock.c
+++ b/openbsc/src/libmsc/mncc_sock.c
@@ -30,8 +30,8 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include <osmocore/talloc.h>
-#include <osmocore/select.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/select.h>
 #include <osmocom/gsm/protocol/gsm_04_08.h>
 
 #include <openbsc/debug.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 add5b05..8d6109b 100644
--- a/openbsc/src/libmsc/vty_interface_layer3.c
+++ b/openbsc/src/libmsc/vty_interface_layer3.c
@@ -29,7 +29,7 @@
 
 #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>
@@ -37,9 +37,9 @@
 #include <openbsc/e1_input.h>
 #include <openbsc/abis_nm.h>
 #include <osmocom/gsm/gsm_utils.h>
-#include <osmocore/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/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/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/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/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/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/bs11_config.c b/openbsc/src/utils/bs11_config.c
index acfbd3c..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 <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/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/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()




From pablo at gnumonks.org  Tue Mar 22 15:36:11 2011
From: pablo at gnumonks.org (pablo at gnumonks.org)
Date: Tue, 22 Mar 2011 16:36:11 +0100
Subject: [PATCH 0/2] [v2] reorganization of GSM-specific stuff and header files
Message-ID: <1300808173-12958-1-git-send-email-pablo@gnumonks.org>

From: Pablo Neira Ayuso <pablo at 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




From pablo at gnumonks.org  Tue Mar 22 15:36:12 2011
From: pablo at gnumonks.org (pablo at gnumonks.org)
Date: Tue, 22 Mar 2011 16:36:12 +0100
Subject: [PATCH 1/2] src: move GSM-specific functions to libosmogsm library
In-Reply-To: <1300808173-12958-1-git-send-email-pablo@gnumonks.org>
References: <1300808173-12958-1-git-send-email-pablo@gnumonks.org>
Message-ID: <1300808173-12958-2-git-send-email-pablo@gnumonks.org>

From: Pablo Neira Ayuso <pablo at gnumonks.org>

This patch moves the GSM-specific functions to the new library
libosmogsm which is provided by libosmocore.

I have also moved generate_backtrace() to backtrace.c instead
of gsm_utils.c, otherwise the timer and msgfile tests depend on
libosmogsm.

Signed-off-by: Pablo Neira Ayuso <pablo at gnumonks.org>
---
 Makefile.am                      |    2 +-
 configure.in                     |    2 +
 include/osmocore/Makefile.am     |    3 +-
 include/osmocore/backtrace.h     |    6 ++++
 include/osmocore/gsm_utils.h     |    1 -
 libosmogsm.pc.in                 |   11 ++++++++
 src/Makefile.am                  |   14 +++++-----
 src/backtrace.c                  |   50 ++++++++++++++++++++++++++++++++++++++
 src/gsm/Makefile.am              |   13 ++++++++++
 src/{ => gsm}/comp128.c          |    0
 src/{ => gsm}/gprs_cipher_core.c |    0
 src/{ => gsm}/gsm0480.c          |    0
 src/{ => gsm}/gsm0808.c          |    0
 src/{ => gsm}/gsm48.c            |    0
 src/{ => gsm}/gsm48_ie.c         |    0
 src/{ => gsm}/gsm_utils.c        |   23 -----------------
 src/{ => gsm}/rsl.c              |    0
 src/{ => gsm}/rxlev_stat.c       |    0
 src/{ => gsm}/tlv_parser.c       |    0
 src/panic.c                      |    1 +
 tests/sms/Makefile.am            |    2 +-
 tests/smscb/Makefile.am          |    2 +-
 tests/ussd/Makefile.am           |    2 +-
 23 files changed, 96 insertions(+), 36 deletions(-)
 create mode 100644 include/osmocore/backtrace.h
 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 (100%)
 rename src/{ => gsm}/gsm0480.c (100%)
 rename src/{ => gsm}/gsm0808.c (100%)
 rename src/{ => gsm}/gsm48.c (100%)
 rename src/{ => gsm}/gsm48_ie.c (100%)
 rename src/{ => gsm}/gsm_utils.c (96%)
 rename src/{ => gsm}/rsl.c (100%)
 rename src/{ => gsm}/rxlev_stat.c (100%)
 rename src/{ => gsm}/tlv_parser.c (100%)

diff --git a/Makefile.am b/Makefile.am
index 93254e8..e391de8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include
 SUBDIRS = include src tests
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libosmocore.pc libosmocodec.pc libosmovty.pc
+pkgconfig_DATA = libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc
 
 BUILT_SOURCES = $(top_srcdir)/.version
 $(top_srcdir)/.version:
diff --git a/configure.in b/configure.in
index 165cecb..b572bf4 100644
--- a/configure.in
+++ b/configure.in
@@ -101,6 +101,7 @@ AC_OUTPUT(
 	libosmocore.pc
 	libosmocodec.pc
 	libosmovty.pc
+	libosmogsm.pc
 	include/osmocom/Makefile
 	include/osmocom/vty/Makefile
 	include/osmocom/codec/Makefile
@@ -111,6 +112,7 @@ AC_OUTPUT(
 	src/Makefile
 	src/vty/Makefile
 	src/codec/Makefile
+	src/gsm/Makefile
 	tests/Makefile
 	tests/timer/Makefile
 	tests/sms/Makefile
diff --git a/include/osmocore/Makefile.am b/include/osmocore/Makefile.am
index a3b12ef..b65589a 100644
--- a/include/osmocore/Makefile.am
+++ b/include/osmocore/Makefile.am
@@ -2,7 +2,8 @@ osmocore_HEADERS = signal.h linuxlist.h timer.h select.h msgb.h bits.h \
 		   tlv.h bitvec.h comp128.h statistics.h gsm_utils.h utils.h \
 		   gsmtap.h write_queue.h rsl.h gsm48.h rxlev_stat.h mncc.h \
 		   gsm48_ie.h logging.h gsm0808.h rate_ctr.h gsmtap_util.h \
-		   plugin.h crc16.h panic.h process.h gsm0480.h msgfile.h
+		   plugin.h crc16.h panic.h process.h gsm0480.h msgfile.h \
+		   backtrace.h
 
 if ENABLE_TALLOC
 osmocore_HEADERS += talloc.h
diff --git a/include/osmocore/backtrace.h b/include/osmocore/backtrace.h
new file mode 100644
index 0000000..bbbb2c2
--- /dev/null
+++ b/include/osmocore/backtrace.h
@@ -0,0 +1,6 @@
+#ifndef _OSMO_BACKTRACE_H_
+#define _OSMO_BACKTRACE_H_
+
+void generate_backtrace();
+
+#endif
diff --git a/include/osmocore/gsm_utils.h b/include/osmocore/gsm_utils.h
index 0aadd2e..19adb70 100644
--- a/include/osmocore/gsm_utils.h
+++ b/include/osmocore/gsm_utils.h
@@ -114,5 +114,4 @@ int gprs_tlli_type(uint32_t tlli);
 
 uint32_t gprs_tmsi2tlli(uint32_t p_tmsi, enum gprs_tlli_type type);
 
-void generate_backtrace();
 #endif
diff --git a/libosmogsm.pc.in b/libosmogsm.pc.in
new file mode 100644
index 0000000..753bb3a
--- /dev/null
+++ b/libosmogsm.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Osmocom GSM Core Library
+Description: GSM Core Library
+Version: @VERSION@
+Libs: -L${libdir} -losmogsm
+Cflags: -I${includedir}/
+
diff --git a/src/Makefile.am b/src/Makefile.am
index 94492c5..c5c8a21 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=. vty codec
+SUBDIRS=. vty codec gsm
 
 # This is _NOT_ the library release version, it's an API version.
 # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
@@ -9,12 +9,12 @@ AM_CFLAGS = -fPIC -Wall
 
 lib_LTLIBRARIES = libosmocore.la
 
-libosmocore_la_SOURCES = timer.c select.c signal.c msgb.c rxlev_stat.c bits.c \
-			 tlv_parser.c bitvec.c comp128.c gsm_utils.c statistics.c \
-			 write_queue.c utils.c rsl.c gsm48.c gsm48_ie.c \
-			 logging.c logging_syslog.c gsm0808.c rate_ctr.c \
-			 gsmtap_util.c gprs_cipher_core.c crc16.c panic.c \
-			 process.c gsm0480.c
+libosmocore_la_SOURCES = timer.c select.c signal.c msgb.c bits.c \
+			 bitvec.c statistics.c \
+			 write_queue.c utils.c \
+			 logging.c logging_syslog.c rate_ctr.c \
+			 gsmtap_util.c crc16.c panic.c backtrace.c \
+			 process.c
 
 if ENABLE_PLUGIN
 libosmocore_la_SOURCES += plugin.c
diff --git a/src/backtrace.c b/src/backtrace.c
new file mode 100644
index 0000000..4239445
--- /dev/null
+++ b/src/backtrace.c
@@ -0,0 +1,50 @@
+/*
+ * (C) 2008 by Daniel Willmann <daniel at totalueberwachung.de>
+ * (C) 2009 by Holger Hans Peter Freyther <zecke at selfish.org>
+ * (C) 2009-2010 by Harald Welte <laforge at gnumonks.org>
+ * (C) 2010 by Nico Golde <nico at ngolde.de>
+ *
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <osmocore/utils.h>
+#include "config.h"
+
+#ifdef HAVE_EXECINFO_H
+#include <execinfo.h>
+void generate_backtrace()
+{
+	int i, nptrs;
+	void *buffer[100];
+	char **strings;
+
+	nptrs = backtrace(buffer, ARRAY_SIZE(buffer));
+	printf("backtrace() returned %d addresses\n", nptrs);
+
+	strings = backtrace_symbols(buffer, nptrs);
+	if (!strings)
+		return;
+
+	for (i = 1; i < nptrs; i++)
+		printf("%s\n", strings[i]);
+
+	free(strings);
+}
+#endif
diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am
new file mode 100644
index 0000000..a8c2e56
--- /dev/null
+++ b/src/gsm/Makefile.am
@@ -0,0 +1,13 @@
+# This is _NOT_ the library release version, it's an API version.
+# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
+LIBVERSION=0:0:0
+
+INCLUDES = $(all_includes) -I$(top_srcdir)/include
+AM_CFLAGS = -fPIC -Wall
+
+lib_LTLIBRARIES = libosmogsm.la
+
+libosmogsm_la_SOURCES = rxlev_stat.c tlv_parser.c comp128.c gsm_utils.c \
+                        rsl.c gsm48.c gsm48_ie.c gsm0808.c \
+			gprs_cipher_core.c gsm0480.c
+libosmogsm_la_LIBADD = $(top_builddir)/src/libosmocore.la
diff --git a/src/comp128.c b/src/gsm/comp128.c
similarity index 100%
rename from src/comp128.c
rename to src/gsm/comp128.c
diff --git a/src/gprs_cipher_core.c b/src/gsm/gprs_cipher_core.c
similarity index 100%
rename from src/gprs_cipher_core.c
rename to src/gsm/gprs_cipher_core.c
diff --git a/src/gsm0480.c b/src/gsm/gsm0480.c
similarity index 100%
rename from src/gsm0480.c
rename to src/gsm/gsm0480.c
diff --git a/src/gsm0808.c b/src/gsm/gsm0808.c
similarity index 100%
rename from src/gsm0808.c
rename to src/gsm/gsm0808.c
diff --git a/src/gsm48.c b/src/gsm/gsm48.c
similarity index 100%
rename from src/gsm48.c
rename to src/gsm/gsm48.c
diff --git a/src/gsm48_ie.c b/src/gsm/gsm48_ie.c
similarity index 100%
rename from src/gsm48_ie.c
rename to src/gsm/gsm48_ie.c
diff --git a/src/gsm_utils.c b/src/gsm/gsm_utils.c
similarity index 96%
rename from src/gsm_utils.c
rename to src/gsm/gsm_utils.c
index 31e3cd6..54a13ad 100644
--- a/src/gsm_utils.c
+++ b/src/gsm/gsm_utils.c
@@ -334,29 +334,6 @@ enum gsm_band gsm_band_parse(const char* mhz)
 	}
 }
 
-
-#ifdef HAVE_EXECINFO_H
-#include <execinfo.h>
-void generate_backtrace()
-{
-	int i, nptrs;
-	void *buffer[100];
-	char **strings;
-
-	nptrs = backtrace(buffer, ARRAY_SIZE(buffer));
-	printf("backtrace() returned %d addresses\n", nptrs);
-
-	strings = backtrace_symbols(buffer, nptrs);
-	if (!strings)
-		return;
-
-	for (i = 1; i < nptrs; i++)
-		printf("%s\n", strings[i]);
-
-	free(strings);
-}
-#endif
-
 enum gsm_band gsm_arfcn2band(uint16_t arfcn)
 {
 	int is_pcs = arfcn & ARFCN_PCS;
diff --git a/src/rsl.c b/src/gsm/rsl.c
similarity index 100%
rename from src/rsl.c
rename to src/gsm/rsl.c
diff --git a/src/rxlev_stat.c b/src/gsm/rxlev_stat.c
similarity index 100%
rename from src/rxlev_stat.c
rename to src/gsm/rxlev_stat.c
diff --git a/src/tlv_parser.c b/src/gsm/tlv_parser.c
similarity index 100%
rename from src/tlv_parser.c
rename to src/gsm/tlv_parser.c
diff --git a/src/panic.c b/src/panic.c
index 5fb7b56..21e8fd5 100644
--- a/src/panic.c
+++ b/src/panic.c
@@ -22,6 +22,7 @@
 
 #include <osmocore/gsm_utils.h>
 #include <osmocore/panic.h>
+#include <osmocore/backtrace.h>
 
 #include "../config.h"
 
diff --git a/tests/sms/Makefile.am b/tests/sms/Makefile.am
index a8f1ff6..fa4e387 100644
--- a/tests/sms/Makefile.am
+++ b/tests/sms/Makefile.am
@@ -2,4 +2,4 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include
 noinst_PROGRAMS = sms_test
 
 sms_test_SOURCES = sms_test.c
-sms_test_LDADD = $(top_builddir)/src/libosmocore.la
+sms_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la
diff --git a/tests/smscb/Makefile.am b/tests/smscb/Makefile.am
index 1d0e538..9a6fb4f 100644
--- a/tests/smscb/Makefile.am
+++ b/tests/smscb/Makefile.am
@@ -2,4 +2,4 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include
 noinst_PROGRAMS = smscb_test
 
 smscb_test_SOURCES = smscb_test.c
-smscb_test_LDADD = $(top_builddir)/src/libosmocore.la
+smscb_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la
diff --git a/tests/ussd/Makefile.am b/tests/ussd/Makefile.am
index d29506c..ef9aa49 100644
--- a/tests/ussd/Makefile.am
+++ b/tests/ussd/Makefile.am
@@ -2,4 +2,4 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include
 noinst_PROGRAMS = ussd_test
 
 ussd_test_SOURCES = ussd_test.c
-ussd_test_LDADD = $(top_builddir)/src/libosmocore.la
+ussd_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la
-- 
1.7.2.3




From pablo at gnumonks.org  Tue Mar 22 15:36:13 2011
From: pablo at gnumonks.org (pablo at gnumonks.org)
Date: Tue, 22 Mar 2011 16:36:13 +0100
Subject: [PATCH 2/2] include: reorganize headers file to
	include/osmocom/[gsm|core]
In-Reply-To: <1300808173-12958-1-git-send-email-pablo@gnumonks.org>
References: <1300808173-12958-1-git-send-email-pablo@gnumonks.org>
Message-ID: <1300808173-12958-3-git-send-email-pablo@gnumonks.org>

From: Pablo Neira Ayuso <pablo at gnumonks.org>

This patch moves all GSM-specific definitions to include/osmocom/gsm.
Moreover, the headers in include/osmocore/ have been moved to
include/osmocom/core.

This has been proposed by Harald Welte and Sylvain Munaunt.

Tested with `make distcheck'.

Signed-off-by: Pablo Neira Ayuso <pablo at gnumonks.org>
---
 configure.in                                       |    5 +++--
 include/Makefile.am                                |    2 +-
 include/osmocom/Makefile.am                        |    4 ++--
 include/osmocom/core/Makefile.am                   |   12 ++++++++++++
 include/{osmocore => osmocom/core}/backtrace.h     |    0
 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      |    0
 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                       |   14 --------------
 include/osmocore/protocol/Makefile.am              |    6 ------
 src/backtrace.c                                    |    2 +-
 src/bits.c                                         |    2 +-
 src/bitvec.c                                       |    2 +-
 src/crc16.c                                        |    2 +-
 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                                |    6 +++---
 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                                        |    6 +++---
 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/sms_test.c                               |    6 +++---
 tests/smscb/smscb_test.c                           |    2 +-
 tests/timer/timer_test.c                           |    4 ++--
 tests/ussd/ussd_test.c                             |    2 +-
 89 files changed, 149 insertions(+), 144 deletions(-)
 create mode 100644 include/osmocom/core/Makefile.am
 rename include/{osmocore => osmocom/core}/backtrace.h (100%)
 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 (100%)
 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

diff --git a/configure.in b/configure.in
index b572bf4..ead18f0 100644
--- a/configure.in
+++ b/configure.in
@@ -106,8 +106,9 @@ AC_OUTPUT(
 	include/osmocom/vty/Makefile
 	include/osmocom/codec/Makefile
 	include/osmocom/crypt/Makefile
-	include/osmocore/Makefile
-	include/osmocore/protocol/Makefile
+	include/osmocom/gsm/Makefile
+	include/osmocom/gsm/protocol/Makefile
+	include/osmocom/core/Makefile
 	include/Makefile
 	src/Makefile
 	src/vty/Makefile
diff --git a/include/Makefile.am b/include/Makefile.am
index 185c696..3578a80 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1 +1 @@
-SUBDIRS = osmocom osmocore
+SUBDIRS = osmocom
diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am
index ec548fb..21f4f2d 100644
--- a/include/osmocom/Makefile.am
+++ b/include/osmocom/Makefile.am
@@ -1,5 +1,5 @@
 if ENABLE_VTY
-SUBDIRS = vty codec crypt
+SUBDIRS = vty codec crypt gsm core
 else
-SUBDIRS = codec crypt
+SUBDIRS = codec crypt gsm core
 endif
diff --git a/include/osmocom/core/Makefile.am b/include/osmocom/core/Makefile.am
new file mode 100644
index 0000000..6109f47
--- /dev/null
+++ b/include/osmocom/core/Makefile.am
@@ -0,0 +1,12 @@
+osmocore_HEADERS = signal.h linuxlist.h timer.h select.h msgb.h bits.h \
+		   bitvec.h statistics.h utils.h \
+		   gsmtap.h write_queue.h \
+		   logging.h rate_ctr.h gsmtap_util.h \
+		   plugin.h crc16.h panic.h process.h msgfile.h \
+		   backtrace.h
+
+if ENABLE_TALLOC
+osmocore_HEADERS += talloc.h
+endif
+
+osmocoredir = $(includedir)/osmocom/core
diff --git a/include/osmocore/backtrace.h b/include/osmocom/core/backtrace.h
similarity index 100%
rename from include/osmocore/backtrace.h
rename to include/osmocom/core/backtrace.h
diff --git a/include/osmocore/bits.h b/include/osmocom/core/bits.h
similarity index 100%
rename from include/osmocore/bits.h
rename to include/osmocom/core/bits.h
diff --git a/include/osmocore/bitvec.h b/include/osmocom/core/bitvec.h
similarity index 100%
rename from include/osmocore/bitvec.h
rename to include/osmocom/core/bitvec.h
diff --git a/include/osmocore/crc16.h b/include/osmocom/core/crc16.h
similarity index 100%
rename from include/osmocore/crc16.h
rename to include/osmocom/core/crc16.h
diff --git a/include/osmocore/gsmtap.h b/include/osmocom/core/gsmtap.h
similarity index 100%
rename from include/osmocore/gsmtap.h
rename to include/osmocom/core/gsmtap.h
diff --git a/include/osmocore/gsmtap_util.h b/include/osmocom/core/gsmtap_util.h
similarity index 100%
rename from include/osmocore/gsmtap_util.h
rename to include/osmocom/core/gsmtap_util.h
diff --git a/include/osmocore/linuxlist.h b/include/osmocom/core/linuxlist.h
similarity index 100%
rename from include/osmocore/linuxlist.h
rename to include/osmocom/core/linuxlist.h
diff --git a/include/osmocore/logging.h b/include/osmocom/core/logging.h
similarity index 99%
rename from include/osmocore/logging.h
rename to include/osmocom/core/logging.h
index a2c63e9..649c4e7 100644
--- a/include/osmocore/logging.h
+++ b/include/osmocom/core/logging.h
@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#include <osmocore/linuxlist.h>
+#include <osmocom/core/linuxlist.h>
 
 #define LOG_MAX_CATEGORY	32
 #define LOG_MAX_CTX		8
diff --git a/include/osmocore/msgb.h b/include/osmocom/core/msgb.h
similarity index 98%
rename from include/osmocore/msgb.h
rename to include/osmocom/core/msgb.h
index c4f4430..57b5d7f 100644
--- a/include/osmocore/msgb.h
+++ b/include/osmocom/core/msgb.h
@@ -21,8 +21,8 @@
  */
 
 #include <stdint.h>
-#include "linuxlist.h"
-#include "utils.h"
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/utils.h>
 
 #define MSGB_DEBUG
 
@@ -62,7 +62,7 @@ extern struct msgb *msgb_dequeue(struct llist_head *queue);
 extern void msgb_reset(struct msgb *m);
 
 #ifdef MSGB_DEBUG
-#include <osmocore/panic.h>
+#include <osmocom/core/panic.h>
 #define MSGB_ABORT(msg, fmt, args ...) do {		\
 	osmo_panic("msgb(%p): " fmt, msg, ## args);	\
 	} while(0)
diff --git a/include/osmocore/msgfile.h b/include/osmocom/core/msgfile.h
similarity index 100%
rename from include/osmocore/msgfile.h
rename to include/osmocom/core/msgfile.h
diff --git a/include/osmocore/panic.h b/include/osmocom/core/panic.h
similarity index 100%
rename from include/osmocore/panic.h
rename to include/osmocom/core/panic.h
diff --git a/include/osmocore/plugin.h b/include/osmocom/core/plugin.h
similarity index 100%
rename from include/osmocore/plugin.h
rename to include/osmocom/core/plugin.h
diff --git a/include/osmocore/process.h b/include/osmocom/core/process.h
similarity index 100%
rename from include/osmocore/process.h
rename to include/osmocom/core/process.h
diff --git a/include/osmocore/rate_ctr.h b/include/osmocom/core/rate_ctr.h
similarity index 98%
rename from include/osmocore/rate_ctr.h
rename to include/osmocom/core/rate_ctr.h
index f887d9a..dba573d 100644
--- a/include/osmocore/rate_ctr.h
+++ b/include/osmocom/core/rate_ctr.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-#include <osmocore/linuxlist.h>
+#include <osmocom/core/linuxlist.h>
 
 #define RATE_CTR_INTV_NUM	4
 
diff --git a/include/osmocore/select.h b/include/osmocom/core/select.h
similarity index 92%
rename from include/osmocore/select.h
rename to include/osmocom/core/select.h
index 2d8b3ec..5ca21c3 100644
--- a/include/osmocore/select.h
+++ b/include/osmocom/core/select.h
@@ -1,7 +1,7 @@
 #ifndef _BSC_SELECT_H
 #define _BSC_SELECT_H
 
-#include "linuxlist.h"
+#include <osmocom/core/linuxlist.h>
 
 #define BSC_FD_READ	0x0001
 #define BSC_FD_WRITE	0x0002
diff --git a/include/osmocore/signal.h b/include/osmocom/core/signal.h
similarity index 100%
rename from include/osmocore/signal.h
rename to include/osmocom/core/signal.h
diff --git a/include/osmocore/statistics.h b/include/osmocom/core/statistics.h
similarity index 100%
rename from include/osmocore/statistics.h
rename to include/osmocom/core/statistics.h
diff --git a/include/osmocore/talloc.h b/include/osmocom/core/talloc.h
similarity index 100%
rename from include/osmocore/talloc.h
rename to include/osmocom/core/talloc.h
diff --git a/include/osmocore/timer.h b/include/osmocom/core/timer.h
similarity index 98%
rename from include/osmocore/timer.h
rename to include/osmocom/core/timer.h
index fee888b..1966478 100644
--- a/include/osmocore/timer.h
+++ b/include/osmocom/core/timer.h
@@ -23,7 +23,7 @@
 
 #include <sys/time.h>
 
-#include "linuxlist.h"
+#include <osmocom/core/linuxlist.h>
 
 /**
  * Timer management:
diff --git a/include/osmocore/utils.h b/include/osmocom/core/utils.h
similarity index 100%
rename from include/osmocore/utils.h
rename to include/osmocom/core/utils.h
diff --git a/include/osmocore/write_queue.h b/include/osmocom/core/write_queue.h
similarity index 100%
rename from include/osmocore/write_queue.h
rename to include/osmocom/core/write_queue.h
diff --git a/include/osmocom/crypt/gprs_cipher.h b/include/osmocom/crypt/gprs_cipher.h
index 3e514ec..3051071 100644
--- a/include/osmocom/crypt/gprs_cipher.h
+++ b/include/osmocom/crypt/gprs_cipher.h
@@ -1,7 +1,7 @@
 #ifndef _GPRS_CIPHER_H
 #define _GPRS_CIPHER_H
 
-#include <osmocore/linuxlist.h>
+#include <osmocom/core/linuxlist.h>
 
 #define GSM0464_CIPH_MAX_BLOCK	1523
 
diff --git a/include/osmocom/gsm/Makefile.am b/include/osmocom/gsm/Makefile.am
new file mode 100644
index 0000000..8685fc9
--- /dev/null
+++ b/include/osmocom/gsm/Makefile.am
@@ -0,0 +1,6 @@
+osmogsm_HEADERS = comp128.h gsm0808.h gsm48_ie.h mncc.h rxlev_stat.h \
+		  gsm0480.h gsm48.h gsm_utils.h rsl.h tlv.h
+
+SUBDIRS = protocol
+
+osmogsmdir = $(includedir)/osmocom/gsm
diff --git a/include/osmocore/comp128.h b/include/osmocom/gsm/comp128.h
similarity index 100%
rename from include/osmocore/comp128.h
rename to include/osmocom/gsm/comp128.h
diff --git a/include/osmocore/gsm0480.h b/include/osmocom/gsm/gsm0480.h
similarity index 84%
rename from include/osmocore/gsm0480.h
rename to include/osmocom/gsm/gsm0480.h
index b504332..d6626d6 100644
--- a/include/osmocore/gsm0480.h
+++ b/include/osmocom/gsm/gsm0480.h
@@ -1,9 +1,9 @@
 #ifndef gsm0480_h
 #define gsm0480_h
 
-#include "msgb.h"
-#include "protocol/gsm_04_08.h"
-#include "protocol/gsm_04_80.h"
+#include <osmocom/core/msgb.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/gsm/protocol/gsm_04_80.h>
 
 #define MAX_LEN_USSD_STRING	31
 
diff --git a/include/osmocore/gsm0808.h b/include/osmocom/gsm/gsm0808.h
similarity index 100%
rename from include/osmocore/gsm0808.h
rename to include/osmocom/gsm/gsm0808.h
diff --git a/include/osmocore/gsm48.h b/include/osmocom/gsm/gsm48.h
similarity index 90%
rename from include/osmocore/gsm48.h
rename to include/osmocom/gsm/gsm48.h
index ffe0399..1e9403b 100644
--- a/include/osmocore/gsm48.h
+++ b/include/osmocom/gsm/gsm48.h
@@ -1,9 +1,9 @@
 #ifndef _OSMOCORE_GSM48_H
 #define _OSMOCORE_GSM48_H
 
-#include <osmocore/tlv.h>
-#include <osmocore/protocol/gsm_04_08.h>
-#include <osmocore/gsm48_ie.h>
+#include <osmocom/gsm/tlv.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/gsm/gsm48_ie.h>
 
 /* A parsed GPRS routing area */
 struct gprs_ra_id {
diff --git a/include/osmocore/gsm48_ie.h b/include/osmocom/gsm/gsm48_ie.h
similarity index 96%
rename from include/osmocore/gsm48_ie.h
rename to include/osmocom/gsm/gsm48_ie.h
index fa66159..f4fce25 100644
--- a/include/osmocore/gsm48_ie.h
+++ b/include/osmocom/gsm/gsm48_ie.h
@@ -5,10 +5,10 @@
 #include <string.h>
 #include <errno.h>
 
-#include <osmocore/msgb.h>
-#include <osmocore/tlv.h>
-#include <osmocore/mncc.h>
-#include <osmocore/protocol/gsm_04_08.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/gsm/tlv.h>
+#include <osmocom/gsm/mncc.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
 
 /* decode a 'called/calling/connect party BCD number' as in 10.5.4.7 */
 int gsm48_decode_bcd_number(char *output, int output_len,
diff --git a/include/osmocore/gsm_utils.h b/include/osmocom/gsm/gsm_utils.h
similarity index 100%
rename from include/osmocore/gsm_utils.h
rename to include/osmocom/gsm/gsm_utils.h
diff --git a/include/osmocore/mncc.h b/include/osmocom/gsm/mncc.h
similarity index 100%
rename from include/osmocore/mncc.h
rename to include/osmocom/gsm/mncc.h
diff --git a/include/osmocom/gsm/protocol/Makefile.am b/include/osmocom/gsm/protocol/Makefile.am
new file mode 100644
index 0000000..8483f10
--- /dev/null
+++ b/include/osmocom/gsm/protocol/Makefile.am
@@ -0,0 +1,6 @@
+osmogsm_proto_HEADERS = gsm_03_41.h \
+			gsm_04_08.h gsm_04_11.h gsm_04_12.h gsm_04_80.h \
+			gsm_08_08.h gsm_08_58.h \
+			gsm_12_21.h
+
+osmogsm_protodir = $(includedir)/osmocom/gsm/protocol
diff --git a/include/osmocore/protocol/gsm_03_41.h b/include/osmocom/gsm/protocol/gsm_03_41.h
similarity index 100%
rename from include/osmocore/protocol/gsm_03_41.h
rename to include/osmocom/gsm/protocol/gsm_03_41.h
diff --git a/include/osmocore/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h
similarity index 100%
rename from include/osmocore/protocol/gsm_04_08.h
rename to include/osmocom/gsm/protocol/gsm_04_08.h
diff --git a/include/osmocore/protocol/gsm_04_11.h b/include/osmocom/gsm/protocol/gsm_04_11.h
similarity index 100%
rename from include/osmocore/protocol/gsm_04_11.h
rename to include/osmocom/gsm/protocol/gsm_04_11.h
diff --git a/include/osmocore/protocol/gsm_04_12.h b/include/osmocom/gsm/protocol/gsm_04_12.h
similarity index 100%
rename from include/osmocore/protocol/gsm_04_12.h
rename to include/osmocom/gsm/protocol/gsm_04_12.h
diff --git a/include/osmocore/protocol/gsm_04_80.h b/include/osmocom/gsm/protocol/gsm_04_80.h
similarity index 100%
rename from include/osmocore/protocol/gsm_04_80.h
rename to include/osmocom/gsm/protocol/gsm_04_80.h
diff --git a/include/osmocore/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h
similarity index 100%
rename from include/osmocore/protocol/gsm_08_08.h
rename to include/osmocom/gsm/protocol/gsm_08_08.h
diff --git a/include/osmocore/protocol/gsm_08_58.h b/include/osmocom/gsm/protocol/gsm_08_58.h
similarity index 100%
rename from include/osmocore/protocol/gsm_08_58.h
rename to include/osmocom/gsm/protocol/gsm_08_58.h
diff --git a/include/osmocore/protocol/gsm_12_21.h b/include/osmocom/gsm/protocol/gsm_12_21.h
similarity index 99%
rename from include/osmocore/protocol/gsm_12_21.h
rename to include/osmocom/gsm/protocol/gsm_12_21.h
index 9cae45d..b8b00f3 100644
--- a/include/osmocore/protocol/gsm_12_21.h
+++ b/include/osmocom/gsm/protocol/gsm_12_21.h
@@ -24,7 +24,7 @@
  */
 
 #include <stdint.h>
-#include <osmocore/tlv.h>
+#include <osmocom/gsm/tlv.h>
 
 /* generic header in front of every OML message according to TS 08.59 */
 struct abis_om_hdr {
diff --git a/include/osmocore/rsl.h b/include/osmocom/gsm/rsl.h
similarity index 94%
rename from include/osmocore/rsl.h
rename to include/osmocom/gsm/rsl.h
index 54d6703..7e46330 100644
--- a/include/osmocore/rsl.h
+++ b/include/osmocom/gsm/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/include/osmocore/rxlev_stat.h b/include/osmocom/gsm/rxlev_stat.h
similarity index 100%
rename from include/osmocore/rxlev_stat.h
rename to include/osmocom/gsm/rxlev_stat.h
diff --git a/include/osmocore/tlv.h b/include/osmocom/gsm/tlv.h
similarity index 99%
rename from include/osmocore/tlv.h
rename to include/osmocom/gsm/tlv.h
index 7bda9f9..552af2b 100644
--- a/include/osmocore/tlv.h
+++ b/include/osmocom/gsm/tlv.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <osmocore/msgb.h>
+#include <osmocom/core/msgb.h>
 
 /* Terminology / wording
 		tag	length		value	(in bits)
diff --git a/include/osmocom/vty/telnet_interface.h b/include/osmocom/vty/telnet_interface.h
index 444e649..0c034e4 100644
--- a/include/osmocom/vty/telnet_interface.h
+++ b/include/osmocom/vty/telnet_interface.h
@@ -21,8 +21,8 @@
 #ifndef TELNET_INTERFACE_H
 #define TELNET_INTERFACE_H
 
-#include <osmocore/logging.h>
-#include <osmocore/select.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/select.h>
 
 #include <osmocom/vty/vty.h>
 
diff --git a/include/osmocore/Makefile.am b/include/osmocore/Makefile.am
deleted file mode 100644
index b65589a..0000000
--- a/include/osmocore/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-osmocore_HEADERS = signal.h linuxlist.h timer.h select.h msgb.h bits.h \
-		   tlv.h bitvec.h comp128.h statistics.h gsm_utils.h utils.h \
-		   gsmtap.h write_queue.h rsl.h gsm48.h rxlev_stat.h mncc.h \
-		   gsm48_ie.h logging.h gsm0808.h rate_ctr.h gsmtap_util.h \
-		   plugin.h crc16.h panic.h process.h gsm0480.h msgfile.h \
-		   backtrace.h
-
-if ENABLE_TALLOC
-osmocore_HEADERS += talloc.h
-endif
-
-osmocoredir = $(includedir)/osmocore
-
-SUBDIRS = protocol
diff --git a/include/osmocore/protocol/Makefile.am b/include/osmocore/protocol/Makefile.am
deleted file mode 100644
index 03a4849..0000000
--- a/include/osmocore/protocol/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-osmocore_proto_HEADERS = gsm_03_41.h \
-			 gsm_04_08.h gsm_04_11.h gsm_04_12.h gsm_04_80.h \
-			 gsm_08_08.h gsm_08_58.h \
-			 gsm_12_21.h
-
-osmocore_protodir = $(includedir)/osmocore/protocol
diff --git a/src/backtrace.c b/src/backtrace.c
index 4239445..ecd6b9c 100644
--- a/src/backtrace.c
+++ b/src/backtrace.c
@@ -24,7 +24,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <osmocore/utils.h>
+#include <osmocom/core/utils.h>
 #include "config.h"
 
 #ifdef HAVE_EXECINFO_H
diff --git a/src/bits.c b/src/bits.c
index fcdf5cc..ff5d176 100644
--- a/src/bits.c
+++ b/src/bits.c
@@ -1,7 +1,7 @@
 
 #include <stdint.h>
 
-#include <osmocore/bits.h>
+#include <osmocom/core/bits.h>
 
 /* convert unpacked bits to packed bits, return length in bytes */
 int osmo_ubit2pbit(pbit_t *out, const ubit_t *in, unsigned int num_bits)
diff --git a/src/bitvec.c b/src/bitvec.c
index 95d78a5..4984af2 100644
--- a/src/bitvec.c
+++ b/src/bitvec.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <stdint.h>
 
-#include <osmocore/bitvec.h>
+#include <osmocom/core/bitvec.h>
 
 #define BITNUM_FROM_COMP(byte, bit)	((byte*8)+bit)
 
diff --git a/src/crc16.c b/src/crc16.c
index 8ac8031..3a0d0dd 100644
--- a/src/crc16.c
+++ b/src/crc16.c
@@ -8,7 +8,7 @@
  * Version 2. See the file COPYING for more details.
  */
 
-#include <osmocore/crc16.h>
+#include <osmocom/core/crc16.h>
 
 /** CRC table for the CRC-16. The poly is 0x8005 (x^16 + x^15 + x^2 + 1) */
 uint16_t const crc16_table[256] = {
diff --git a/src/gsm/gprs_cipher_core.c b/src/gsm/gprs_cipher_core.c
index 6174bd7..0ff85e2 100644
--- a/src/gsm/gprs_cipher_core.c
+++ b/src/gsm/gprs_cipher_core.c
@@ -23,9 +23,9 @@
 #include <errno.h>
 #include <stdint.h>
 
-#include <osmocore/utils.h>
-#include <osmocore/linuxlist.h>
-#include <osmocore/plugin.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/plugin.h>
 
 #include <osmocom/crypt/gprs_cipher.h>
 
diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c
index b6b345c..b9b3ed9 100644
--- a/src/gsm/gsm0480.c
+++ b/src/gsm/gsm0480.c
@@ -22,13 +22,13 @@
  *
  */
 
-#include <osmocore/gsm0480.h>
-#include <osmocore/gsm_utils.h>
+#include <osmocom/gsm/gsm0480.h>
+#include <osmocom/gsm/gsm_utils.h>
 
-#include <osmocore/logging.h>
+#include <osmocom/core/logging.h>
 
-#include <osmocore/protocol/gsm_04_08.h>
-#include <osmocore/protocol/gsm_04_80.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/gsm/protocol/gsm_04_80.h>
 
 #include <string.h>
 
diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c
index dc450cc..1640adc 100644
--- a/src/gsm/gsm0808.c
+++ b/src/gsm/gsm0808.c
@@ -18,9 +18,9 @@
  *
  */
 
-#include <osmocore/gsm0808.h>
-#include <osmocore/protocol/gsm_08_08.h>
-#include <osmocore/gsm48.h>
+#include <osmocom/gsm/gsm0808.h>
+#include <osmocom/gsm/protocol/gsm_08_08.h>
+#include <osmocom/gsm/gsm48.h>
 
 #include <arpa/inet.h>
 
diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c
index daec4f3..436bf14 100644
--- a/src/gsm/gsm48.c
+++ b/src/gsm/gsm48.c
@@ -28,11 +28,11 @@
 
 #include <arpa/inet.h>
 
-#include <osmocore/utils.h>
-#include <osmocore/tlv.h>
-#include <osmocore/gsm48.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/gsm/tlv.h>
+#include <osmocom/gsm/gsm48.h>
 
-#include <osmocore/protocol/gsm_04_08.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
 
 const struct tlv_definition gsm48_att_tlvdef = {
 	.def = {
diff --git a/src/gsm/gsm48_ie.c b/src/gsm/gsm48_ie.c
index 0e27088..efcf281 100644
--- a/src/gsm/gsm48_ie.c
+++ b/src/gsm/gsm48_ie.c
@@ -27,12 +27,12 @@
 #include <string.h>
 #include <errno.h>
 
-#include <osmocore/utils.h>
-#include <osmocore/msgb.h>
-#include <osmocore/tlv.h>
-#include <osmocore/mncc.h>
-#include <osmocore/protocol/gsm_04_08.h>
-#include <osmocore/gsm48_ie.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/gsm/tlv.h>
+#include <osmocom/gsm/mncc.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/gsm/gsm48_ie.h>
 
 static const char bcd_num_digits[] = {
 	'0', '1', '2', '3', '4', '5', '6', '7',
diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c
index 54a13ad..377705d 100644
--- a/src/gsm/gsm_utils.c
+++ b/src/gsm/gsm_utils.c
@@ -23,8 +23,8 @@
  */
 
 //#include <openbsc/gsm_data.h>
-#include <osmocore/utils.h>
-#include <osmocore/gsm_utils.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/gsm/gsm_utils.h>
 
 #include <stdlib.h>
 #include <stdint.h>
@@ -33,7 +33,7 @@
 #include <errno.h>
 #include <ctype.h>
 
-#include "../config.h"
+#include "../../config.h"
 
 /* ETSI GSM 03.38 6.2.1 and 6.2.1.1 default alphabet
  * Greek symbols at hex positions 0x10 and 0x12-0x1a
diff --git a/src/gsm/rsl.c b/src/gsm/rsl.c
index 3bfeffb..12ac0cf 100644
--- a/src/gsm/rsl.c
+++ b/src/gsm/rsl.c
@@ -25,8 +25,8 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include <osmocore/tlv.h>
-#include <osmocore/rsl.h>
+#include <osmocom/gsm/tlv.h>
+#include <osmocom/gsm/rsl.h>
 
 #define RSL_ALLOC_SIZE		200
 #define RSL_ALLOC_HEADROOM	56
diff --git a/src/gsm/rxlev_stat.c b/src/gsm/rxlev_stat.c
index b474aaa..626aaff 100644
--- a/src/gsm/rxlev_stat.c
+++ b/src/gsm/rxlev_stat.c
@@ -27,8 +27,8 @@
 #include <errno.h>
 #include <stdint.h>
 
-#include <osmocore/bitvec.h>
-#include <osmocore/rxlev_stat.h>
+#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)
 {
diff --git a/src/gsm/tlv_parser.c b/src/gsm/tlv_parser.c
index bbef7a9..1e4c6b5 100644
--- a/src/gsm/tlv_parser.c
+++ b/src/gsm/tlv_parser.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdint.h>
-#include <osmocore/utils.h>
-#include <osmocore/tlv.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/gsm/tlv.h>
 
 struct tlv_definition tvlv_att_def;
 
diff --git a/src/gsmtap_util.c b/src/gsmtap_util.c
index abee4da..6d02d58 100644
--- a/src/gsmtap_util.c
+++ b/src/gsmtap_util.c
@@ -24,13 +24,13 @@
 
 #ifdef HAVE_SYS_SELECT_H
 
-#include <osmocore/gsmtap_util.h>
-#include <osmocore/logging.h>
-#include <osmocore/protocol/gsm_04_08.h>
-#include <osmocore/gsmtap.h>
-#include <osmocore/msgb.h>
-#include <osmocore/rsl.h>
-#include <osmocore/select.h>
+#include <osmocom/core/gsmtap_util.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/gsmtap.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/select.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/gsm/rsl.h>
 
 #include <arpa/inet.h>
 #include <sys/socket.h>
diff --git a/src/logging.c b/src/logging.c
index 876a352..9b98bc0 100644
--- a/src/logging.c
+++ b/src/logging.c
@@ -33,9 +33,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>
 
 const struct log_info *osmo_log_info;
 
diff --git a/src/logging_syslog.c b/src/logging_syslog.c
index b558fc0..4f043b1 100644
--- a/src/logging_syslog.c
+++ b/src/logging_syslog.c
@@ -33,9 +33,9 @@
 #include <strings.h>
 #endif
 
-#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>
 
 static const int logp2syslog_level(unsigned int level)
 {
diff --git a/src/msgb.c b/src/msgb.c
index 12a839a..8672006 100644
--- a/src/msgb.c
+++ b/src/msgb.c
@@ -24,9 +24,9 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
-#include <osmocore/msgb.h>
+#include <osmocom/core/msgb.h>
 //#include <openbsc/gsm_data.h>
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
 //#include <openbsc/debug.h>
 
 void *tall_msgb_ctx;
diff --git a/src/msgfile.c b/src/msgfile.c
index 68f0581..ec4434a 100644
--- a/src/msgfile.c
+++ b/src/msgfile.c
@@ -21,8 +21,8 @@
  *
  */
 
-#include <osmocore/msgfile.h>
-#include <osmocore/talloc.h>
+#include <osmocom/core/msgfile.h>
+#include <osmocom/core/talloc.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/panic.c b/src/panic.c
index 21e8fd5..588a5fe 100644
--- a/src/panic.c
+++ b/src/panic.c
@@ -20,9 +20,9 @@
  *
  */
 
-#include <osmocore/gsm_utils.h>
-#include <osmocore/panic.h>
-#include <osmocore/backtrace.h>
+#include <osmocom/gsm/gsm_utils.h>
+#include <osmocom/core/panic.h>
+#include <osmocom/core/backtrace.h>
 
 #include "../config.h"
 
diff --git a/src/plugin.c b/src/plugin.c
index 3ba2d43..4924e95 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -31,7 +31,7 @@
 #include <errno.h>
 #include <limits.h>
 
-#include <osmocore/plugin.h>
+#include <osmocom/core/plugin.h>
 
 int plugin_load_all(const char *directory)
 {
diff --git a/src/rate_ctr.c b/src/rate_ctr.c
index 80ef55b..dd56e80 100644
--- a/src/rate_ctr.c
+++ b/src/rate_ctr.c
@@ -23,11 +23,11 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <osmocore/utils.h>
-#include <osmocore/linuxlist.h>
-#include <osmocore/talloc.h>
-#include <osmocore/timer.h>
-#include <osmocore/rate_ctr.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/timer.h>
+#include <osmocom/core/rate_ctr.h>
 
 static LLIST_HEAD(rate_ctr_groups);
 
diff --git a/src/select.c b/src/select.c
index 5aa2beb..adf3619 100644
--- a/src/select.c
+++ b/src/select.c
@@ -22,9 +22,9 @@
 #include <fcntl.h>
 #include <stdio.h>
 
-#include <osmocore/select.h>
-#include <osmocore/linuxlist.h>
-#include <osmocore/timer.h>
+#include <osmocom/core/select.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/timer.h>
 
 #include "../config.h"
 
diff --git a/src/signal.c b/src/signal.c
index c7ca86c..bb5c38e 100644
--- a/src/signal.c
+++ b/src/signal.c
@@ -18,9 +18,9 @@
  *
  */
 
-#include <osmocore/signal.h>
-#include <osmocore/talloc.h>
-#include <osmocore/linuxlist.h>
+#include <osmocom/core/signal.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/linuxlist.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
diff --git a/src/statistics.c b/src/statistics.c
index 34e6a40..183005d 100644
--- a/src/statistics.c
+++ b/src/statistics.c
@@ -23,9 +23,9 @@
 
 #include <sys/types.h>
 
-#include <osmocore/linuxlist.h>
-#include <osmocore/talloc.h>
-#include <osmocore/statistics.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/statistics.h>
 
 static LLIST_HEAD(counters);
 
diff --git a/src/talloc.c b/src/talloc.c
index 98c2ee0..60d7927 100644
--- a/src/talloc.c
+++ b/src/talloc.c
@@ -55,7 +55,7 @@
 #define __USE_GNU
 #include <string.h>
 #undef __USE_GNU
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
 #define MIN(x,y) ((x) < (y) ? (x) : (y))
 #endif /* not _TALLOC_SAMBA3 */
 
diff --git a/src/timer.c b/src/timer.c
index 37d7d16..9b2dd9e 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -20,7 +20,7 @@
 
 #include <assert.h>
 #include <string.h>
-#include <osmocore/timer.h>
+#include <osmocom/core/timer.h>
 
 static LLIST_HEAD(timer_list);
 static struct timeval s_nearest_time;
diff --git a/src/utils.c b/src/utils.c
index 354fce5..af1829c 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <stdio.h>
 
-#include <osmocore/utils.h>
+#include <osmocom/core/utils.h>
 
 static char namebuf[255];
 const char *get_value_string(const struct value_string *vs, uint32_t val)
diff --git a/src/vty/buffer.c b/src/vty/buffer.c
index a5655b9..e385f9f 100644
--- a/src/vty/buffer.c
+++ b/src/vty/buffer.c
@@ -28,7 +28,7 @@
 #include <stddef.h>
 #include <sys/uio.h>
 
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
 #include <osmocom/vty/buffer.h>
 #include <osmocom/vty/vty.h>
 
diff --git a/src/vty/command.c b/src/vty/command.c
index 0f65224..5dc1dd4 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -38,7 +38,7 @@ Boston, MA 02111-1307, USA.  */
 #include <osmocom/vty/vty.h>
 #include <osmocom/vty/command.h>
 
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
 
 #define CONFIGFILE_MASK 022
 
diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c
index 904f8fe..08b98bd 100644
--- a/src/vty/logging_vty.c
+++ b/src/vty/logging_vty.c
@@ -24,9 +24,9 @@
 
 #include "../../config.h"
 
-#include <osmocore/talloc.h>
-#include <osmocore/logging.h>
-#include <osmocore/utils.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/utils.h>
 
 //#include <openbsc/vty.h>
 
diff --git a/src/vty/telnet_interface.c b/src/vty/telnet_interface.c
index 098fa2e..0d45d61 100644
--- a/src/vty/telnet_interface.c
+++ b/src/vty/telnet_interface.c
@@ -25,9 +25,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <osmocore/msgb.h>
-#include <osmocore/talloc.h>
-#include <osmocore/logging.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/logging.h>
 
 #include <osmocom/vty/telnet_interface.h>
 #include <osmocom/vty/buffer.h>
diff --git a/src/vty/utils.c b/src/vty/utils.c
index e163526..7797e62 100644
--- a/src/vty/utils.c
+++ b/src/vty/utils.c
@@ -23,10 +23,10 @@
 #include <stdint.h>
 #include <inttypes.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 <osmocom/vty/vty.h>
 
diff --git a/src/vty/vector.c b/src/vty/vector.c
index 0343163..4012f24 100644
--- a/src/vty/vector.c
+++ b/src/vty/vector.c
@@ -24,7 +24,7 @@
 
 #include <osmocom/vty/vector.h>
 #include <osmocom/vty/vty.h>
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
 #include <memory.h>
 
 void *tall_vty_vec_ctx;
diff --git a/src/vty/vty.c b/src/vty/vty.c
index c1a9b3a..a1f0304 100644
--- a/src/vty/vty.c
+++ b/src/vty/vty.c
@@ -16,7 +16,7 @@
 #include <osmocom/vty/vty.h>
 #include <osmocom/vty/command.h>
 #include <osmocom/vty/buffer.h>
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
 
 #define SYSCONFDIR "/usr/local/etc"
 
diff --git a/src/write_queue.c b/src/write_queue.c
index 7295569..0642aad 100644
--- a/src/write_queue.c
+++ b/src/write_queue.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include <osmocore/write_queue.h>
+#include <osmocom/core/write_queue.h>
 
 int write_queue_bfd_cb(struct bsc_fd *fd, unsigned int what)
 {
diff --git a/tests/msgfile/msgfile_test.c b/tests/msgfile/msgfile_test.c
index a82ac51..4637cea 100644
--- a/tests/msgfile/msgfile_test.c
+++ b/tests/msgfile/msgfile_test.c
@@ -19,7 +19,7 @@
  *
  */
 
-#include <osmocore/msgfile.h>
+#include <osmocom/core/msgfile.h>
 
 #include <stdio.h>
 
diff --git a/tests/sms/sms_test.c b/tests/sms/sms_test.c
index 9d87b5b..f5d82b9 100644
--- a/tests/sms/sms_test.c
+++ b/tests/sms/sms_test.c
@@ -23,9 +23,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
-#include <osmocore/msgb.h>
-#include <osmocore/gsm_utils.h>
-#include <osmocore/utils.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/gsm/gsm_utils.h>
+#include <osmocom/core/utils.h>
 
 struct test_case {
 	const uint8_t *input;
diff --git a/tests/smscb/smscb_test.c b/tests/smscb/smscb_test.c
index 627d5a1..e10e12d 100644
--- a/tests/smscb/smscb_test.c
+++ b/tests/smscb/smscb_test.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include <osmocore/protocol/gsm_03_41.h>
+#include <osmocom/gsm/protocol/gsm_03_41.h>
 
 #include <stdio.h>
 
diff --git a/tests/timer/timer_test.c b/tests/timer/timer_test.c
index 1b458d8..30b08ad 100644
--- a/tests/timer/timer_test.c
+++ b/tests/timer/timer_test.c
@@ -20,8 +20,8 @@
 
 #include <stdio.h>
 
-#include <osmocore/timer.h>
-#include <osmocore/select.h>
+#include <osmocom/core/timer.h>
+#include <osmocom/core/select.h>
 
 #include "../../config.h"
 
diff --git a/tests/ussd/ussd_test.c b/tests/ussd/ussd_test.c
index bddbbcb..6d2a8c9 100644
--- a/tests/ussd/ussd_test.c
+++ b/tests/ussd/ussd_test.c
@@ -19,7 +19,7 @@
  *
  */
 
-#include <osmocore/gsm0480.h>
+#include <osmocom/gsm/gsm0480.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-- 
1.7.2.3




From laforge at gnumonks.org  Wed Mar 23 09:37:29 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Wed, 23 Mar 2011 10:37:29 +0100
Subject: [PATCH 0/2] [v2] reorganization of GSM-specific stuff and
	header files
In-Reply-To: <1300808173-12958-1-git-send-email-pablo@gnumonks.org>
References: <1300808173-12958-1-git-send-email-pablo@gnumonks.org>
Message-ID: <20110323093729.GM15771@prithivi.gnumonks.org>

Pablo,

On Tue, Mar 22, 2011 at 04:36:11PM +0100, pablo at gnumonks.org wrote:
> 
> * 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.

thanks a lot for your patches.  As Holger is travelling right now
back from Taiwan, I would like to wait for 1-2 more days to get his
review before we apply such an invasive change.

I'm fine with it, though I somehow think the "osmocom/gsm/protocol/gsm_04_08.h"
is getting a _bit_ long.  But well, it's a logical structure...

-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From holger at freyther.de  Wed Mar 23 10:14:41 2011
From: holger at freyther.de (Holger Hans Peter Freyther)
Date: Wed, 23 Mar 2011 11:14:41 +0100
Subject: [PATCH 0/2] [v2] reorganization of GSM-specific stuff and header
	files
In-Reply-To: <20110323093729.GM15771@prithivi.gnumonks.org>
References: <1300808173-12958-1-git-send-email-pablo@gnumonks.org>
	<20110323093729.GM15771@prithivi.gnumonks.org>
Message-ID: <4D89C811.4050303@freyther.de>

On 03/23/2011 10:37 AM, Harald Welte wrote:
> Pablo,

> thanks a lot for your patches.  As Holger is travelling right now
> back from Taiwan, I would like to wait for 1-2 more days to get his
> review before we apply such an invasive change.

Hi all,

I am at the airport right now. I do not have any problems with the general
approach and would not mind fixing fall outs afterwards.

regards
	holger



From laforge at gnumonks.org  Wed Mar 23 17:35:34 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Wed, 23 Mar 2011 18:35:34 +0100
Subject: [PATCH 0/2] [v2] reorganization of GSM-specific stuff and
	header files
In-Reply-To: <1300808173-12958-1-git-send-email-pablo@gnumonks.org>
References: <1300808173-12958-1-git-send-email-pablo@gnumonks.org>
Message-ID: <20110323173534.GD20261@prithivi.gnumonks.org>

On Tue, Mar 22, 2011 at 04:36:11PM +0100, pablo at gnumonks.org wrote:
> From: Pablo Neira Ayuso <pablo at 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.

Thanks, this has now been applied.  Hoewever, it was not working against
the latest git tree, so I had to find your original base and do a rebase.

Further fall-out: libosmo-sccp include paths had to be updated, and bsc-nat
as well as gprs parts of openbsc.git failed to build due to some missing
header changes.

At least libosmocore.git / libosmo-sccp.git / openbsc.git should be fine
now.

Regards,
	Harald
-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From pablo at gnumonks.org  Wed Mar 23 23:30:04 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Thu, 24 Mar 2011 00:30:04 +0100
Subject: [PATCH 0/2] [v2] reorganization of GSM-specific stuff and header
	files
In-Reply-To: <20110323173534.GD20261@prithivi.gnumonks.org>
References: <1300808173-12958-1-git-send-email-pablo@gnumonks.org>
	<20110323173534.GD20261@prithivi.gnumonks.org>
Message-ID: <4D8A827C.1090303@gnumonks.org>

On 23/03/11 18:35, Harald Welte wrote:
> On Tue, Mar 22, 2011 at 04:36:11PM +0100, pablo at gnumonks.org wrote:
>> From: Pablo Neira Ayuso <pablo at 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.
> 
> Thanks, this has now been applied.  Hoewever, it was not working against
> the latest git tree, so I had to find your original base and do a rebase.

it seems I forgot to pull before working on the patches :-(

> Further fall-out: libosmo-sccp include paths had to be updated, and bsc-nat
> as well as gprs parts of openbsc.git failed to build due to some missing
> header changes.

Sorry, I forgot to add --enable-nat=yes and to have installed libgtp.
I'll include this in the future to test my patches.

> At least libosmocore.git / libosmo-sccp.git / openbsc.git should be fine
> now.

Thanks!



From pablo at gnumonks.org  Tue Mar 22 15:47:59 2011
From: pablo at gnumonks.org (pablo at gnumonks.org)
Date: Tue, 22 Mar 2011 16:47:59 +0100
Subject: [PATCH OPENBSC] [v2] src: use new library libosmogsm and new path to
	headers in libosmocore
Message-ID: <1300808879-13315-1-git-send-email-pablo@gnumonks.org>

From: Pablo Neira Ayuso <pablo at 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 at 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




From amed.et at hotmail.com  Tue Mar 22 16:03:30 2011
From: amed.et at hotmail.com (amed et)
Date: Tue, 22 Mar 2011 16:03:30 +0000
Subject: nanoBTS to buy !!!
Message-ID: <BAY155-w64F926C4B3380A2C59C436FDB40@phx.gbl>


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, 
 		 	   		  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110322/c4e31d94/attachment.htm>

From stuart at bluewave.im  Tue Mar 22 16:40:22 2011
From: stuart at bluewave.im (Stuart Baggs)
Date: Tue, 22 Mar 2011 16:40:22 +0000
Subject: nanoBTS to buy !!!
In-Reply-To: <BAY155-w64F926C4B3380A2C59C436FDB40@phx.gbl>
References: <BAY155-w64F926C4B3380A2C59C436FDB40@phx.gbl>
Message-ID: <8D3D4D6B-AC3E-43A3-A5C6-C5674D49910D@bluewave.im>

Hi, we have 2 units left for sale (model 139's). We have sold plenty to list members already.

Best,

Stuart

Sent from my iPhone

On 22 Mar 2011, at 16:03, amed et <amed.et at hotmail.com> wrote:

> 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, 



From pablo at gnumonks.org  Tue Mar 22 16:16:58 2011
From: pablo at gnumonks.org (pablo at gnumonks.org)
Date: Tue, 22 Mar 2011 17:16:58 +0100
Subject: [PATCH OSMOCOM-BB] src: use new libosmogsm and
	include/osmocom/[gsm|core] path to headers
Message-ID: <1300810618-13712-1-git-send-email-pablo@gnumonks.org>

From: Pablo Neira Ayuso <pablo at 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 at 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




From kobayashi_maru at onlinehome.de  Tue Mar 22 16:45:32 2011
From: kobayashi_maru at onlinehome.de (Thomas Ansorg)
Date: Tue, 22 Mar 2011 17:45:32 +0100
Subject: impedance of cable to connect bs-11
Message-ID: <1300812332.11249.11.camel@r-9djhc747gf8b40ha>

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!




From laforge at gnumonks.org  Tue Mar 22 19:24:01 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Tue, 22 Mar 2011 20:24:01 +0100
Subject: impedance of cable to connect bs-11
In-Reply-To: <1300812332.11249.11.camel@r-9djhc747gf8b40ha>
References: <1300812332.11249.11.camel@r-9djhc747gf8b40ha>
Message-ID: <20110322192401.GD15771@prithivi.gnumonks.org>

On Tue, Mar 22, 2011 at 05:45:32PM +0100, Thomas Ansorg wrote:

> what impedance should a pair of cable for multidrop have? 

i think it is whatever impedance you configure using the thermination jumpers
on the BS-11 connector board.

-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From Andreas.Eversberg at versatel.de  Wed Mar 23 07:06:51 2011
From: Andreas.Eversberg at versatel.de (Andreas.Eversberg)
Date: Wed, 23 Mar 2011 08:06:51 +0100
Subject: AW: impedance of cable to connect bs-11
Message-ID: <B16317F2B1592B4492FC414114171CE6053EBBB8@FLBVEXCH01.versatel.local>

> 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.



From pablo at gnumonks.org  Wed Mar 23 00:48:06 2011
From: pablo at gnumonks.org (pablo at gnumonks.org)
Date: Wed, 23 Mar 2011 01:48:06 +0100
Subject: [PATCH] src: fix use of logging_vty_add_cmds() without log_info
	parameter
Message-ID: <1300841286-1864-1-git-send-email-pablo@gnumonks.org>

From: Pablo Neira Ayuso <pablo at 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 at 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




From laforge at gnumonks.org  Wed Mar 23 09:35:38 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Wed, 23 Mar 2011 10:35:38 +0100
Subject: [PATCH] src: fix use of logging_vty_add_cmds() without
	log_info parameter
In-Reply-To: <1300841286-1864-1-git-send-email-pablo@gnumonks.org>
References: <1300841286-1864-1-git-send-email-pablo@gnumonks.org>
Message-ID: <20110323093538.GL15771@prithivi.gnumonks.org>

Hi pablo,

On Wed, Mar 23, 2011 at 01:48:06AM +0100, pablo at gnumonks.org wrote:
 
> And a similar problem in osmo-bsc_nat.

thanks, patch applied.
-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From laforge at gnumonks.org  Wed Mar 23 07:48:12 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Wed, 23 Mar 2011 08:48:12 +0100
Subject: Fwd: [PATCH] bsc: change bsc_vty_init to take logging
	categories as	parameter
In-Reply-To: <4D8938DE.7000003@gnumonks.org>
References: <4D850696.40307@gnumonks.org>
	<20110322093348.GG9858@prithivi.gnumonks.org>
	<4D8938DE.7000003@gnumonks.org>
Message-ID: <20110323074812.GK15771@prithivi.gnumonks.org>

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 at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From holger at freyther.de  Wed Mar 23 10:16:37 2011
From: holger at freyther.de (Holger Hans Peter Freyther)
Date: Wed, 23 Mar 2011 11:16:37 +0100
Subject: Fwd: [PATCH] bsc: change bsc_vty_init to take logging	categories
	as	parameter
In-Reply-To: <20110323074812.GK15771@prithivi.gnumonks.org>
References: <4D850696.40307@gnumonks.org>	<20110322093348.GG9858@prithivi.gnumonks.org>	<4D8938DE.7000003@gnumonks.org>
	<20110323074812.GK15771@prithivi.gnumonks.org>
Message-ID: <4D89C885.6010507@freyther.de>

On 03/23/2011 08:48 AM, Harald Welte wrote:

> 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...

do you (have a cron job to) repack the repositories? At openmoko we were
seeing such failures due mmap failing (IIRC) on too many objects.

regards
	holger



From laforge at gnumonks.org  Wed Mar 23 12:21:06 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Wed, 23 Mar 2011 13:21:06 +0100
Subject: Fwd: [PATCH] bsc: change bsc_vty_init to take logging
	categories as	parameter
In-Reply-To: <4D89C885.6010507@freyther.de>
References: <4D850696.40307@gnumonks.org>
	<20110322093348.GG9858@prithivi.gnumonks.org>
	<4D8938DE.7000003@gnumonks.org>
	<20110323074812.GK15771@prithivi.gnumonks.org>
	<4D89C885.6010507@freyther.de>
Message-ID: <20110323122106.GP15771@prithivi.gnumonks.org>

On Wed, Mar 23, 2011 at 11:16:37AM +0100, Holger Hans Peter Freyther wrote:
> On 03/23/2011 08:48 AM, Harald Welte wrote:
> 
> > 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...
> 
> do you (have a cron job to) repack the repositories? At openmoko we were
> seeing such failures due mmap failing (IIRC) on too many objects.

i've already doen repack and fsck without success.  There also is no mmap
failure in the strace/ltrace.

-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From kobayashi_maru at onlinehome.de  Wed Mar 23 21:43:01 2011
From: kobayashi_maru at onlinehome.de (Thomas Ansorg)
Date: Wed, 23 Mar 2011 22:43:01 +0100
Subject: bts/trx(0/0) and (1/1)
Message-ID: <1300916581.5132.7.camel@r-9djhc747gf8b40ha>

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!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dsc00020.jpg
Type: image/jpeg
Size: 740854 bytes
Desc: not available
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110323/c91ab337/attachment.jpg>

From kobayashi_maru at onlinehome.de  Wed Mar 23 21:54:03 2011
From: kobayashi_maru at onlinehome.de (Thomas Ansorg)
Date: Wed, 23 Mar 2011 22:54:03 +0100
Subject: cid, lac, bsic and the -P parameter
Message-ID: <1300917243.5132.18.camel@r-9djhc747gf8b40ha>

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!




From laforge at gnumonks.org  Sat Mar 19 23:52:53 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Sun, 20 Mar 2011 00:52:53 +0100
Subject: cid, lac, bsic and the -P parameter
In-Reply-To: <1300917243.5132.18.camel@r-9djhc747gf8b40ha>
References: <1300917243.5132.18.camel@r-9djhc747gf8b40ha>
Message-ID: <542db62a-7080-495a-ba60-19c371920c0a@email.android.com>

-P is regarding the rtp poxy. As you know, your BS11 uses an E1 line, and not RTP. 
RTP only has significance in case of Abis/Ip

-- 
Sent from my mobile phone. Please excuse my brevity.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110320/4c31b641/attachment.htm>

From laforge at gnumonks.org  Thu Mar 24 10:43:13 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Thu, 24 Mar 2011 11:43:13 +0100
Subject: [ADM] Problems with osmocom git server
Message-ID: <20110324104313.GJ4534@prithivi.gnumonks.org>

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 at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From holger at freyther.de  Sat Mar 26 17:43:21 2011
From: holger at freyther.de (Holger Hans Peter Freyther)
Date: Sat, 26 Mar 2011 18:43:21 +0100
Subject: [ADM] Problems with osmocom git server
In-Reply-To: <20110324104313.GJ4534@prithivi.gnumonks.org>
References: <20110324104313.GJ4534@prithivi.gnumonks.org>
Message-ID: <4D8E25B9.4090201@freyther.de>

On 03/24/2011 11:43 AM, Harald Welte wrote:
> Hi all!

> 
> More technical details are available at this posting to the git mailing list:
> http://article.gmane.org/gmane.comp.version-control.git/169909

Hey,
this seems to be either a race condition in git or in the kernel. I have a
workaround that issues a sleep(1) in the upload-pack program and it seems to
fix the issue. I don't understand how this is changing things (it delays
closing the socket a bit due being the last app to close it).

Right now the git-daemon runs in a thread, I could build a lenny package with
my hack if you want to.

holger



From holger at freyther.de  Sat Mar 26 22:51:35 2011
From: holger at freyther.de (Holger Hans Peter Freyther)
Date: Sat, 26 Mar 2011 23:51:35 +0100
Subject: [ADM] Problems with osmocom git server
In-Reply-To: <4D8E25B9.4090201@freyther.de>
References: <20110324104313.GJ4534@prithivi.gnumonks.org>
	<4D8E25B9.4090201@freyther.de>
Message-ID: <4D8E6DF7.4020200@freyther.de>

On 03/26/2011 06:43 PM, Holger Hans Peter Freyther wrote:

> Right now the git-daemon runs in a thread, I could build a lenny package with
> my hack if you want to.

I re-built git-core with my patch and installed it on the machine. I have set
all of my packages to hold. Is anyone still getting premature EOF errors?

holger



From laforge at gnumonks.org  Fri Mar 25 13:00:42 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Fri, 25 Mar 2011 14:00:42 +0100
Subject: [ADM] New commitlog mailing list
Message-ID: <20110325130042.GP12584@prithivi.gnumonks.org>

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 at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From dario.lombardo at libero.it  Sat Mar 26 21:37:02 2011
From: dario.lombardo at libero.it (Dario Lombardo)
Date: Sat, 26 Mar 2011 22:37:02 +0100
Subject: [ADM] New commitlog mailing list
In-Reply-To: <20110325130042.GP12584@prithivi.gnumonks.org>
References: <20110325130042.GP12584@prithivi.gnumonks.org>
Message-ID: <AANLkTi=6zXvc2-yHa22-sD=1gVN+QuKGyuKL4D2s0VBY@mail.gmail.com>

On Fri, Mar 25, 2011 at 2:00 PM, Harald Welte <laforge at gnumonks.org> wrote:
>
> The new mailing list 'osmocom-commitlog' (renamed from openbsc-commits) will
> receive updates from all repositories on git.osmocom.org.
>

Another way to be kept up-to-date with bb commits (and other changes
too) is to subscribe to the RSS feed that trac exports, and that can
be found at

http://bb.osmocom.org/trac/timeline

Dario.



From laforge at gnumonks.org  Sat Mar 26 22:57:00 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Sat, 26 Mar 2011 23:57:00 +0100
Subject: [ADM] New commitlog mailing list
In-Reply-To: <AANLkTi=6zXvc2-yHa22-sD=1gVN+QuKGyuKL4D2s0VBY@mail.gmail.com>
References: <20110325130042.GP12584@prithivi.gnumonks.org>
	<AANLkTi=6zXvc2-yHa22-sD=1gVN+QuKGyuKL4D2s0VBY@mail.gmail.com>
Message-ID: <20110326225700.GL22508@prithivi.gnumonks.org>

Hi Dario,

On Sat, Mar 26, 2011 at 10:37:02PM +0100, Dario Lombardo wrote:
> On Fri, Mar 25, 2011 at 2:00 PM, Harald Welte <laforge at gnumonks.org> wrote:
> >
> > The new mailing list 'osmocom-commitlog' (renamed from openbsc-commits) will
> > receive updates from all repositories on git.osmocom.org.
> >
> 
> Another way to be kept up-to-date with bb commits (and other changes
> too) is to subscribe to the RSS feed that trac exports, and that can
> be found at
> 
> http://bb.osmocom.org/trac/timeline

unfortunately this only works for one repository (osmocom-bb.git), and
not for all the other repositories visible on http://cgit.osmocom.org/

The trac (version we use) does not support multiple repositories associated
with one trac instance :/

Regards,
	Harald
-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From pablo at gnumonks.org  Sat Mar 26 21:08:53 2011
From: pablo at gnumonks.org (pablo at gnumonks.org)
Date: Sat, 26 Mar 2011 22:08:53 +0100
Subject: [PATCH] tests: fix bsc-nat test
Message-ID: <1301173733-24209-1-git-send-email-pablo@gnumonks.org>

From: Pablo Neira Ayuso <pablo at 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




From laforge at gnumonks.org  Sat Mar 26 22:58:18 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Sat, 26 Mar 2011 23:58:18 +0100
Subject: [PATCH] tests: fix bsc-nat test
In-Reply-To: <1301173733-24209-1-git-send-email-pablo@gnumonks.org>
References: <1301173733-24209-1-git-send-email-pablo@gnumonks.org>
Message-ID: <20110326225818.GM22508@prithivi.gnumonks.org>

Hi Pablo,

On Sat, Mar 26, 2011 at 10:08:53PM +0100, pablo at gnumonks.org wrote:
 
> 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).

thanks, applied.
-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From kobayashi_maru at onlinehome.de  Sun Mar 27 11:32:42 2011
From: kobayashi_maru at onlinehome.de (kobayashi_maru at onlinehome.de)
Date: Sun, 27 Mar 2011 13:32:42 +0200 (CEST)
Subject: trx1 not found/not existing trx1
Message-ID: <1257444774.1313338.1301225562386.JavaMail.tomcat55@mrmseu1.kundenserver.de>

An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110327/35b04d69/attachment.htm>
-------------- next part --------------

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.


From kobayashi_maru at onlinehome.de  Sun Mar 27 11:37:16 2011
From: kobayashi_maru at onlinehome.de (kobayashi_maru at onlinehome.de)
Date: Sun, 27 Mar 2011 13:37:16 +0200 (CEST)
Subject: switchin from multidrop to star
Message-ID: <2137408395.1313737.1301225836367.JavaMail.tomcat55@mrmseu1.kundenserver.de>

An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110327/e75a8183/attachment.htm>
-------------- next part --------------

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.



From pablo at gnumonks.org  Sun Mar 27 19:31:48 2011
From: pablo at gnumonks.org (pablo at gnumonks.org)
Date: Sun, 27 Mar 2011 21:31:48 +0200
Subject: [PATCH] ipaccess-proxy: fix segfault in handle_dead_socket
Message-ID: <1301254308-3871-1-git-send-email-pablo@gnumonks.org>

From: Pablo Neira Ayuso <pablo at 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




From laforge at gnumonks.org  Sun Mar 27 20:21:39 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Sun, 27 Mar 2011 22:21:39 +0200
Subject: [PATCH] ipaccess-proxy: fix segfault in handle_dead_socket
In-Reply-To: <1301254308-3871-1-git-send-email-pablo@gnumonks.org>
References: <1301254308-3871-1-git-send-email-pablo@gnumonks.org>
Message-ID: <20110327202139.GS22508@prithivi.gnumonks.org>

On Sun, Mar 27, 2011 at 09:31:48PM +0200, pablo at gnumonks.org wrote:
 
> 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.

thanks, applied.
-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From pablo at gnumonks.org  Sun Mar 27 19:37:54 2011
From: pablo at gnumonks.org (pablo at gnumonks.org)
Date: Sun, 27 Mar 2011 21:37:54 +0200
Subject: [PATCH] [RFC] src: add prefix osmocom_ to all functions in libosmocore
Message-ID: <1301254674-4378-1-git-send-email-pablo@gnumonks.org>

From: Pablo Neira Ayuso <pablo at 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




From 246tnt at gmail.com  Sun Mar 27 20:16:12 2011
From: 246tnt at gmail.com (246tnt at gmail.com)
Date: Sun, 27 Mar 2011 20:16:12 +0000
Subject: [PATCH] [RFC] src: add prefix osmocom_ to all functions in
	libosmocore
In-Reply-To: <1301254674-4378-1-git-send-email-pablo@gnumonks.org>
Message-ID: <000e0cdfcb0e998624049f7c7f77@google.com>

Hi,

> This patch is a RFC, I can add the prefix osmocom_ to all functions
> in libosmocore to fix with the existing namespace pollution.

Well, use osmo_ not osmocom_ (that's what's used at several places already).

Second, I wouldn't say _all_ ...
I mean when there is already a prefix, I see no point adding another  
(things like msgb_, vty_, bitvec_, log_, gsmtap_, rsl_, gsm48_ ...).

For things that are too generic, like 'generate_backtrace'  
or 'plugin_load_all', then sure.


Sylvain
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110327/6f3a3440/attachment.htm>

From laforge at gnumonks.org  Sun Mar 27 20:20:54 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Sun, 27 Mar 2011 22:20:54 +0200
Subject: [PATCH] [RFC] src: add prefix osmocom_ to all functions in
	libosmocore
In-Reply-To: <1301254674-4378-1-git-send-email-pablo@gnumonks.org>
References: <1301254674-4378-1-git-send-email-pablo@gnumonks.org>
Message-ID: <20110327202054.GR22508@prithivi.gnumonks.org>

Hi Pablo,

On Sun, Mar 27, 2011 at 09:37:54PM +0200, pablo at gnumonks.org wrote:
 
> This patch is a RFC, I can add the prefix osmocom_ to all functions
> in libosmocore to fix with the existing namespace pollution.

I think 'osmocom_' is too long.  'osmo_' should be better.  And yes,
generally it would make sense to prefix most functions. 

Exceptions:
* libosmovty should have a common vty_ prefix, but not osmo.
* for libosmovty we should probably simply limit the number of exported
  symbols.  There is e.g. all the buffer_*() and vector_*() use internally,
  but there is no need to globally export all those symbols.
* no osmo_ prefix for msgb_* and tlv_*, as they are used everywhere
* no prefix for talloc
* bitvec_* -> osmo_bv_*
* bsc_*_timer -> osmo_timer_*
* *_signal_* -> osmo_signal_*

> Let me know if you are OK with this approach and I'll send a
> patchset along this week.

I think it's great. Once the namespace is cleaned up, I think we can head
for a 1.0 release of the libraries.
-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From pablo at gnumonks.org  Mon Mar 28 14:40:08 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Mon, 28 Mar 2011 16:40:08 +0200
Subject: [PATCH] [RFC] src: add prefix osmocom_ to all functions
	in	libosmocore
In-Reply-To: <20110327202054.GR22508@prithivi.gnumonks.org>
References: <1301254674-4378-1-git-send-email-pablo@gnumonks.org>
	<20110327202054.GR22508@prithivi.gnumonks.org>
Message-ID: <4D909DC8.80102@gnumonks.org>

Hi!

On 27/03/11 22:20, Harald Welte wrote:
> Hi Pablo,
> 
> On Sun, Mar 27, 2011 at 09:37:54PM +0200, pablo at gnumonks.org wrote:
>  
>> This patch is a RFC, I can add the prefix osmocom_ to all functions
>> in libosmocore to fix with the existing namespace pollution.
> 
> I think 'osmocom_' is too long.  'osmo_' should be better.  And yes,
> generally it would make sense to prefix most functions. 
> 
> Exceptions:
> * libosmovty should have a common vty_ prefix, but not osmo.
> * for libosmovty we should probably simply limit the number of exported
>   symbols.  There is e.g. all the buffer_*() and vector_*() use internally,
>   but there is no need to globally export all those symbols.
> * no osmo_ prefix for msgb_* and tlv_*, as they are used everywhere
> * no prefix for talloc
> * bitvec_* -> osmo_bv_*
> * bsc_*_timer -> osmo_timer_*
> * *_signal_* -> osmo_signal_*

thanks for the feedback!

>> Let me know if you are OK with this approach and I'll send a
>> patchset along this week.
> 
> I think it's great. Once the namespace is cleaned up, I think we can head
> for a 1.0 release of the libraries.

those are good news.

BTW, do you plan to maintain a stable ABI along releases for libraries?

Another proposition: it may be a good idea to use some EXPORT_SYMBOL()
macro, similar to what we use in the Linux kernel, to explicit tell what
symbols of the library are exported.

We use this in libmnl:
http://git.netfilter.org/cgi-bin/gitweb.cgi?p=libmnl.git;a=summary



From laforge at gnumonks.org  Mon Mar 28 15:28:11 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Mon, 28 Mar 2011 17:28:11 +0200
Subject: [PATCH] [RFC] src: add prefix osmocom_ to all functions in
	libosmocore
In-Reply-To: <4D909DC8.80102@gnumonks.org>
References: <1301254674-4378-1-git-send-email-pablo@gnumonks.org>
	<20110327202054.GR22508@prithivi.gnumonks.org>
	<4D909DC8.80102@gnumonks.org>
Message-ID: <20110328152811.GV31090@prithivi.gnumonks.org>

Hi Pablo,

On Mon, Mar 28, 2011 at 04:40:08PM +0200, Pablo Neira Ayuso wrote:

> >> Let me know if you are OK with this approach and I'll send a
> >> patchset along this week.
> > 
> > I think it's great. Once the namespace is cleaned up, I think we can head
> > for a 1.0 release of the libraries.
> 
> those are good news.
> 
> BTW, do you plan to maintain a stable ABI along releases for libraries?

that's the idea once we have the namespace pollution fixed and release a 1.0

> Another proposition: it may be a good idea to use some EXPORT_SYMBOL()
> macro, similar to what we use in the Linux kernel, to explicit tell what
> symbols of the library are exported.

I think it makes sense, indeed.  Feel free to work on a patch, after
the namespace conversion has been done.  Also, don't forget the wireshark
dissector related work (which I think is more important).

Thanks,
	Harald
-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From pablo at gnumonks.org  Mon Mar 28 15:27:42 2011
From: pablo at gnumonks.org (Pablo Neira Ayuso)
Date: Mon, 28 Mar 2011 17:27:42 +0200
Subject: [PATCH] [RFC] src: add prefix osmocom_ to all functions
	in	libosmocore
In-Reply-To: <20110327202054.GR22508@prithivi.gnumonks.org>
References: <1301254674-4378-1-git-send-email-pablo@gnumonks.org>
	<20110327202054.GR22508@prithivi.gnumonks.org>
Message-ID: <4D90A8EE.6060103@gnumonks.org>

Some minor questions:

On 27/03/11 22:20, Harald Welte wrote:
> Exceptions:
> * libosmovty should have a common vty_ prefix, but not osmo.
> * for libosmovty we should probably simply limit the number of exported
>   symbols.  There is e.g. all the buffer_*() and vector_*() use internally,
>   but there is no need to globally export all those symbols.
> * no osmo_ prefix for msgb_* and tlv_*, as they are used everywhere
> * no prefix for talloc
> * bitvec_* -> osmo_bv_*

enum bit_value -> enum osmo_bit_value
struct bitvec -> struct osmo_bitvec

> * bsc_*_timer -> osmo_timer_*

there are some inconsistencies in the API naming in the timer bits:

bsc_add_timer(...)
bsc_timer_pending(...)

I can put the timer postfix in the end, so it looks consistent.

struct timer_list should be struct osmo_timer_list, right?

> * *_signal_* -> osmo_signal_*

Is there any plan to remove the static lists inside the library?

I can make this in follow up patches. This would require more testing
since it's not a simple renaming.



From laforge at gnumonks.org  Mon Mar 28 18:00:23 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Mon, 28 Mar 2011 20:00:23 +0200
Subject: [PATCH] [RFC] src: add prefix osmocom_ to all functions in
	libosmocore
In-Reply-To: <4D90A8EE.6060103@gnumonks.org>
References: <1301254674-4378-1-git-send-email-pablo@gnumonks.org>
	<20110327202054.GR22508@prithivi.gnumonks.org>
	<4D90A8EE.6060103@gnumonks.org>
Message-ID: <20110328180023.GA31090@prithivi.gnumonks.org>

Hi Pablo,

On Mon, Mar 28, 2011 at 05:27:42PM +0200, Pablo Neira Ayuso wrote:
> Some minor questions:
> 
> On 27/03/11 22:20, Harald Welte wrote:
> > Exceptions:
> > * libosmovty should have a common vty_ prefix, but not osmo.
> > * for libosmovty we should probably simply limit the number of exported
> >   symbols.  There is e.g. all the buffer_*() and vector_*() use internally,
> >   but there is no need to globally export all those symbols.
> > * no osmo_ prefix for msgb_* and tlv_*, as they are used everywhere
> > * no prefix for talloc
> > * bitvec_* -> osmo_bv_*
> 
> enum bit_value -> enum osmo_bit_value
> struct bitvec -> struct osmo_bitvec

both fine with me.  I think Sylvain wanted to be a bit less 'aggressive'
with renaming, but the point is: We're breaking the API anyway, so we
might as well do it properly once and hopefully not have to care about
it in the future.

> there are some inconsistencies in the API naming in the timer bits:
> 
> bsc_add_timer(...)
> bsc_timer_pending(...)
> 
> I can put the timer postfix in the end, so it looks consistent.

I think it should all be called osmo_timer_* for consistency.

> struct timer_list should be struct osmo_timer_list, right?

ACK.

> > * *_signal_* -> osmo_signal_*
> 
> Is there any plan to remove the static lists inside the library?

no, I don't have such plans, and I don't think it is neccessarry. The
signalling system is not intended to have multiple instances.  There is
one in every process, that's it.

Regards,
	Harald
-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From pablo at gnumonks.org  Mon Mar 28 17:24:19 2011
From: pablo at gnumonks.org (pablo at gnumonks.org)
Date: Mon, 28 Mar 2011 19:24:19 +0200
Subject: [PATCH 1/4] bitvec: add bitvec_find_first_bit_pos() from
	gsm/rxlev_stat.c
Message-ID: <1301333062-32292-1-git-send-email-pablo@gnumonks.org>

From: Pablo Neira Ayuso <pablo at 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




From pablo at gnumonks.org  Mon Mar 28 17:24:20 2011
From: pablo at gnumonks.org (pablo at gnumonks.org)
Date: Mon, 28 Mar 2011 19:24:20 +0200
Subject: [PATCH 2/4] write_queue: use full path of includes in
	osmocom/core/write_queue.h
In-Reply-To: <1301333062-32292-1-git-send-email-pablo@gnumonks.org>
References: <1301333062-32292-1-git-send-email-pablo@gnumonks.org>
Message-ID: <1301333062-32292-2-git-send-email-pablo@gnumonks.org>

From: Pablo Neira Ayuso <pablo at gnumonks.org>

---
 include/osmocom/core/write_queue.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/osmocom/core/write_queue.h b/include/osmocom/core/write_queue.h
index ef244c3..3b730c7 100644
--- a/include/osmocom/core/write_queue.h
+++ b/include/osmocom/core/write_queue.h
@@ -23,8 +23,8 @@
 #ifndef write_queue_h
 #define write_queue_h
 
-#include "select.h"
-#include "msgb.h"
+#include <osmocom/core/select.h>
+#include <osmocom/core/msgb.h>
 
 struct write_queue {
 	struct bsc_fd bfd;
-- 
1.7.2.3




From pablo at gnumonks.org  Mon Mar 28 17:24:21 2011
From: pablo at gnumonks.org (pablo at gnumonks.org)
Date: Mon, 28 Mar 2011 19:24:21 +0200
Subject: [PATCH 3/4] vty: move vty_out_rate_ctr_group prototype to
	osmocom/vty/misc.h
In-Reply-To: <1301333062-32292-1-git-send-email-pablo@gnumonks.org>
References: <1301333062-32292-1-git-send-email-pablo@gnumonks.org>
Message-ID: <1301333062-32292-3-git-send-email-pablo@gnumonks.org>

From: Pablo Neira Ayuso <pablo at gnumonks.org>

Before this patch, it was in osmocom/core/rate_ctr.h
---
 include/osmocom/core/rate_ctr.h |    3 ---
 include/osmocom/vty/Makefile.am |    2 +-
 include/osmocom/vty/misc.h      |   10 ++++++++++
 3 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 include/osmocom/vty/misc.h

diff --git a/include/osmocom/core/rate_ctr.h b/include/osmocom/core/rate_ctr.h
index dba573d..9efc23d 100644
--- a/include/osmocom/core/rate_ctr.h
+++ b/include/osmocom/core/rate_ctr.h
@@ -75,7 +75,4 @@ static inline void rate_ctr_inc(struct rate_ctr *ctr)
 /* Initialize the counter module */
 int rate_ctr_init(void *tall_ctx);
 
-struct vty;
-void vty_out_rate_ctr_group(struct vty *vty, const char *prefix,
-			    struct rate_ctr_group *ctrg);
 #endif /* RATE_CTR_H */
diff --git a/include/osmocom/vty/Makefile.am b/include/osmocom/vty/Makefile.am
index d2f0616..83d0010 100644
--- a/include/osmocom/vty/Makefile.am
+++ b/include/osmocom/vty/Makefile.am
@@ -1,4 +1,4 @@
 osmovty_HEADERS = buffer.h command.h vector.h vty.h \
-	telnet_interface.h logging.h
+	telnet_interface.h logging.h misc.h
 
 osmovtydir = $(includedir)/osmocom/vty
diff --git a/include/osmocom/vty/misc.h b/include/osmocom/vty/misc.h
new file mode 100644
index 0000000..707f82f
--- /dev/null
+++ b/include/osmocom/vty/misc.h
@@ -0,0 +1,10 @@
+#ifndef OSMO_VTY_MISC_H
+#define OSMO_VTY_MISC_H
+
+#include <osmocom/vty/vty.h>
+#include <osmocom/core/rate_ctr.h>
+
+void vty_out_rate_ctr_group(struct vty *vty, const char *prefix,
+                            struct rate_ctr_group *ctrg);
+
+#endif
-- 
1.7.2.3




From pablo at gnumonks.org  Mon Mar 28 17:24:22 2011
From: pablo at gnumonks.org (pablo at gnumonks.org)
Date: Mon, 28 Mar 2011 19:24:22 +0200
Subject: [PATCH 4/4] utils: move OSMO_SNPRINT_RET() macro definition to
	osmocom/core/utils.h
In-Reply-To: <1301333062-32292-1-git-send-email-pablo@gnumonks.org>
References: <1301333062-32292-1-git-send-email-pablo@gnumonks.org>
Message-ID: <1301333062-32292-4-git-send-email-pablo@gnumonks.org>

From: Pablo Neira Ayuso <pablo at gnumonks.org>

This is used by the logging to vty conversion functions by now, but it
may be of help for other functions that plan to use snprintf().
---
 include/osmocom/core/utils.h |    9 +++++++++
 src/logging.c                |   26 ++++++++------------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h
index 0cdf03b..252228d 100644
--- a/include/osmocom/core/utils.h
+++ b/include/osmocom/core/utils.h
@@ -27,4 +27,13 @@ char *ubit_dump(const uint8_t *bits, unsigned int len);
 void osmo_str2lower(char *out, const char *in);
 void osmo_str2upper(char *out, const char *in);
 
+#define OSMO_SNPRINTF_RET(ret, rem, offset, len)		\
+do {								\
+	len += ret;						\
+	if (ret > rem)						\
+		ret = rem;					\
+	offset += ret;						\
+	rem -= ret;						\
+} while (0)
+
 #endif
diff --git a/src/logging.c b/src/logging.c
index 653c80d..2c24f2f 100644
--- a/src/logging.c
+++ b/src/logging.c
@@ -434,16 +434,6 @@ int log_target_file_reopen(struct log_target *target)
 	return 0;
 }
 
-/* This can go into some header file so others can benefit from it. */
-#define SNPRINTF_FAILURE(ret, rem, offset, len)			\
-do {								\
-	len += ret;						\
-	if (ret > rem)						\
-		ret = rem;					\
-	offset += ret;						\
-	rem -= ret;						\
-} while (0)
-
 /* This generates the logging command string for VTY. */
 const char *log_vty_command_string(const struct log_info *info)
 {
@@ -465,7 +455,7 @@ const char *log_vty_command_string(const struct log_info *info)
 	ret = snprintf(str + offset, rem, "logging level (");
 	if (ret < 0)
 		goto err;
-	SNPRINTF_FAILURE(ret, rem, offset, len);
+	OSMO_SNPRINTF_RET(ret, rem, offset, len);
 
 	for (i = 0; i < info->num_cat; i++) {
 		int j, name_len = strlen(info->cat[i].name)+1;
@@ -478,7 +468,7 @@ const char *log_vty_command_string(const struct log_info *info)
 		ret = snprintf(str + offset, rem, "%s|", name+1);
 		if (ret < 0)
 			goto err;
-		SNPRINTF_FAILURE(ret, rem, offset, len);
+		OSMO_SNPRINTF_RET(ret, rem, offset, len);
 	}
 	offset--;	/* to remove the trailing | */
 	rem++;
@@ -486,7 +476,7 @@ const char *log_vty_command_string(const struct log_info *info)
 	ret = snprintf(str + offset, rem, ") (");
 	if (ret < 0)
 		goto err;
-	SNPRINTF_FAILURE(ret, rem, offset, len);
+	OSMO_SNPRINTF_RET(ret, rem, offset, len);
 
 	for (i = 0; i < LOGLEVEL_DEFS; i++) {
 		int j, loglevel_str_len = strlen(loglevel_strs[i].str)+1;
@@ -499,7 +489,7 @@ const char *log_vty_command_string(const struct log_info *info)
 		ret = snprintf(str + offset, rem, "%s|", loglevel_str);
 		if (ret < 0)
 			goto err;
-		SNPRINTF_FAILURE(ret, rem, offset, len);
+		OSMO_SNPRINTF_RET(ret, rem, offset, len);
 	}
 	offset--;	/* to remove the trailing | */
 	rem++;
@@ -507,7 +497,7 @@ const char *log_vty_command_string(const struct log_info *info)
 	ret = snprintf(str + offset, rem, ")");
 	if (ret < 0)
 		goto err;
-	SNPRINTF_FAILURE(ret, rem, offset, len);
+	OSMO_SNPRINTF_RET(ret, rem, offset, len);
 err:
 	return str;
 }
@@ -536,21 +526,21 @@ const char *log_vty_command_description(const struct log_info *info)
 			"Set the log level for a specified category\n");
 	if (ret < 0)
 		goto err;
-	SNPRINTF_FAILURE(ret, rem, offset, len);
+	OSMO_SNPRINTF_RET(ret, rem, offset, len);
 
 	for (i = 0; i < info->num_cat; i++) {
 		ret = snprintf(str + offset, rem, "%s\n",
 				info->cat[i].description);
 		if (ret < 0)
 			goto err;
-		SNPRINTF_FAILURE(ret, rem, offset, len);
+		OSMO_SNPRINTF_RET(ret, rem, offset, len);
 	}
 	for (i = 0; i < LOGLEVEL_DEFS; i++) {
 		ret = snprintf(str + offset, rem, "%s\n",
 				loglevel_descriptions[i]);
 		if (ret < 0)
 			goto err;
-		SNPRINTF_FAILURE(ret, rem, offset, len);
+		OSMO_SNPRINTF_RET(ret, rem, offset, len);
 	}
 err:
 	return str;
-- 
1.7.2.3




From pablo at gnumonks.org  Mon Mar 28 17:26:42 2011
From: pablo at gnumonks.org (pablo at gnumonks.org)
Date: Mon, 28 Mar 2011 19:26:42 +0200
Subject: [PATCH 0/4] libosmocore: several cleanups
Message-ID: <1301333202-32365-1-git-send-email-pablo@gnumonks.org>

From: Pablo Neira Ayuso <pablo at 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




From laforge at gnumonks.org  Mon Mar 28 18:02:05 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Mon, 28 Mar 2011 20:02:05 +0200
Subject: [PATCH 0/4] libosmocore: several cleanups
In-Reply-To: <1301333202-32365-1-git-send-email-pablo@gnumonks.org>
References: <1301333202-32365-1-git-send-email-pablo@gnumonks.org>
Message-ID: <20110328180205.GB31090@prithivi.gnumonks.org>

Hi Pablo,

On Mon, Mar 28, 2011 at 07:26:42PM +0200, pablo at gnumonks.org wrote:
 
> This patchset includes several cleanups previous to another patchset
> that will contain the namespace pollution fix (to appear soon).

Thanks, applied.  Also your single follow-up patch for openbsc.git
-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From pablo at gnumonks.org  Mon Mar 28 17:34:59 2011
From: pablo at gnumonks.org (pablo at gnumonks.org)
Date: Mon, 28 Mar 2011 19:34:59 +0200
Subject: [PATCH] openBSC: include new file osmocom/vty/misc.h in several
	daemons
Message-ID: <1301333700-32551-1-git-send-email-pablo@gnumonks.org>

From: Pablo Neira Ayuso <pablo at 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




From pablo at gnumonks.org  Mon Mar 28 17:35:00 2011
From: pablo at gnumonks.org (pablo at gnumonks.org)
Date: Mon, 28 Mar 2011 19:35:00 +0200
Subject: [PATCH] src: include new file osmocom/vty/misc.h for
	vty_out_rate_ctr_group()
In-Reply-To: <1301333700-32551-1-git-send-email-pablo@gnumonks.org>
References: <1301333700-32551-1-git-send-email-pablo@gnumonks.org>
Message-ID: <1301333700-32551-2-git-send-email-pablo@gnumonks.org>

From: Pablo Neira Ayuso <pablo at gnumonks.org>

This uses the new include file for vty_out_rate_ctr_group() which
available in libosmocore.
---
 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(-)

diff --git a/openbsc/src/gprs/sgsn_vty.c b/openbsc/src/gprs/sgsn_vty.c
index 7100b1f..cfde630 100644
--- a/openbsc/src/gprs/sgsn_vty.c
+++ b/openbsc/src/gprs/sgsn_vty.c
@@ -36,6 +36,7 @@
 
 #include <osmocom/vty/command.h>
 #include <osmocom/vty/vty.h>
+#include <osmocom/vty/misc.h>
 
 #include <pdp.h>
 
diff --git a/openbsc/src/libgb/gprs_bssgp_vty.c b/openbsc/src/libgb/gprs_bssgp_vty.c
index 720c221..a0d74ac 100644
--- a/openbsc/src/libgb/gprs_bssgp_vty.c
+++ b/openbsc/src/libgb/gprs_bssgp_vty.c
@@ -42,6 +42,7 @@
 #include <osmocom/vty/command.h>
 #include <osmocom/vty/logging.h>
 #include <osmocom/vty/telnet_interface.h>
+#include <osmocom/vty/misc.h>
 
 /* FIXME: this should go to some common file as it is copied
  * in vty_interface.c of the BSC */
diff --git a/openbsc/src/libgb/gprs_ns_vty.c b/openbsc/src/libgb/gprs_ns_vty.c
index 505dc3b..14d7691 100644
--- a/openbsc/src/libgb/gprs_ns_vty.c
+++ b/openbsc/src/libgb/gprs_ns_vty.c
@@ -42,6 +42,7 @@
 #include <osmocom/vty/command.h>
 #include <osmocom/vty/logging.h>
 #include <osmocom/vty/telnet_interface.h>
+#include <osmocom/vty/misc.h>
 
 static struct gprs_ns_inst *vty_nsi = NULL;
 
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
index 90f69ae..08a9269 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
@@ -30,6 +30,7 @@
 #include <osmocom/core/rate_ctr.h>
 #include <osmocom/core/utils.h>
 #include <osmocom/vty/logging.h>
+#include <osmocom/vty/misc.h>
 
 #include <osmocom/sccp/sccp.h>
 
-- 
1.7.2.3




From bertoncello at netzing.de  Tue Mar 29 13:55:09 2011
From: bertoncello at netzing.de (Luca Bertoncello)
Date: Tue, 29 Mar 2011 15:55:09 +0200
Subject: Problem with RTP-Proxy
Message-ID: <20110329155509.54f4b667@Luca>

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 at 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 at netzing.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20110329/97877617/attachment.bin>

From meckel at netzing.de  Wed Mar 30 12:50:01 2011
From: meckel at netzing.de (meckel at netzing.de)
Date: Wed, 30 Mar 2011 14:50:01 +0200
Subject: RTP-Proxy without MNCC-BuildIn no running
Message-ID: <20110330145001.fao3uqers4cggoww@webmail.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




From holger at freyther.de  Wed Mar 30 13:32:13 2011
From: holger at freyther.de (Holger Hans Peter Freyther)
Date: Wed, 30 Mar 2011 15:32:13 +0200
Subject: RTP-Proxy without MNCC-BuildIn no running
In-Reply-To: <20110330145001.fao3uqers4cggoww@webmail.netzing.de>
References: <20110330145001.fao3uqers4cggoww@webmail.netzing.de>
Message-ID: <4D9330DD.8020609@freyther.de>

On 03/30/2011 02:50 PM, meckel at netzing.de wrote:
> 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".

Hi,

where did you find that information? The RTP proxy is only useful if you have
two BTS and want to be able to do handover between them and don't have
someting like LCR running.



From laforge at gnumonks.org  Wed Mar 30 13:39:52 2011
From: laforge at gnumonks.org (Harald Welte)
Date: Wed, 30 Mar 2011 15:39:52 +0200
Subject: RTP-Proxy without MNCC-BuildIn no running
In-Reply-To: <4D9330DD.8020609@freyther.de>
References: <20110330145001.fao3uqers4cggoww@webmail.netzing.de>
	<4D9330DD.8020609@freyther.de>
Message-ID: <20110330133952.GG4719@prithivi.gnumonks.org>

Hi all,

On Wed, Mar 30, 2011 at 03:32:13PM +0200, Holger Hans Peter Freyther wrote:
> On 03/30/2011 02:50 PM, meckel at netzing.de wrote:
> > 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".
> 
> Hi,
> 
> where did you find that information? The RTP proxy is only useful if you have
> two BTS and want to be able to do handover between them and don't have
> someting like LCR running.

I actually think the proxy has to be active, since only then the OpenBSC ever
sees the RTP frames from the nanoBTS (and can hand them via MNCC into LCR).

The "rtp proxy" command option should decide if the RTP streams are rounted
directly between BTSs, or if they are routed via OpenBSC.

So for a LCR setup, I'm quite positive that you would have to use "-P"

@netzing: I honestly don't have time right now to try to reproduce the setup,
way too much work overload. Sorry.

-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)



From meckel at netzing.de  Wed Mar 30 15:00:49 2011
From: meckel at netzing.de (Meckel)
Date: Wed, 30 Mar 2011 17:00:49 +0200
Subject: RTP-Proxy without MNCC-BuildIn no running
In-Reply-To: <20110330133952.GG4719@prithivi.gnumonks.org>
References: <20110330145001.fao3uqers4cggoww@webmail.netzing.de>	<4D9330DD.8020609@freyther.de>
	<20110330133952.GG4719@prithivi.gnumonks.org>
Message-ID: <4D9345A1.1060304@netzing.de>

Hi List

I?m really sorry!
After I write this E-Mail,I checked out the the git log from lcr and see 
that it makes changes to work with the current Osmocom-BB.
But i hadn?t the current Osmocom-BB and so messages from lcr never 
reached openbsc and I thought the RTP-Proxy doesn?t be active and the 
reason for my problems.

But thanks for the quick responses!

Have a Nice Day

Meckel

On 30.03.2011 15:39, Harald Welte wrote:
> Hi all,
>
> On Wed, Mar 30, 2011 at 03:32:13PM +0200, Holger Hans Peter Freyther wrote:
>> On 03/30/2011 02:50 PM, meckel at netzing.de wrote:
>>> 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".
>> Hi,
>>
>> where did you find that information? The RTP proxy is only useful if you have
>> two BTS and want to be able to do handover between them and don't have
>> someting like LCR running.
> I actually think the proxy has to be active, since only then the OpenBSC ever
> sees the RTP frames from the nanoBTS (and can hand them via MNCC into LCR).
>
> The "rtp proxy" command option should decide if the RTP streams are rounted
> directly between BTSs, or if they are routed via OpenBSC.
>
> So for a LCR setup, I'm quite positive that you would have to use "-P"
>
> @netzing: I honestly don't have time right now to try to reproduce the setup,
> way too much work overload. Sorry.
>




From pablo at gnumonks.org  Thu Mar 31 12:05:07 2011
From: pablo at gnumonks.org (pablo at gnumonks.org)
Date: Thu, 31 Mar 2011 14:05:07 +0200
Subject: wireshark: update of RSL dissector
Message-ID: <1301573108-9518-1-git-send-email-pablo@gnumonks.org>

From: Pablo Neira Ayuso <pablo at 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




From pablo at gnumonks.org  Thu Mar 31 12:05:08 2011
From: pablo at gnumonks.org (pablo at gnumonks.org)
Date: Thu, 31 Mar 2011 14:05:08 +0200
Subject: [PATCH] wireshark: update extension of RSL dissector with ip.access
	nanoBTS support
In-Reply-To: <1301573108-9518-1-git-send-email-pablo@gnumonks.org>
References: <1301573108-9518-1-git-send-email-pablo@gnumonks.org>
Message-ID: <1301573108-9518-2-git-send-email-pablo@gnumonks.org>

From: Pablo Neira Ayuso <pablo at gnumonks.org>

This patch removes the C99 structure initialization which is not allowed
by the wireshark project (since it has to compile with non-C99 compliant
compilers).

It also adds a new option to enable/disable the dissection of vendor
specific ip.access nanoBTS RSL messages.

Tested with file:
ipaccess-startup-mo_to_mo_call-proxy.pcap
---
 wireshark/0004-rsl-ipaccess.patch |  228 ++++++++++++++++++++++---------------
 1 files changed, 134 insertions(+), 94 deletions(-)

diff --git a/wireshark/0004-rsl-ipaccess.patch b/wireshark/0004-rsl-ipaccess.patch
index 6f2b8c1..e68c362 100644
--- a/wireshark/0004-rsl-ipaccess.patch
+++ b/wireshark/0004-rsl-ipaccess.patch
@@ -1,15 +1,16 @@
 From 54882db58b6ec12da6b80071e0ac2344d42df24c Mon Sep 17 00:00:00 2001
+
 From: Holger Hans Peter Freyther <zecke at selfish.org>
-Date: Tue, 11 Jan 2011 16:22:33 +0100
+
 Subject: [PATCH 4/4] rsl-ipaccess
 
 Add vendor specific commands for RSL.
 ---
- epan/dissectors/packet-rsl.c |  522 +++++++++++++++++++++++++++++++++++++++++-
- 1 files changed, 515 insertions(+), 7 deletions(-)
+ epan/dissectors/packet-rsl.c |  544 +++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 536 insertions(+), 8 deletions(-)
 
 diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c
-index bf83f6f..d858e1a 100644
+index bf83f6f..213ae28 100644
 --- a/epan/dissectors/packet-rsl.c
 +++ b/epan/dissectors/packet-rsl.c
 @@ -2,6 +2,7 @@
@@ -20,8 +21,11 @@ index bf83f6f..d858e1a 100644
   *
   * $Id$
   *
-@@ -42,6 +43,8 @@
+@@ -40,8 +41,11 @@
+ #include <epan/packet.h>
+ #include <epan/proto.h>
  #include <epan/lapd_sapi.h>
++#include <epan/prefs.h>
  
  #include "packet-gsm_a_common.h"
 +#include "packet-rtp.h"
@@ -29,7 +33,7 @@ index bf83f6f..d858e1a 100644
  
  /* Initialize the protocol and registered fields */
  static int proto_rsl		= -1;
-@@ -116,6 +119,24 @@ static int hf_rsl_emlpp_prio		= -1;
+@@ -116,6 +120,24 @@ static int hf_rsl_emlpp_prio		= -1;
  static int hf_rsl_rtd				= -1;
  static int hf_rsl_delay_ind			= -1;
  static int hf_rsl_tfo				= -1;
@@ -54,7 +58,7 @@ index bf83f6f..d858e1a 100644
  
  /* Initialize the subtree pointers */
  static int ett_rsl = -1;
-@@ -173,6 +194,15 @@ static int ett_ie_cause = -1;
+@@ -173,6 +195,15 @@ static int ett_ie_cause = -1;
  static int ett_ie_meas_res_no = -1;
  static int ett_ie_message_id = -1;
  static int ett_ie_sys_info_type = -1;
@@ -70,7 +74,17 @@ index bf83f6f..d858e1a 100644
  
  static proto_tree *top_tree;
  static dissector_handle_t gsm_a_ccch_handle;
-@@ -208,8 +238,11 @@ static const value_string rsl_msg_disc_vals[] = {
+@@ -180,6 +211,9 @@ static dissector_handle_t gsm_a_dtap_handle;
+ 
+ static gboolean is_si2q = FALSE;
+ 
++/* Decode things as nanoBTS traces */
++static gboolean global_rsl_use_nano_bts = TRUE;
++
+ /* Forward declarations */
+ static int dissct_rsl_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset);
+ 
+@@ -208,8 +242,11 @@ static const value_string rsl_msg_disc_vals[] = {
  	{  0x06,		"Common Channel Management messages" },
  	{  0x08,		"TRX Management messages" },
  	{  0x16,		"Location Services messages" },
@@ -82,7 +96,7 @@ index bf83f6f..d858e1a 100644
  /*
   * 9.2 MESSAGE TYPE
   */
-@@ -276,6 +309,49 @@ static const value_string rsl_msg_disc_vals[] = {
+@@ -276,6 +313,49 @@ static const value_string rsl_msg_disc_vals[] = {
  	/* 	0 1 - - - - - - Location Services messages: */
  #define RSL_MSG_LOC_INF					65	/* 8.7.1 */
  
@@ -132,7 +146,7 @@ index bf83f6f..d858e1a 100644
  
  static const value_string rsl_msg_type_vals[] = {
  	  /* 	0 0 0 0 - - - - Radio Link Layer Management messages: */
-@@ -338,6 +414,26 @@ static const value_string rsl_msg_type_vals[] = {
+@@ -338,6 +418,26 @@ static const value_string rsl_msg_type_vals[] = {
  	{  0x3f,	"TFO MODification REQuest" },					/* 8.4.31 */
  	/* 	0 1 - - - - - - Location Services messages: */
  	{  0x41,	"Location Information" },						/* 8.7.1 */
@@ -159,7 +173,7 @@ index bf83f6f..d858e1a 100644
  	{ 0,		NULL }
  };
  
-@@ -371,10 +467,10 @@ static const value_string rsl_msg_type_vals[] = {
+@@ -371,10 +471,10 @@ static const value_string rsl_msg_type_vals[] = {
  #define RSL_IE_MESSAGE_ID		28
  
  #define RSL_IE_SYS_INFO_TYPE	30
@@ -174,7 +188,7 @@ index bf83f6f..d858e1a 100644
  #define RSL_IE_FULL_IMM_ASS_INF			35
  #define RSL_IE_SMSCB_INF				36
  #define RSL_IE_FULL_MS_TIMING_OFFSET	37
-@@ -477,6 +573,24 @@ static const value_string rsl_ie_type_vals[] = {
+@@ -477,6 +577,24 @@ static const value_string rsl_ie_type_vals[] = {
  			Not used
  
  	*/
@@ -199,7 +213,7 @@ index bf83f6f..d858e1a 100644
  	{ 0,			NULL }
  };
  
-@@ -513,6 +627,96 @@ static const value_string rsl_ch_no_Cbits_vals[] = {
+@@ -513,6 +631,27 @@ static const value_string rsl_ch_no_Cbits_vals[] = {
  	{ 0,			NULL }
  };
  
@@ -221,82 +235,13 @@ index bf83f6f..d858e1a 100644
 +	struct tlv_def def[0xff];
 +};
 +
-+static const struct tlv_definition rsl_att_tlvdef = {
-+	.def = {
-+		[RSL_IE_CH_NO]			= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_LINK_ID]		= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_ACT_TYPE]		= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_BS_POW]			= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_CH_ID]			= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_CH_MODE]		= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_ENC_INF]		= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_FRAME_NO]		= { TLV_TYPE_FIXED, 2 },
-+		[RSL_IE_HO_REF]			= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_L1_INF]			= { TLV_TYPE_FIXED, 2 },
-+		[RSL_IE_L3_INF]			= { TLV_TYPE_TL16V, 0 },
-+		[RSL_IE_MS_ID]			= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_MS_POW]			= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_PAGING_GRP]		= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_PAGING_LOAD]		= { TLV_TYPE_FIXED, 2 },
-+		[RSL_IE_PHY_CTX]		= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_ACCESS_DELAY]		= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_RACH_LOAD]		= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_REQ_REF]		= { TLV_TYPE_FIXED, 3 },
-+		[RSL_IE_REL_MODE]		= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_RESOURCE_INF]		= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_RLM_CAUSE]		= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_STARTING_TIME]		= { TLV_TYPE_FIXED, 2 },
-+		[RSL_IE_TIMING_ADV]		= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_UPLINK_MEAS]		= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_CAUSE]			= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_MEAS_RES_NO]		= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_MESSAGE_ID]		= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_SYS_INFO_TYPE]		= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_MS_POWER_PARAM]		= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_BS_POWER_PARAM]		= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_PREPROC_PARAM]		= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_PREPROC_MEAS]		= { TLV_TYPE_TLV, 0 },
-+		//[RSL_IE_IMM_ASS_INFO]		= { TLV_TYPE_TLV, 0 },
-+		//[RSL_IE_SMSCB_INFO]		= { TLV_TYPE_FIXED, 23 },
-+		//[RSL_IE_MS_TIMING_OFFSET]	= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_ERR_MSG]		= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_FULL_BCCH_INF]		= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_CH_NEEDED]		= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_CB_CMD_TYPE]		= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_SMSCB_MESS]		= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_FULL_IMM_ASS_INF]	= { TLV_TYPE_TLV, 0 },
-+		//[RSL_IE_SACCH_INFO]		= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_CBCH_LOAD_INF]		= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_SMSCB_CH_IND]		= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_GRP_CALL_REF]		= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_CH_DESC]		= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_NCH_DRX_INF]		= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_CMD_IND]		= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_EMLPP_PRIO]		= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_UIC]			= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_MAIN_CH_REF]		= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_MULTIRATE_CONF]		= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_MULTIRATE_CNTRL]	= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_SUP_CODEC_TYPES]	= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_CODEC_CONF]		= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_RTD]			= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_TFO_STATUS]		= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_LLP_APDU]		= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_IPAC_REMOTE_IP]		= { TLV_TYPE_FIXED, 4 },
-+		[RSL_IE_IPAC_REMOTE_PORT]	= { TLV_TYPE_FIXED, 2 },
-+		[RSL_IE_IPAC_LOCAL_IP]		= { TLV_TYPE_FIXED, 4 },
-+		[RSL_IE_IPAC_CONN_STAT]		= { TLV_TYPE_TLV, 0 },
-+		[RSL_IE_IPAC_LOCAL_PORT]	= { TLV_TYPE_FIXED, 2 },
-+		[RSL_IE_IPAC_SPEECH_MODE]	= { TLV_TYPE_TV, 0 },
-+		[RSL_IE_IPAC_CONN_ID]		= { TLV_TYPE_FIXED, 2 },
-+		[RSL_IE_IPAC_RTP_PAYLOAD2]	= { TLV_TYPE_TV, 0 },
-+	},
-+};
++/* This structure is initialized in proto_register_rsl() */
++static struct tlv_definition rsl_att_tlvdef;
 +
  /* 9.3.1 Channel number			9.3.1	M TV 2 */
  static int
  dissect_rsl_ie_ch_no(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, gboolean is_mandatory)
-@@ -2045,7 +2249,6 @@ dissect_rsl_ie_err_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int
+@@ -2045,7 +2184,6 @@ dissect_rsl_ie_err_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int
  	proto_item_set_len(ti, length+2);
  
  	proto_tree_add_item(ie_tree, hf_rsl_ie_length, tvb, offset, 1, FALSE);
@@ -304,7 +249,7 @@ index bf83f6f..d858e1a 100644
  
  	/* Received Message */
  	offset = dissct_rsl_msg(tvb, pinfo, ie_tree, offset);
-@@ -2910,12 +3113,184 @@ dissect_rsl_ie_tfo_transp_cont(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
+@@ -2910,12 +3048,184 @@ dissect_rsl_ie_tfo_transp_cont(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
  }
  
  static int
@@ -490,7 +435,7 @@ index bf83f6f..d858e1a 100644
  	offset++;
  
  	switch (msg_type){
-@@ -3483,6 +3858,18 @@ dissct_rsl_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
+@@ -3483,6 +3793,18 @@ dissct_rsl_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
  		/* LLP APDU 9.3.58 M LV 2-N */
  		offset = dissect_rsl_ie_llp_apdu(tvb, pinfo, tree, offset, TRUE);
  		break;
@@ -509,7 +454,7 @@ index bf83f6f..d858e1a 100644
  	default:
  		break;
  	}
-@@ -3490,6 +3877,40 @@ dissct_rsl_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
+@@ -3490,6 +3812,40 @@ dissct_rsl_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
  	return offset;
  
  }
@@ -550,7 +495,20 @@ index bf83f6f..d858e1a 100644
  static void
  dissect_rsl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
  {
-@@ -3517,7 +3938,6 @@ dissect_rsl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+@@ -3512,12 +3868,19 @@ dissect_rsl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+ 	top_tree = tree;
+ 	if (tree) {
+ 		ti = proto_tree_add_item(tree, proto_rsl, tvb, 0, -1, FALSE);
++
++		/* if nanoBTS specific vendor messages are not enabled, skip */
++		if (!global_rsl_use_nano_bts) {
++			guint8 msg_disc = tvb_get_guint8(tvb, offset) >> 1;
++
++			if (msg_disc == RSL_MSGDISC_IPACCESS)
++				return;
++		}
+ 		rsl_tree = proto_item_add_subtree(ti, ett_rsl);
+ 
  		/* 9.1 Message discriminator */
  		proto_tree_add_item(rsl_tree, hf_rsl_msg_dsc, tvb, offset, 1, FALSE);
  		proto_tree_add_item(rsl_tree, hf_rsl_T_bit, tvb, offset, 1, FALSE);
@@ -558,7 +516,7 @@ index bf83f6f..d858e1a 100644
  
  		offset = dissct_rsl_msg(tvb, pinfo, rsl_tree, offset);
  
-@@ -3892,6 +4312,86 @@ void proto_register_rsl(void)
+@@ -3892,6 +4255,86 @@ void proto_register_rsl(void)
  			FT_UINT8, BASE_DEC, VALS(rsl_emlpp_prio_vals), 0x03,
  			NULL, HFILL }
  		},
@@ -645,7 +603,7 @@ index bf83f6f..d858e1a 100644
  	};
  	static gint *ett[] = {
  		&ett_rsl,
-@@ -3949,6 +4449,14 @@ void proto_register_rsl(void)
+@@ -3949,7 +4392,88 @@ void proto_register_rsl(void)
  		&ett_ie_meas_res_no,
  		&ett_ie_message_id,
  		&ett_ie_sys_info_type,
@@ -658,8 +616,90 @@ index bf83f6f..d858e1a 100644
 +		&ett_ie_local_ip,
 +		&ett_ie_rtp_payload,
  	};
++	module_t *rsl_module;
++
++#define RSL_ATT_TLVDEF(_attr, _type, _fixed_len)		\
++	rsl_att_tlvdef.def[_attr].type = _type;			\
++	rsl_att_tlvdef.def[_attr].fixed_len = _fixed_len;	\
++
++	RSL_ATT_TLVDEF(RSL_IE_CH_NO,		TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_LINK_ID,		TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_ACT_TYPE,		TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_BS_POW,		TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_CH_ID,		TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_CH_MODE,		TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_ENC_INF,		TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_FRAME_NO,		TLV_TYPE_FIXED,		2);
++	RSL_ATT_TLVDEF(RSL_IE_HO_REF,		TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_L1_INF,		TLV_TYPE_FIXED,		2);
++	RSL_ATT_TLVDEF(RSL_IE_L3_INF,		TLV_TYPE_TL16V,		0);
++	RSL_ATT_TLVDEF(RSL_IE_MS_ID,		TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_MS_POW,		TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_PAGING_GRP,	TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_PAGING_LOAD,	TLV_TYPE_FIXED,		2);
++	RSL_ATT_TLVDEF(RSL_IE_PHY_CTX,		TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_ACCESS_DELAY,	TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_RACH_LOAD,	TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_REQ_REF,		TLV_TYPE_FIXED,		3);
++	RSL_ATT_TLVDEF(RSL_IE_REL_MODE,		TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_RESOURCE_INF,	TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_RLM_CAUSE,	TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_STARTING_TIME,	TLV_TYPE_FIXED,		2);
++	RSL_ATT_TLVDEF(RSL_IE_TIMING_ADV,	TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_UPLINK_MEAS,	TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_CAUSE,		TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_MEAS_RES_NO,	TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_MESSAGE_ID,	TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_SYS_INFO_TYPE,	TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_MS_POWER_PARAM,	TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_BS_POWER_PARAM,	TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_PREPROC_PARAM,	TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_PREPROC_MEAS,	TLV_TYPE_TLV,		0);
++//	RSL_ATT_TLVDEF(RSL_IE_IMM_ASS_INFO,	TLV_TYPE_TLV,		0);
++//	RSL_ATT_TLVDEF(RSL_IE_SMSCB_INFO,	TLV_TYPE_FIXED,		23);
++//	RSL_ATT_TLVDEF(RSL_IE_MS_TIMING_OFFSET,	TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_ERR_MSG,		TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_FULL_BCCH_INF,	TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_CH_NEEDED,	TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_CB_CMD_TYPE,	TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_SMSCB_MESS,	TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_FULL_IMM_ASS_INF,	TLV_TYPE_TLV,		0);
++//	RSL_ATT_TLVDEF(RSL_IE_SACCH_INFO,	TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_CBCH_LOAD_INF,	TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_SMSCB_CH_IND,	TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_GRP_CALL_REF,	TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_CH_DESC,		TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_NCH_DRX_INF,	TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_CMD_IND,		TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_EMLPP_PRIO,	TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_UIC,		TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_MAIN_CH_REF,	TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_MULTIRATE_CONF,	TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_MULTIRATE_CNTRL,	TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_SUP_CODEC_TYPES,	TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_CODEC_CONF,	TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_RTD,		TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_TFO_STATUS,	TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_LLP_APDU,		TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_IPAC_REMOTE_IP,	TLV_TYPE_FIXED,		4);
++	RSL_ATT_TLVDEF(RSL_IE_IPAC_REMOTE_PORT,	TLV_TYPE_FIXED,		2);
++	RSL_ATT_TLVDEF(RSL_IE_IPAC_LOCAL_IP,	TLV_TYPE_FIXED,		4);
++	RSL_ATT_TLVDEF(RSL_IE_IPAC_CONN_STAT,	TLV_TYPE_TLV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_IPAC_LOCAL_PORT,	TLV_TYPE_FIXED,		2);
++	RSL_ATT_TLVDEF(RSL_IE_IPAC_SPEECH_MODE,	TLV_TYPE_TV,		0);
++	RSL_ATT_TLVDEF(RSL_IE_IPAC_CONN_ID,	TLV_TYPE_FIXED,		2);
++	RSL_ATT_TLVDEF(RSL_IE_IPAC_RTP_PAYLOAD2,TLV_TYPE_TV,		0);
  
  	/* Register the protocol name and description */
--- 
-1.7.3.4
-
+ 	proto_rsl = proto_register_protocol("Radio Signalling Link (RSL)",
+@@ -3960,5 +4484,9 @@ void proto_register_rsl(void)
+ 
+ 	register_dissector("gsm_abis_rsl", dissect_rsl, proto_rsl);
+ 
++	rsl_module = prefs_register_protocol(proto_rsl, proto_reg_handoff_rsl);
++	prefs_register_bool_preference(rsl_module, "use_ipaccess_rsl",
++			"Use nanoBTS definitions",
++			"Use ipaccess nanoBTS specific definitions for RSL",
++			&global_rsl_use_nano_bts);
+ }
+-
-- 
1.7.2.3