diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2019-04-01 22:24:33 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2019-04-13 21:38:58 +0000 |
| commit | 9838c9070fb8147418e65348e71147a52f64320b (patch) | |
| tree | f1d9c54235f01cb5a47f73a3eb3ca082a729f3b9 /include | |
| parent | 0ee798a0172a009cec4fb27c427b8f1d66fca749 (diff) | |
GSUP: add Message Class IE
osmo-msc and osmo-hlr have distinct subsystems handling incoming GSUP messages.
So far we decide entirely by message type which code path should handle a GSUP
message. Thus no GSUP message type may be re-used across subsystems.
If we add a GSUP message to indicate a routing error, it would have to be a
distinct message type for subscriber management, another one for SMS, another
one for USSD...
To allow introducing common message types, introduce a GSUP Message Class IE.
In the presence of this IE, GSUP handlers can trivially direct a received
message to the right code path. If it is missing, handlers can fall back to the
previous switch(message_type) method.
Change-Id: Ic397a9f2c4a7224e47cab944c72e75ca5592efef
Diffstat (limited to 'include')
| -rw-r--r-- | include/osmocom/gsm/gsup.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index 9a583aae..7f304a3c 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -68,6 +68,7 @@ enum osmo_gsup_iei { OSMO_GSUP_FREEZE_PTMSI_IE = 0x07, OSMO_GSUP_MSISDN_IE = 0x08, OSMO_GSUP_HLR_NUMBER_IE = 0x09, + OSMO_GSUP_MESSAGE_CLASS_IE = 0x0a, OSMO_GSUP_PDP_CONTEXT_ID_IE = 0x10, OSMO_GSUP_PDP_TYPE_IE = 0x11, OSMO_GSUP_ACCESS_POINT_NAME_IE = 0x12, @@ -229,6 +230,21 @@ struct osmo_gsup_pdp_info { size_t pdp_charg_enc_len; }; +enum osmo_gsup_message_class { + OSMO_GSUP_MESSAGE_CLASS_UNSET = 0, + OSMO_GSUP_MESSAGE_CLASS_SUBSCRIBER_MANAGEMENT = 1, + OSMO_GSUP_MESSAGE_CLASS_SMS = 2, + OSMO_GSUP_MESSAGE_CLASS_USSD = 3, + OSMO_GSUP_MESSAGE_CLASS_INTER_MSC = 4, + /* Keep this as last entry with a value of max(enum osmo_gsup_message_class) + 1. + * This value shall serve as the size for an array to aid de-muxing all known GSUP classes. */ + OSMO_GSUP_MESSAGE_CLASS_ARRAYSIZE +}; + +extern const struct value_string osmo_gsup_message_class_names[]; +static inline const char *osmo_gsup_message_class_name(enum osmo_gsup_message_class val) +{ return get_value_string(osmo_gsup_message_class_names, val); } + /*! parsed/decoded GSUP protocol message */ struct osmo_gsup_message { enum osmo_gsup_message_type message_type; @@ -286,6 +302,11 @@ struct osmo_gsup_message { const uint8_t *imei_enc; size_t imei_enc_len; enum osmo_gsup_imei_result imei_result; + + /*! Indicate the message class to trivially dispatch incoming GSUP messages to the right code paths. + * Inter-MSC messages are *required* to set a class = OSMO_GSUP_MESSAGE_CLASS_INTER_MSC. For older message classes, this may + * be omitted (for backwards compatibility only -- if in doubt, include it). */ + enum osmo_gsup_message_class message_class; }; int osmo_gsup_decode(const uint8_t *data, size_t data_len, |