diff options
| -rw-r--r-- | TODO-RELEASE | 1 | ||||
| -rw-r--r-- | include/osmocom/gprs/protocol/gsm_04_60.h | 3 | ||||
| -rw-r--r-- | src/gsm/gsm48_rest_octets.c | 6 |
3 files changed, 9 insertions, 1 deletions
diff --git a/TODO-RELEASE b/TODO-RELEASE index 7699aff3..33e27afc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,5 +8,6 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line libosmogsm new API gsm0808_create_sapi_reject_cause() with cause argument +libosmogsm ABI change struct osmo_gprs_cell_options size changed (new field at the end) libosmovty ABI change struct cmd_element: add a field for program specific attributes libosmovty ABI change struct vty_app_info: optional program specific attributes description diff --git a/include/osmocom/gprs/protocol/gsm_04_60.h b/include/osmocom/gprs/protocol/gsm_04_60.h index 05728f49..ed63fe00 100644 --- a/include/osmocom/gprs/protocol/gsm_04_60.h +++ b/include/osmocom/gprs/protocol/gsm_04_60.h @@ -167,7 +167,7 @@ enum osmo_gprs_nmo { GPRS_NMO_III = 2, /* no paging coordination */ }; -/* TS 04.60 12.24 */ +/* TS 44.060 12.24 */ struct osmo_gprs_cell_options { enum osmo_gprs_nmo nmo; /* T3168: wait for packet uplink assignment message */ @@ -187,6 +187,7 @@ struct osmo_gprs_cell_options { uint8_t pfc_supported; uint8_t dtm_supported; uint8_t bss_paging_coordination; + bool ccn_active; } ext_info; }; diff --git a/src/gsm/gsm48_rest_octets.c b/src/gsm/gsm48_rest_octets.c index 1f9c2b52..3a424f7e 100644 --- a/src/gsm/gsm48_rest_octets.c +++ b/src/gsm/gsm48_rest_octets.c @@ -906,6 +906,8 @@ static int append_gprs_cell_opt(struct bitvec *bv, bitvec_set_bit(bv, 0); } else { /* extension information */ + + /* R99 extension: */ bitvec_set_bit(bv, 1); if (!gco->ext_info.egprs_supported) { /* 6bit length of extension */ @@ -927,6 +929,10 @@ static int append_gprs_cell_opt(struct bitvec *bv, bitvec_set_bit(bv, gco->ext_info.pfc_supported); bitvec_set_bit(bv, gco->ext_info.dtm_supported); bitvec_set_bit(bv, gco->ext_info.bss_paging_coordination); + + /* REL-4 extension: */ + bitvec_set_bit(bv, gco->ext_info.ccn_active); + bitvec_set_bit(bv, 0); /* NW_EXT_UTBF disabled */ } return 0; |