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@gnumonks.org>
debian
Pablo Neira Ayuso 12 years ago committed by Harald Welte
parent 04139f14b6
commit fba495e5f6
  1. 2
      Makefile.am
  2. 2
      configure.in
  3. 3
      include/osmocore/Makefile.am
  4. 6
      include/osmocore/backtrace.h
  5. 1
      include/osmocore/gsm_utils.h
  6. 11
      libosmogsm.pc.in
  7. 14
      src/Makefile.am
  8. 50
      src/backtrace.c
  9. 13
      src/gsm/Makefile.am
  10. 0
      src/gsm/comp128.c
  11. 0
      src/gsm/gprs_cipher_core.c
  12. 0
      src/gsm/gsm0480.c
  13. 0
      src/gsm/gsm0808.c
  14. 0
      src/gsm/gsm48.c
  15. 0
      src/gsm/gsm48_ie.c
  16. 23
      src/gsm/gsm_utils.c
  17. 0
      src/gsm/rsl.c
  18. 0
      src/gsm/rxlev_stat.c
  19. 0
      src/gsm/tlv_parser.c
  20. 1
      src/panic.c
  21. 2
      tests/sms/Makefile.am
  22. 2
      tests/smscb/Makefile.am
  23. 2
      tests/ussd/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:

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

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

@ -0,0 +1,6 @@
#ifndef _OSMO_BACKTRACE_H_
#define _OSMO_BACKTRACE_H_
void generate_backtrace();
#endif

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

@ -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}/

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

@ -0,0 +1,50 @@
/*
* (C) 2008 by Daniel Willmann <daniel@totalueberwachung.de>
* (C) 2009 by Holger Hans Peter Freyther <zecke@selfish.org>
* (C) 2009-2010 by Harald Welte <laforge@gnumonks.org>
* (C) 2010 by Nico Golde <nico@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

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

@ -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;

@ -22,6 +22,7 @@
#include <osmocore/gsm_utils.h>
#include <osmocore/panic.h>
#include <osmocore/backtrace.h>
#include "../config.h"

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

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

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

Loading…
Cancel
Save