baseband-devel September 2012

baseband-devel@lists.osmocom.org

18 participants
29 discussions

[PATCH] gsm_utils.c: cleanup + do not use dynamic memory when decoding 7bit messages

by Nico Golde

--- src/gsm/gsm_utils.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index 3f3a73f..08932d1 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -2,7 +2,7 @@ * (C) 2008 by Daniel Willmann <daniel(a)totalueberwachung.de> * (C) 2009 by Holger Hans Peter Freyther <zecke(a)selfish.org> * (C) 2009-2010 by Harald Welte <laforge(a)gnumonks.org> - * (C) 2010 by Nico Golde <nico(a)ngolde.de> + * (C) 2010-2012 by Nico Golde <nico(a)ngolde.de> * * All Rights Reserved * @@ -65,6 +65,7 @@ //#include <openbsc/gsm_data.h> #include <osmocom/core/utils.h> #include <osmocom/gsm/gsm_utils.h> +#include <osmocom/core/logging.h> #include <stdlib.h> #include <stdint.h> @@ -128,8 +129,8 @@ int gsm_7bit_decode_hdr(char *text, const uint8_t *user_data, uint8_t septet_l, int i = 0; int shift = 0; - uint8_t *rtext = calloc(septet_l, sizeof(uint8_t)); - uint8_t tmp; + uint8_t data[160]; + uint8_t ext_septet; /* skip the user data header */ if (ud_hdr_ind) { @@ -140,8 +141,13 @@ int gsm_7bit_decode_hdr(char *text, const uint8_t *user_data, uint8_t septet_l, septet_l = septet_l - shift; } + if(septet_l >= sizeof(data)){ + LOGP(DLSMS, LOGL_ERROR, + "Message User-Data too long\n"); + return -EINVAL; + } for (i = 0; i < septet_l; i++) { - rtext[i] = + data[i] = ((user_data[((i + shift) * 7 + 7) >> 3] << (7 - (((i + shift) * 7 + 7) & 7))) | (user_data[((i + shift) * 7) >> 3] >> @@ -150,20 +156,19 @@ int gsm_7bit_decode_hdr(char *text, const uint8_t *user_data, uint8_t septet_l, for (i = 0; i < septet_l; i++) { /* this is an extension character */ - if(rtext[i] == 0x1b && i + 1 < septet_l){ - tmp = rtext[i+1]; - *(text++) = gsm_7bit_alphabet[0x7f + tmp]; + if(data[i] == 0x1b && i + 1 < septet_l){ + ext_septet = data[i+1]; + *(text++) = gsm_7bit_alphabet[0x7f + ext_septet]; i++; continue; } - *(text++) = gsm_septet_lookup(rtext[i]); + *(text++) = gsm_septet_lookup(data[i]); } if (ud_hdr_ind) i += shift; *text = '\0'; - free(rtext); return i; } -- 1.7.10.4 --r5Pyd7+fXNt84Ff3--

12 years, 9 months

[PATCH] gsm_utils.c: cleanup + do not use dynamic memory when decoding 7bit messages

by Nico Golde

