From 060e46ea6dd6b25d851baaa8757b3531a37edb1a Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sun, 19 Aug 2012 01:05:54 +0200 Subject: channel: add abis directory under channel And move all existing A-bis channel implementation to channel/abis/ directory. This is just a cleanup to reorganize the source code tree. --- examples/channel/Makefile.am | 16 +++--- examples/channel/abis_ipa_client.c | 92 ------------------------------- examples/channel/abis_ipa_server.c | 79 -------------------------- examples/channel/abis_ipa_stream_client.c | 92 +++++++++++++++++++++++++++++++ examples/channel/abis_ipa_stream_server.c | 79 ++++++++++++++++++++++++++ 5 files changed, 179 insertions(+), 179 deletions(-) delete mode 100644 examples/channel/abis_ipa_client.c delete mode 100644 examples/channel/abis_ipa_server.c create mode 100644 examples/channel/abis_ipa_stream_client.c create mode 100644 examples/channel/abis_ipa_stream_server.c (limited to 'examples') diff --git a/examples/channel/Makefile.am b/examples/channel/Makefile.am index eb53c41..6ab34b6 100644 --- a/examples/channel/Makefile.am +++ b/examples/channel/Makefile.am @@ -2,13 +2,13 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) -noinst_PROGRAMS = abis_ipa_server \ - abis_ipa_client +noinst_PROGRAMS = abis_ipa_stream_server \ + abis_ipa_stream_client -abis_ipa_server_SOURCES = abis_ipa_server.c -abis_ipa_server_LDADD = $(top_builddir)/src/libosmonetif.la \ - $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) +abis_ipa_stream_server_SOURCES = abis_ipa_stream_server.c +abis_ipa_stream_server_LDADD = $(top_builddir)/src/libosmonetif.la \ + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -abis_ipa_client_SOURCES = abis_ipa_client.c -abis_ipa_client_LDADD = $(top_builddir)/src/libosmonetif.la \ - $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) +abis_ipa_stream_client_SOURCES = abis_ipa_stream_client.c +abis_ipa_stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \ + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) diff --git a/examples/channel/abis_ipa_client.c b/examples/channel/abis_ipa_client.c deleted file mode 100644 index 3e24b62..0000000 --- a/examples/channel/abis_ipa_client.c +++ /dev/null @@ -1,92 +0,0 @@ -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include -#include - -static void *tall_example; - -#define DEXAMPLE 0 - -struct log_info_cat example_cat[] = { - [DEXAMPLE] = { - .name = "DEXAMPLE", - .description = "example", - .color = "\033[1;35m", - .enabled = 1, .loglevel = LOGL_DEBUG, - }, -}; - -const struct log_info example_log_info = { - .filter_fn = NULL, - .cat = example_cat, - .num_cat = ARRAY_SIZE(example_cat), -}; - -void sighandler(int foo) -{ - LOGP(DEXAMPLE, LOGL_NOTICE, "closing test.\n"); - exit(EXIT_SUCCESS); -} - -static void signal_msg_cb(struct msgb *msg, int type) -{ - LOGP(DEXAMPLE, LOGL_NOTICE, "received signal message\n"); -} - -static struct osmo_chan *chan; - -int main(void) -{ - struct ipaccess_unit *unit; - - tall_example = talloc_named_const(NULL, 1, "example"); - - osmo_init_logging(&example_log_info); - log_set_log_level(osmo_stderr_target, LOGL_DEBUG); - - /* initialize channel infrastructure. */ - osmo_chan_init(tall_example); - - /* create channel. */ - chan = osmo_chan_create(OSMO_CHAN_ABIS_IPA_CLI, OSMO_SUBCHAN_STREAM); - if (chan == NULL) { - LOGP(DEXAMPLE, LOGL_ERROR, "Cannot create A-bis IPA client\n"); - exit(EXIT_FAILURE); - } - - /* set specific parameters (depends on channel type). */ - osmo_abis_ipa_cli_set_oml_addr(chan, "127.0.0.1"); - osmo_abis_ipa_cli_set_rsl_addr(chan, "127.0.0.1"); - - unit = osmo_ipa_unit_alloc(); - if (unit == NULL) { - LOGP(DEXAMPLE, LOGL_ERROR, "Cannot create IPA unit\n"); - exit(EXIT_FAILURE); - } - osmo_ipa_unit_set_site_id(unit, 1801); - - osmo_abis_ipa_cli_set_unit(chan, unit); - osmo_abis_ipa_cli_set_cb_signalmsg(chan, signal_msg_cb); - - /* open channel. */ - if (osmo_chan_open(chan) < 0) { - LOGP(DEXAMPLE, LOGL_ERROR, "Cannot create A-bis IPA client\n"); - exit(EXIT_FAILURE); - } - - LOGP(DEXAMPLE, LOGL_NOTICE, "Entering main loop\n"); - - while(1) { - osmo_select_main(0); - } -} diff --git a/examples/channel/abis_ipa_server.c b/examples/channel/abis_ipa_server.c deleted file mode 100644 index a1b2ffd..0000000 --- a/examples/channel/abis_ipa_server.c +++ /dev/null @@ -1,79 +0,0 @@ -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include - -static void *tall_example; - -#define DEXAMPLE 0 - -struct log_info_cat example_cat[] = { - [DEXAMPLE] = { - .name = "DEXAMPLE", - .description = "example", - .color = "\033[1;35m", - .enabled = 1, .loglevel = LOGL_DEBUG, - }, -}; - -const struct log_info example_log_info = { - .filter_fn = NULL, - .cat = example_cat, - .num_cat = ARRAY_SIZE(example_cat), -}; - -void sighandler(int foo) -{ - LOGP(DEXAMPLE, LOGL_NOTICE, "closing test.\n"); - exit(EXIT_SUCCESS); -} - -static void signal_msg_cb(struct msgb *msg, int type) -{ - LOGP(DEXAMPLE, LOGL_NOTICE, "received signal message\n"); -} - -static struct osmo_chan *chan; - -int main(void) -{ - tall_example = talloc_named_const(NULL, 1, "example"); - - osmo_init_logging(&example_log_info); - log_set_log_level(osmo_stderr_target, LOGL_DEBUG); - - /* initialize channel infrastructure. */ - osmo_chan_init(tall_example); - - /* create channel. */ - chan = osmo_chan_create(OSMO_CHAN_ABIS_IPA_SRV, OSMO_SUBCHAN_STREAM); - if (chan == NULL) { - LOGP(DEXAMPLE, LOGL_ERROR, "Cannot create A-bis IPA server\n"); - exit(EXIT_FAILURE); - } - - /* set specific parameters (depends on channel type). */ - osmo_abis_ipa_srv_set_cb_signalmsg(chan, signal_msg_cb); - osmo_abis_ipa_unit_add(chan, 1801, 0); - - /* open channel. */ - if (osmo_chan_open(chan) < 0) { - LOGP(DEXAMPLE, LOGL_ERROR, "Cannot create A-bis IPA server\n"); - exit(EXIT_FAILURE); - } - - LOGP(DEXAMPLE, LOGL_NOTICE, "Entering main loop\n"); - - while(1) { - osmo_select_main(0); - } -} diff --git a/examples/channel/abis_ipa_stream_client.c b/examples/channel/abis_ipa_stream_client.c new file mode 100644 index 0000000..3e24b62 --- /dev/null +++ b/examples/channel/abis_ipa_stream_client.c @@ -0,0 +1,92 @@ +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include +#include +#include + +static void *tall_example; + +#define DEXAMPLE 0 + +struct log_info_cat example_cat[] = { + [DEXAMPLE] = { + .name = "DEXAMPLE", + .description = "example", + .color = "\033[1;35m", + .enabled = 1, .loglevel = LOGL_DEBUG, + }, +}; + +const struct log_info example_log_info = { + .filter_fn = NULL, + .cat = example_cat, + .num_cat = ARRAY_SIZE(example_cat), +}; + +void sighandler(int foo) +{ + LOGP(DEXAMPLE, LOGL_NOTICE, "closing test.\n"); + exit(EXIT_SUCCESS); +} + +static void signal_msg_cb(struct msgb *msg, int type) +{ + LOGP(DEXAMPLE, LOGL_NOTICE, "received signal message\n"); +} + +static struct osmo_chan *chan; + +int main(void) +{ + struct ipaccess_unit *unit; + + tall_example = talloc_named_const(NULL, 1, "example"); + + osmo_init_logging(&example_log_info); + log_set_log_level(osmo_stderr_target, LOGL_DEBUG); + + /* initialize channel infrastructure. */ + osmo_chan_init(tall_example); + + /* create channel. */ + chan = osmo_chan_create(OSMO_CHAN_ABIS_IPA_CLI, OSMO_SUBCHAN_STREAM); + if (chan == NULL) { + LOGP(DEXAMPLE, LOGL_ERROR, "Cannot create A-bis IPA client\n"); + exit(EXIT_FAILURE); + } + + /* set specific parameters (depends on channel type). */ + osmo_abis_ipa_cli_set_oml_addr(chan, "127.0.0.1"); + osmo_abis_ipa_cli_set_rsl_addr(chan, "127.0.0.1"); + + unit = osmo_ipa_unit_alloc(); + if (unit == NULL) { + LOGP(DEXAMPLE, LOGL_ERROR, "Cannot create IPA unit\n"); + exit(EXIT_FAILURE); + } + osmo_ipa_unit_set_site_id(unit, 1801); + + osmo_abis_ipa_cli_set_unit(chan, unit); + osmo_abis_ipa_cli_set_cb_signalmsg(chan, signal_msg_cb); + + /* open channel. */ + if (osmo_chan_open(chan) < 0) { + LOGP(DEXAMPLE, LOGL_ERROR, "Cannot create A-bis IPA client\n"); + exit(EXIT_FAILURE); + } + + LOGP(DEXAMPLE, LOGL_NOTICE, "Entering main loop\n"); + + while(1) { + osmo_select_main(0); + } +} diff --git a/examples/channel/abis_ipa_stream_server.c b/examples/channel/abis_ipa_stream_server.c new file mode 100644 index 0000000..a1b2ffd --- /dev/null +++ b/examples/channel/abis_ipa_stream_server.c @@ -0,0 +1,79 @@ +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include +#include + +static void *tall_example; + +#define DEXAMPLE 0 + +struct log_info_cat example_cat[] = { + [DEXAMPLE] = { + .name = "DEXAMPLE", + .description = "example", + .color = "\033[1;35m", + .enabled = 1, .loglevel = LOGL_DEBUG, + }, +}; + +const struct log_info example_log_info = { + .filter_fn = NULL, + .cat = example_cat, + .num_cat = ARRAY_SIZE(example_cat), +}; + +void sighandler(int foo) +{ + LOGP(DEXAMPLE, LOGL_NOTICE, "closing test.\n"); + exit(EXIT_SUCCESS); +} + +static void signal_msg_cb(struct msgb *msg, int type) +{ + LOGP(DEXAMPLE, LOGL_NOTICE, "received signal message\n"); +} + +static struct osmo_chan *chan; + +int main(void) +{ + tall_example = talloc_named_const(NULL, 1, "example"); + + osmo_init_logging(&example_log_info); + log_set_log_level(osmo_stderr_target, LOGL_DEBUG); + + /* initialize channel infrastructure. */ + osmo_chan_init(tall_example); + + /* create channel. */ + chan = osmo_chan_create(OSMO_CHAN_ABIS_IPA_SRV, OSMO_SUBCHAN_STREAM); + if (chan == NULL) { + LOGP(DEXAMPLE, LOGL_ERROR, "Cannot create A-bis IPA server\n"); + exit(EXIT_FAILURE); + } + + /* set specific parameters (depends on channel type). */ + osmo_abis_ipa_srv_set_cb_signalmsg(chan, signal_msg_cb); + osmo_abis_ipa_unit_add(chan, 1801, 0); + + /* open channel. */ + if (osmo_chan_open(chan) < 0) { + LOGP(DEXAMPLE, LOGL_ERROR, "Cannot create A-bis IPA server\n"); + exit(EXIT_FAILURE); + } + + LOGP(DEXAMPLE, LOGL_NOTICE, "Entering main loop\n"); + + while(1) { + osmo_select_main(0); + } +} -- cgit v1.2.3