gbproxy: Add NSE peer that can have multiple gbproxy_peers
We want this level of indirection to support multiple BVCs per NSE. The
current code assumes that an NSE only has one BVC which breaks messages
on the signalling BVC which should only be sent once to an NSE
regardless of the number of BVCs it contains.
Change-Id: I97cc6c8f8c0f1b91577ab8f679c4ae217cc88076
Related: SYS#5226
diff --git a/src/gb_proxy_patch.c b/src/gb_proxy_patch.c
index 9c70d3f..6601657 100644
--- a/src/gb_proxy_patch.c
+++ b/src/gb_proxy_patch.c
@@ -44,6 +44,10 @@
GBPROX_PEER_CTR_RAID_PATCHED_SGSN :
GBPROX_PEER_CTR_RAID_PATCHED_BSS;
+ OSMO_ASSERT(peer->nse);
+ struct gbproxy_config *cfg = peer->nse->cfg;
+ OSMO_ASSERT(cfg);
+
if (!state->local_plmn.mcc || !state->local_plmn.mnc)
return;
@@ -58,11 +62,11 @@
if (!to_bss) {
/* BSS -> SGSN */
if (state->local_plmn.mcc)
- raid.mcc = peer->cfg->core_plmn.mcc;
+ raid.mcc = cfg->core_plmn.mcc;
if (state->local_plmn.mnc) {
- raid.mnc = peer->cfg->core_plmn.mnc;
- raid.mnc_3_digits = peer->cfg->core_plmn.mnc_3_digits;
+ raid.mnc = cfg->core_plmn.mnc;
+ raid.mnc_3_digits = cfg->core_plmn.mnc_3_digits;
}
} else {
/* SGSN -> BSS */
@@ -100,11 +104,14 @@
size_t apn_len = hdr->apn_len;
uint8_t *apn = hdr->apn;
+ OSMO_ASSERT(peer->nse);
+ struct gbproxy_config *cfg = peer->nse->cfg;
+ OSMO_ASSERT(cfg);
OSMO_ASSERT(apn_ie_len == apn_len + sizeof(struct apn_ie_hdr));
OSMO_ASSERT(apn_ie_len > 2 && apn_ie_len <= 102);
- if (peer->cfg->core_apn_size == 0) {
+ if (cfg->core_apn_size == 0) {
char str1[110];
/* Remove the IE */
LOGP(DGPRS, LOGL_DEBUG,
@@ -119,20 +126,20 @@
char str1[110];
char str2[110];
- OSMO_ASSERT(peer->cfg->core_apn_size <= 100);
+ OSMO_ASSERT(cfg->core_apn_size <= 100);
LOGP(DGPRS, LOGL_DEBUG,
"Patching %s to SGSN: "
"Replacing APN '%s' -> '%s'\n",
log_text,
osmo_apn_to_str(str1, apn, apn_len),
- osmo_apn_to_str(str2, peer->cfg->core_apn,
- peer->cfg->core_apn_size));
+ osmo_apn_to_str(str2, cfg->core_apn,
+ cfg->core_apn_size));
- *new_apn_ie_len = peer->cfg->core_apn_size + 2;
- msgb_resize_area(msg, apn, apn_len, peer->cfg->core_apn_size);
- memcpy(apn, peer->cfg->core_apn, peer->cfg->core_apn_size);
- hdr->apn_len = peer->cfg->core_apn_size;
+ *new_apn_ie_len = cfg->core_apn_size + 2;
+ msgb_resize_area(msg, apn, apn_len, cfg->core_apn_size);
+ memcpy(apn, cfg->core_apn, cfg->core_apn_size);
+ hdr->apn_len = cfg->core_apn_size;
}
rate_ctr_inc(&peer->ctrg->ctr[GBPROX_PEER_CTR_APN_PATCHED]);
@@ -207,10 +214,12 @@
struct gprs_llc_hdr_parsed *ghp = &parse_ctx->llc_hdr_parsed;
int have_patched = 0;
int fcs;
- struct gbproxy_config *cfg = peer->cfg;
+ OSMO_ASSERT(peer->nse);
+ struct gbproxy_config *cfg = peer->nse->cfg;
+ OSMO_ASSERT(cfg);
if (parse_ctx->ptmsi_enc && link_info &&
- !parse_ctx->old_raid_is_foreign && peer->cfg->patch_ptmsi) {
+ !parse_ctx->old_raid_is_foreign && cfg->patch_ptmsi) {
uint32_t ptmsi;
if (parse_ctx->to_bss)
ptmsi = link_info->tlli.ptmsi;
@@ -291,13 +300,16 @@
{
const char *err_info = NULL;
int err_ctr = -1;
+ OSMO_ASSERT(peer->nse);
+ struct gbproxy_config *cfg = peer->nse->cfg;
+ OSMO_ASSERT(cfg);
if (parse_ctx->bssgp_raid_enc)
gbproxy_patch_raid((struct gsm48_ra_id *)parse_ctx->bssgp_raid_enc, peer,
parse_ctx->to_bss, "BSSGP");
if (parse_ctx->need_decryption &&
- (peer->cfg->patch_ptmsi || peer->cfg->core_apn)) {
+ (cfg->patch_ptmsi || cfg->core_apn)) {
/* Patching LLC messages has been requested
* explicitly, but the message (including the
* type) is encrypted, so we possibly fail to
@@ -319,7 +331,7 @@
if (!link_info)
return;
- if (parse_ctx->tlli_enc && peer->cfg->patch_ptmsi) {
+ if (parse_ctx->tlli_enc && cfg->patch_ptmsi) {
uint32_t tlli = gbproxy_map_tlli(parse_ctx->tlli,
link_info, parse_ctx->to_bss);
@@ -335,7 +347,7 @@
}
}
- if (parse_ctx->bssgp_ptmsi_enc && peer->cfg->patch_ptmsi) {
+ if (parse_ctx->bssgp_ptmsi_enc && cfg->patch_ptmsi) {
uint32_t ptmsi;
if (parse_ctx->to_bss)
ptmsi = link_info->tlli.ptmsi;