--- src/gsm/gsm_utils.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index 3f3a73f..cf1cc2b 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -128,8 +128,8 @@ int gsm_7bit_decode_hdr(char *text, const uint8_t *user_data, uint8_t septet_l, int i = 0; int shift = 0; - uint8_t *rtext = calloc(septet_l, sizeof(uint8_t)); - uint8_t tmp; + uint8_t data[160]; + uint8_t ext_septet; /* skip the user data header */ if (ud_hdr_ind) { @@ -140,30 +140,29 @@ int gsm_7bit_decode_hdr(char *text, const uint8_t *user_data, uint8_t septet_l, septet_l = septet_l - shift; } - for (i = 0; i < septet_l; i++) { - rtext[i] = + for (i = 0; i < septet_l && i < sizeof(data); i++) { + data[i] = ((user_data[((i + shift) * 7 + 7) >> 3] << (7 - (((i + shift) * 7 + 7) & 7))) | (user_data[((i + shift) * 7) >> 3] >> (((i + shift) * 7) & 7))) & 0x7f; } - for (i = 0; i < septet_l; i++) { + for (i = 0; i < septet_l && i < sizeof(data); i++) { /* this is an extension character */ - if(rtext[i] == 0x1b && i + 1 < septet_l){ - tmp = rtext[i+1]; - *(text++) = gsm_7bit_alphabet[0x7f + tmp]; + if(data[i] == 0x1b && i + 1 < septet_l){ + ext_septet = data[i+1]; + *(text++) = gsm_7bit_alphabet[0x7f + ext_septet]; i++; continue; } - *(text++) = gsm_septet_lookup(rtext[i]); + *(text++) = gsm_septet_lookup(data[i]); } if (ud_hdr_ind) i += shift; *text = '\0'; - free(rtext); return i; } -- 1.7.10.4 --r5Pyd7+fXNt84Ff3--

12 years, 9 months

libgps fix for layer23

by Kevin Redon

[PATCH] Fix linking with GNU ld 2.22 and libgps Error: gcc -Wall -I/home/kevredon/osmocom-bb/src/shared/libosmocore/include -I/home/kevredon/osmocom-bb/src/shared/libosmocore/include -g -O2 -D_HAVE_GPSD -lgps -o cell_log main.o app_cell_log.o cell_log.o geo.o ../common/liblayer23.a /home/kevredon/osmocom-bb/src/shared/libosmocore/build-host/src/.libs/libosmocore.a /home/kevredon/osmocom-bb/src/shared/libosmocore/build-host/src/gsm/.libs/libosmogsm.a /home/kevredon/osmocom-bb/src/shared/libosmocore/build-host/src/codec/.libs/libosmocodec.a -lm ../common/liblayer23.a(gps.o): In function `osmo_gpsd_cb': /home/kevredon/osmocom-bb/src/host/layer23/src/common/gps.c:79: undefined reference to `gps_waiting' Fix: Holger told me to do so (he knows better then me about autoconf) - set CFLAGS and LIBS for LIBGPS in layer23 - add libgps CFLAGS and LIBS in Makefile.am for common, misc, mobile I would have done the following (which also works): -AC_CHECK_LIB(gps, gps_waiting, CFLAGS+=" -D_HAVE_GPSD" LDFLAGS+=" -lgps",,) +AC_CHECK_LIB(gps, gps_waiting, CFLAGS+=" -D_HAVE_GPSD" LDFLAGS+=" -lgps" LIBS+=" -lgps",,) --- src/host/layer23/configure.ac | 5 ++++- src/host/layer23/src/common/Makefile.am | 2 +- src/host/layer23/src/misc/Makefile.am | 4 ++-- src/host/layer23/src/mobile/Makefile.am | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/host/layer23/configure.ac b/src/host/layer23/configure.ac index b50868a..9335e66 100644 --- a/src/host/layer23/configure.ac +++ b/src/host/layer23/configure.ac @@ -17,7 +17,10 @@ PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm) PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec) -AC_CHECK_LIB(gps, gps_waiting, CFLAGS+=" -D_HAVE_GPSD" LDFLAGS+=" -lgps",,) +AC_CHECK_LIB(gps, gps_waiting, LIBGPS_CFLAGS=" -D_HAVE_GPSD" LIBGPS_LIBS=" -lgps ",,) +AC_SUBST([LIBGPS_CFLAGS]) +AC_SUBST([LIBGPS_LIBS]) + dnl checks for header files AC_HEADER_STDC diff --git a/src/host/layer23/src/common/Makefile.am b/src/host/layer23/src/common/Makefile.am index 73a0fc9..8d96ed2 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) $(LIBOSMOGSM_CFLAGS) +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBGPS_CFLAGS) noinst_LIBRARIES = liblayer23.a liblayer23_a_SOURCES = l1ctl.c l1l2_interface.c sap_interface.c \ diff --git a/src/host/layer23/src/misc/Makefile.am b/src/host/layer23/src/misc/Makefile.am index 0b59f38..d8fb322 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) $(LIBOSMOGSM_CFLAGS) -LDADD = ../common/liblayer23.a $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBGPS_CFLAGS) +LDADD = ../common/liblayer23.a $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBGPS_LIBS) bin_PROGRAMS = bcch_scan ccch_scan echo_test cell_log cbch_sniff diff --git a/src/host/layer23/src/mobile/Makefile.am b/src/host/layer23/src/mobile/Makefile.am index f3365af..8920c54 100644 --- a/src/host/layer23/src/mobile/Makefile.am +++ b/src/host/layer23/src/mobile/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) -LDADD = ../common/liblayer23.a $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBGPS_CFLAGS) +LDADD = ../common/liblayer23.a $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBGPS_LIBS) noinst_LIBRARIES = libmobile.a libmobile_a_SOURCES = gsm322.c gsm480_ss.c gsm411_sms.c gsm48_cc.c gsm48_mm.c \ -- 1.7.9.5

12 years, 9 months

[PATCH] fix libosmocore build with dpkg-buildpackage

by ☎

Hello. Attached is a trivial patch to make dpkg-buildpackage -rfakeroot -uc -us work out of the box. Tested on ubuntu 12.04 x86_64 but should work on any debian-based distro. -- best regards, Max, http://fairwaves.ru

12 years, 9 months

[PATCH] Fix build with dpkg-buildpackage.

by Max

--- .gitignore | 10 ++++++++++ debian/libosmocore.install | 1 + 2 files changed, 11 insertions(+) diff --git a/.gitignore b/.gitignore index 0bc78eb..3dc916b 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,16 @@ Doxyfile.gsm Doxyfile.vty Doxyfile.codec +debian/autoreconf.after +debian/autoreconf.before +debian/files +debian/libosmocore-dev/ +debian/libosmocore*.log +debian/tmp/ +debian/libosmocore*.substvars +debian/libosmocore/ +debian/libosmocore.post*.debhelper + .tarball-version .version diff --git a/debian/libosmocore.install b/debian/libosmocore.install index d0dbfd1..9330260 100644 --- a/debian/libosmocore.install +++ b/debian/libosmocore.install @@ -1 +1,2 @@ usr/lib/lib*.so.* +usr/share/doc/libosmocore/* -- 1.7.9.5 --------------010904040907040604020505--

12 years, 10 months

PNLM list overwritten

by Dario Lombardo

Hil list Today I've observed a strange behaviour when modifying the PNLM of some real networks expired sims (to be used with osmocom and openbts). I've put 001 01 on the top of the list. I've ejected and reinsterted the sim in the reader many times, and I'm sure that the value has been wrtitten. When trying to connect to my test operator I get the message "your sim card doesn't allow the connection to this network operator" from my android phone. Reading again the pnlm I see that the original list has been restored. This astonishes me... Is is possible that the SIM overwrites the list by itselt? Or is it the phone that does it? The android has an original, not branded, operating system. Thanks everybody for your help. Dario

12 years, 10 months

Sept 5, 8pm / Osmocom Berlin User Group meeting

by Harald Welte

Hi all! This is the announcement for the next Osmocom Berlin meeting. Sept 05, 8pm @ CCC Berlin, Marienstr. 11, 10113 Berlin There is no formal presentation scheduled for this meeting. If you are interested to show up, feel free to do so. There is no registration required. The meeting is free as in "free beer", despite no actual free beer being around. Regards, Harald [p.s.: I myself will not be able to attend tonight, but I'm sure you will be able to do just fine (or even better?)] -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

12 years, 10 months

LTE support

by Pierre Pronchery

Hi guys, Fabrice Bellard strikes again: http://bellard.org/lte/ It looks like he hasn't released the source code though :( Cheers, -- khorben

12 years, 10 months

Re: Sagem OT-290 trace phone / GSMTAP integration

by Thomas Bertani

Hi list, I'm an information engineering student interested in working on embedded systems and tlc (especially I would like to get deep into firmware coding and dsp). In the last years I have been an active member of the italian openmoko community so I'm familiar with gta0X phones (I owned a gta02, now I have only a gta01). Two years ago I've worked at the Trento's research center on the n900 while today I'm working at a tlc company in Padua. Even if it's not what I'm working on at the moment, I'd like to spend some of my time by working on the GSMTAP integration of the Sagem OT-290. Is there any news about that? Since the last message on this thread was posted more than 2 months ago I wanted to know whether anyone was already working on it. Thanks, Thomas Bertani

12 years, 10 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

baseband-devel September 2012