diff options
Diffstat (limited to 'include/openbsc/gprs_sgsn.h')
| -rw-r--r-- | include/openbsc/gprs_sgsn.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/openbsc/gprs_sgsn.h b/include/openbsc/gprs_sgsn.h index b470c536c..0fa49a775 100644 --- a/include/openbsc/gprs_sgsn.h +++ b/include/openbsc/gprs_sgsn.h @@ -4,7 +4,7 @@ #include <stdint.h> #include <netinet/in.h> -#include <osmocore/gsm48.h> +#include <osmocom/gsm/gsm48.h> #include <osmocom/crypt/gprs_cipher.h> @@ -50,7 +50,8 @@ enum gprs_t3350_mode { GMM_T3350_MODE_PTMSI_REALL, }; -#define MS_RADIO_ACCESS_CAPA +#define MS_RADIO_ACCESS_CAPA_MAX_LENGTH 255 +#define MS_NETWORK_CAPA_MAX_LENGTH 32 /* 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 */ @@ -78,11 +79,11 @@ struct sgsn_mm_ctx { /* CKSN */ enum gprs_ciph_algo ciph_algo; struct { - uint8_t buf[14]; /* 10.5.5.12a */ + uint8_t buf[MS_RADIO_ACCESS_CAPA_MAX_LENGTH]; /* 10.5.5.12a */ uint8_t len; } ms_radio_access_capa; struct { - uint8_t buf[4]; /* 10.5.5.12 */ + uint8_t buf[MS_NETWORK_CAPA_MAX_LENGTH]; /* 10.5.5.12 */ uint8_t len; } ms_network_capa; uint16_t drx_parms; @@ -102,7 +103,7 @@ struct sgsn_mm_ctx { uint16_t nsei; uint16_t bvci; struct rate_ctr_group *ctrg; - struct timer_list timer; + struct osmo_timer_list timer; unsigned int T; /* Txxxx number */ unsigned int num_T_exp; /* number of consecutive T expirations */ @@ -168,7 +169,7 @@ struct sgsn_pdp_ctx { //uint32_t charging_id; int reordering_reqd; - struct timer_list timer; + struct osmo_timer_list timer; unsigned int T; /* Txxxx number */ unsigned int num_T_exp; /* number of consecutive T expirations */ }; |