Use negative numbers for non-spec osmo-specific timers

(values -1 and -2 cannot be used because they are already taken).

Related: OS#3928
Change-Id: Ibcdb05ff5bb8efe6cb95cf94e2c8e418dc8deced
changes/06/23906/1
Pau Espin 2 years ago
parent 25ebf3c8f9
commit 14339f6fac
  1. 6
      src/gprs_bssgp_pcu.c
  2. 4
      src/gprs_pcu.c

@ -975,7 +975,7 @@ static void bvc_timeout(void *_priv)
if (!the_pcu->bssgp.bvc_sig_reset) {
LOGP(DBSSGP, LOGL_INFO, "Sending reset on BVCI 0\n");
bssgp_tx_bvc_reset(the_pcu->bssgp.bctx, 0, BSSGP_CAUSE_OML_INTERV);
secs = osmo_tdef_get(the_pcu->T_defs, 2, OSMO_TDEF_S, -1);
secs = osmo_tdef_get(the_pcu->T_defs, -102, OSMO_TDEF_S, -1);
osmo_timer_schedule(&the_pcu->bssgp.bvc_timer, secs, 0);
return;
}
@ -984,7 +984,7 @@ static void bvc_timeout(void *_priv)
LOGP(DBSSGP, LOGL_INFO, "Sending reset on BVCI %d\n",
the_pcu->bssgp.bctx->bvci);
bssgp_tx_bvc_reset(the_pcu->bssgp.bctx, the_pcu->bssgp.bctx->bvci, BSSGP_CAUSE_OML_INTERV);
secs = osmo_tdef_get(the_pcu->T_defs, 2, OSMO_TDEF_S, -1);
secs = osmo_tdef_get(the_pcu->T_defs, -102, OSMO_TDEF_S, -1);
osmo_timer_schedule(&the_pcu->bssgp.bvc_timer, secs, 0);
return;
}
@ -993,7 +993,7 @@ static void bvc_timeout(void *_priv)
LOGP(DBSSGP, LOGL_INFO, "Sending unblock on BVCI %d\n",
the_pcu->bssgp.bctx->bvci);
bssgp_tx_bvc_unblock(the_pcu->bssgp.bctx);
secs = osmo_tdef_get(the_pcu->T_defs, 1, OSMO_TDEF_S, -1);
secs = osmo_tdef_get(the_pcu->T_defs, -101, OSMO_TDEF_S, -1);
osmo_timer_schedule(&the_pcu->bssgp.bvc_timer, secs, 0);
return;
}

@ -30,13 +30,13 @@
struct gprs_pcu *the_pcu;
static struct osmo_tdef T_defs_pcu[] = {
{ .T=1, .default_val=30, .unit=OSMO_TDEF_S, .desc="BSSGP (un)blocking procedures timer (s)", .val=0 },
{ .T=2, .default_val=30, .unit=OSMO_TDEF_S, .desc="BSSGP reset procedure timer (s)", .val=0 },
{ .T=3190, .default_val=5, .unit=OSMO_TDEF_S, .desc="Return to packet idle mode after Packet DL Assignment on CCCH (s)", .val=0},
{ .T=PCU_TDEF_NEIGH_RESOLVE_TO, .default_val=1000, .unit=OSMO_TDEF_MS, .desc="[ARFCN+BSIC]->[RAC+CI] resolution timeout (ms)", .val=0 },
{ .T=PCU_TDEF_SI_RESOLVE_TO, .default_val=1000, .unit=OSMO_TDEF_MS, .desc="RIM RAN-INFO response timeout (ms)", .val=0 },
{ .T=PCU_TDEF_NEIGH_CACHE_ALIVE, .default_val=5, .unit=OSMO_TDEF_S, .desc="[ARFCN+BSIC]->[RAC+CI] resolution cache entry storage timeout (s)", .val=0 },
{ .T=PCU_TDEF_SI_CACHE_ALIVE, .default_val=5, .unit=OSMO_TDEF_S, .desc="[RAC+CI]->[SI] resolution cache entry storage timeout (s)", .val=0 },
{ .T=-101, .default_val=30, .unit=OSMO_TDEF_S, .desc="BSSGP (un)blocking procedures timer (s)", .val=0 },
{ .T=-102, .default_val=30, .unit=OSMO_TDEF_S, .desc="BSSGP reset procedure timer (s)", .val=0 },
{ .T=-2000, .default_val=2, .unit=OSMO_TDEF_MS, .desc="Tbf reject for PRR timer (ms)", .val=0 },
{ .T=-2001, .default_val=2, .unit=OSMO_TDEF_S, .desc="PACCH assignment timer (s)", .val=0 },
{ .T=-2002, .default_val=200, .unit=OSMO_TDEF_MS, .desc="Waiting after IMM.ASS confirm timer (ms)", .val=0 },

Loading…
Cancel
Save