diff options
author | Harald Welte <laforge@gnumonks.org> | 2018-06-29 10:57:24 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2018-06-29 10:57:24 +0200 |
commit | e2fbd3dee43bb3d47c53514200650db41b4f5ef7 (patch) | |
tree | ac734d1bdded7790705539f101ec0f6f3898013e /include | |
parent | 7839556ca950f02e2dda48f8e10dd68e90266926 (diff) |
remove "channel" layer
The "channel" layer on top of IPA client + server was introduced in
2011 but never used in any osmocom program/project so far. Contrary
to the several other IPA multiplex related implementations in libosmo*,
it did not deal properly with segmented IPA messages, i.e. where a
single TCP segment (and hence recv/read call) does not contain a full
IPA message.
So rather than fixing it up and having yet another IPA related API in
our libraries, let's remove it.
Change-Id: I97c378750acb1637ee032fa88a968edf68d8979f
Diffstat (limited to 'include')
-rw-r--r-- | include/osmocom/netif/Makefile.am | 3 | ||||
-rw-r--r-- | include/osmocom/netif/channel.h | 54 | ||||
-rw-r--r-- | include/osmocom/netif/channel/Makefile.am | 3 | ||||
-rw-r--r-- | include/osmocom/netif/channel/abis_ipa_client.h | 13 | ||||
-rw-r--r-- | include/osmocom/netif/channel/abis_ipa_server.h | 14 |
5 files changed, 0 insertions, 87 deletions
diff --git a/include/osmocom/netif/Makefile.am b/include/osmocom/netif/Makefile.am index 0db78fb..39df08a 100644 --- a/include/osmocom/netif/Makefile.am +++ b/include/osmocom/netif/Makefile.am @@ -1,7 +1,4 @@ -SUBDIRS = channel - osmonetif_HEADERS = amr.h \ - channel.h \ datagram.h \ jibuf.h \ osmux.h \ diff --git a/include/osmocom/netif/channel.h b/include/osmocom/netif/channel.h deleted file mode 100644 index 1abc828..0000000 --- a/include/osmocom/netif/channel.h +++ /dev/null @@ -1,54 +0,0 @@ -#ifndef _CHANNEL_H_ -#define _CHANNEL_H_ - -#include <stdint.h> - -/* channel types */ -enum { - OSMO_CHAN_NONE, - OSMO_CHAN_ABIS_IPA_SRV, - OSMO_CHAN_ABIS_IPA_CLI, - OSMO_CHAN_MAX, -}; - -/* channel subtypes */ -enum { - OSMO_SUBCHAN_STREAM, - OSMO_SUBCHAN_MAX, -}; - -struct osmo_chan; -struct msgb; - -struct osmo_chan_type { - struct llist_head head; - - char *name; - int type; - int subtype; - int datasiz; - - int (*create)(struct osmo_chan *chan); - void (*destroy)(struct osmo_chan *chan); - int (*open)(struct osmo_chan *chan); - void (*close)(struct osmo_chan *chan); - int (*enqueue)(struct osmo_chan *chan, struct msgb *msg); -}; - -struct osmo_chan { - void *ctx; - struct osmo_chan_type *ops; - char data[0]; -}; - -void osmo_chan_init(void *ctx); - -struct osmo_chan *osmo_chan_create(int type, int subtype); -void osmo_chan_destroy(struct osmo_chan *c); - -int osmo_chan_open(struct osmo_chan *c); -void osmo_chan_close(struct osmo_chan *c); - -int osmo_chan_enqueue(struct osmo_chan *c, struct msgb *msg); - -#endif /* _CHANNEL_H_ */ diff --git a/include/osmocom/netif/channel/Makefile.am b/include/osmocom/netif/channel/Makefile.am deleted file mode 100644 index dec19b2..0000000 --- a/include/osmocom/netif/channel/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -osmonetif_channel_HEADERS = abis_ipa_server.h abis_ipa_client.h - -osmonetif_channeldir = $(includedir)/osmocom/netif/channel diff --git a/include/osmocom/netif/channel/abis_ipa_client.h b/include/osmocom/netif/channel/abis_ipa_client.h deleted file mode 100644 index cd35852..0000000 --- a/include/osmocom/netif/channel/abis_ipa_client.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _OSMO_ABIS_IPA_CLIENT_H_ -#define _OSMO_ABIS_IPA_CLIENT_H_ - -struct osmo_ipa_unit; - -void osmo_abis_ipa_cli_set_oml_addr(struct osmo_chan *c, const char *addr); -void osmo_abis_ipa_cli_set_oml_port(struct osmo_chan *c, uint16_t port); -void osmo_abis_ipa_cli_set_rsl_addr(struct osmo_chan *c, const char *addr); -void osmo_abis_ipa_cli_set_rsl_port(struct osmo_chan *c, uint16_t port); -void osmo_abis_ipa_cli_set_unit(struct osmo_chan *c, struct osmo_ipa_unit *unit); -void osmo_abis_ipa_cli_set_cb_signalmsg(struct osmo_chan *c, void (*signal_msg)(struct msgb *msg, int type)); - -#endif /* _OSMO_ABIS_IPA_CLIENT_H_ */ diff --git a/include/osmocom/netif/channel/abis_ipa_server.h b/include/osmocom/netif/channel/abis_ipa_server.h deleted file mode 100644 index 6518f99..0000000 --- a/include/osmocom/netif/channel/abis_ipa_server.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef _ABIS_IPA_SERVER_H_ -#define _ABIS_IPA_SERVER_H_ - -void osmo_abis_ipa_srv_set_oml_addr(struct osmo_chan *c, const char *addr); -void osmo_abis_ipa_srv_set_oml_port(struct osmo_chan *c, uint16_t port); - -void osmo_abis_ipa_srv_set_rsl_addr(struct osmo_chan *c, const char *addr); -void osmo_abis_ipa_srv_set_rsl_port(struct osmo_chan *c, uint16_t port); - -void osmo_abis_ipa_srv_set_cb_signalmsg(struct osmo_chan *c, void (*signal_msg)(struct msgb *msg, int type)); - -int osmo_abis_ipa_unit_add(struct osmo_chan *c, uint16_t site_id, uint16_t bts_id); - -#endif |