diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-10-12 02:55:31 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-11-12 16:06:46 +0100 |
| commit | 8afc916e360a1ae739bb9df6913317eb3990a1ab (patch) | |
| tree | fa8fc269ee8955ecd9491af8cab50f38f628b037 /openbsc/include | |
| parent | 22e0b7c35ebedde333b6fce0fc7f87ee34ff5368 (diff) | |
IuCS, IuPS: move flag to use X.213 NSAP addr into ue_conn_ctx
The future perspective is to remember the preferred RAB Transport Layer Address
encoding for each 3G cell that is connected, so store per UE conn instead of
globally hardcoding.
Add rab_assign_addr_enc member to ue_conn_ctx. Thus the iu_rab_act_cs() and
iu_rab_act_ps() functions no longer need the explicit use_x213_nsap argument.
Add include/openbsc/common.h in order to define the enum nsap_addr_enc, in a
separate file to be able to easily include it in all of libmsc, libiu and
gprs/* without creating include cycles.
Set the rab_assign_addr_enc when an MM ctx is created for iu, and whenever the
ue_conn_ctx for an Iu MM ctx is updated. This looks a bit clumsy so far, the
hope is that there will be a nice way to setup the ue_conn_ctx prior to that.
Change-Id: I49bb5736df7bdfdd55d3e7b74ee559595cfd2f7d
Diffstat (limited to 'openbsc/include')
| -rw-r--r-- | openbsc/include/openbsc/Makefile.am | 1 | ||||
| -rw-r--r-- | openbsc/include/openbsc/common.h | 6 | ||||
| -rw-r--r-- | openbsc/include/openbsc/gprs_gmm.h | 2 | ||||
| -rw-r--r-- | openbsc/include/openbsc/iu.h | 1 |
4 files changed, 9 insertions, 1 deletions
diff --git a/openbsc/include/openbsc/Makefile.am b/openbsc/include/openbsc/Makefile.am index ac3a2d081..5ea8ef5f5 100644 --- a/openbsc/include/openbsc/Makefile.am +++ b/openbsc/include/openbsc/Makefile.am @@ -13,6 +13,7 @@ noinst_HEADERS = \ bss.h \ bts_ipaccess_nanobts_omlattr.h \ chan_alloc.h \ + common.h \ crc24.h \ ctrl.h \ db.h \ diff --git a/openbsc/include/openbsc/common.h b/openbsc/include/openbsc/common.h new file mode 100644 index 000000000..d91b3d39e --- /dev/null +++ b/openbsc/include/openbsc/common.h @@ -0,0 +1,6 @@ +#pragma once + +enum nsap_addr_enc { + NSAP_ADDR_ENC_X213, + NSAP_ADDR_ENC_V4RAW, +}; diff --git a/openbsc/include/openbsc/gprs_gmm.h b/openbsc/include/openbsc/gprs_gmm.h index d210a3547..c38e49f0d 100644 --- a/openbsc/include/openbsc/gprs_gmm.h +++ b/openbsc/include/openbsc/gprs_gmm.h @@ -30,6 +30,6 @@ int gprs_gmm_rx_resume(struct gprs_ra_id *raid, uint32_t tlli, time_t gprs_max_time_to_idle(void); -int iu_rab_act_ps(uint8_t rab_id, struct sgsn_pdp_ctx *pdp, bool use_x213_nsap); +int iu_rab_act_ps(uint8_t rab_id, struct sgsn_pdp_ctx *pdp); #endif /* _GPRS_GMM_H */ diff --git a/openbsc/include/openbsc/iu.h b/openbsc/include/openbsc/iu.h index dd962bf9f..a82d53066 100644 --- a/openbsc/include/openbsc/iu.h +++ b/openbsc/include/openbsc/iu.h @@ -25,6 +25,7 @@ struct ue_conn_ctx { uint32_t conn_id; int integrity_active; struct gprs_ra_id ra_id; + enum nsap_addr_enc rab_assign_addr_enc; }; enum iu_event_type { |