summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Eversberg2010-05-31 08:44:30 +0200
committerAndreas Eversberg2010-05-31 08:44:30 +0200
commit0f805e041a900551a8c3cf9a75a78c2b34e1977c (patch)
tree78fb5ce15b7a669ae9a9faf214b6e7bd00c73ffa
parentAdded patch to play ringing tone when connected but the call is forwarded (diff)
downloadlcr-0f805e041a900551a8c3cf9a75a78c2b34e1977c.tar.gz
lcr-0f805e041a900551a8c3cf9a75a78c2b34e1977c.tar.xz
lcr-0f805e041a900551a8c3cf9a75a78c2b34e1977c.zip
Fixed LCR to work with the current API of OpenBSC.
modified: Makefile.am modified: Makefile.in modified: README modified: gsm.cpp
-rw-r--r--Makefile.am6
-rw-r--r--Makefile.in84
-rw-r--r--README2
-rw-r--r--gsm.cpp14
4 files changed, 70 insertions, 36 deletions
diff --git a/Makefile.am b/Makefile.am
index b56560b..aaa23f6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,11 +45,11 @@ INSTALLATION_DEFINES = \
if ENABLE_GSM
-GSM_INCLUDE = -DWITH_GSM -I./openbsc/include -I./libosmocore/include
+GSM_INCLUDE = -DWITH_GSM -I./openbsc/include -I./libosmocore/include -I./openbsc
-GSM_SOURCE = gsm_audio.c gsm.cpp gsm_conf.c openbsc/src/bsc_init.c openbsc/src/vty_interface.c openbsc/src/vty_interface_layer3.c
+GSM_SOURCE = gsm_audio.c gsm.cpp gsm_conf.c openbsc/src/bsc_init.c openbsc/src/bsc_vty.c openbsc/src/vty_interface_layer3.c openbsc/src/bsc_api.c openbsc/src/bsc_version.c
-GSM_LIB = /usr/lib/libgsm.a ./openbsc/src/libbsc.a ./openbsc/src/libmsc.a ./openbsc/src/libvty.a -L./libosmocore/src/ -losmocore -ldbi -lcrypt
+GSM_LIB = /usr/lib/libgsm.a ./openbsc/src/libbsc.a ./openbsc/src/libmsc.a ./openbsc/src/libvty.a -losmovty -losmocore -ldbi -lcrypt
#gsm_audio.po: gsm_audio.c gsm_audio.h
# $(CC) -D_GNU_SOURCE -fPIC -c gsm_audio.c -o gsm_audio.po
diff --git a/Makefile.in b/Makefile.in
index 6bd502b..ade5849 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -77,18 +77,20 @@ genwave_SOURCES = genwave.c
genwave_OBJECTS = genwave.$(OBJEXT)
genwave_LDADD = $(LDADD)
am__lcr_SOURCES_DIST = gsm_audio.c gsm.cpp gsm_conf.c \
- openbsc/src/bsc_init.c openbsc/src/vty_interface.c \
- openbsc/src/vty_interface_layer3.c ss5.cpp ss5_encode.c \
- ss5_decode.c select.c action.cpp mISDN.cpp tones.c \
- action_efi.cpp crypt.cpp mail.c trace.c action_vbox.cpp \
- dss1.cpp main.c vbox.cpp alawulaw.c endpoint.cpp interface.c \
- message.c apppbx.cpp endpointapp.cpp join.cpp options.c \
- extension.c joinpbx.cpp port.cpp callerid.c joinremote.cpp \
- route.c cause.c socket_server.c
+ openbsc/src/bsc_init.c openbsc/src/bsc_vty.c \
+ openbsc/src/vty_interface_layer3.c openbsc/src/bsc_api.c \
+ openbsc/src/bsc_version.c ss5.cpp ss5_encode.c ss5_decode.c \
+ select.c action.cpp mISDN.cpp tones.c action_efi.cpp crypt.cpp \
+ mail.c trace.c action_vbox.cpp dss1.cpp main.c vbox.cpp \
+ alawulaw.c endpoint.cpp interface.c message.c apppbx.cpp \
+ endpointapp.cpp join.cpp options.c extension.c joinpbx.cpp \
+ port.cpp callerid.c joinremote.cpp route.c cause.c \
+ socket_server.c
@ENABLE_GSM_TRUE@am__objects_1 = gsm_audio.$(OBJEXT) gsm.$(OBJEXT) \
@ENABLE_GSM_TRUE@ gsm_conf.$(OBJEXT) bsc_init.$(OBJEXT) \
-@ENABLE_GSM_TRUE@ vty_interface.$(OBJEXT) \
-@ENABLE_GSM_TRUE@ vty_interface_layer3.$(OBJEXT)
+@ENABLE_GSM_TRUE@ bsc_vty.$(OBJEXT) \
+@ENABLE_GSM_TRUE@ vty_interface_layer3.$(OBJEXT) \
+@ENABLE_GSM_TRUE@ bsc_api.$(OBJEXT) bsc_version.$(OBJEXT)
@ENABLE_SS5_TRUE@am__objects_2 = ss5.$(OBJEXT) ss5_encode.$(OBJEXT) \
@ENABLE_SS5_TRUE@ ss5_decode.$(OBJEXT)
am_lcr_OBJECTS = $(am__objects_1) $(am__objects_2) select.$(OBJEXT) \
@@ -185,6 +187,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
POW_LIB = @POW_LIB@
@@ -249,9 +252,9 @@ INSTALLATION_DEFINES = \
-DLOG_DIR="\"$(LOGdir)\"" \
-DEXTENSION_DATA="\"$(EXTENSIONdir)\""
-@ENABLE_GSM_TRUE@GSM_INCLUDE = -DWITH_GSM -I./openbsc/include -I./libosmocore/include
-@ENABLE_GSM_TRUE@GSM_SOURCE = gsm_audio.c gsm.cpp gsm_conf.c openbsc/src/bsc_init.c openbsc/src/vty_interface.c openbsc/src/vty_interface_layer3.c
-@ENABLE_GSM_TRUE@GSM_LIB = /usr/lib/libgsm.a ./openbsc/src/libbsc.a ./openbsc/src/libmsc.a ./openbsc/src/libvty.a -L./libosmocore/src/ -losmocore -ldbi -lcrypt
+@ENABLE_GSM_TRUE@GSM_INCLUDE = -DWITH_GSM -I./openbsc/include -I./libosmocore/include -I./openbsc
+@ENABLE_GSM_TRUE@GSM_SOURCE = gsm_audio.c gsm.cpp gsm_conf.c openbsc/src/bsc_init.c openbsc/src/bsc_vty.c openbsc/src/vty_interface_layer3.c openbsc/src/bsc_api.c openbsc/src/bsc_version.c
+@ENABLE_GSM_TRUE@GSM_LIB = /usr/lib/libgsm.a ./openbsc/src/libbsc.a ./openbsc/src/libmsc.a ./openbsc/src/libvty.a -losmovty -losmocore -ldbi -lcrypt
#gsm_audio.po: gsm_audio.c gsm_audio.h
# $(CC) -D_GNU_SOURCE -fPIC -c gsm_audio.c -o gsm_audio.po
@@ -420,7 +423,10 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/action_vbox.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alawulaw.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/apppbx.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsc_api.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsc_init.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsc_version.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsc_vty.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callerid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cause.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt.Po@am__quote@
@@ -455,7 +461,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tones.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trace.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vbox.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vty_interface.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vty_interface_layer3.Po@am__quote@
.c.o:
@@ -486,19 +491,19 @@ bsc_init.obj: openbsc/src/bsc_init.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bsc_init.obj `if test -f 'openbsc/src/bsc_init.c'; then $(CYGPATH_W) 'openbsc/src/bsc_init.c'; else $(CYGPATH_W) '$(srcdir)/openbsc/src/bsc_init.c'; fi`
-vty_interface.o: openbsc/src/vty_interface.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT vty_interface.o -MD -MP -MF "$(DEPDIR)/vty_interface.Tpo" -c -o vty_interface.o `test -f 'openbsc/src/vty_interface.c' || echo '$(srcdir)/'`openbsc/src/vty_interface.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/vty_interface.Tpo" "$(DEPDIR)/vty_interface.Po"; else rm -f "$(DEPDIR)/vty_interface.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='openbsc/src/vty_interface.c' object='vty_interface.o' libtool=no @AMDEPBACKSLASH@
+bsc_vty.o: openbsc/src/bsc_vty.c
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bsc_vty.o -MD -MP -MF "$(DEPDIR)/bsc_vty.Tpo" -c -o bsc_vty.o `test -f 'openbsc/src/bsc_vty.c' || echo '$(srcdir)/'`openbsc/src/bsc_vty.c; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bsc_vty.Tpo" "$(DEPDIR)/bsc_vty.Po"; else rm -f "$(DEPDIR)/bsc_vty.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='openbsc/src/bsc_vty.c' object='bsc_vty.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o vty_interface.o `test -f 'openbsc/src/vty_interface.c' || echo '$(srcdir)/'`openbsc/src/vty_interface.c
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bsc_vty.o `test -f 'openbsc/src/bsc_vty.c' || echo '$(srcdir)/'`openbsc/src/bsc_vty.c
-vty_interface.obj: openbsc/src/vty_interface.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT vty_interface.obj -MD -MP -MF "$(DEPDIR)/vty_interface.Tpo" -c -o vty_interface.obj `if test -f 'openbsc/src/vty_interface.c'; then $(CYGPATH_W) 'openbsc/src/vty_interface.c'; else $(CYGPATH_W) '$(srcdir)/openbsc/src/vty_interface.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/vty_interface.Tpo" "$(DEPDIR)/vty_interface.Po"; else rm -f "$(DEPDIR)/vty_interface.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='openbsc/src/vty_interface.c' object='vty_interface.obj' libtool=no @AMDEPBACKSLASH@
+bsc_vty.obj: openbsc/src/bsc_vty.c
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bsc_vty.obj -MD -MP -MF "$(DEPDIR)/bsc_vty.Tpo" -c -o bsc_vty.obj `if test -f 'openbsc/src/bsc_vty.c'; then $(CYGPATH_W) 'openbsc/src/bsc_vty.c'; else $(CYGPATH_W) '$(srcdir)/openbsc/src/bsc_vty.c'; fi`; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bsc_vty.Tpo" "$(DEPDIR)/bsc_vty.Po"; else rm -f "$(DEPDIR)/bsc_vty.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='openbsc/src/bsc_vty.c' object='bsc_vty.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o vty_interface.obj `if test -f 'openbsc/src/vty_interface.c'; then $(CYGPATH_W) 'openbsc/src/vty_interface.c'; else $(CYGPATH_W) '$(srcdir)/openbsc/src/vty_interface.c'; fi`
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bsc_vty.obj `if test -f 'openbsc/src/bsc_vty.c'; then $(CYGPATH_W) 'openbsc/src/bsc_vty.c'; else $(CYGPATH_W) '$(srcdir)/openbsc/src/bsc_vty.c'; fi`
vty_interface_layer3.o: openbsc/src/vty_interface_layer3.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT vty_interface_layer3.o -MD -MP -MF "$(DEPDIR)/vty_interface_layer3.Tpo" -c -o vty_interface_layer3.o `test -f 'openbsc/src/vty_interface_layer3.c' || echo '$(srcdir)/'`openbsc/src/vty_interface_layer3.c; \
@@ -514,6 +519,34 @@ vty_interface_layer3.obj: openbsc/src/vty_interface_layer3.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o vty_interface_layer3.obj `if test -f 'openbsc/src/vty_interface_layer3.c'; then $(CYGPATH_W) 'openbsc/src/vty_interface_layer3.c'; else $(CYGPATH_W) '$(srcdir)/openbsc/src/vty_interface_layer3.c'; fi`
+bsc_api.o: openbsc/src/bsc_api.c
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bsc_api.o -MD -MP -MF "$(DEPDIR)/bsc_api.Tpo" -c -o bsc_api.o `test -f 'openbsc/src/bsc_api.c' || echo '$(srcdir)/'`openbsc/src/bsc_api.c; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bsc_api.Tpo" "$(DEPDIR)/bsc_api.Po"; else rm -f "$(DEPDIR)/bsc_api.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='openbsc/src/bsc_api.c' object='bsc_api.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bsc_api.o `test -f 'openbsc/src/bsc_api.c' || echo '$(srcdir)/'`openbsc/src/bsc_api.c
+
+bsc_api.obj: openbsc/src/bsc_api.c
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bsc_api.obj -MD -MP -MF "$(DEPDIR)/bsc_api.Tpo" -c -o bsc_api.obj `if test -f 'openbsc/src/bsc_api.c'; then $(CYGPATH_W) 'openbsc/src/bsc_api.c'; else $(CYGPATH_W) '$(srcdir)/openbsc/src/bsc_api.c'; fi`; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bsc_api.Tpo" "$(DEPDIR)/bsc_api.Po"; else rm -f "$(DEPDIR)/bsc_api.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='openbsc/src/bsc_api.c' object='bsc_api.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bsc_api.obj `if test -f 'openbsc/src/bsc_api.c'; then $(CYGPATH_W) 'openbsc/src/bsc_api.c'; else $(CYGPATH_W) '$(srcdir)/openbsc/src/bsc_api.c'; fi`
+
+bsc_version.o: openbsc/src/bsc_version.c
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bsc_version.o -MD -MP -MF "$(DEPDIR)/bsc_version.Tpo" -c -o bsc_version.o `test -f 'openbsc/src/bsc_version.c' || echo '$(srcdir)/'`openbsc/src/bsc_version.c; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bsc_version.Tpo" "$(DEPDIR)/bsc_version.Po"; else rm -f "$(DEPDIR)/bsc_version.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='openbsc/src/bsc_version.c' object='bsc_version.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bsc_version.o `test -f 'openbsc/src/bsc_version.c' || echo '$(srcdir)/'`openbsc/src/bsc_version.c
+
+bsc_version.obj: openbsc/src/bsc_version.c
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bsc_version.obj -MD -MP -MF "$(DEPDIR)/bsc_version.Tpo" -c -o bsc_version.obj `if test -f 'openbsc/src/bsc_version.c'; then $(CYGPATH_W) 'openbsc/src/bsc_version.c'; else $(CYGPATH_W) '$(srcdir)/openbsc/src/bsc_version.c'; fi`; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bsc_version.Tpo" "$(DEPDIR)/bsc_version.Po"; else rm -f "$(DEPDIR)/bsc_version.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='openbsc/src/bsc_version.c' object='bsc_version.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bsc_version.obj `if test -f 'openbsc/src/bsc_version.c'; then $(CYGPATH_W) 'openbsc/src/bsc_version.c'; else $(CYGPATH_W) '$(srcdir)/openbsc/src/bsc_version.c'; fi`
+
.cpp.o:
@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@@ -606,7 +639,8 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ -find "$(distdir)" -type d ! -perm -755 \
+ -exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
diff --git a/README b/README
index e561f1b..c586799 100644
--- a/README
+++ b/README
@@ -548,5 +548,5 @@ Changes after Version 1.7
- Fixed redirection info in chan_lcr. Thanx to Dennis for the fix.
- Added patch to play ringing tone when connected but the call is forwarded
and ringing again. Thanx to Jacek for this patch.
-
+- Fixed LCR to work with the current API of OpenBSC.
diff --git a/gsm.cpp b/gsm.cpp
index 961c11f..d6109c9 100644
--- a/gsm.cpp
+++ b/gsm.cpp
@@ -36,7 +36,7 @@ void on_dso_load_ho_dec(void);
int bts_model_unknown_init(void);
int bts_model_bs11_init(void);
int bts_model_nanobts_init(void);
-static struct debug_target *stderr_target;
+static struct log_target *stderr_target;
/* timer to store statistics */
#define DB_SYNC_INTERVAL 60, 0
@@ -1607,21 +1607,21 @@ int gsm_init(void)
char conf_error[128] = "";
- debug_init();
+ log_init(&log_info);
tall_bsc_ctx = talloc_named_const(NULL, 1, "openbsc");
talloc_ctx_init();
on_dso_load_token();
on_dso_load_rrlp();
on_dso_load_ho_dec();
- stderr_target = debug_target_create_stderr();
- debug_add_target(stderr_target);
+ stderr_target = log_target_create_stderr();
+ log_add_target(stderr_target);
bts_model_unknown_init();
bts_model_bs11_init();
bts_model_nanobts_init();
/* enable filters */
- debug_set_all_filter(stderr_target, 1);
+ log_set_all_filter(stderr_target, 1);
/* seed the PRNG */
srand(time(NULL));
@@ -1638,7 +1638,7 @@ int gsm_init(void)
/* set debug */
if (gsm->conf.debug[0])
- debug_parse_category_mask(stderr_target, gsm->conf.debug);
+ log_parse_category_mask(stderr_target, gsm->conf.debug);
/* open pcap file */
if (gsm->conf.pcapfile[0]) {
@@ -1706,7 +1706,7 @@ int handle_gsm(void)
int ret1, ret2;
ret1 = bsc_upqueue((struct gsm_network *)gsm->network);
- debug_reset_context();
+ log_reset_context();
ret2 = bsc_select_main(1); /* polling */
if (ret1 || ret2)
return 1;