diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-03-24 10:28:43 +0100 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-03-24 10:28:43 +0100 |
commit | b9c520f9b36fd97ae11c91f2bec394d684ac6749 (patch) | |
tree | e312d0d70579eafa9e1fdc9c9c3daaf5a21f03fe /openbsc/include/openbsc/gsm_data.h | |
parent | 8a7ca57d3eec7376169661ea3cfcca4c3c2f33cf (diff) | |
parent | f99f0930fd02a5ef164c54fe8926a7e0b11acbdb (diff) |
Merge remote branch 'origin/master' into on-waves/bsc-master
Keep a static version as the shell script is not dealing well
with branch tags/names containing text.
Resolve merge conflict in the Makefile.am by adding both sides
to the list of sources for the libbsc.a
Conflicts:
openbsc/configure.in
openbsc/src/Makefile.am
Diffstat (limited to 'openbsc/include/openbsc/gsm_data.h')
-rw-r--r-- | openbsc/include/openbsc/gsm_data.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index dd7f6c11e..5b70d1db6 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -393,6 +393,10 @@ struct gsm_envabtse { struct gsm_bts_gprs_nsvc { struct gsm_bts *bts; int id; + u_int16_t nsvci; + u_int16_t local_port; + u_int16_t remote_port; + u_int32_t remote_ip; struct gsm_nm_state nm_state; }; @@ -481,13 +485,17 @@ struct gsm_bts { /* Not entirely sure how ip.access specific this is */ struct { + int enabled; struct { struct gsm_nm_state nm_state; + u_int16_t nsei; } nse; struct { struct gsm_nm_state nm_state; + u_int16_t bvci; } cell; struct gsm_bts_gprs_nsvc nsvc[2]; + u_int8_t rac; } gprs; /* transceivers */ @@ -720,6 +728,16 @@ const char *rrlp_mode_name(enum rrlp_mode mode); void gsm_trx_lock_rf(struct gsm_bts_trx *trx, int locked); +/* A parsed GPRS routing area */ +struct gprs_ra_id { + u_int16_t mnc; + u_int16_t mcc; + u_int16_t lac; + u_int8_t rac; +}; + +int gsm48_ra_id_by_bts(u_int8_t *buf, struct gsm_bts *bts); +void gprs_ra_id_by_bts(struct gprs_ra_id *raid, struct gsm_bts *bts); struct gsm_meas_rep *lchan_next_meas_rep(struct gsm_lchan *lchan); int gsm_bts_model_register(struct gsm_bts_model *model); |