talloc: revert to use talloc inside libosmocore

It's not a good idea to confuse the two changes with each other.  Moving the
Abis part into a separate library is independent from the question whether we
have talloc inside libosmocore or use a stand-alone talloc library.

configure.ac

@@ -37,7 +37,6 @@ AM_CONFIG_HEADER(config.h)
 PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0)
 PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0)
 PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.0)
-PKG_CHECK_MODULES([LIBTALLOC], talloc >= 2.0.1)
 
 AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_ERROR(DAHDI input driver headers missing))
 

src/e1_input.c

@@ -47,7 +47,7 @@
 #include <osmocom/abis/e1_input.h>
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/abis/subchan_demux.h>
-#include <talloc.h>
+#include <osmocom/core/talloc.h>
 
 #define NUM_E1_TS	32
 

src/e1_input_vty.c

@@ -31,7 +31,7 @@
 #include <osmocom/abis/e1_input.h>
 #include <osmocom/core/utils.h>
 #include <osmocom/gsm/gsm_utils.h>
-#include <talloc.h>
+#include <osmocom/core/talloc.h>
 
 #define E1_DRIVER_NAMES		"(misdn|dahdi|ipa|hsl)"
 #define E1_DRIVER_HELP		"mISDN supported E1 Card\n" \

src/init.c

@@ -18,7 +18,7 @@
 #include "internal.h"
 #include <osmocom/core/utils.h>
 #include <osmocom/core/logging.h>
-#include <talloc.h>
+#include <osmocom/core/talloc.h>
 
 void *libosmo_abis_ctx;
 

src/input/dahdi.c

@@ -40,7 +40,7 @@
 #include <osmocom/core/signal.h>
 #include <osmocom/abis/subchan_demux.h>
 #include <osmocom/abis/e1_input.h>
-#include <talloc.h>
+#include <osmocom/core/talloc.h>
 
 #include <osmocom/abis/lapd.h>
 

src/input/hsl.c

@@ -52,7 +52,7 @@
 #include <osmocom/abis/ipaccess.h>
 #include <osmocom/core/socket.h>
 #include <osmocom/abis/ipa.h>
-#include <talloc.h>
+#include <osmocom/core/talloc.h>
 
 #define HSL_TCP_PORT	2500
 #define HSL_PROTO_DEBUG	0xdd

src/input/ipa.c

@@ -15,7 +15,7 @@
 #include <osmocom/gsm/tlv.h>
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/logging.h>
-#include <talloc.h>
+#include <osmocom/core/talloc.h>
 #include <osmocom/abis/e1_input.h>
 #include <osmocom/abis/ipaccess.h>
 #include <osmocom/core/socket.h>

src/input/ipaccess.c

@@ -39,7 +39,7 @@
 #include <osmocom/gsm/tlv.h>
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/logging.h>
-#include <talloc.h>
+#include <osmocom/core/talloc.h>
 #include <osmocom/abis/e1_input.h>
 #include <osmocom/abis/ipaccess.h>
 #include <osmocom/core/socket.h>

src/input/lapd.c

@@ -40,7 +40,7 @@
 
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/core/logging.h>
-#include <talloc.h>
+#include <osmocom/core/talloc.h>
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/timer.h>
 

src/input/misdn.c

@@ -45,7 +45,7 @@
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/logging.h>
 #include <osmocom/abis/e1_input.h>
-#include <talloc.h>
+#include <osmocom/core/talloc.h>
 
 #define TS1_ALLOC_SIZE	300
 

src/ipa_proxy.c

@@ -17,7 +17,7 @@
 #include <osmocom/gsm/tlv.h>
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/logging.h>
-#include <talloc.h>
+#include <osmocom/core/talloc.h>
 #include <osmocom/abis/e1_input.h>
 #include <osmocom/abis/ipaccess.h>
 #include <osmocom/core/socket.h>

src/subchan_demux.c

@@ -28,7 +28,7 @@
 
 #include <osmocom/abis/subchan_demux.h>
 #include <osmocom/abis/trau_frame.h>
-#include <talloc.h>
+#include <osmocom/core/talloc.h>
 
 void *tall_tqe_ctx;
 

tests/e1inp_hsl_bsc_test.c

@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <talloc.h>
+#include <osmocom/core/talloc.h>
 #include <osmocom/abis/abis.h>
 #include <osmocom/abis/e1_input.h>
 #include <osmocom/core/application.h>

tests/e1inp_hsl_bts_test.c

@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <talloc.h>
+#include <osmocom/core/talloc.h>
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>

tests/e1inp_ipa_bsc_test.c

@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <talloc.h>
+#include <osmocom/core/talloc.h>
 #include <osmocom/abis/abis.h>
 #include <osmocom/abis/e1_input.h>
 #include <osmocom/core/application.h>

tests/e1inp_ipa_bts_test.c

@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <talloc.h>
+#include <osmocom/core/talloc.h>
 #include <string.h>
 #include <unistd.h>
 #include <osmocom/abis/abis.h>

tests/ipa_proxy_test.c

@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <talloc.h>
+#include <osmocom/core/talloc.h>
 #include <osmocom/abis/abis.h>
 #include <osmocom/abis/e1_input.h>
 #include <osmocom/abis/ipa_proxy.h>