diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-02-21 00:39:07 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-03-11 00:47:14 +0100 |
| commit | bdc55fad62e333951a0eb1fc7b96aaaec16dd6ff (patch) | |
| tree | 2dde9a0de875f3e21e4e461df5bcb8f74c6c9496 /src/pcu_l1_if.cpp | |
| parent | 8343b4adbbe9afd4294232429696ee9736ec1004 (diff) | |
implement support for 3-digit MNC with leading zeros
Receive the mnc_3_digits flag from the PCU interface.
Bump the PCU interface to 9.
This is one part of the three identical pcuif_proto.h patches:
- I49cd762c3c9d7ee6a82451bdf3ffa2a060767947 (osmo-bts)
- I787fed84a7b613158a5618dd5cffafe4e4927234 (osmo-pcu)
- I78f30aef7aa224b2e9db54c3a844d8f520b3aee0 (osmo-bsc)
Add 3-digit flags and use the new RAI and LAI API from libosmocore throughout
the code base to be able to handle an MNC < 100 that has three digits (leading
zeros).
Depends: Id2240f7f518494c9df6c8bda52c0d5092f90f221 (libosmocore),
Ib7176b1d65a03b76f41f94bc9d3293a8a07d24c6 (libosmocore)
Change-Id: I787fed84a7b613158a5618dd5cffafe4e4927234
Diffstat (limited to 'src/pcu_l1_if.cpp')
| -rw-r--r-- | src/pcu_l1_if.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 664a7b7b..85dbfb9a 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -408,6 +408,7 @@ static int pcu_rx_info_ind(struct gsm_pcu_if_info_ind *info_ind) int rc = 0; unsigned int trx, ts; int i; + uint16_t cell_id = ntohs(info_ind->cell_id); if (info_ind->version != PCU_IF_VERSION) { fprintf(stderr, "PCU interface version number of BTS (%d) is " @@ -434,11 +435,11 @@ bssgp_failed: exit(0); } LOGP(DL1IF, LOGL_INFO, "BTS available\n"); - LOGP(DL1IF, LOGL_DEBUG, " mcc=%x\n", info_ind->mcc); - LOGP(DL1IF, LOGL_DEBUG, " mnc=%x\n", info_ind->mnc); + LOGP(DL1IF, LOGL_DEBUG, " mcc=%03u\n", info_ind->mcc); + LOGP(DL1IF, LOGL_DEBUG, " mnc=%0*u\n", info_ind->mnc_3_digits, info_ind->mnc); LOGP(DL1IF, LOGL_DEBUG, " lac=%d\n", info_ind->lac); LOGP(DL1IF, LOGL_DEBUG, " rac=%d\n", info_ind->rac); - LOGP(DL1IF, LOGL_DEBUG, " cell_id=%d\n", ntohs(info_ind->cell_id)); + LOGP(DL1IF, LOGL_DEBUG, " cell_id=%d\n", cell_id); LOGP(DL1IF, LOGL_DEBUG, " bsic=%d\n", info_ind->bsic); LOGP(DL1IF, LOGL_DEBUG, " nsei=%d\n", info_ind->nsei); LOGP(DL1IF, LOGL_DEBUG, " nse_timer=%d %d %d %d %d %d %d\n", @@ -488,8 +489,8 @@ bssgp_failed: pcu = gprs_bssgp_create_and_connect(bts, info_ind->local_port[0], info_ind->remote_ip[0], info_ind->remote_port[0], info_ind->nsei, info_ind->nsvci[0], info_ind->bvci, - info_ind->mcc, info_ind->mnc, info_ind->lac, info_ind->rac, - info_ind->cell_id); + info_ind->mcc, info_ind->mnc, info_ind->mnc_3_digits, info_ind->lac, info_ind->rac, + cell_id); if (!pcu) { LOGP(DL1IF, LOGL_NOTICE, "SGSN not available\n"); goto bssgp_failed; |