Convert GprsMS and helpers classes to C
As we integrate osmo-pcu more and more with libosmocore features, it
becomes really hard to use them since libosmocore relies heavily on C
specific compilation features, which are not available in old C++
compilers (such as designated initializers for complex types in FSMs).
GprsMs is right now a quite simple object since initial design of
osmo-pcu made it optional and most of the logic was placed and stored
duplicated in TBF objects. However, that's changing as we introduce more
features, with the GprsMS class getting more weight. Hence, let's move
it now to be a C struct in order to be able to easily use libosmocore
features there, such as FSMs.
Some helper classes which GprsMs uses are also mostly move to C since
they are mostly structs with methods, so there's no point in having
duplicated APIs for C++ and C for such simple cases.
For some more complex classes, like (ul_,dl_)tbf, C API bindings are
added where needed so that GprsMs can use functionalitites from that
class. Most of those APIs can be kept afterwards and drop the C++ ones
since they provide no benefit in general.
Change-Id: I0b50e3367aaad9dcada76da97b438e452c8b230c
diff --git a/src/gprs_ms_storage.h b/src/gprs_ms_storage.h
index 35062f3..af49688 100644
--- a/src/gprs_ms_storage.h
+++ b/src/gprs_ms_storage.h
@@ -21,28 +21,24 @@
#pragma once
#include "gprs_ms.h"
-#include "cxx_linuxlist.h"
#include "tbf.h"
#include <stdint.h>
#include <stddef.h>
struct BTS;
-class GprsMsStorage : public GprsMs::Callback {
+class GprsMsStorage {
public:
GprsMsStorage(BTS *bts);
~GprsMsStorage();
void cleanup();
- virtual void ms_idle(class GprsMs *);
- virtual void ms_active(class GprsMs *);
-
GprsMs *get_ms(uint32_t tlli, uint32_t old_tlli = GSM_RESERVED_TMSI, const char *imsi = NULL) const;
GprsMs *create_ms();
- const LListHead<GprsMs>& ms_list() const {return m_list;}
+ const struct llist_head* ms_list() const {return &m_list;}
private:
BTS *m_bts;
- LListHead<GprsMs> m_list;
+ struct llist_head m_list; /* list of struct GprsMs */
};