pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30871 )
Change subject: Move related structs to gprs_subscriber.h ......................................................................
Move related structs to gprs_subscriber.h
This allows shrinking a bit more gprs_sgsn.h and and in turn have everything much more tidy.
Change-Id: Ie39b48a0d612aa632327cc5a21c833b05f5bf297 --- M include/osmocom/sgsn/gprs_sgsn.h M include/osmocom/sgsn/gprs_subscriber.h 2 files changed, 26 insertions(+), 24 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/71/30871/1
diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index e34a019..8b9a00e 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -14,6 +14,8 @@ #include <osmocom/gsm/protocol/gsm_23_003.h> #include <osmocom/crypt/auth.h>
+#include <osmocom/sgsn/gprs_subscriber.h> + #define GSM_EXTENSION_LENGTH 15 #define GSM_APN_LENGTH 102
@@ -105,13 +107,6 @@
struct ranap_ue_conn_ctx;
-struct gsm_auth_tuple { - int use_count; - int key_seq; - struct osmo_auth_vector vec; -}; -#define GSM_KEY_SEQ_INVAL 7 /* GSM 04.08 - 10.5.1.2 */ - /* According to TS 03.60, Table 5: SGSN MM and PDP Contexts */ /* Extended by 3GPP TS 23.060, Table 6: SGSN MM and PDP Contexts */ struct sgsn_mm_ctx { @@ -418,23 +413,6 @@ bool has_pdp_charg; };
-struct sgsn_subscriber_data { - struct sgsn_mm_ctx *mm; - struct gsm_auth_tuple auth_triplets[5]; - int auth_triplets_updated; - struct llist_head pdp_list; - int error_cause; - - uint8_t msisdn[9]; - size_t msisdn_len; - - uint8_t hlr[9]; - size_t hlr_len; - - uint8_t pdp_charg[2]; - bool has_pdp_charg; -}; - #define SGSN_ERROR_CAUSE_NONE (-1)
#define LOGGSUBSCRP(level, subscr, fmt, args...) \ diff --git a/include/osmocom/sgsn/gprs_subscriber.h b/include/osmocom/sgsn/gprs_subscriber.h index c735a29..a961c45 100644 --- a/include/osmocom/sgsn/gprs_subscriber.h +++ b/include/osmocom/sgsn/gprs_subscriber.h @@ -22,6 +22,30 @@ GPRS_SUBSCRIBER_UPDATE_AUTH_INFO_PENDING \ )
+struct gsm_auth_tuple { + int use_count; + int key_seq; + struct osmo_auth_vector vec; +}; +#define GSM_KEY_SEQ_INVAL 7 /* GSM 04.08 - 10.5.1.2 */ + +struct sgsn_subscriber_data { + struct sgsn_mm_ctx *mm; + struct gsm_auth_tuple auth_triplets[5]; + int auth_triplets_updated; + struct llist_head pdp_list; + int error_cause; + + uint8_t msisdn[9]; + size_t msisdn_len; + + uint8_t hlr[9]; + size_t hlr_len; + + uint8_t pdp_charg[2]; + bool has_pdp_charg; +}; + struct gprs_subscr { struct llist_head entry; int use_count;
-
pespin